Merge pull request #409 from sasjs/print-support

feat(execute): save webout, log, print and code after completion

Author: allanbowe

package-lock.json

@@ -250,7 +250,7 @@
     "vscode-test": "^1.6.1"
   },
   "dependencies": {
-    "@sasjs/adapter": "4.1.2",
+    "@sasjs/adapter": "4.3.3",
     "@sasjs/cli": "4.1.1",
     "@sasjs/lint": "2.3.1",
     "@sasjs/utils": "3.2.0",

package.json

@@ -1,10 +1,19 @@
 import { window, ExtensionContext, commands } from 'vscode'
 import { getEditorContent } from '../../utils/editor'
-import { selectTarget } from '../../utils/target'
-import { createAndOpenLogFile, handleErrorResponse } from '../../utils/utils'
+import {
+  createAndOpenLogFile,
+  handleErrorResponse,
+  getTimestamp
+} from '../../utils/utils'
 import { executeCode } from '../../utils/executeCode'
-import { updateSasjsConstants } from '../../utils/setConstants'
 import { TargetCommand } from '../../types/commands/targetCommand'
+import { ScriptExecutionResult } from '@sasjs/adapter'
+import { createFile, createFolder } from '../../utils/file'
+import * as path from 'path'
+
+interface ExecutionArtifacts extends ScriptExecutionResult {
+  code?: string
+}
 
 export class ExecuteCodeCommand extends TargetCommand {
   constructor(private context: ExtensionContext) {
@@ -29,17 +38,21 @@ export class ExecuteCodeCommand extends TargetCommand {
     }
 
     const execFilePath = window.activeTextEditor?.document.fileName
-
     const sasCodeInjection = `options set=SAS_EXECFILEPATH "${execFilePath}";`
-
-    const currentFileContent = `${sasCodeInjection}\n${getEditorContent()}`
+    const editorContent = getEditorContent()
+    const currentFileContent = `${sasCodeInjection}\n${editorContent}`
 
     commands.executeCommand('setContext', 'isSasjsCodeExecuting', true)
 
     await executeCode(target, currentFileContent || '')
-      .then(async ({ log }) => {
+      .then(async (res) => {
         process.outputChannel.appendLine('SASjs: Code executed successfully!')
-        await handleSuccessResponse(log)
+
+        if (typeof res.log === 'object') {
+          res.log = JSON.stringify(res.log, null, 2)
+        }
+
+        await this.saveExecutionArtifacts({ ...res, code: editorContent })
       })
       .catch(async (err) => {
         await handleErrorResponse(err, 'Error executing code')
@@ -48,14 +61,27 @@ export class ExecuteCodeCommand extends TargetCommand {
         commands.executeCommand('setContext', 'isSasjsCodeExecuting', false)
       })
   }
-}
 
-const handleSuccessResponse = async (log: any) => {
-  if (typeof log === 'object') {
-    return await createAndOpenLogFile(JSON.stringify(log, null, 2))
-  }
+  private saveExecutionArtifacts = async (result: ExecutionArtifacts) => {
+    const { buildDestinationResultsFolder: resultsFolder } =
+      process.sasjsConstants
+    const timestamp = getTimestamp()
+    const folderPath = path.join(resultsFolder, timestamp)
+
+    await createFolder(folderPath)
+
+    const { log, webout, printOutput, code } = result
+
+    if (webout) {
+      await createFile(path.join(folderPath, 'webout.txt'), webout)
+    }
+    if (printOutput) {
+      await createFile(path.join(folderPath, 'print.lst'), printOutput)
+    }
+    if (code) {
+      await createFile(path.join(folderPath, 'code.sas'), code)
+    }
 
-  if (typeof log === 'string') {
-    return await createAndOpenLogFile(log)
+    await createAndOpenLogFile(log, path.join(folderPath, 'log.log'))
   }
 }

src/commands/execute-code/ExecuteCodeCommand.ts

@@ -1,6 +1,7 @@
 import { Target, ServerType, decodeFromBase64 } from '@sasjs/utils'
 import { getAuthConfig, getAuthConfigSas9 } from './config'
 import { getSASjs } from './getSASjs'
+import { ScriptExecutionResult } from '@sasjs/adapter'
 
 export const executeCode = async (target: Target, code: string) => {
   if (target.serverType === ServerType.SasViya) {
@@ -55,11 +56,11 @@ const executeOnSasJS = async (target: Target, code: string) => {
   const sasjs = getSASjs(target)
   const authConfig = await getAuthConfig(target)
 
-  const executionResult = await sasjs.executeScript({
+  const executionResult: ScriptExecutionResult = await sasjs.executeScript({
     linesOfCode: code.split('\n'),
     runTime: 'sas',
     authConfig
   })
 
-  return { log: executionResult }
+  return executionResult
 }

src/utils/executeCode.ts

@@ -9,3 +9,7 @@ export async function readFile(filePath: string) {
     .readFile(Uri.file(filePath))
     .then((content) => Buffer.from(content).toString('utf8'))
 }
+
+export async function createFolder(filePath: string) {
+  return await workspace.fs.createDirectory(Uri.file(filePath))
+}

src/utils/file.ts

@@ -5,7 +5,6 @@ import { window, workspace, ViewColumn } from 'vscode'
 import {
   Target,
   timestampToYYYYMMDDHHMMSS,
-  fileExists,
   folderExists,
   copy
 } from '@sasjs/utils'
@@ -103,12 +102,12 @@ export const handleErrorResponse = async (e: any, message: string) => {
   }
 }
 
-export const createAndOpenLogFile = async (log: string) => {
+export const createAndOpenLogFile = async (log: string, filePath?: string) => {
   const { buildDestinationResultsFolder: resultsFolder } =
     process.sasjsConstants
 
   const timestamp = getTimestamp()
-  const resultsPath = path.join(resultsFolder, `${timestamp}.log`)
+  const resultsPath = filePath || path.join(resultsFolder, `${timestamp}.log`)
 
   process.outputChannel.appendLine(
     `SASjs: Attempting to create log file at ${resultsPath}.`