@sasjs/cli 3.8.8 → 3.10.0

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/deploy/deploy.js

@@ -59,14 +59,14 @@ var deployToSasViyaWithServicePack_1 = require("../shared/deployToSasViyaWithSer
 function deploy(target, isLocal, sasjs) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     return __awaiter(this, void 0, void 0, function () {
-        var appLoc, buildDestinationFolder_1, finalFilePathJSON, jsonObject, webIndexFileName, deployScripts, buildDestinationFolder, logFilePath;
+        var appLoc, buildDestinationFolder_1, finalFilePathJSON, jsonObject, webIndexFileName, deployScripts, buildDestinationFolder, logFilePath, streamConfig;
         var _this = this;
         return __generator(this, function (_k) {
             switch (_k.label) {
                 case 0:
                     if (!(target.serverType === utils_2.ServerType.SasViya &&
                         ((_a = target.deployConfig) === null || _a === void 0 ? void 0 : _a.deployServicePack))) return [3 /*break*/, 2];
-                    appLoc = target.appLoc.replace(/\ /g, '%20');
+                    appLoc = encodeURI(target.appLoc);
                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Deploying service pack to ".concat(target.serverUrl, " at location ").concat(appLoc, " ."));
                     buildDestinationFolder_1 = process.sasjsConstants.buildDestinationFolder;
                     finalFilePathJSON = path_1.default.join(buildDestinationFolder_1, "".concat(target.name, ".json"));
@@ -89,19 +89,22 @@ function deploy(target, isLocal, sasjs) {
                     }
                     buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
                     logFilePath = buildDestinationFolder;
-                    if (!(target.serverType === utils_2.ServerType.Sasjs)) return [3 /*break*/, 5];
-                    return [4 /*yield*/, deployToSasjs(target, sasjs)];
+                    return [4 /*yield*/, (0, config_1.getStreamConfig)(target)];
                 case 4:
+                    streamConfig = _k.sent();
+                    if (!(target.serverType === utils_2.ServerType.Sasjs)) return [3 /*break*/, 6];
+                    return [4 /*yield*/, deployToSasjs(target, sasjs, streamConfig)];
+                case 5:
                     _k.sent();
-                    return [3 /*break*/, 7];
-                case 5: return [4 /*yield*/, (0, utils_2.asyncForEach)(deployScripts, function (deployScript) { return __awaiter(_this, void 0, void 0, function () {
-                        var deployScriptPath, deployScriptContent, linesToExecute, streamConfig, deployScriptName, logPath;
+                    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) {
                                 case 0:
                                     deployScriptPath = (0, utils_2.getAbsolutePath)(deployScript, process.projectDir);
-                                    if (!(0, file_1.isSasFile)(deployScript)) return [3 /*break*/, 7];
+                                    if (!(0, file_1.isSasFile)(deployScript)) return [3 /*break*/, 6];
                                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Processing SAS file ".concat(path_1.default.basename(deployScript), " ..."));
                                     return [4 /*yield*/, (0, utils_2.readFile)(deployScriptPath)
                                         // split into lines
@@ -111,37 +114,34 @@ function deploy(target, isLocal, sasjs) {
                                     linesToExecute = deployScriptContent
                                         .replace(/\r\n/g, '\n')
                                         .split('\n');
-                                    return [4 /*yield*/, (0, config_1.getStreamConfig)(target)];
-                                case 2:
-                                    streamConfig = _d.sent();
                                     deployScriptName = path_1.default.basename(deployScript);
-                                    if (!(target.serverType === utils_2.ServerType.SasViya)) return [3 /*break*/, 4];
+                                    if (!(target.serverType === utils_2.ServerType.SasViya)) return [3 /*break*/, 3];
                                     return [4 /*yield*/, deployToSasViya(deployScriptName, target, isLocal, linesToExecute, logFilePath, streamConfig)];
-                                case 3:
+                                case 2:
                                     _d.sent();
-                                    return [3 /*break*/, 6];
-                                case 4: return [4 /*yield*/, deployToSas9(deployScriptName, target, linesToExecute, logFilePath, streamConfig)];
-                                case 5:
+                                    return [3 /*break*/, 5];
+                                case 3: return [4 /*yield*/, deployToSas9(deployScriptName, target, linesToExecute, logFilePath, streamConfig)];
+                                case 4:
                                     _d.sent();
-                                    _d.label = 6;
-                                case 6: return [3 /*break*/, 9];
-                                case 7:
-                                    if (!(0, file_1.isShellScript)(deployScript)) return [3 /*break*/, 9];
+                                    _d.label = 5;
+                                case 5: return [3 /*break*/, 8];
+                                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 8:
+                                case 7:
                                     _d.sent();
                                     (_c = process.logger) === null || _c === void 0 ? void 0 : _c.success("Shell script execution completed! Log is here: ".concat(logPath));
-                                    _d.label = 9;
-                                case 9: return [2 /*return*/];
+                                    _d.label = 8;
+                                case 8: return [2 /*return*/];
                             }
                         });
                     }); })];
-                case 6:
+                case 7:
                     _k.sent();
-                    _k.label = 7;
-                case 7: return [2 /*return*/];
+                    _k.label = 8;
+                case 8: return [2 /*return*/];
             }
         });
     });
@@ -239,7 +239,7 @@ function deployToSasViya(deployScriptName, target, isLocal, linesToExecute, logF
                     _g.label = 5;
                 case 5:
                     if (streamConfig === null || streamConfig === void 0 ? void 0 : streamConfig.streamWeb) {
-                        appLoc = target.appLoc.replace(/\ /g, '%20');
+                        appLoc = encodeURI(target.appLoc);
                         webAppStreamUrl = "".concat(target.serverUrl, "/SASJobExecution?_FILE=").concat(appLoc, "/services/").concat(streamConfig.streamServiceName, ".html&_debug=2");
                         (_e = process.logger) === null || _e === void 0 ? void 0 : _e.info("Web app is available at ".concat(webAppStreamUrl));
                     }
@@ -317,7 +317,7 @@ function deployToSas9(deployScriptName, target, linesToExecute, logFolder, strea
                     }
                     (_d = process.logger) === null || _d === void 0 ? void 0 : _d.success("Deployment completed! Log is available at ".concat(logFilePath));
                     if (streamConfig === null || streamConfig === void 0 ? void 0 : streamConfig.streamWeb) {
-                        appLoc = target.appLoc.replace(/\ /g, '%20');
+                        appLoc = encodeURI(target.appLoc);
                         webAppStreamUrl = "".concat(target.serverUrl, "/SASStoredProcess/?_PROGRAM=").concat(appLoc, "/services/").concat(streamConfig.streamServiceName);
                         (_e = process.logger) === null || _e === void 0 ? void 0 : _e.info("Web app is available at ".concat(webAppStreamUrl));
                     }
@@ -331,18 +331,18 @@ function deployToSas9(deployScriptName, target, linesToExecute, logFolder, strea
  * @param {Target} target- the target having deploy configuration.
  * @param {object} sasjs - optional configuration object of SAS adapter.
  */
-function deployToSasjs(target, sasjs) {
-    var _a, _b;
+function deployToSasjs(target, sasjs, streamConfig) {
+    var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function () {
-        var buildDestinationFolder, finalFilePathJSON, jsonContent, payload, authConfig, e_2, result;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var buildDestinationFolder, finalFilePathJSON, jsonContent, payload, authConfig, e_2, result, appLoc, webAppStreamUrl;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
                     buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
                     finalFilePathJSON = path_1.default.join(buildDestinationFolder, "".concat(target.name, ".json"));
                     return [4 /*yield*/, (0, utils_2.readFile)(finalFilePathJSON)];
                 case 1:
-                    jsonContent = _c.sent();
+                    jsonContent = _d.sent();
                     payload = JSON.parse(jsonContent);
                     if (!!sasjs) return [3 /*break*/, 5];
                     sasjs = new node_1.default({
@@ -352,15 +352,15 @@ function deployToSasjs(target, sasjs) {
                         httpsAgentOptions: target.httpsAgentOptions,
                         debug: true
                     });
-                    _c.label = 2;
+                    _d.label = 2;
                 case 2:
-                    _c.trys.push([2, 4, , 5]);
+                    _d.trys.push([2, 4, , 5]);
                     return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
                 case 3:
-                    authConfig = _c.sent();
+                    authConfig = _d.sent();
                     return [3 /*break*/, 5];
                 case 4:
-                    e_2 = _c.sent();
+                    e_2 = _d.sent();
                     return [3 /*break*/, 5];
                 case 5: return [4 /*yield*/, sasjs
                         .deployToSASjs(payload, undefined, authConfig)
@@ -369,13 +369,18 @@ function deployToSasjs(target, sasjs) {
                         (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error(err);
                     })];
                 case 6:
-                    result = _c.sent();
+                    result = _d.sent();
                     if ((result === null || result === void 0 ? void 0 : result.status) === 'failure') {
                         (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error(result.message);
                         if (result.example) {
                             (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Payload example:\n".concat(JSON.stringify(result.example, null, 2)));
                         }
                     }
+                    if (streamConfig === null || streamConfig === void 0 ? void 0 : streamConfig.streamWeb) {
+                        appLoc = encodeURI(target.appLoc);
+                        webAppStreamUrl = "".concat(target.serverUrl, "/AppStream").concat(appLoc);
+                        (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info("Web app is available at ".concat(webAppStreamUrl));
+                    }
                     return [2 /*return*/];
             }
         });

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/request/request.js

@@ -130,12 +130,32 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                                     case 2:
                                         output = '';
                                         if (res === null || res === void 0 ? void 0 : res.result)
-                                            output = res.result;
+                                            res = res.result;
+                                        // In sasjs request debug is always on, meaning the response object always contains the log
+                                        // This log goes to a seperate .log file, and should not be added to the output file (*.json)
+                                        // Therefore, we delete it now from the result object
+                                        else if (res === null || res === void 0 ? void 0 : res.log)
+                                            delete res.log;
+                                        // Sometimes res.result contains the log (eg when there is a SAS error)
+                                        // Here we make sure that the content in the output file (*.json) will be in json format
+                                        if (typeof res === 'string') {
+                                            try {
+                                                output = JSON.parse(res);
+                                            }
+                                            catch (error) {
+                                                (0, displayResult_1.displayError)('Error parsing response. JSON is expected.');
+                                            }
+                                        }
+                                        else {
+                                            output = res;
+                                        }
+                                        if (!!!output) return [3 /*break*/, 4];
                                         return [4 /*yield*/, writeOutput(outputPathParam, output, isLocal)];
                                     case 3:
                                         _a.sent();
-                                        return [4 /*yield*/, saveLogFile(sasjs, sasJobLocation, logFile, jobPath)];
-                                    case 4:
+                                        _a.label = 4;
+                                    case 4: return [4 /*yield*/, saveLogFile(sasjs, sasJobLocation, logFile, jobPath)];
+                                    case 5:
                                         _a.sent();
                                         result = true;
                                         return [2 /*return*/];
@@ -143,6 +163,7 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                             });
                         }); })
                             .catch(function (err) { return __awaiter(_this, void 0, void 0, function () {
+                            var error;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
@@ -150,7 +171,10 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                                             (0, utils_2.displaySasjsRunnerError)(configJson.username);
                                         }
                                         else {
-                                            (0, displayResult_1.displayError)(err, 'An error occurred while executing the request.');
+                                            error = {};
+                                            if (err.message)
+                                                error.message = err.message;
+                                            (0, displayResult_1.displayError)(error, 'An error occurred while executing the request.');
                                         }
                                         return [4 /*yield*/, saveLogFile(sasjs, sasJobLocation, logFile, jobPath)];
                                     case 1: