@sasjs/cli 3.9.0 → 3.10.2

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

@@ -74,13 +74,14 @@ var utils_1 = require("@sasjs/utils");
 var internalModule = __importStar(require("@sasjs/utils/sasjsCli/getInitTerm"));
 var getInitTerm_1 = require("@sasjs/utils/sasjsCli/getInitTerm");
 var test_1 = require("../../../utils/test");
+var utils_2 = require("../../../utils");
 var loadDependencies_1 = require("../internal/loadDependencies");
-var fakeInit = "/**\n  @file serviceinit.sas\n  @brief this file is called with every service\n  @details  This file is included in *every* service, *after* the macros and *before* the service code.\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n\n**/\n\noptions\n  DATASTMTCHK=ALLKEYWORDS /* some sites have this enabled */\n  PS=MAX /* reduce log size slightly */\n;\n%put service is starting!!;";
-var fakeTerm = "/**\n  @file serviceterm.sas\n  @brief this file is called at the end of every service\n  @details  This file is included at the *end* of every service.\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n  @li mf_existds.sas\n\n**/\n\n%put service is finishing.  Thanks, SASjs!;";
-var fakeInit2 = "/**\n  @file serviceinit.sas\n  @brief this file is called with every service\n  @details  This file is included in *every* service, *after* the macros and *before* the service code.\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n\n**/\n\noptions\n  DATASTMTCHK=ALLKEYWORDS /* some sites have this enabled */\n  PS=MAX /* reduce log size slightly */\n;\n%put service is starting!!;";
-var fakeTerm2 = "/**\n  @file serviceterm.sas\n  @brief this file is called at the end of every service\n  @details  This file is included at the *end* of every service.\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n  @li mf_existds.sas\n\n**/\n\n%put service is finishing.  Thanks, SASjs!;";
-var fakeJobInit = "/**\n  @file\n  @brief This code is inserted into the beginning of each Viya Job.\n  @details Inserted during the `sasjs compile` step.  Add any code here that\n  should go at the beginning of every deployed job.\n\n  The path to this file should be listed in the `jobInit` property of the\n  sasjsconfig file.\n\n  <h4> SAS Programs </h4>\n  @li test.sas TEST\n\n  <h4> SAS Macros </h4>\n  @li examplemacro.sas\n\n**/\n\n%example(Job Init is executing!)\n\n%let mylib=WORK;";
-var fakeJobInit2 = "/**\n  @file\n  @brief This code is inserted into the beginning of each Viya Job.\n  @details Inserted during the `sasjs compile` step.  Add any code here that\n  should go at the beginning of every deployed job.\n\n  The path to this file should be listed in the `jobInit` property of the\n  sasjsconfig file.\n\n  <h4> SAS Includes </h4>\n  @li test.sas TEST\n\n  <h4> SAS Macros </h4>\n  @li examplemacro.sas\n\n**/\n\n%example(Job Init is executing!)\n\n%let mylib=WORK;";
+var fakeInit = "/**\n  @file serviceinit.sas\n  @brief this file is called with every service\n  @details  This file is included in *every* service, *after* the macros and *before* the service code.\n\n  ".concat(utils_1.DependencyHeader.Macro, "\n  @li mf_abort.sas\n\n**/\n\noptions\n  DATASTMTCHK=ALLKEYWORDS /* some sites have this enabled */\n  PS=MAX /* reduce log size slightly */\n;\n%put service is starting!!;");
+var fakeTerm = "/**\n  @file serviceterm.sas\n  @brief this file is called at the end of every service\n  @details  This file is included at the *end* of every service.\n\n  ".concat(utils_1.DependencyHeader.Macro, "\n  @li mf_abort.sas\n  @li mf_existds.sas\n\n**/\n\n%put service is finishing.  Thanks, SASjs!;");
+var fakeInit2 = "/**\n  @file serviceinit.sas\n  @brief this file is called with every service\n  @details  This file is included in *every* service, *after* the macros and *before* the service code.\n\n  ".concat(utils_1.DependencyHeader.Macro, "\n  @li mf_abort.sas\n\n**/\n\noptions\n  DATASTMTCHK=ALLKEYWORDS /* some sites have this enabled */\n  PS=MAX /* reduce log size slightly */\n;\n%put service is starting!!;");
+var fakeTerm2 = "/**\n  @file serviceterm.sas\n  @brief this file is called at the end of every service\n  @details  This file is included at the *end* of every service.\n\n  ".concat(utils_1.DependencyHeader.Macro, "\n  @li mf_abort.sas\n  @li mf_existds.sas\n\n**/\n\n%put service is finishing.  Thanks, SASjs!;");
+var fakeJobInit = "/**\n  @file\n  @brief This code is inserted into the beginning of each Viya Job.\n  @details Inserted during the `sasjs compile` step.  Add any code here that\n  should go at the beginning of every deployed job.\n\n  The path to this file should be listed in the `jobInit` property of the\n  sasjsconfig file.\n\n  ".concat(utils_1.DependencyHeader.DeprecatedInclude, "\n  @li test.sas TEST\n\n  ").concat(utils_1.DependencyHeader.Macro, "\n  @li examplemacro.sas\n\n**/\n\n%example(Job Init is executing!)\n\n%let mylib=WORK;");
+var fakeJobInit2 = "/**\n  @file\n  @brief This code is inserted into the beginning of each Viya Job.\n  @details Inserted during the `sasjs compile` step.  Add any code here that\n  should go at the beginning of every deployed job.\n\n  The path to this file should be listed in the `jobInit` property of the\n  sasjsconfig file.\n\n  ".concat(utils_1.DependencyHeader.Include, "\n  @li test.sas TEST\n\n  ").concat(utils_1.DependencyHeader.Macro, "\n  @li examplemacro.sas\n\n**/\n\n%example(Job Init is executing!)\n\n%let mylib=WORK;");
 var fakeProgramLines = [
     'filename TEST temp;',
     'data _null_;',
@@ -132,17 +133,22 @@ describe('loadDependencies', function () {
         macroVars: {}
     }, utils_1.ServerType.SasViya);
     var target = new utils_1.Target(__assign(__assign({}, temp.toJson()), { jobConfig: jobConfig(false), serviceConfig: serviceConfig(false) }));
+    var compileTree;
     beforeAll(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.createTestMinimalApp)(__dirname, target.name)];
+                case 0: return [4 /*yield*/, (0, utils_2.setConstants)()];
                 case 1:
+                    _a.sent();
+                    compileTree = (0, loadDependencies_1.getCompileTree)(target);
+                    return [4 /*yield*/, (0, test_1.createTestMinimalApp)(__dirname, target.name)];
+                case 2:
                     _a.sent();
                     return [4 /*yield*/, (0, test_1.updateConfig)({
                             jobConfig: jobConfig(),
                             serviceConfig: serviceConfig()
                         })];
-                case 2:
+                case 3:
                     _a.sent();
                     return [2 /*return*/];
             }
@@ -158,13 +164,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test('it should load dependencies for a service with <h4> Dependencies </h4>', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load dependencies for a service with ".concat(utils_1.DependencyHeader.DeprecatedMacro), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeInit, fakeTerm);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.service)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));
@@ -178,13 +184,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test('it should load dependencies for a job <h4> SAS Macros </h4>', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load dependencies for a job ".concat(utils_1.DependencyHeader.Macro), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeInit, fakeTerm);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.job)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -198,13 +204,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test('it should load dependencies for a service with <h4> SAS MAcros </h4>', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load dependencies for a service with ".concat(utils_1.DependencyHeader.Macro), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeInit2, fakeTerm2);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.service)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));
@@ -218,13 +224,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test('it should load dependencies for a job <h4> SAS MAcros </h4>', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load dependencies for a job ".concat(utils_1.DependencyHeader.Macro), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeInit2, fakeTerm2);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.job)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -238,13 +244,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test('it should load programs for a service with <h4> SAS Programs </h4>', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load programs for a service with ".concat(utils_1.DependencyHeader.DeprecatedInclude), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeJobInit, fakeTerm);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));
@@ -258,13 +264,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test('it should load programs for a job <h4> SAS Programs </h4>', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load programs for a job ".concat(utils_1.DependencyHeader.DeprecatedInclude), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeJobInit, fakeTerm);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -278,13 +284,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test('it should load programs for a service with <h4> SAS Includes </h4>', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load programs for a service with ".concat(utils_1.DependencyHeader.Include), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeJobInit2, fakeTerm2);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));
@@ -298,13 +304,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test('it should load programs for a job <h4> SAS Includes </h4>', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load programs for a job ".concat(utils_1.DependencyHeader.Include), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeJobInit2, fakeTerm2);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -318,13 +324,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test("it should load dependencies for a job having jobInit's <h4> SAS Programs </h4>", function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load dependencies for a job having jobInit's ".concat(utils_1.DependencyHeader.DeprecatedInclude), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeJobInit, fakeTerm2);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -341,13 +347,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test("it should load dependencies for a job having jobTerm's <h4> SAS Programs </h4>", function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load dependencies for a job having jobTerm's ".concat(utils_1.DependencyHeader.DeprecatedInclude), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeInit2, fakeJobInit);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -363,13 +369,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test("it should load dependencies for a service having serviceInit's <h4> SAS Programs </h4>", function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load dependencies for a service having serviceInit's ".concat(utils_1.DependencyHeader.DeprecatedInclude), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeJobInit, fakeTerm2);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));
@@ -386,13 +392,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test("it should load dependencies for a service having serviceTerm's <h4> SAS Programs </h4>", function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load dependencies for a service having serviceTerm's ".concat(utils_1.DependencyHeader.DeprecatedInclude), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeInit2, fakeJobInit);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));

package/build/commands/docs/generateDocs.js

@@ -84,7 +84,6 @@ var utils_1 = require("@sasjs/utils");
 var getFoldersForDocs_1 = require("./internal/getFoldersForDocs");
 var createDotFiles_1 = require("./internal/createDotFiles");
 var getDocConfig_1 = require("./internal/getDocConfig");
-var utils_2 = require("../../utils");
 /**
  * Generates documentation(Doxygen)
  * By default the docs will be at 'sasjsbuild/docs' folder
@@ -188,16 +187,13 @@ function generateDocs(target, config, outDirectory) {
 exports.generateDocs = generateDocs;
 function setVariableCmd(params) {
     var command = '';
-    var isWin = (0, utils_2.isWindows)();
-    if (isWin) {
-        for (var param in params) {
+    if ((0, utils_1.isWindows)()) {
+        for (var param in params)
             command += "set ".concat(param, "=").concat(params[param], " && ");
-        }
     }
     else {
-        for (var param in params) {
+        for (var param in params)
             command += "".concat(param, "='").concat(params[param], "' ");
-        }
     }
     return command;
 }

package/build/commands/docs/internal/getFileInputs.js

@@ -9,7 +9,7 @@ var utils_1 = require("@sasjs/utils");
  * @param {Map} paramNodes- Map for params(Inputs/Outputs)
  */
 function getFileInputs(fileName, fileContent, paramNodes) {
-    var fileInputs = (0, utils_1.getList)('<h4> Data Inputs </h4>', fileContent)
+    var fileInputs = (0, utils_1.getList)(utils_1.DependencyHeader.DataInput, fileContent)
         .map(function (input) { return input.toUpperCase(); })
         .filter(function (input) { return !input.endsWith('.DLL'); });
     fileInputs.forEach(function (inputParam) {

package/build/commands/docs/internal/getFileOutputs.js

@@ -8,7 +8,7 @@ var utils_1 = require("@sasjs/utils");
  * @param {Map} paramNodes- Map for params(Inputs/Outputs)
  */
 function getFileOutputs(fileContent, paramNodes) {
-    var fileOutputs = (0, utils_1.getList)('<h4> Data Outputs </h4>', fileContent)
+    var fileOutputs = (0, utils_1.getList)(utils_1.DependencyHeader.DataOutput, fileContent)
         .map(function (output) { return output.toUpperCase(); })
         .filter(function (output) { return !output.endsWith('.DLL'); });
     fileOutputs.forEach(function (outputParam) {

package/build/commands/help/help.js

@@ -223,8 +223,8 @@ function printHelpText() {
                         "the user run a SAS job against a specified target.",
                         "The target can exist either in the local project configuration or in the global .sasjsrc file.",
                         "<sasProgramPath> - if this has a leading slash (eg /Public/app/folder/servicename) then it must be the full path. If it is a relative path (eg path/servicename) then it will be pre-pended with the appLoc - which must then be defined in the sasjs config.",
-                        "<path/to/log> - Location in which to store the log file. If not provided AND an error occurs, the log will be stored in the execution path.",
-                        "<path/to/output> - Location to store the output file. If not provided, a file named output.json will be saved in the execution path."
+                        "<path/to/log> - Location in which to store the log file. If not provided AND current directory is a sasjs project, it will be saved in sasjsresults else in the current directory",
+                        "<path/to/output> - Location to store the output file. If not provided AND current directory is a sasjs project, an output file  will be saved in the sasjsresults folder else in current directory."
                     ]
                 },
                 {

package/build/commands/request/request.js

@@ -47,7 +47,6 @@ var displayResult_1 = require("../../utils/displayResult");
 var types_1 = require("@sasjs/utils/types");
 var utils_2 = require("../../utils/utils");
 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;
@@ -150,7 +149,7 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                                             output = res;
                                         }
                                         if (!!!output) return [3 /*break*/, 4];
-                                        return [4 /*yield*/, writeOutput(outputPathParam, output, isLocal)];
+                                        return [4 /*yield*/, writeOutput(outputPathParam, output, sasJobLocation)];
                                     case 3:
                                         _a.sent();
                                         _a.label = 4;
@@ -193,20 +192,28 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
 }
 exports.runSasJob = runSasJob;
 var saveLogFile = function (sasjs, sasJobLocation, logFile, jobPath) { return __awaiter(void 0, void 0, void 0, function () {
-    var sasRequests, currentRequestLog;
+    var sasRequests, currentRequestLog, logPath, timestamp, filename;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
                 sasRequests = sasjs.getSasRequests();
                 currentRequestLog = sasRequests.find(function (x) { return x.serviceLink === sasJobLocation; });
-                if (!(currentRequestLog && jobPath)) return [3 /*break*/, 2];
-                if (!logFile)
-                    logFile = (0, getLogFilePath_1.getLogFilePath)('', jobPath || '');
-                return [4 /*yield*/, (0, saveLog_1.saveLog)(currentRequestLog.logFile, logFile, jobPath || '', false)];
+                if (!(currentRequestLog && jobPath)) return [3 /*break*/, 4];
+                if (!!logFile) return [3 /*break*/, 2];
+                return [4 /*yield*/, (0, utils_2.isSASjsProject)()];
             case 1:
-                _a.sent();
+                logPath = (_a.sent())
+                    ? path_1.default.join(process.sasjsConstants.buildDestinationResultsFolder, 'requests')
+                    : process.projectDir;
+                timestamp = (0, utils_1.generateTimestamp)();
+                filename = sasJobLocation.split(path_1.default.sep).pop();
+                logFile = path_1.default.join(logPath, "".concat(filename, "-").concat(timestamp, ".log"));
                 _a.label = 2;
-            case 2: return [2 /*return*/];
+            case 2: return [4 /*yield*/, (0, saveLog_1.saveLog)(currentRequestLog.logFile, logFile, jobPath || '', false)];
+            case 3:
+                _a.sent();
+                _a.label = 4;
+            case 4: return [2 /*return*/];
         }
     });
 }); };
@@ -214,15 +221,18 @@ var saveLogFile = function (sasjs, sasJobLocation, logFile, jobPath) { return __
  * 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
+ * @param sasJobLocation is used for output file name when outputPathParam is undefined
  * @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;
+var writeOutput = function (outputPathParam, output, sasJobLocation) { return __awaiter(void 0, void 0, void 0, function () {
+    var outputPath, outputFilename, outputPathArr, timestamp, filename, outputString;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0:
-                outputPath = path_1.default.join(process.projectDir, isLocal ? '' : '');
+            case 0: return [4 /*yield*/, (0, utils_2.isSASjsProject)()];
+            case 1:
+                outputPath = (_a.sent())
+                    ? path_1.default.join(process.sasjsConstants.buildDestinationResultsFolder, 'requests')
+                    : process.projectDir;
                 if (outputPathParam && typeof outputPathParam === 'string') {
                     outputPathParam = path_1.default.join(process.projectDir, outputPathParam || '');
                     outputPathArr = outputPathParam.split(path_1.default.sep);
@@ -230,18 +240,20 @@ var writeOutput = function (outputPathParam, output, isLocal) { return __awaiter
                     outputPath = outputPathArr.join(path_1.default.sep);
                 }
                 return [4 /*yield*/, (0, utils_1.folderExists)(outputPath)];
-            case 1:
-                if (!!(_a.sent())) return [3 /*break*/, 3];
-                return [4 /*yield*/, (0, utils_1.createFolder)(outputPath)];
             case 2:
-                _a.sent();
-                _a.label = 3;
+                if (!!(_a.sent())) return [3 /*break*/, 4];
+                return [4 /*yield*/, (0, utils_1.createFolder)(outputPath)];
             case 3:
+                _a.sent();
+                _a.label = 4;
+            case 4:
                 if (outputFilename) {
                     outputPath += "".concat(path_1.default.sep).concat(outputFilename);
                 }
                 else {
-                    outputPath += "".concat(path_1.default.sep, "output.json");
+                    timestamp = (0, utils_1.generateTimestamp)();
+                    filename = sasJobLocation.split(path_1.default.sep).pop();
+                    outputPath += "".concat(path_1.default.sep).concat(filename, "-").concat(timestamp, ".json");
                 }
                 outputString = '';
                 if (typeof output === 'object') {
@@ -256,16 +268,16 @@ var writeOutput = function (outputPathParam, output, isLocal) { return __awaiter
                 else {
                     outputString = output;
                 }
-                if (!outputString) return [3 /*break*/, 5];
+                if (!outputString) return [3 /*break*/, 6];
                 return [4 /*yield*/, (0, utils_1.createFile)(outputPath, outputString)];
-            case 4:
+            case 5:
                 _a.sent();
                 (0, displayResult_1.displaySuccess)("Request finished. Output is stored at '".concat(outputPath, "'"));
-                return [3 /*break*/, 6];
-            case 5:
+                return [3 /*break*/, 7];
+            case 6:
                 (0, displayResult_1.displayError)("There was a problem with writing output file. Data not present.");
-                _a.label = 6;
-            case 6: return [2 /*return*/];
+                _a.label = 7;
+            case 7: return [2 /*return*/];
         }
     });
 }); };