@sasjs/cli 3.4.0 → 3.6.0

package/build/commands/compile/internal/compileServiceFile.js

@@ -101,8 +101,11 @@ function getPreCodeForServicePack(serverType) {
                             '/* so we provide instead as __program */\n' +
                             '%global __program _program;\n' +
                             '%let _program=%sysfunc(coalescec(&__program,&_program));\n' +
-                            '%macro webout(action,ds,dslabel=,fmt=,missing=NULL);\n' +
-                            '%mv_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt,missing=&missing)\n' +
+                            '%macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO);\n' +
+                            '  %mv_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt\n' +
+                            '    ,missing=&missing\n' +
+                            '    ,showmeta=&showmeta\n' +
+                            '  )' +
                             '%mend;\n';
                     return [3 /*break*/, 14];
                 case 5:
@@ -119,8 +122,11 @@ function getPreCodeForServicePack(serverType) {
                 case 8:
                     content = _g + _l.sent();
                     content +=
-                        '  %macro webout(action,ds,dslabel=,fmt=,missing=NULL);\n' +
-                            '    %mm_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt,missing=&missing)\n' +
+                        '  %macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO);\n' +
+                            '    %mm_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt\n' +
+                            '      ,missing=&missing\n' +
+                            '      ,showmeta=&showmeta\n' +
+                            '    )' +
                             '  %mend;\n';
                     return [3 /*break*/, 14];
                 case 9:
@@ -137,8 +143,11 @@ function getPreCodeForServicePack(serverType) {
                 case 12:
                     content = _k + _l.sent();
                     content +=
-                        '  %macro webout(action,ds,dslabel=,fmt=,missing=NULL);\n' +
-                            '    %ms_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt,missing=&missing)\n' +
+                        '  %macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO);\n' +
+                            '    %ms_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt\n' +
+                            '      ,missing=&missing\n' +
+                            '      ,showmeta=&showmeta\n' +
+                            '    )' +
                             '  %mend;\n';
                     return [3 /*break*/, 14];
                 case 13: throw new error_1.ServerTypeError();

package/build/commands/compile/internal/loadDependencies.js

@@ -42,7 +42,7 @@ var config_1 = require("../../../utils/config");
 function loadDependencies(target, filePath, macroFolders, programFolders, type) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var fileContent, configuration, _b, buildSourceFolder, macroCorePath;
+        var fileContent, configuration, _b, buildSourceFolder, macroCorePath, binaryFolders;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -54,6 +54,9 @@ function loadDependencies(target, filePath, macroFolders, programFolders, type)
                 case 2:
                     configuration = (_c.sent()).configuration;
                     _b = process.sasjsConstants, buildSourceFolder = _b.buildSourceFolder, macroCorePath = _b.macroCorePath;
+                    return [4 /*yield*/, config_1.getBinaryFolders(target)];
+                case 3:
+                    binaryFolders = _c.sent();
                     headerSyntaxNotices(fileContent);
                     return [4 /*yield*/, utils_1.loadDependenciesFile({
                             fileContent: fileContent,
@@ -64,9 +67,10 @@ function loadDependencies(target, filePath, macroFolders, programFolders, type)
                             macroFolders: macroFolders,
                             programFolders: programFolders,
                             buildSourceFolder: buildSourceFolder,
-                            macroCorePath: macroCorePath
+                            macroCorePath: macroCorePath,
+                            binaryFolders: binaryFolders
                         })];
-                case 3: return [2 /*return*/, _c.sent()];
+                case 4: return [2 /*return*/, _c.sent()];
             }
         });
     });

package/build/commands/compile/internal/spec/compileTestFile.spec.js

@@ -128,10 +128,10 @@ describe('compileTestFile', function () {
                                         return [4 /*yield*/, utils_1.readFile(compiledTestFilePath)];
                                     case 2:
                                         testFileContent = _a.apply(void 0, [_b.sent()]);
-                                        testVar = replaceLineBreaks("* Test Variables start;\n\n%let " + Object.keys(target.testConfig.macroVars)[0] + "=" + Object.values(target.testConfig.macroVars)[0] + ";\n\n*Test Variables end;");
+                                        testVar = replaceLineBreaks("* Test Variables start;\n\n%let " + Object.keys(target.testConfig.macroVars)[0] + "=" + Object.values(target.testConfig.macroVars)[0] + ";\n\n* Test Variables end;");
                                         testInit = replaceLineBreaks("* TestInit start;\n/**\n  @file\n  @brief setting up the test\n\n  <h4> SAS Macros </h4>\n**/\n\n%put testing, init;\n* TestInit end;");
                                         testTerm = replaceLineBreaks("* TestTerm start;\n/**\n  @file\n  @brief ending the test\n\n  <h4> SAS Macros </h4>\n**/\n\n%put testing, termed;\n* TestTerm end;");
-                                        mvWebout = "%macro mv_webout(action,ds,fref=_mvwtemp,dslabel=,fmt=Y,stream=Y);";
+                                        mvWebout = "%macro mv_webout(action,ds,fref=_mvwtemp,dslabel=,fmt=Y,stream=Y,missing=NULL<br>  ,showmeta=NO<br>);";
                                         expect(testFileContent.indexOf(testVar)).toBeGreaterThan(-1);
                                         expect(testFileContent.indexOf(testInit)).toBeGreaterThan(-1);
                                         expect(testFileContent.indexOf(testTerm)).toBeGreaterThan(-1);

package/build/commands/compile/spec/loadDependencies.spec.js

@@ -121,7 +121,7 @@ var serviceConfig = function (root) {
             }
     });
 };
-var compiledVars = function (type) { return "* " + type + " Variables start;\n\n%let macrovar1=macro " + type.toLowerCase() + " value configuration 1;\n%let macrovar2=macro " + type.toLowerCase() + " value target 2;\n%let macrovar3=macro " + type.toLowerCase() + " value target 3;\n\n*" + type + " Variables end;"; };
+var compiledVars = function (type) { return "* " + type + " Variables start;\n\n%let macrovar1=macro " + type.toLowerCase() + " value configuration 1;\n%let macrovar2=macro " + type.toLowerCase() + " value target 2;\n%let macrovar3=macro " + type.toLowerCase() + " value target 3;\n\n* " + type + " Variables end;"; };
 describe('loadDependencies', function () {
     var appName = "cli-tests-load-dependencies-" + utils_1.generateTimestamp();
     var temp = test_1.generateTestTarget(appName, '/Public/app', {

package/build/commands/deploy/spec/cbd.spec.js

@@ -119,8 +119,11 @@ describe('sasjs cbd with server type SASJS', function () {
                     return [4 /*yield*/, utils_1.readFile(macroCorePath + "/server/ms_webout.sas")];
                 case 7:
                     ms_webout = _a.sent();
-                    webout = '  %macro webout(action,ds,dslabel=,fmt=,missing=NULL);\n' +
-                        '    %ms_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt,missing=&missing)\n' +
+                    webout = '  %macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO);\n' +
+                        '    %ms_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt\n' +
+                        '      ,missing=&missing\n' +
+                        '      ,showmeta=&showmeta\n' +
+                        '    )' +
                         '  %mend;\n';
                     expect(sasjs.deployToSASjs).toHaveBeenCalledWith({
                         members: [
@@ -136,13 +139,13 @@ describe('sasjs cbd with server type SASJS', function () {
                                                 name: 'appinit',
                                                 type: 'service',
                                                 code: utils_3.removeComments("" + mf_getuser + mp_jsonout + ms_webout + webout +
-                                                    '/* provide additional debug info */\n%global _program;\n%put &=syscc;\n%put user=%mf_getuser();\n%put pgm=&_program;\n%put timestamp=%sysfunc(datetime(),datetime19.);\n* Service Variables start;\n*Service Variables end;\n* Dependencies start;\n* Dependencies end;\n* Programs start;\n*Programs end;\n* Service start;\nproc sql;\ncreate table areas as select distinct area\n  from sashelp.springs;\n%webout(OPEN)\n%webout(OBJ,areas)\n%webout(CLOSE)\n* Service end;')
+                                                    '/* provide additional debug info */\n%global _program;\n%put &=syscc;\n%put user=%mf_getuser();\n%put pgm=&_program;\n%put timestamp=%sysfunc(datetime(),datetime19.);\n* Service Variables start;\n* Service Variables end;\n* SAS Macros start;\n* SAS Macros end;\n* SAS Includes start;\n* SAS Includes end;\n* Binary Files start;\n* Binary Files end;\n* Service start;\nproc sql;\ncreate table areas as select distinct area\n  from sashelp.springs;\n%webout(OPEN)\n%webout(OBJ,areas)\n%webout(CLOSE)\n* Service end;')
                                             },
                                             {
                                                 name: 'getdata',
                                                 type: 'service',
                                                 code: utils_3.removeComments("" + mf_getuser + mp_jsonout + ms_webout + webout +
-                                                    '/* provide additional debug info */\n%global _program;\n%put &=syscc;\n%put user=%mf_getuser();\n%put pgm=&_program;\n%put timestamp=%sysfunc(datetime(),datetime19.);\n* Service Variables start;\n*Service Variables end;\n* Dependencies start;\n* Dependencies end;\n* Programs start;\n*Programs end;\n* Service start;\n%webout(FETCH)\nproc sql;\ncreate table springs as select * from sashelp.springs\n  where area in (select area from work.areas);\n%webout(OPEN)\n%webout(OBJ,springs)\n%webout(CLOSE)\n* Service end;')
+                                                    '/* provide additional debug info */\n%global _program;\n%put &=syscc;\n%put user=%mf_getuser();\n%put pgm=&_program;\n%put timestamp=%sysfunc(datetime(),datetime19.);\n* Service Variables start;\n* Service Variables end;\n* SAS Macros start;\n* SAS Macros end;\n* SAS Includes start;\n* SAS Includes end;\n* Binary Files start;\n* Binary Files end;\n* Service start;\n%webout(FETCH)\nproc sql;\ncreate table springs as select * from sashelp.springs\n  where area in (select area from work.areas);\n%webout(OPEN)\n%webout(OBJ,springs)\n%webout(CLOSE)\n* Service end;')
                                             }
                                         ]
                                     }

package/build/commands/job/internal/utils.js

@@ -53,7 +53,7 @@ var saveLog = function (logData, logFile, jobPath, returnStatusOnly) { return __
                     logPath = logFile;
                 }
                 else {
-                    logPath = path_1.default.join(process.projectDir, jobPath.split('/').slice(-1).pop() + ".log");
+                    logPath = path_1.default.join(process.projectDir, jobPath.split(path_1.default.sep).slice(-1).pop() + ".log");
                 }
                 folderPath = logPath.split(path_1.default.sep);
                 folderPath.pop();

package/build/commands/job/jobCommand.js

@@ -61,6 +61,7 @@ var path_1 = __importDefault(require("path"));
 var command_1 = require("../../types/command");
 var targetCommand_1 = require("../../types/command/targetCommand");
 var utils_2 = require("../../utils");
+var getLogFilePath_1 = require("../../utils/getLogFilePath");
 var prefixAppLoc_1 = require("../../utils/prefixAppLoc");
 var execute_1 = require("./internal/execute");
 var JobSubCommand;
@@ -232,7 +233,7 @@ var JobCommand = /** @class */ (function (_super) {
                 switch (_d.label) {
                     case 0:
                         jobPath = prefixAppLoc_1.prefixAppLoc(target.appLoc, this.parsed.jobPath);
-                        log = getLogFilePath(this.parsed.log, jobPath);
+                        log = getLogFilePath_1.getLogFilePath(this.parsed.log, jobPath);
                         wait = this.parsed.wait || !!log;
                         output = ((_a = this.parsed.output) === null || _a === void 0 ? void 0 : _a.length)
                             ? this.parsed.output
@@ -268,19 +269,6 @@ var JobCommand = /** @class */ (function (_super) {
     return JobCommand;
 }(targetCommand_1.TargetCommand));
 exports.JobCommand = JobCommand;
-var getLogFilePath = function (logArg, jobPath) {
-    if (logArg === undefined) {
-        return undefined;
-    }
-    if (logArg) {
-        var currentDirPath = path_1.default.isAbsolute(logArg)
-            ? ''
-            : process.projectDir;
-        return path_1.default.join(currentDirPath, logArg);
-    }
-    var logFileName = jobPath.split('/').slice(-1).pop() + ".log";
-    return path_1.default.join(process.projectDir, logFileName);
-};
 var getStatusFilePath = function (statusFileArg) {
     if (statusFileArg) {
         var currentDirPath = path_1.default.isAbsolute(statusFileArg)

package/build/commands/request/request.d.ts

@@ -1,2 +1,2 @@
 import { AuthConfig, Target } from '@sasjs/utils/types';
-export declare function runSasJob(target: Target, isLocal: boolean, sasJobLocation: string, dataFilePath?: string, configFilePath?: string, authConfig?: AuthConfig): Promise<undefined>;
+export declare function runSasJob(target: Target, isLocal: boolean, sasJobLocation: string, dataFilePath?: string, configFilePath?: string, authConfig?: AuthConfig, logFile?: string, jobPath?: string | null, outputPathParam?: string | undefined): Promise<undefined>;

package/build/commands/request/request.js

@@ -46,16 +46,19 @@ var utils_1 = require("@sasjs/utils");
 var displayResult_1 = require("../../utils/displayResult");
 var types_1 = require("@sasjs/utils/types");
 var utils_2 = require("../../utils/utils");
-function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath, authConfig) {
+var saveLog_1 = require("../../utils/saveLog");
+var getLogFilePath_1 = require("../../utils/getLogFilePath");
+function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath, authConfig, logFile, jobPath, outputPathParam) {
     return __awaiter(this, void 0, void 0, function () {
-        var dataJson, configJson, dataFile, configFile, sas9CredentialsError, sasjs, result;
+        var dataJson, configJson, dataFile, configFile, sas9CredentialsError, sasjs, result, isError, sasRequests, currentRequestLog;
         var _this = this;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    dataJson = {};
+                    dataJson = null;
                     configJson = {};
                     if (!dataFilePath) return [3 /*break*/, 2];
+                    dataJson = {};
                     if (dataFilePath.split('.').slice(-1)[0] !== 'json') {
                         throw new Error('Provided data file must be valid json.');
                     }
@@ -106,61 +109,129 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                         appLoc: target.appLoc,
                         serverType: target.serverType,
                         contextName: target.contextName,
-                        useComputeApi: false
+                        useComputeApi: false,
+                        debug: true
                     });
-                    if (!dataJson)
-                        dataJson = null;
+                    isError = false;
                     return [4 /*yield*/, sasjs
                             .request(sasJobLocation, dataJson, configJson, function () {
                             displayResult_1.displayError(null, 'Login callback called. Request failed.');
                         }, authConfig)
                             .then(function (res) { return __awaiter(_this, void 0, void 0, function () {
-                            var output, outputPath;
+                            var output;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
+                                        if ((res && res.errorCode) || res.error)
+                                            isError = true;
                                         if (res === null || res === void 0 ? void 0 : res.result)
                                             res = res.result;
-                                        try {
-                                            output = JSON.stringify(res, null, 2);
+                                        if (typeof res !== 'object') {
+                                            try {
+                                                output = JSON.stringify(res, null, 2);
+                                            }
+                                            catch (error) {
+                                                displayResult_1.displayError(error, 'Result parsing failed.');
+                                                return [2 /*return*/, error];
+                                            }
                                         }
-                                        catch (error) {
-                                            displayResult_1.displayError(error, 'Result parsing failed.');
-                                            return [2 /*return*/, error];
+                                        else {
+                                            output = res;
                                         }
-                                        outputPath = path_1.default.join(process.projectDir, isLocal ? '/sasjsbuild' : '');
-                                        return [4 /*yield*/, utils_1.folderExists(outputPath)];
+                                        return [4 /*yield*/, writeOutput(outputPathParam, output, isLocal)];
                                     case 1:
-                                        if (!!(_a.sent())) return [3 /*break*/, 3];
-                                        return [4 /*yield*/, utils_1.createFolder(outputPath)];
-                                    case 2:
-                                        _a.sent();
-                                        _a.label = 3;
-                                    case 3:
-                                        outputPath += '/output.json';
-                                        return [4 /*yield*/, utils_1.createFile(outputPath, output)];
-                                    case 4:
                                         _a.sent();
                                         result = true;
-                                        displayResult_1.displaySuccess("Request finished. Output is stored at '" + outputPath + "'");
                                         return [2 /*return*/];
                                 }
                             });
                         }); })
-                            .catch(function (err) {
-                            result = err;
-                            if (err && err.errorCode === 404) {
-                                utils_2.displaySasjsRunnerError(configJson.username);
-                            }
-                            else {
-                                displayResult_1.displayError(err, 'An error occurred while executing the request.');
-                            }
-                        })];
+                            .catch(function (err) { return __awaiter(_this, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        isError = true;
+                                        if (err && err.errorCode === 404) {
+                                            utils_2.displaySasjsRunnerError(configJson.username);
+                                        }
+                                        else {
+                                            displayResult_1.displayError('', 'An error occurred while executing the request.');
+                                        }
+                                        return [4 /*yield*/, writeOutput(outputPathParam, err, isLocal)];
+                                    case 1:
+                                        _a.sent();
+                                        result = err;
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); })];
                 case 5:
                     _a.sent();
-                    return [2 /*return*/, result];
+                    sasRequests = sasjs.getSasRequests();
+                    currentRequestLog = sasRequests.find(function (x) { return x.serviceLink === sasJobLocation; });
+                    if (!(currentRequestLog && ((logFile && jobPath) || isError))) return [3 /*break*/, 7];
+                    if (!logFile)
+                        logFile = getLogFilePath_1.getLogFilePath('', jobPath || '');
+                    return [4 /*yield*/, saveLog_1.saveLog(currentRequestLog.logFile, logFile, jobPath || '', false)];
+                case 6:
+                    _a.sent();
+                    _a.label = 7;
+                case 7: return [2 /*return*/, result];
             }
         });
     });
 }
 exports.runSasJob = runSasJob;
+/**
+ * Writes output to the file
+ * @param outputPathParam path to output file
+ * @param output data to be written to output file
+ * @param isLocal is local target, othervise it is global
+ * @returns output path for the file created
+ */
+var writeOutput = function (outputPathParam, output, isLocal) { return __awaiter(void 0, void 0, void 0, function () {
+    var outputPath, outputFilename, outputPathArr, outputString;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                outputPath = path_1.default.join(process.projectDir, isLocal ? '' : '');
+                if (outputPathParam && typeof outputPathParam === 'string') {
+                    outputPathParam = path_1.default.join(process.projectDir, outputPathParam || '');
+                    outputPathArr = outputPathParam.split(path_1.default.sep);
+                    outputFilename = outputPathArr.pop();
+                    outputPath = outputPathArr.join(path_1.default.sep);
+                }
+                return [4 /*yield*/, utils_1.folderExists(outputPath)];
+            case 1:
+                if (!!(_a.sent())) return [3 /*break*/, 3];
+                return [4 /*yield*/, utils_1.createFolder(outputPath)];
+            case 2:
+                _a.sent();
+                _a.label = 3;
+            case 3:
+                if (outputFilename) {
+                    outputPath += "" + path_1.default.sep + outputFilename;
+                }
+                else {
+                    outputPath += path_1.default.sep + "output.json";
+                }
+                outputString = '';
+                if (typeof output === 'object') {
+                    outputString = JSON.stringify(output);
+                }
+                else {
+                    outputString = output;
+                }
+                if (!outputString) return [3 /*break*/, 5];
+                return [4 /*yield*/, utils_1.createFile(outputPath, outputString)];
+            case 4:
+                _a.sent();
+                displayResult_1.displaySuccess("Request finished. Output is stored at '" + outputPath + "'");
+                return [3 /*break*/, 6];
+            case 5:
+                displayResult_1.displayError("There was a problem with writing output file. Data not present.");
+                _a.label = 6;
+            case 6: return [2 /*return*/];
+        }
+    });
+}); };

package/build/commands/request/requestCommand.js

@@ -57,8 +57,9 @@ var command_1 = require("../../types/command");
 var targetCommand_1 = require("../../types/command/targetCommand");
 var utils_2 = require("../../utils");
 var request_1 = require("./request");
+var getLogFilePath_1 = require("../../utils/getLogFilePath");
 var syntax = 'request <sasProgramPath> [options]';
-var usage = 'sasjs request <sasProgramPath> --data <path-to-datafile> --config <path-to-configfile> --target <target-name>';
+var usage = 'sasjs request <sasProgramPath> --data <path-to-datafile> --config <path-to-configfile> --target <target-name> --output <path-to-outputfile> --log <path-to-logfile>';
 var description = "Lets the user run a SAS job against a specified target.\n" +
     "The target can exist either in the local project configuration or in the global .sasjsrc file.";
 var examples = [
@@ -73,6 +74,10 @@ var examples = [
     {
         command: 'sasjs request ./path/run-job.sas -t targetName -d ./path/data.json -c ./path/config.json',
         description: ''
+    },
+    {
+        command: 'sasjs request ./path/run-job.sas -t targetName -l ./jobLog.log -o ./jobOutput.json',
+        description: ''
     }
 ];
 var RequestCommand = /** @class */ (function (_super) {
@@ -89,6 +94,16 @@ var RequestCommand = /** @class */ (function (_super) {
                     type: 'string',
                     alias: 'c',
                     description: 'The path to a json file containting the config to be used when executing a request.'
+                },
+                log: {
+                    type: 'string',
+                    alias: 'l',
+                    description: 'Path where the log of the finished job will be saved. If used, -w is implied.'
+                },
+                output: {
+                    type: 'string',
+                    alias: 'o',
+                    description: 'path where output of the finished job execution will be saved.'
                 }
             },
             syntax: syntax,
@@ -99,12 +114,17 @@ var RequestCommand = /** @class */ (function (_super) {
     }
     RequestCommand.prototype.execute = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, target, isLocal, authConfig, _b, _c, sasProgramPath, data, config;
+            var _a, target, isLocal, jobPath, log, output, authConfig, _b, _c, sasProgramPath, data, config;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0: return [4 /*yield*/, this.getTargetInfo()];
                     case 1:
                         _a = _d.sent(), target = _a.target, isLocal = _a.isLocal;
+                        jobPath = utils_2.prefixAppLoc(target.appLoc, process.currentDir);
+                        log = this.parsed.log
+                            ? getLogFilePath_1.getLogFilePath(this.parsed.log || '', jobPath || '')
+                            : undefined;
+                        output = this.parsed.output || undefined;
                         if (!(target.serverType === utils_1.ServerType.SasViya)) return [3 /*break*/, 3];
                         return [4 /*yield*/, utils_2.getAuthConfig(target)];
                     case 2:
@@ -116,7 +136,7 @@ var RequestCommand = /** @class */ (function (_super) {
                     case 4:
                         authConfig = _b;
                         _c = this.parsed, sasProgramPath = _c.sasProgramPath, data = _c.data, config = _c.config;
-                        return [4 /*yield*/, request_1.runSasJob(target, isLocal, sasProgramPath, data, config, authConfig)
+                        return [4 /*yield*/, request_1.runSasJob(target, isLocal, sasProgramPath, data, config, authConfig, log, jobPath, output)
                                 .then(function () {
                                 return command_1.ReturnCode.Success;
                             })

package/build/commands/request/spec/request.spec.server.js

@@ -59,6 +59,8 @@ var request_1 = require("../request");
 var build_1 = require("../../build/build");
 var deploy_1 = require("../../deploy/deploy");
 var utils_3 = require("../../../utils");
+var getLogFilePath_1 = require("../../../utils/getLogFilePath");
+var fs_1 = require("fs");
 var sampleDataJson = {
     table1: [
         { col1: 'first col value1', col2: 'second col value1' },
@@ -222,6 +224,59 @@ describe('sasjs request without compute API', function () {
             }
         });
     }); });
+    it("should execute service 'sendArr' with absolute path with output path", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var rawData, output;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, expect(request_1.runSasJob(target, false, "/Public/app/cli-tests/" + target.name + "/services/runRequest/sendArr", dataPathRel, undefined, authConfig, undefined, undefined, './myoutput.json')).toResolve()];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, utils_1.readFile(process.projectDir + "/myoutput.json")];
+                case 2:
+                    rawData = _a.sent();
+                    output = JSON.parse(rawData);
+                    expect(output.table1).toEqual(expectedDataArr.table1);
+                    expect(output.table2).toEqual(expectedDataArr.table2);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it("should execute service 'err' with absolute path with log path", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var jobPath, log, rawLogDataStats, rawDataStats;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    jobPath = utils_3.prefixAppLoc(target.appLoc, process.currentDir);
+                    log = getLogFilePath_1.getLogFilePath('./mylog.txt', jobPath || '');
+                    return [4 /*yield*/, expect(request_1.runSasJob(target, false, "/Public/app/cli-tests/" + target.name + "/services/runRequest/err", dataPathRel, undefined, authConfig, log, jobPath)).toResolve()];
+                case 1:
+                    _a.sent();
+                    rawLogDataStats = fs_1.statSync(process.projectDir + "/mylog.txt");
+                    rawDataStats = fs_1.statSync(process.projectDir + "/output.json");
+                    expect(rawLogDataStats.size).toBeGreaterThan(10);
+                    expect(rawDataStats.size).toBeGreaterThan(10);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it("should execute service 'err' with absolute path with default log path", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var jobPath, log, rawLogDataStats, rawDataStats;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    jobPath = utils_3.prefixAppLoc(target.appLoc, process.currentDir);
+                    log = getLogFilePath_1.getLogFilePath('', jobPath || '');
+                    return [4 /*yield*/, expect(request_1.runSasJob(target, false, "/Public/app/cli-tests/" + target.name + "/services/runRequest/err", dataPathRel, undefined, authConfig, log, jobPath)).toResolve()];
+                case 1:
+                    _a.sent();
+                    rawLogDataStats = fs_1.statSync(process.projectDir + "/" + target.name + ".log");
+                    rawDataStats = fs_1.statSync(process.projectDir + "/output.json");
+                    expect(rawLogDataStats.size).toBeGreaterThan(10);
+                    expect(rawDataStats.size).toBeGreaterThan(10);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
 });
 describe('sasjs request with SAS9', function () {
     var appName = 'cli-tests-request-sas9-' + utils_2.generateTimestamp();
@@ -351,6 +406,59 @@ describe('sasjs request with SAS9', function () {
             }
         });
     }); });
+    it("should execute service 'sendArr' with absolute path with output path", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var rawData, output;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, expect(request_1.runSasJob(target, false, "/Public/app/cli-tests/" + target.name + "/services/runRequest/sendArr", dataPathRel, undefined, undefined, undefined, undefined, './myoutput.json')).toResolve()];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, utils_1.readFile(process.projectDir + "/myoutput.json")];
+                case 2:
+                    rawData = _a.sent();
+                    output = JSON.parse(rawData);
+                    expect(output.table1).toEqual(expectedDataArr.table1);
+                    expect(output.table2).toEqual(expectedDataArr.table2);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it("should execute service 'err' with absolute path with log path", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var jobPath, log, rawLogDataStats, rawDataStats;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    jobPath = utils_3.prefixAppLoc(target.appLoc, process.currentDir);
+                    log = getLogFilePath_1.getLogFilePath('./mylog.txt', jobPath || '');
+                    return [4 /*yield*/, expect(request_1.runSasJob(target, false, "/Public/app/cli-tests/" + target.name + "/services/runRequest/err", dataPathRel, undefined, undefined, log, jobPath)).toResolve()];
+                case 1:
+                    _a.sent();
+                    rawLogDataStats = fs_1.statSync(process.projectDir + "/mylog.txt");
+                    rawDataStats = fs_1.statSync(process.projectDir + "/output.json");
+                    expect(rawLogDataStats.size).toBeGreaterThan(10);
+                    expect(rawDataStats.size).toBeGreaterThan(10);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it("should execute service 'err' with absolute path with default log path", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var jobPath, log, rawLogDataStats, rawDataStats;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    jobPath = utils_3.prefixAppLoc(target.appLoc, process.currentDir);
+                    log = getLogFilePath_1.getLogFilePath('', jobPath || '');
+                    return [4 /*yield*/, expect(request_1.runSasJob(target, false, "/Public/app/cli-tests/" + target.name + "/services/runRequest/err", dataPathRel, undefined, undefined, log, jobPath)).toResolve()];
+                case 1:
+                    _a.sent();
+                    rawLogDataStats = fs_1.statSync(process.projectDir + "/" + target.name + ".log");
+                    rawDataStats = fs_1.statSync(process.projectDir + "/output.json");
+                    expect(rawLogDataStats.size).toBeGreaterThan(10);
+                    expect(rawDataStats.size).toBeGreaterThan(10);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
 });
 describe("sasjs request with compute API", function () {
     var appName = 'cli-tests-request-' + utils_2.generateTimestamp();

package/build/commands/request/spec/requestCommand.spec.js

@@ -92,6 +92,8 @@ var target = new utils_1.Target({
 var sasProgramPath = 'path/to/soure.sas';
 var dataFilePath = 'path/to/data.json';
 var configFilePath = 'path/to/config.json';
+var outputPath = './output.txt';
+var logPath = './log.txt';
 describe('RequestCommand', function () {
     beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -122,7 +124,7 @@ describe('RequestCommand', function () {
                     expect(command.name).toEqual('request');
                     expect(targetInfo.target).toEqual(target);
                     expect(targetInfo.isLocal).toBeTrue();
-                    expect(requestModule.runSasJob).toHaveBeenCalledWith(target, true, sasProgramPath, undefined, undefined, undefined);
+                    expect(requestModule.runSasJob).toHaveBeenCalledWith(target, true, sasProgramPath, undefined, undefined, undefined, undefined, null, undefined);
                     return [2 /*return*/];
             }
         });
@@ -166,7 +168,7 @@ describe('RequestCommand', function () {
                     expect(command.name).toEqual('request');
                     expect(targetInfo.target).toEqual(mockViyaTarget);
                     expect(targetInfo.isLocal).toBeTrue();
-                    expect(requestModule.runSasJob).toHaveBeenCalledWith(mockViyaTarget, true, sasProgramPath, undefined, undefined, mockAuthConfig);
+                    expect(requestModule.runSasJob).toHaveBeenCalledWith(mockViyaTarget, true, sasProgramPath, undefined, undefined, mockAuthConfig, undefined, null, undefined);
                     return [2 /*return*/];
             }
         });
@@ -184,7 +186,11 @@ describe('RequestCommand', function () {
                         '--data',
                         dataFilePath,
                         '--config',
-                        configFilePath
+                        configFilePath,
+                        '--output',
+                        outputPath,
+                        '--log',
+                        logPath
                     ]);
                     command = new requestCommand_1.RequestCommand(args);
                     return [4 /*yield*/, command.execute()];
@@ -196,7 +202,7 @@ describe('RequestCommand', function () {
                     expect(command.name).toEqual('request');
                     expect(targetInfo.target).toEqual(target);
                     expect(targetInfo.isLocal).toBeTrue();
-                    expect(requestModule.runSasJob).toHaveBeenCalledWith(target, true, sasProgramPath, dataFilePath, configFilePath, undefined);
+                    expect(requestModule.runSasJob).toHaveBeenCalledWith(target, true, sasProgramPath, dataFilePath, configFilePath, undefined, undefined, null, outputPath);
                     return [2 /*return*/];
             }
         });
@@ -214,7 +220,11 @@ describe('RequestCommand', function () {
                         '-d',
                         dataFilePath,
                         '-c',
-                        configFilePath
+                        configFilePath,
+                        '-o',
+                        outputPath,
+                        '-l',
+                        logPath
                     ]);
                     command = new requestCommand_1.RequestCommand(args);
                     return [4 /*yield*/, command.execute()];
@@ -226,7 +236,7 @@ describe('RequestCommand', function () {
                     expect(command.name).toEqual('request');
                     expect(targetInfo.target).toEqual(target);
                     expect(targetInfo.isLocal).toBeTrue();
-                    expect(requestModule.runSasJob).toHaveBeenCalledWith(target, true, sasProgramPath, dataFilePath, configFilePath, undefined);
+                    expect(requestModule.runSasJob).toHaveBeenCalledWith(target, true, sasProgramPath, dataFilePath, configFilePath, undefined, undefined, null, outputPath);
                     return [2 /*return*/];
             }
         });

package/build/commands/testing/internal/saveOutput.js

@@ -76,7 +76,7 @@ var saveLog = function (outDirectory, test, log, lineBreak) {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    logPath = path_1.default.join(outDirectory, 'logs', test.replace(file_1.sasFileRegExp, '').split('/').slice(1).join('_') + '.log');
+                    logPath = path_1.default.join(outDirectory, 'logs', test.replace(file_1.sasFileRegExp, '').split(path_1.default.sep).slice(1).join('_') + '.log');
                     return [4 /*yield*/, utils_1.createFile(logPath, log)];
                 case 1:
                     _a.sent();

package/build/config.json

@@ -235,6 +235,7 @@
     },
     "macroFolders": ["sasjs/macros"],
     "programFolders": ["sasjs/programs"],
+    "binaryFolders": ["sasjs/binaries"],
     "serverType": "SASVIYA",
     "targets": [
       {

package/build/utils/config.d.ts

@@ -39,6 +39,7 @@ export declare function getFolders(): Promise<any>;
  * @param {Target} target- the target to check program folders for.
  */
 export declare function getProgramFolders(target: Target): Promise<string[]>;
+export declare function getBinaryFolders(target: Target): Promise<string[]>;
 /**
  * Returns SAS macro folders from configuration.
  * This list includes both common and target-specific folders.

package/build/utils/config.js

@@ -71,7 +71,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTestTearDown = exports.getTestSetUp = exports.overrideEnvVariables = exports.getAccessToken = exports.getAuthConfig = exports.getProjectRoot = exports.sanitizeAppLoc = exports.getMacroCorePath = exports.getStreamConfig = exports.getMacroFolders = exports.getProgramFolders = exports.getFolders = exports.saveToLocalConfig = exports.saveLocalConfigFile = exports.getLocalOrGlobalConfig = exports.getLocalConfig = exports.removeFromLocalConfig = exports.removeFromGlobalConfig = exports.saveToGlobalConfig = exports.saveGlobalRcFile = exports.getLocalRcFile = exports.getGlobalRcFile = exports.findTargetInConfiguration = exports.getConfiguration = void 0;
+exports.getTestTearDown = exports.getTestSetUp = exports.overrideEnvVariables = exports.getAccessToken = exports.getAuthConfig = exports.getProjectRoot = exports.sanitizeAppLoc = exports.getMacroCorePath = exports.getStreamConfig = exports.getMacroFolders = exports.getBinaryFolders = exports.getProgramFolders = exports.getFolders = exports.saveToLocalConfig = exports.saveLocalConfigFile = exports.getLocalOrGlobalConfig = exports.getLocalConfig = exports.removeFromLocalConfig = exports.removeFromGlobalConfig = exports.saveToGlobalConfig = exports.saveGlobalRcFile = exports.getLocalRcFile = exports.getGlobalRcFile = exports.findTargetInConfiguration = exports.getConfiguration = void 0;
 var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var utils_1 = require("@sasjs/utils");
 var auth_1 = require("./auth");
@@ -641,6 +641,32 @@ function getProgramFolders(target) {
     });
 }
 exports.getProgramFolders = getProgramFolders;
+function getBinaryFolders(target) {
+    return __awaiter(this, void 0, void 0, function () {
+        var binaryFolders, localConfig, buildSourceFolder;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    binaryFolders = [];
+                    return [4 /*yield*/, getLocalConfig().catch(function () { return null; })];
+                case 1:
+                    localConfig = _a.sent();
+                    if (localConfig === null || localConfig === void 0 ? void 0 : localConfig.binaryFolders) {
+                        binaryFolders = binaryFolders.concat(localConfig.binaryFolders);
+                    }
+                    if (target === null || target === void 0 ? void 0 : target.binaryFolders) {
+                        binaryFolders = binaryFolders.concat(target.binaryFolders);
+                    }
+                    buildSourceFolder = process.sasjsConstants.buildSourceFolder;
+                    binaryFolders = binaryFolders.map(function (binaryFolder) {
+                        return utils_1.getAbsolutePath(binaryFolder, buildSourceFolder);
+                    });
+                    return [2 /*return*/, __spreadArray([], __read(new Set(binaryFolders)))];
+            }
+        });
+    });
+}
+exports.getBinaryFolders = getBinaryFolders;
 /**
  * Returns SAS macro folders from configuration.
  * This list includes both common and target-specific folders.

package/build/utils/displayResult.js

@@ -12,7 +12,7 @@ function displayError(err, errorMessage) {
     if (errorMessage === void 0) { errorMessage = ''; }
     if (errorMessage)
         errorMessage = errorMessage + "\n";
-    if (err) {
+    if (err !== undefined) {
         var failureDetails = '';
         if (err.hasOwnProperty('error')) {
             var body = err.error || null;

package/build/utils/getLogFilePath.d.ts

@@ -0,0 +1 @@
+export declare const getLogFilePath: (logArg: unknown, jobPath: string) => string | undefined;

package/build/utils/getLogFilePath.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLogFilePath = void 0;
+var path_1 = __importDefault(require("path"));
+var getLogFilePath = function (logArg, jobPath) {
+    if (logArg === undefined || !jobPath || jobPath === '') {
+        return undefined;
+    }
+    if (logArg) {
+        var currentDirPath = path_1.default.isAbsolute(logArg)
+            ? ''
+            : process.projectDir;
+        return path_1.default.join(currentDirPath, logArg);
+    }
+    var logFileName = jobPath.split('/').slice(-1).pop() + ".log";
+    return path_1.default.join(process.projectDir, logFileName);
+};
+exports.getLogFilePath = getLogFilePath;

package/build/utils/saveLog.d.ts

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

package/build/utils/saveLog.js

@@ -0,0 +1,80 @@
+"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.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, 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*/, utils_1.folderExists(parentFolderPath)];
+            case 1:
+                if (!!(_b.sent())) return [3 /*break*/, 3];
+                return [4 /*yield*/, utils_1.createFolder(parentFolderPath)];
+            case 2:
+                _b.sent();
+                _b.label = 3;
+            case 3:
+                logLines = typeof logData === 'object' ? _1.parseLogLines(logData) : logData;
+                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Creating log file at " + logPath + " .");
+                return [4 /*yield*/, utils_1.createFile(logPath, logLines)];
+            case 4:
+                _b.sent();
+                if (!returnStatusOnly)
+                    _1.displaySuccess("Log saved to " + logPath);
+                return [2 /*return*/];
+        }
+    });
+}); };
+exports.saveLog = saveLog;

package/build/utils/test.js

@@ -350,7 +350,9 @@ var verifyPackageJsonContent = function (parentFolderName) {
                 case 2:
                     packageJsonContent = _a.sent();
                     packageJson = JSON.parse(packageJsonContent);
-                    expect(packageJson.dependencies).toEqual(expect.objectContaining({ '@sasjs/core': expect.anything() }));
+                    expect(parentFolderName.includes('minimal')
+                        ? packageJson.devDependencies
+                        : packageJson.dependencies).toEqual(expect.objectContaining({ '@sasjs/core': expect.anything() }));
                     return [2 /*return*/];
             }
         });

package/package.json

@@ -49,10 +49,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "3.3.0",
-    "@sasjs/core": "^3.8.0",
+    "@sasjs/adapter": "3.4.1",
+    "@sasjs/core": "3.10.0",
     "@sasjs/lint": "1.11.2",
-    "@sasjs/utils": "2.34.1",
+    "@sasjs/utils": "2.35.0",
     "chalk": "4.1.2",
     "csv-stringify": "5.6.5",
     "dotenv": "10.0.0",
@@ -67,7 +67,7 @@
     "node-graphviz": "0.1.0",
     "ora": "5.4.1",
     "rimraf": "3.0.2",
-    "shelljs": "0.8.4",
+    "shelljs": "0.8.5",
     "xml": "1.0.1",
     "yargs": "17.2.1"
   },
@@ -97,5 +97,5 @@
     "typescript": "4.3.5",
     "util": "0.12.4"
   },
-  "version": "3.4.0"
+  "version": "3.6.0"
 }