@sasjs/cli 3.18.2 → 3.19.3

package/build/commands/add/internal/input.js

@@ -206,7 +206,7 @@ function getAndValidateUpdateExisting(targetScope, targetName) {
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0: return [4 /*yield*/, (0, config_1.findTargetInConfiguration)(targetName, targetScope)
-                        .then(function (res) { return res.target.toJson(); })
+                        .then(function (res) { return res.target.toJson(false); })
                         .catch(function (_) { return undefined; })];
                 case 1:
                     targetJson = _b.sent();

package/build/commands/create/spec/angularAppFiles.js

@@ -62,30 +62,14 @@ exports.angularAppFiles = {
                     ],
                     subFolders: [
                         {
-                            folderName: 'components',
-                            files: [],
-                            subFolders: [
-                                {
-                                    folderName: 'login-modal',
-                                    files: [
-                                        { fileName: 'login-modal.component.html' },
-                                        { fileName: 'login-modal.component.scss' },
-                                        { fileName: 'login-modal.component.spec.ts' },
-                                        { fileName: 'login-modal.component.ts' }
-                                    ],
-                                    subFolders: []
-                                },
-                                {
-                                    folderName: 'requests-modal',
-                                    files: [
-                                        { fileName: 'requests-modal.component.html' },
-                                        { fileName: 'requests-modal.component.scss' },
-                                        { fileName: 'requests-modal.component.spec.ts' },
-                                        { fileName: 'requests-modal.component.ts' }
-                                    ],
-                                    subFolders: []
-                                }
-                            ]
+                            folderName: 'sasjs-ui',
+                            files: [
+                                { fileName: 'sasjs-ui.component.html' },
+                                { fileName: 'sasjs-ui.component.spec.ts' },
+                                { fileName: 'sasjs-ui.component.scss' },
+                                { fileName: 'sasjs-ui.component.ts' }
+                            ],
+                            subFolders: []
                         },
                         {
                             folderName: 'data',

package/build/commands/deploy/deploy.js

@@ -100,9 +100,9 @@ function deploy(target, isLocal, sasjs) {
                     return [3 /*break*/, 8];
                 case 6: return [4 /*yield*/, (0, utils_2.asyncForEach)(deployScripts, function (deployScript) { return __awaiter(_this, void 0, void 0, function () {
                         var deployScriptPath, deployScriptContent, linesToExecute, deployScriptName, logPath;
-                        var _a, _b, _c;
-                        return __generator(this, function (_d) {
-                            switch (_d.label) {
+                        var _a, _b, _c, _d;
+                        return __generator(this, function (_e) {
+                            switch (_e.label) {
                                 case 0:
                                     deployScriptPath = (0, utils_2.getAbsolutePath)(deployScript, process.projectDir);
                                     if (!(0, file_1.isSasFile)(deployScript)) return [3 /*break*/, 6];
@@ -111,7 +111,7 @@ function deploy(target, isLocal, sasjs) {
                                         // split into lines
                                     ];
                                 case 1:
-                                    deployScriptContent = _d.sent();
+                                    deployScriptContent = _e.sent();
                                     linesToExecute = deployScriptContent
                                         .replace(/\r\n/g, '\n')
                                         .split('\n');
@@ -119,23 +119,26 @@ function deploy(target, isLocal, sasjs) {
                                     if (!(target.serverType === utils_2.ServerType.SasViya)) return [3 /*break*/, 3];
                                     return [4 /*yield*/, deployToSasViya(deployScriptName, target, isLocal, linesToExecute, logFilePath, streamConfig)];
                                 case 2:
-                                    _d.sent();
+                                    _e.sent();
                                     return [3 /*break*/, 5];
                                 case 3: return [4 /*yield*/, deployToSas9(deployScriptName, target, linesToExecute, logFilePath, streamConfig)];
                                 case 4:
-                                    _d.sent();
-                                    _d.label = 5;
-                                case 5: return [3 /*break*/, 8];
+                                    _e.sent();
+                                    _e.label = 5;
+                                case 5: return [3 /*break*/, 9];
                                 case 6:
                                     if (!(0, file_1.isShellScript)(deployScript)) return [3 /*break*/, 8];
                                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Executing shell script ".concat(deployScript, " ..."));
                                     logPath = path_1.default.join(process.projectDir, 'sasjsbuild', "".concat(path_1.default.basename(deployScript).replace('.sh', ''), ".log"));
                                     return [4 /*yield*/, (0, utils_1.executeShellScript)(deployScriptPath, logPath)];
                                 case 7:
-                                    _d.sent();
+                                    _e.sent();
                                     (_c = process.logger) === null || _c === void 0 ? void 0 : _c.success("Shell script execution completed! Log is here: ".concat(logPath));
-                                    _d.label = 8;
-                                case 8: return [2 /*return*/];
+                                    return [3 /*break*/, 9];
+                                case 8:
+                                    (_d = process.logger) === null || _d === void 0 ? void 0 : _d.error("Unable to process script located at ".concat(deployScriptPath));
+                                    _e.label = 9;
+                                case 9: return [2 /*return*/];
                             }
                         });
                     }); })];

package/build/commands/help/help.js

@@ -209,10 +209,12 @@ function printHelpText() {
                 },
                 {
                     name: 'run',
-                    title: 'run <sasFilePath> -t <targetName>',
+                    title: 'run <sasFilePath> -t <targetName> --source /local/run.json -l <log/file/path>',
                     description: [
                         "lets the user run a given SAS file against a specified target.",
-                        "The target can exist either in the local project configuration or in the global .sasjsrc file."
+                        "The target can exist either in the local project configuration or in the global .sasjsrc file.",
+                        "Providing log flag (--log or -l) is optional. If not present, the log is stored locally with a timestamp. If present, CLI will fetch and save the log to the specified location. If a relative location, it will be relative to the directory in which the command is invoked.",
+                        "Providing source flag (--source or -s) is optional. It should point to a JSON file with the following structure:  {\"macroVars\": {\"var1\": \"val1\", \"var2\": \"val2\"}}. These will be parsed into SAS \"%let\" statements and pre-append to the SAS code being run."
                     ]
                 },
                 {

package/build/commands/job/internal/execute/sas9.js

@@ -42,9 +42,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeJobSas9 = void 0;
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
-var file_1 = require("../../../../utils/file");
 var displayResult_1 = require("../../../../utils/displayResult");
 var utils_2 = require("../utils");
+var parseSourceFile_1 = require("../../../../utils/parseSourceFile");
 /**
  * Triggers an existing Stored Process for execution as a "job".  See online documentation here: https://cli.sasjs.io/job/
  * @param {object} sasjs - Configuration object of the SASJS adapter.
@@ -56,50 +56,35 @@ var utils_2 = require("../utils");
  */
 function executeJobSas9(sasjs, config, jobPath, logFile, output, source) {
     return __awaiter(this, void 0, void 0, function () {
-        var macroVars, currentDirPath, startTime, result, endTime, outputJson, currentDirPath, outputPath, folderPath, parentFolderPath, error_1;
+        var macroVars, startTime, result, endTime, outputJson, currentDirPath, outputPath, folderPath, parentFolderPath, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     macroVars = null;
-                    if (!source) return [3 /*break*/, 3];
-                    currentDirPath = path_1.default.isAbsolute(source) ? '' : process.projectDir;
-                    source = path_1.default.join(currentDirPath, source);
-                    if (!(0, file_1.isJsonFile)(source))
-                        throw 'Source file has to be JSON.';
-                    return [4 /*yield*/, (0, utils_1.fileExists)(source).catch(function (_) {
-                            throw 'Error while checking if source file exists.';
-                        })];
+                    if (!source) return [3 /*break*/, 2];
+                    return [4 /*yield*/, (0, parseSourceFile_1.parseSourceFile)(source)];
                 case 1:
-                    _a.sent();
-                    return [4 /*yield*/, (0, utils_1.readFile)(source).catch(function (_) {
-                            throw 'Error while reading source file.';
-                        })];
+                    macroVars = _a.sent();
+                    _a.label = 2;
                 case 2:
-                    source = _a.sent();
-                    macroVars = JSON.parse(source);
-                    if (!(0, utils_1.isMacroVars)(macroVars)) {
-                        throw "Provided source is not valid. An example of valid source:\n{ macroVars: { name1: 'value1', name2: 'value2' } }";
-                    }
-                    _a.label = 3;
-                case 3:
                     startTime = new Date().getTime();
                     return [4 /*yield*/, sasjs.request(jobPath, macroVars, config)];
-                case 4:
+                case 3:
                     result = _a.sent();
                     endTime = new Date().getTime();
-                    if (!result) return [3 /*break*/, 15];
-                    if (!(result.status === 200)) return [3 /*break*/, 14];
+                    if (!result) return [3 /*break*/, 14];
+                    if (!(result.status === 200)) return [3 /*break*/, 13];
                     process.logger.success("Job executed successfully! in ".concat((endTime - startTime) / 1000, " seconds"));
-                    if (!(!!logFile && result.log)) return [3 /*break*/, 6];
+                    if (!(!!logFile && result.log)) return [3 /*break*/, 5];
                     return [4 /*yield*/, (0, utils_2.saveLog)(result.log, logFile, jobPath, false)];
-                case 5:
+                case 4:
                     _a.sent();
+                    _a.label = 5;
+                case 5:
+                    if (!(!!output && result.result)) return [3 /*break*/, 12];
                     _a.label = 6;
                 case 6:
-                    if (!(!!output && result.result)) return [3 /*break*/, 13];
-                    _a.label = 7;
-                case 7:
-                    _a.trys.push([7, 12, , 13]);
+                    _a.trys.push([6, 11, , 12]);
                     outputJson = JSON.stringify(result.result, null, 2);
                     currentDirPath = path_1.default.isAbsolute(output)
                         ? ''
@@ -111,27 +96,27 @@ function executeJobSas9(sasjs, config, jobPath, logFile, output, source) {
                     folderPath.pop();
                     parentFolderPath = folderPath.join(path_1.default.sep);
                     return [4 /*yield*/, (0, utils_1.folderExists)(parentFolderPath)];
-                case 8:
-                    if (!!(_a.sent())) return [3 /*break*/, 10];
+                case 7:
+                    if (!!(_a.sent())) return [3 /*break*/, 9];
                     return [4 /*yield*/, (0, utils_1.createFolder)(parentFolderPath)];
-                case 9:
+                case 8:
                     _a.sent();
-                    _a.label = 10;
-                case 10: return [4 /*yield*/, (0, utils_1.createFile)(outputPath, outputJson)];
-                case 11:
+                    _a.label = 9;
+                case 9: return [4 /*yield*/, (0, utils_1.createFile)(outputPath, outputJson)];
+                case 10:
                     _a.sent();
                     (0, displayResult_1.displaySuccess)("Output saved to: ".concat(outputPath));
-                    return [3 /*break*/, 13];
-                case 12:
+                    return [3 /*break*/, 12];
+                case 11:
                     error_1 = _a.sent();
                     (0, displayResult_1.displayError)(error_1, 'An error has occurred when parsing an output of the job.');
-                    return [3 /*break*/, 13];
-                case 13: return [3 /*break*/, 15];
-                case 14:
+                    return [3 /*break*/, 12];
+                case 12: return [3 /*break*/, 14];
+                case 13:
                     process.logger.error(result.message);
                     process.logger.error(JSON.stringify(result.error, null, 2));
-                    _a.label = 15;
-                case 15: return [2 /*return*/, result];
+                    _a.label = 14;
+                case 14: return [2 /*return*/, result];
             }
         });
     });

package/build/commands/run/run.d.ts

@@ -4,7 +4,8 @@ import { Target } from '@sasjs/utils';
  * @param {Target} target - the target to run the SAS code on.
  * @param {string} filePath - the path to the file containing SAS code.
  * @param {boolean} compile - compiles sas file present at 'filePath' before running code.
+ * @param {string} logFile - (Optional) Path to log file.
  */
-export declare function runSasCode(target: Target, filePath: string, compile?: boolean): Promise<{
+export declare function runSasCode(target: Target, filePath: string, compile?: boolean, logFile?: string, source?: string): Promise<{
     log: any;
 }>;

package/build/commands/run/run.js

@@ -35,6 +35,31 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -49,86 +74,87 @@ var __1 = require("../");
 var utils_2 = require("../../utils/");
 var axios_1 = __importDefault(require("axios"));
 var getDestinationPath_1 = require("../compile/internal/getDestinationPath");
+var saveLog_1 = require("../../utils/saveLog");
+var parseSourceFile_1 = require("../../utils/parseSourceFile");
 /**
  * Runs SAS code from a given file on the specified target.
  * @param {Target} target - the target to run the SAS code on.
  * @param {string} filePath - the path to the file containing SAS code.
  * @param {boolean} compile - compiles sas file present at 'filePath' before running code.
+ * @param {string} logFile - (Optional) Path to log file.
  */
-function runSasCode(target, filePath, compile) {
+function runSasCode(target, filePath, compile, logFile, source) {
     var _a;
     if (compile === void 0) { compile = false; }
     return __awaiter(this, void 0, void 0, function () {
-        var isFileCreated, tempFilePath, sourcefilePathParts, sourceFolderPath, sasFilePath, sasFileContent, linesToExecute;
-        var _this = this;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var isTempFile, sourcefilePathParts, sourceFolderPath, sasFilePath, sasFileContent, linesToExecute, macroVars, macroVarStatements, result;
+        var _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
-                    isFileCreated = false;
-                    tempFilePath = path_1.default.join(process.projectDir, 'temp-' + Date.now() + '.sas');
-                    if (!(filePath.startsWith('https://') || filePath.startsWith('http://'))) return [3 /*break*/, 2];
-                    return [4 /*yield*/, axios_1.default
-                            .get(filePath)
-                            .then(function (res) { return __awaiter(_this, void 0, void 0, function () {
-                            var invalidSasError, content;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0:
-                                        invalidSasError = process.sasjsConstants.invalidSasError;
-                                        if (typeof res.data !== 'string') {
-                                            throw new Error(invalidSasError);
-                                        }
-                                        content = res.data.trim();
-                                        if (content && content.startsWith('<')) {
-                                            throw new Error(invalidSasError);
-                                        }
-                                        return [4 /*yield*/, (0, utils_1.createFile)(tempFilePath, content)];
-                                    case 1:
-                                        _a.sent();
-                                        isFileCreated = true;
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); })
-                            .catch(function (err) {
-                            throw new Error("".concat(err.message, "\nUrl: ").concat(filePath));
-                        })];
+                    isTempFile = false;
+                    if (!isUrl(filePath)) return [3 /*break*/, 2];
+                    ;
+                    return [4 /*yield*/, createFileFromUrl(filePath)];
                 case 1:
-                    _b.sent();
-                    _b.label = 2;
+                    (_b = _c.sent(), isTempFile = _b.isTempFile, filePath = _b.tempFilePath);
+                    _c.label = 2;
                 case 2:
-                    if (isFileCreated) {
-                        filePath = tempFilePath;
-                    }
-                    if (!/\.sas$/i.test(filePath)) {
-                        throw new Error("'sasjs run' command supports only *.sas files.");
-                    }
-                    if (!compile) return [3 /*break*/, 4];
+                    if (!compile) return [3 /*break*/, 5];
+                    if (!/\.sas$/i.test(filePath)) return [3 /*break*/, 4];
                     sourcefilePathParts = path_1.default.normalize(filePath).split(path_1.default.sep);
                     sourcefilePathParts.splice(-1, 1);
                     sourceFolderPath = sourcefilePathParts.join(path_1.default.sep);
                     return [4 /*yield*/, (0, __1.compileSingleFile)(target, 'identify', filePath, (0, getDestinationPath_1.getDestinationServicePath)(sourceFolderPath), true)];
                 case 3:
-                    (filePath = (_b.sent()).destinationPath);
+                    (filePath = (_c.sent()).destinationPath);
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("File Compiled and placed at: ".concat(filePath, " ."));
-                    _b.label = 4;
+                    return [3 /*break*/, 5];
                 case 4:
+                    process.logger.info('Compile flag has no effect on files with extension type other than sas');
+                    _c.label = 5;
+                case 5:
                     sasFilePath = (0, utils_1.getAbsolutePath)(filePath, process.currentDir);
                     return [4 /*yield*/, (0, utils_1.readFile)(sasFilePath)];
-                case 5:
-                    sasFileContent = _b.sent();
+                case 6:
+                    sasFileContent = _c.sent();
                     linesToExecute = sasFileContent.replace(/\r\n/g, '\n').split('\n');
-                    if (!(target.serverType === utils_1.ServerType.SasViya)) return [3 /*break*/, 7];
-                    return [4 /*yield*/, executeOnSasViya(filePath, isFileCreated, target, linesToExecute)];
-                case 6: return [2 /*return*/, _b.sent()];
-                case 7: return [4 /*yield*/, executeOnSas9(filePath, isFileCreated, target, linesToExecute)];
-                case 8: return [2 /*return*/, _b.sent()];
+                    if (!source) return [3 /*break*/, 8];
+                    return [4 /*yield*/, (0, parseSourceFile_1.parseSourceFile)(source)];
+                case 7:
+                    macroVars = _c.sent();
+                    macroVarStatements = (0, utils_2.convertToSASStatements)(macroVars).split('\n');
+                    linesToExecute = __spreadArray(__spreadArray([], __read(macroVarStatements), false), __read(linesToExecute), false);
+                    _c.label = 8;
+                case 8:
+                    if (!(target.serverType === utils_1.ServerType.SasViya)) return [3 /*break*/, 10];
+                    return [4 /*yield*/, executeOnSasViya(filePath, target, linesToExecute, logFile)];
+                case 9:
+                    result = _c.sent();
+                    return [3 /*break*/, 14];
+                case 10:
+                    if (!(target.serverType === utils_1.ServerType.Sas9)) return [3 /*break*/, 12];
+                    return [4 /*yield*/, executeOnSas9(target, linesToExecute, logFile)];
+                case 11:
+                    result = _c.sent();
+                    return [3 /*break*/, 14];
+                case 12: return [4 /*yield*/, executeOnSasJS(filePath, target, linesToExecute, logFile)];
+                case 13:
+                    result = _c.sent();
+                    _c.label = 14;
+                case 14:
+                    if (!isTempFile) return [3 /*break*/, 16];
+                    return [4 /*yield*/, (0, utils_1.deleteFile)(filePath)];
+                case 15:
+                    _c.sent();
+                    _c.label = 16;
+                case 16: return [2 /*return*/, result];
             }
         });
     });
 }
 exports.runSasCode = runSasCode;
-function executeOnSasViya(filePath, isTempFile, target, linesToExecute) {
+function executeOnSasViya(filePath, target, linesToExecute, logFile) {
     var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function () {
         var sasjs, contextName, authConfig, executionResult, log, isOutput, buildDestinationResultsFolder, createdFilePath;
@@ -155,18 +181,16 @@ function executeOnSasViya(filePath, isTempFile, target, linesToExecute) {
                     return [4 /*yield*/, sasjs
                             .executeScriptSASViya(path_1.default.basename(filePath), linesToExecute, contextName, authConfig)
                             .catch(function (err) { return __awaiter(_this, void 0, void 0, function () {
-                            var log, createdFilePath;
-                            var _a;
-                            return __generator(this, function (_b) {
-                                switch (_b.label) {
+                            var log;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
                                     case 0:
                                         log = err.log;
                                         if (!log)
                                             throw new node_2.ErrorResponse('We were not able to fetch the log this time.');
-                                        return [4 /*yield*/, createOutputFile(log)];
+                                        return [4 /*yield*/, createOutputFile(log, logFile)];
                                     case 1:
-                                        createdFilePath = _b.sent();
-                                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("Log file has been created at ".concat(createdFilePath, " ."));
+                                        _a.sent();
                                         throw new node_2.ErrorResponse('Find more error details in the log file.');
                                 }
                             });
@@ -188,27 +212,22 @@ function executeOnSasViya(filePath, isTempFile, target, linesToExecute) {
                     (_c = process.logger) === null || _c === void 0 ? void 0 : _c.success('Job execution completed!');
                     buildDestinationResultsFolder = process.sasjsConstants.buildDestinationResultsFolder;
                     (_d = process.logger) === null || _d === void 0 ? void 0 : _d.info("Creating ".concat(isOutput ? 'output' : 'log', " file in ").concat(buildDestinationResultsFolder, " ."));
-                    return [4 /*yield*/, createOutputFile(log)];
+                    return [4 /*yield*/, createOutputFile(log, undefined, isOutput)];
                 case 3:
                     createdFilePath = _f.sent();
                     (_e = process.logger) === null || _e === void 0 ? void 0 : _e.success("".concat(isOutput ? 'Output' : 'Log', " file has been created at ").concat(createdFilePath, " ."));
-                    if (!isTempFile) return [3 /*break*/, 5];
-                    return [4 /*yield*/, (0, utils_1.deleteFile)(filePath)];
-                case 4:
-                    _f.sent();
-                    _f.label = 5;
-                case 5: return [2 /*return*/, { log: log }];
+                    return [2 /*return*/, { log: log }];
             }
         });
     });
 }
-function executeOnSas9(filePath, isTempFile, target, linesToExecute) {
-    var _a, _b, _c;
+function executeOnSas9(target, linesToExecute, logFile) {
+    var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var username, password, sas9CredentialsError, sasjs, buildDestinationResultsFolder, executionResult, createdFilePath;
+        var username, password, sas9CredentialsError, sasjs, executionResult;
         var _this = this;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     if (target.authConfigSas9) {
                         username = target.authConfigSas9.userName;
@@ -230,22 +249,18 @@ function executeOnSas9(filePath, isTempFile, target, linesToExecute) {
                         serverType: target.serverType,
                         debug: true
                     });
-                    buildDestinationResultsFolder = process.sasjsConstants.buildDestinationResultsFolder;
                     return [4 /*yield*/, sasjs
                             .executeScriptSAS9(linesToExecute, username, password)
                             .catch(function (err) { return __awaiter(_this, void 0, void 0, function () {
-                            var log, createdFilePath_1;
-                            var _a, _b;
-                            return __generator(this, function (_c) {
-                                switch (_c.label) {
+                            var log;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
                                     case 0:
                                         if (!(err && err.payload && err.payload.log)) return [3 /*break*/, 2];
                                         log = err.payload.log;
-                                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Creating log file in ".concat(buildDestinationResultsFolder, " ."));
-                                        return [4 /*yield*/, createOutputFile(log)];
+                                        return [4 /*yield*/, createOutputFile(log, logFile)];
                                     case 1:
-                                        createdFilePath_1 = _c.sent();
-                                        (_b = process.logger) === null || _b === void 0 ? void 0 : _b.success("Log file has been created at ".concat(createdFilePath_1, " ."));
+                                        _a.sent();
                                         throw new node_2.ErrorResponse('Find more error details in the log file.');
                                     case 2:
                                         if (err && err.errorCode === 404) {
@@ -256,36 +271,106 @@ function executeOnSas9(filePath, isTempFile, target, linesToExecute) {
                             });
                         }); })];
                 case 1:
-                    executionResult = _d.sent();
+                    executionResult = _b.sent();
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success('Job execution completed!');
-                    (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Creating log file in ".concat(buildDestinationResultsFolder, " ."));
-                    return [4 /*yield*/, createOutputFile(executionResult || '')];
+                    return [4 /*yield*/, createOutputFile(executionResult || '', logFile)];
                 case 2:
-                    createdFilePath = _d.sent();
-                    (_c = process.logger) === null || _c === void 0 ? void 0 : _c.success("Log file has been created at ".concat(createdFilePath, " ."));
-                    if (!isTempFile) return [3 /*break*/, 4];
-                    return [4 /*yield*/, (0, utils_1.deleteFile)(filePath)];
+                    _b.sent();
+                    return [2 /*return*/, { log: executionResult }];
+            }
+        });
+    });
+}
+function executeOnSasJS(filePath, target, linesToExecute, logFile) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function () {
+        var authConfig, sasjs, fileExtension, executionResult;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, (0, utils_2.isSasJsServerInServerMode)(target)];
+                case 1:
+                    if (!_b.sent()) return [3 /*break*/, 3];
+                    return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
+                case 2:
+                    authConfig = _b.sent();
+                    _b.label = 3;
                 case 3:
-                    _d.sent();
-                    _d.label = 4;
-                case 4: return [2 /*return*/, { log: executionResult }];
+                    sasjs = new node_1.default({
+                        serverUrl: target.serverUrl,
+                        httpsAgentOptions: target.httpsAgentOptions,
+                        appLoc: target.appLoc,
+                        serverType: target.serverType,
+                        debug: true
+                    });
+                    fileExtension = path_1.default.extname(filePath).slice(1);
+                    return [4 /*yield*/, sasjs.executeScriptSASjs(linesToExecute.join('\n'), fileExtension, authConfig)];
+                case 4:
+                    executionResult = _b.sent();
+                    (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success('Job execution completed!');
+                    return [4 /*yield*/, createOutputFile(executionResult || '', logFile)];
+                case 5:
+                    _b.sent();
+                    return [2 /*return*/, { log: executionResult }];
             }
         });
     });
 }
-function createOutputFile(log) {
+function createOutputFile(log, logFilePath, silent) {
     return __awaiter(this, void 0, void 0, function () {
-        var timestamp, buildDestinationResultsFolder, outputFilePath;
+        var timestamp, buildDestinationResultsFolder;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     timestamp = (0, utils_1.generateTimestamp)();
                     buildDestinationResultsFolder = process.sasjsConstants.buildDestinationResultsFolder;
-                    outputFilePath = path_1.default.join(buildDestinationResultsFolder, "sasjs-run-".concat(timestamp, ".log"));
-                    return [4 /*yield*/, (0, utils_1.createFile)(outputFilePath, log)];
+                    if (!logFilePath) {
+                        logFilePath = path_1.default.join(buildDestinationResultsFolder, "sasjs-run-".concat(timestamp, ".log"));
+                    }
+                    return [4 /*yield*/, (0, saveLog_1.saveLog)(log || '', logFilePath, '', false, silent)];
                 case 1:
                     _a.sent();
-                    return [2 /*return*/, outputFilePath];
+                    return [2 /*return*/, logFilePath];
+            }
+        });
+    });
+}
+function isUrl(filePath) {
+    return filePath.startsWith('https://') || filePath.startsWith('http://');
+}
+function createFileFromUrl(url) {
+    return __awaiter(this, void 0, void 0, function () {
+        var _this = this;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, axios_1.default
+                        .get(url)
+                        .then(function (res) { return __awaiter(_this, void 0, void 0, function () {
+                        var invalidSasError, content, urlWithoutQueryParams, fileExtension, tempFilePath;
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    invalidSasError = process.sasjsConstants.invalidSasError;
+                                    if (typeof res.data !== 'string') {
+                                        throw new Error(invalidSasError);
+                                    }
+                                    content = res.data.trim();
+                                    if (content && content.startsWith('<')) {
+                                        throw new Error(invalidSasError);
+                                    }
+                                    urlWithoutQueryParams = url.split('?')[0];
+                                    fileExtension = path_1.default.extname(urlWithoutQueryParams);
+                                    tempFilePath = path_1.default.join(process.projectDir, "temp-".concat(Date.now()).concat(fileExtension));
+                                    return [4 /*yield*/, (0, utils_1.createFile)(tempFilePath, content)];
+                                case 1:
+                                    _a.sent();
+                                    return [2 /*return*/, { isTempFile: true, tempFilePath: tempFilePath }];
+                            }
+                        });
+                    }); })
+                        .catch(function (err) {
+                        throw new Error("".concat(err.message, "\nUrl: ").concat(url));
+                    })];
+                case 1: return [2 /*return*/, _a.sent()];
             }
         });
     });

package/build/commands/run/runCommand.js

@@ -72,6 +72,14 @@ var examples = [
     {
         command: 'sasjs run ./path/run-job.sas -t targetName -c',
         description: ''
+    },
+    {
+        command: 'sasjs run ./path/run-job.sas -t targetName -c --log ./path/file.log',
+        description: ''
+    },
+    {
+        command: 'sasjs run ./path/run-job.sas -t targetName --source ./path/source.json',
+        description: ''
     }
 ];
 var RunCommand = /** @class */ (function (_super) {
@@ -83,7 +91,18 @@ var RunCommand = /** @class */ (function (_super) {
                     type: 'boolean',
                     alias: 'c',
                     default: false,
-                    description: 'Used to force a deploy, eg even if the folders / services already exist (they will then be overwritten)'
+                    description: 'Used to compile the program prior to execution. Useful for including dependent macros and includes. More info here: https://cli.sasjs.io/compile'
+                },
+                log: {
+                    type: 'string',
+                    alias: 'l',
+                    default: '',
+                    description: 'Path where the log of the finished job will be saved.'
+                },
+                source: {
+                    type: 'string',
+                    alias: 's',
+                    description: 'Path to an input JSON containing job variables.'
                 }
             },
             syntax: syntax,
@@ -94,14 +113,14 @@ var RunCommand = /** @class */ (function (_super) {
     }
     RunCommand.prototype.execute = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var target, _a, sasFilePath, compile;
+            var target, _a, sasFilePath, compile, log, source;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, this.getTargetInfo()];
                     case 1:
                         target = (_b.sent()).target;
-                        _a = this.parsed, sasFilePath = _a.sasFilePath, compile = _a.compile;
-                        return [4 /*yield*/, (0, run_1.runSasCode)(target, sasFilePath, compile)
+                        _a = this.parsed, sasFilePath = _a.sasFilePath, compile = _a.compile, log = _a.log, source = _a.source;
+                        return [4 /*yield*/, (0, run_1.runSasCode)(target, sasFilePath, compile, log, source)
                                 .then(function () {
                                 return command_1.ReturnCode.Success;
                             })

package/build/commands/run/spec/run.spec.server.sasjs.d.ts

@@ -0,0 +1 @@
+export {};

package/build/commands/run/spec/run.spec.server.sasjs.js

@@ -0,0 +1,100 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var path_1 = __importDefault(require("path"));
+var __1 = require("../..");
+var utils_1 = require("@sasjs/utils");
+var test_1 = require("../../../utils/test");
+describe('sasjs run with server type sasjs', function () {
+    var target;
+    beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
+        var appName;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    appName = 'cli-tests-run-sasjs' + (0, utils_1.generateTimestamp)();
+                    return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
+                case 1:
+                    _a.sent();
+                    target = (0, test_1.generateTestTarget)(appName, "/Public/app/cli-tests/".concat(appName), {
+                        serviceFolders: ['sasjs/testServices'],
+                        initProgram: '',
+                        termProgram: '',
+                        macroVars: {}
+                    }, utils_1.ServerType.Sasjs);
+                    return [4 /*yield*/, (0, utils_1.copy)(path_1.default.join(__dirname, 'testServices'), path_1.default.join(process.projectDir, 'sasjs', 'testServices'))];
+                case 2:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    afterEach(function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, target.name)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should run a file when a relative path is provided', function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, expect((0, __1.runSasCode)(target, 'sasjs/testServices/logJob.js')).toResolve()];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should run a file when an absolute path is provided', function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, expect((0, __1.runSasCode)(target, "".concat(process.projectDir, "/sasjs/testServices/logJob.js"))).toResolve()];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});

package/build/commands/run/spec/runCommand.spec.js

@@ -93,7 +93,9 @@ var target = new utils_1.Target({
     serverType: utils_1.ServerType.SasViya,
     contextName: 'test context'
 });
+var sourceFilePath = 'path/to/source.json';
 var sasFilePath = 'path/to/soure.sas';
+var logFilePath = 'path/to/log.log';
 describe('RunCommand', function () {
     beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -111,10 +113,16 @@ describe('RunCommand', function () {
     it('should parse sasjs run command', function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, executeCommandWrapper([sasFilePath])];
+                case 0: return [4 /*yield*/, executeCommandWrapper([
+                        sasFilePath,
+                        '--log',
+                        logFilePath,
+                        '-s',
+                        sourceFilePath
+                    ])];
                 case 1:
                     _a.sent();
-                    expect(runModule.runSasCode).toHaveBeenCalledWith(target, sasFilePath, false);
+                    expect(runModule.runSasCode).toHaveBeenCalledWith(target, sasFilePath, false, logFilePath, sourceFilePath);
                     return [2 /*return*/];
             }
         });
@@ -122,10 +130,19 @@ describe('RunCommand', function () {
     it('should parse sasjs run command with all arguments', function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, executeCommandWrapper([sasFilePath, '--target', 'test', '--compile'])];
+                case 0: return [4 /*yield*/, executeCommandWrapper([
+                        sasFilePath,
+                        '--target',
+                        'test',
+                        '--compile',
+                        '--log',
+                        logFilePath,
+                        '--source',
+                        sourceFilePath
+                    ])];
                 case 1:
                     _a.sent();
-                    expect(runModule.runSasCode).toHaveBeenCalledWith(target, sasFilePath, true);
+                    expect(runModule.runSasCode).toHaveBeenCalledWith(target, sasFilePath, true, logFilePath, sourceFilePath);
                     return [2 /*return*/];
             }
         });
@@ -133,10 +150,19 @@ describe('RunCommand', function () {
     it('should parse a sasjs run command with all shorthand arguments', function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, executeCommandWrapper([sasFilePath, '-t', 'test', '-c'])];
+                case 0: return [4 /*yield*/, executeCommandWrapper([
+                        sasFilePath,
+                        '-t',
+                        'test',
+                        '-c',
+                        '-l',
+                        logFilePath,
+                        '-s',
+                        sourceFilePath
+                    ])];
                 case 1:
                     _a.sent();
-                    expect(runModule.runSasCode).toHaveBeenCalledWith(target, sasFilePath, true);
+                    expect(runModule.runSasCode).toHaveBeenCalledWith(target, sasFilePath, true, logFilePath, sourceFilePath);
                     return [2 /*return*/];
             }
         });

package/build/commands/run/spec/testServices/logJob.js

@@ -0,0 +1,4 @@
+"use strict";
+Array(100)
+    .fill()
+    .forEach(function (_, i) { return console.log(i); });

package/build/commands/testing/test.js

@@ -163,11 +163,11 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath, force) {
                         case utils_1.ServerType.Sas9: return [3 /*break*/, 4];
                         case utils_1.ServerType.Sasjs: return [3 /*break*/, 5];
                     }
-                    return [3 /*break*/, 9];
+                    return [3 /*break*/, 11];
                 case 2: return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
                 case 3:
                     authConfig = _e.sent();
-                    return [3 /*break*/, 9];
+                    return [3 /*break*/, 11];
                 case 4:
                     if (target.authConfigSas9) {
                         username = target.authConfigSas9.userName;
@@ -182,19 +182,23 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath, force) {
                         throw new Error(sas9CredentialsError);
                     }
                     password = (0, utils_1.decodeFromBase64)(password);
-                    return [3 /*break*/, 9];
+                    return [3 /*break*/, 11];
                 case 5:
-                    _e.trys.push([5, 7, , 8]);
-                    return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
+                    _e.trys.push([5, 9, , 10]);
+                    return [4 /*yield*/, (0, utils_2.isSasJsServerInServerMode)(target)];
                 case 6:
-                    authConfig = _e.sent();
-                    return [3 /*break*/, 8];
+                    if (!_e.sent()) return [3 /*break*/, 8];
+                    return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
                 case 7:
-                    e_1 = _e.sent();
-                    return [3 /*break*/, 8];
-                case 8: // FIXME: handle error properly
-                return [3 /*break*/, 9];
+                    authConfig = _e.sent();
+                    _e.label = 8;
+                case 8: return [3 /*break*/, 10];
                 case 9:
+                    e_1 = _e.sent();
+                    return [3 /*break*/, 10];
+                case 10: // FIXME: handle error properly
+                return [3 /*break*/, 11];
+                case 11:
                     result = {
                         sasjs_test_meta: []
                     };
@@ -337,21 +341,21 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath, force) {
                                 }
                             });
                         }); })];
-                case 10:
+                case 12:
                     _e.sent();
                     return [4 /*yield*/, (0, saveOutput_1.saveResultJson)(outDirectory, result)];
-                case 11:
+                case 13:
                     jsonPath = _e.sent();
                     if (!jsonPath)
                         return [2 /*return*/];
                     return [4 /*yield*/, (0, saveOutput_1.saveResultXml)(outDirectory, result)];
-                case 12:
+                case 14:
                     xmlPath = _e.sent();
                     return [4 /*yield*/, (0, saveOutput_1.saveResultCsv)(outDirectory, result)];
-                case 13:
+                case 15:
                     _d = _e.sent(), csvData = _d.csvData, csvPath = _d.csvPath;
                     return [4 /*yield*/, (0, saveOutput_1.saveCoverageLcov)(outDirectory, flow)];
-                case 14:
+                case 16:
                     coverageReportPath = _e.sent();
                     resultTable = {};
                     if (Array.isArray(csvData)) {

package/build/utils/parseSourceFile.d.ts

@@ -0,0 +1,2 @@
+import { MacroVars } from '@sasjs/utils';
+export declare function parseSourceFile(source: string): Promise<MacroVars>;

package/build/utils/parseSourceFile.js

@@ -0,0 +1,75 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseSourceFile = void 0;
+var utils_1 = require("@sasjs/utils");
+var path_1 = __importDefault(require("path"));
+var file_1 = require("./file");
+function parseSourceFile(source) {
+    return __awaiter(this, void 0, void 0, function () {
+        var macroVars, currentDirPath;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    currentDirPath = path_1.default.isAbsolute(source) ? '' : process.projectDir;
+                    source = path_1.default.join(currentDirPath, source);
+                    if (!(0, file_1.isJsonFile)(source))
+                        throw 'Source file has to be JSON.';
+                    return [4 /*yield*/, (0, utils_1.fileExists)(source).catch(function (_) {
+                            throw 'Error while checking if source file exists.';
+                        })];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, (0, utils_1.readFile)(source).catch(function (_) {
+                            throw 'Error while reading source file.';
+                        })];
+                case 2:
+                    source = _a.sent();
+                    macroVars = JSON.parse(source);
+                    if (!(0, utils_1.isMacroVars)(macroVars)) {
+                        throw "Provided source is not valid. An example of valid source:\n{ macroVars: { name1: 'value1', name2: 'value2' } }";
+                    }
+                    return [2 /*return*/, macroVars];
+            }
+        });
+    });
+}
+exports.parseSourceFile = parseSourceFile;

package/build/utils/saveLog.d.ts

@@ -1 +1 @@
-export declare const saveLog: (logData: any, logFile: string | undefined, jobPath: string, returnStatusOnly: boolean) => Promise<void>;
+export declare const saveLog: (logData: any, logFile: string | undefined, jobPath: string, returnStatusOnly: boolean, silent?: boolean) => Promise<void>;

package/build/utils/saveLog.js

@@ -43,38 +43,42 @@ exports.saveLog = void 0;
 var utils_1 = require("@sasjs/utils");
 var path_1 = __importDefault(require("path"));
 var _1 = require(".");
-var saveLog = function (logData, logFile, jobPath, returnStatusOnly) { return __awaiter(void 0, void 0, void 0, function () {
-    var logPath, folderPath, parentFolderPath, logLines;
-    var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0:
-                if (logFile) {
-                    logPath = logFile;
-                }
-                else {
-                    logPath = path_1.default.join(process.projectDir, "".concat(jobPath.split(path_1.default.sep).slice(-1).pop(), ".log"));
-                }
-                folderPath = logPath.split(path_1.default.sep);
-                folderPath.pop();
-                parentFolderPath = folderPath.join(path_1.default.sep);
-                return [4 /*yield*/, (0, utils_1.folderExists)(parentFolderPath)];
-            case 1:
-                if (!!(_b.sent())) return [3 /*break*/, 3];
-                return [4 /*yield*/, (0, utils_1.createFolder)(parentFolderPath)];
-            case 2:
-                _b.sent();
-                _b.label = 3;
-            case 3:
-                logLines = typeof logData === 'object' ? (0, _1.parseLogLines)(logData) : logData;
-                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Creating log file at ".concat(logPath, " ."));
-                return [4 /*yield*/, (0, utils_1.createFile)(logPath, logLines)];
-            case 4:
-                _b.sent();
-                if (!returnStatusOnly)
-                    (0, _1.displaySuccess)("Log saved to ".concat(logPath));
-                return [2 /*return*/];
-        }
+var saveLog = function (logData, logFile, jobPath, returnStatusOnly, silent) {
+    if (silent === void 0) { silent = false; }
+    return __awaiter(void 0, void 0, void 0, function () {
+        var logPath, folderPath, parentFolderPath, logLines;
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    if (logFile) {
+                        logPath = logFile;
+                    }
+                    else {
+                        logPath = path_1.default.join(process.projectDir, "".concat(jobPath.split(path_1.default.sep).slice(-1).pop(), ".log"));
+                    }
+                    folderPath = logPath.split(path_1.default.sep);
+                    folderPath.pop();
+                    parentFolderPath = folderPath.join(path_1.default.sep);
+                    return [4 /*yield*/, (0, utils_1.folderExists)(parentFolderPath)];
+                case 1:
+                    if (!!(_b.sent())) return [3 /*break*/, 3];
+                    return [4 /*yield*/, (0, utils_1.createFolder)(parentFolderPath)];
+                case 2:
+                    _b.sent();
+                    _b.label = 3;
+                case 3:
+                    logLines = typeof logData === 'object' ? (0, _1.parseLogLines)(logData) : logData;
+                    if (!silent)
+                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Creating log file at ".concat(logPath, " ."));
+                    return [4 /*yield*/, (0, utils_1.createFile)(logPath, logLines)];
+                case 4:
+                    _b.sent();
+                    if (!returnStatusOnly && !silent)
+                        (0, _1.displaySuccess)("Log saved to ".concat(logPath));
+                    return [2 /*return*/];
+            }
+        });
     });
-}); };
+};
 exports.saveLog = saveLog;

package/build/utils/test.js

@@ -177,12 +177,15 @@ var generateTestTarget = function (targetName, appLoc, serviceConfig, serverType
         macroVars: {}
     }; }
     dotenv_1.default.config();
+    var serverUrl = process.env.SASJS_SERVER_URL;
+    if (serverType === types_1.ServerType.SasViya)
+        serverUrl = process.env.VIYA_SERVER_URL;
+    if (serverType === types_1.ServerType.Sas9)
+        serverUrl = process.env.SAS9_SERVER_URL;
     var target = new types_1.Target({
         name: targetName,
         serverType: serverType,
-        serverUrl: (serverType === types_1.ServerType.SasViya
-            ? process.env.VIYA_SERVER_URL
-            : process.env.SAS9_SERVER_URL),
+        serverUrl: serverUrl,
         contextName: setConstants_1.contextName,
         appLoc: appLoc,
         authConfig: {

package/build/utils/utils.d.ts

@@ -1,4 +1,4 @@
-import { Target } from '@sasjs/utils';
+import { Target, MacroVars } from '@sasjs/utils';
 import SASjs from '@sasjs/adapter/node';
 export declare function inExistingProject(folderPath: string): Promise<boolean>;
 export declare function diff(a: any[], b: any[]): any[];
@@ -20,6 +20,14 @@ export declare function parseLogLines(logJson: {
         line: string;
     }[];
 }): string;
+/**
+ * Converts MacroVars JSON from command source param to sas statements
+ * The JSON must have the following structure:
+ *     {"macroVars": {"var1": "val1", "var2": "val2"}}
+ *
+ * @param {object} json
+ */
+export declare function convertToSASStatements(json: MacroVars): string;
 export declare const arrToObj: (arr: any[]) => any;
 export declare const millisecondsToDdHhMmSs: (milliseconds: number) => string;
 export declare function checkNodeVersion(): void;

package/build/utils/utils.js

@@ -86,7 +86,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSasJsServerInServerMode = exports.getNodeModulePath = exports.isSASjsProject = exports.terminateProcess = exports.prefixAppLoc = exports.loadEnvVariables = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.parseLogLines = exports.executeShellScript = exports.getUniqServicesObj = exports.setupDoxygen = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
+exports.isSasJsServerInServerMode = exports.getNodeModulePath = exports.isSASjsProject = exports.terminateProcess = exports.prefixAppLoc = exports.loadEnvVariables = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.convertToSASStatements = exports.parseLogLines = exports.executeShellScript = exports.getUniqServicesObj = exports.setupDoxygen = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
 var shelljs_1 = __importDefault(require("shelljs"));
 var path_1 = __importDefault(require("path"));
 var ora_1 = __importDefault(require("ora"));
@@ -443,6 +443,35 @@ function parseLogLines(logJson) {
     return logLines;
 }
 exports.parseLogLines = parseLogLines;
+/**
+ * Converts MacroVars JSON from command source param to sas statements
+ * The JSON must have the following structure:
+ *     {"macroVars": {"var1": "val1", "var2": "val2"}}
+ *
+ * @param {object} json
+ */
+function convertToSASStatements(json) {
+    var e_2, _a;
+    var sasStatements = '';
+    try {
+        for (var _b = __values(Object.keys(json.macroVars)), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var macroVar = _c.value;
+            var key = macroVar;
+            var value = json.macroVars[macroVar];
+            var line = "%let ".concat(key, "=").concat(value, ";\n");
+            sasStatements += line;
+        }
+    }
+    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    finally {
+        try {
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        }
+        finally { if (e_2) throw e_2.error; }
+    }
+    return sasStatements;
+}
+exports.convertToSASStatements = convertToSASStatements;
 var arrToObj = function (arr) {
     return arr.reduce(function (o, key) {
         var _a;

package/package.json

@@ -48,10 +48,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "3.10.11",
+    "@sasjs/adapter": "3.10.15",
     "@sasjs/core": "4.35.3",
     "@sasjs/lint": "1.12.0",
-    "@sasjs/utils": "2.47.0",
+    "@sasjs/utils": "2.47.1",
     "adm-zip": "0.5.9",
     "chalk": "4.1.2",
     "csv-stringify": "5.6.5",
@@ -97,5 +97,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.18.2"
+  "version": "3.19.3"
 }