@sasjs/cli 2.38.6 → 3.0.0

package/build/commands/add/addCredential.d.ts

@@ -1,4 +1,4 @@
-import { SasAuthResponse, Target } from '@sasjs/utils/types';
+import { SasAuthResponse, Target, HttpsAgentOptions } from '@sasjs/utils/types';
 import { TargetScope } from '../../types/targetScope';
 /**
  * Creates a .env file for the specified target.
@@ -10,6 +10,6 @@ import { TargetScope } from '../../types/targetScope';
  */
 export declare const addCredential: (target: Target, insecure: boolean, targetScope: TargetScope) => Promise<Target>;
 export declare const validateTargetName: (targetName: string) => string;
-export declare const getTokens: (target: Target, client: string, secret: string, insecure?: boolean) => Promise<SasAuthResponse>;
+export declare const getTokens: (target: Target, client: string, secret: string, httpsAgentOptions?: HttpsAgentOptions | undefined) => Promise<SasAuthResponse>;
 export declare const createEnvFileForViya: (targetName: string, client: string, secret: string, accessToken: string, refreshToken: string) => Promise<void>;
 export declare const createEnvFileForSas9: (targetName: string, userName: string, password: string) => Promise<void>;

package/build/commands/add/addCredential.js

@@ -69,12 +69,13 @@ var saveConfig_1 = require("./internal/saveConfig");
  * @param {boolean} insecure- boolean to use insecure connection, default is false. lf true the server will not reject any connection which is not authorized with the list of supplied CAs
  */
 var addCredential = function (target, insecure, targetScope) { return __awaiter(void 0, void 0, void 0, function () {
-    var serverUrl, filePath, _a, client, secret, _b, access_token, refresh_token, filePath, _c, userName, password, filePath;
+    var httpsAgentOptions, serverUrl, filePath, _a, client, secret, _b, access_token, refresh_token, filePath, _c, userName, password, filePath;
     var _d, _e, _f, _g;
     return __generator(this, function (_h) {
         switch (_h.label) {
             case 0:
-                insecure = insecure || target.allowInsecureRequests;
+                httpsAgentOptions = insecure
+                    ? __assign(__assign({}, target.httpsAgentOptions), { allowInsecureRequests: true, rejectUnauthorized: false }) : target.httpsAgentOptions;
                 if (insecure)
                     (_d = process.logger) === null || _d === void 0 ? void 0 : _d.warn('Executing with insecure connection.');
                 if (!!target.serverUrl) return [3 /*break*/, 3];
@@ -92,7 +93,7 @@ var addCredential = function (target, insecure, targetScope) { return __awaiter(
                 return [4 /*yield*/, input_1.getCredentialsInputForViya(target.name)];
             case 4:
                 _a = _h.sent(), client = _a.client, secret = _a.secret;
-                return [4 /*yield*/, exports.getTokens(target, client, secret, insecure)];
+                return [4 /*yield*/, exports.getTokens(target, client, secret, httpsAgentOptions)];
             case 5:
                 _b = _h.sent(), access_token = _b.access_token, refresh_token = _b.refresh_token;
                 if (!(targetScope === targetScope_1.TargetScope.Local)) return [3 /*break*/, 7];
@@ -144,32 +145,29 @@ var validateTargetName = function (targetName) {
     return targetName;
 };
 exports.validateTargetName = validateTargetName;
-var getTokens = function (target, client, secret, insecure) {
-    if (insecure === void 0) { insecure = false; }
-    return __awaiter(void 0, void 0, void 0, function () {
-        var adapter, authResponse;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    adapter = new node_1.default({
-                        serverUrl: target.serverUrl,
-                        serverType: target.serverType,
-                        allowInsecureRequests: insecure,
-                        debug: ((_a = process.logger) === null || _a === void 0 ? void 0 : _a.logLevel) === logger_1.LogLevel.Debug
-                    });
-                    return [4 /*yield*/, auth_1.getNewAccessToken(adapter, client, secret, target).catch(function (e) {
-                            var _a;
-                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("An error has occurred while validating your credentials: " + e + "\nPlease check your Client ID and Client Secret and try again.\n");
-                            throw e;
-                        })];
-                case 1:
-                    authResponse = _b.sent();
-                    return [2 /*return*/, authResponse];
-            }
-        });
+var getTokens = function (target, client, secret, httpsAgentOptions) { return __awaiter(void 0, void 0, void 0, function () {
+    var adapter, authResponse;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                adapter = new node_1.default({
+                    serverUrl: target.serverUrl,
+                    serverType: target.serverType,
+                    httpsAgentOptions: httpsAgentOptions,
+                    debug: ((_a = process.logger) === null || _a === void 0 ? void 0 : _a.logLevel) === logger_1.LogLevel.Debug
+                });
+                return [4 /*yield*/, auth_1.getNewAccessToken(adapter, client, secret, target).catch(function (e) {
+                        var _a;
+                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("An error has occurred while validating your credentials: " + e + "\nPlease check your Client ID and Client Secret and try again.\n");
+                        throw e;
+                    })];
+            case 1:
+                authResponse = _b.sent();
+                return [2 /*return*/, authResponse];
+        }
     });
-};
+}); };
 exports.getTokens = getTokens;
 var createEnvFileForViya = function (targetName, client, secret, accessToken, refreshToken) { return __awaiter(void 0, void 0, void 0, function () {
     var envFileContent, envFilePath;

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

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 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) {
@@ -229,7 +240,7 @@ exports.getAndValidateSas9Fields = getAndValidateSas9Fields;
 function getAndValidateSasViyaFields(target, scope, serverUrl, insecure, authenticateCallback) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var contextName, shouldAuthenticate, sasjs, contexts, contextNumberErrorMessage, contextNumber;
+        var contextName, shouldAuthenticate, httpsAgentOptions, sasjs, contexts, contextNumberErrorMessage, contextNumber;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -241,10 +252,12 @@ function getAndValidateSasViyaFields(target, scope, serverUrl, insecure, authent
                     return [4 /*yield*/, authenticateCallback(target, insecure, scope)];
                 case 2:
                     target = _b.sent();
+                    httpsAgentOptions = insecure
+                        ? __assign(__assign({}, target.httpsAgentOptions), { allowInsecureRequests: true, rejectUnauthorized: false }) : target.httpsAgentOptions;
                     sasjs = new node_1.default({
                         serverUrl: serverUrl,
                         serverType: types_1.ServerType.SasViya,
-                        allowInsecureRequests: insecure,
+                        httpsAgentOptions: httpsAgentOptions,
                         debug: ((_a = process.logger) === null || _a === void 0 ? void 0 : _a.logLevel) === logger_1.LogLevel.Debug
                     });
                     contexts = [];

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

@@ -1,3 +1,3 @@
-import { Target } from '@sasjs/utils/types';
+import { Target } from '@sasjs/utils';
 export declare function build(target: Target): Promise<void>;
 export declare function getBuildVars(target: Target): Promise<string>;

package/build/commands/build/build.js

@@ -84,8 +84,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBuildVars = exports.build = void 0;
 var path_1 = __importDefault(require("path"));
-var types_1 = require("@sasjs/utils/types");
 var utils_1 = require("@sasjs/utils");
+var error_1 = require("@sasjs/utils/error");
 var utils_2 = require("../../utils/utils");
 var file_1 = require("../../utils/file");
 var config_1 = require("../../utils/config");
@@ -189,26 +189,26 @@ function createFinalSasFile(target, streamConfig) {
 }
 function getBuildInfo(target, streamWeb) {
     return __awaiter(this, void 0, void 0, function () {
-        var buildConfig, serverType, appLoc, macroFolders, createWebServiceScript, dependencyFilePaths, createFileScript, dependencyFilePathsForCreateFile, gsubScript, _a, dependencyFilePathsForGsubScript, dependenciesContent, buildVars;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var buildConfig, serverType, appLoc, macroFolders, createWebServiceScript, dependencyFilePaths, createFileScript, dependencyFilePathsForCreateFile, gsubScript, dependencyFilePathsForGsubScript, dependenciesContent, buildVars;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     buildConfig = '';
                     serverType = target.serverType, appLoc = target.appLoc;
                     return [4 /*yield*/, config_1.getMacroFolders(target)];
                 case 1:
-                    macroFolders = _b.sent();
+                    macroFolders = _a.sent();
                     return [4 /*yield*/, getCreateWebServiceScript(serverType)];
                 case 2:
-                    createWebServiceScript = _b.sent();
+                    createWebServiceScript = _a.sent();
                     buildConfig += createWebServiceScript + "\n";
                     return [4 /*yield*/, dependencies_1.getDependencyPaths(buildConfig, macroFolders)];
                 case 3:
-                    dependencyFilePaths = _b.sent();
-                    if (!(target.serverType === types_1.ServerType.SasViya && streamWeb)) return [3 /*break*/, 9];
+                    dependencyFilePaths = _a.sent();
+                    if (!(target.serverType === utils_1.ServerType.SasViya && streamWeb)) return [3 /*break*/, 8];
                     return [4 /*yield*/, getCreateFileScript(serverType)];
                 case 4:
-                    createFileScript = _b.sent();
+                    createFileScript = _a.sent();
                     buildConfig += createFileScript + "\n";
                     return [4 /*yield*/, dependencies_1.getDependencyPaths(createFileScript, macroFolders)
                         // The gsubScript is used to perform the replacement of the appLoc within
@@ -216,24 +216,22 @@ function getBuildInfo(target, streamWeb) {
                         // SAS Program (build.sas) approach.
                     ];
                 case 5:
-                    dependencyFilePathsForCreateFile = _b.sent();
-                    _a = utils_1.readFile;
-                    return [4 /*yield*/, config_1.getMacroCorePath()];
-                case 6: return [4 /*yield*/, _a.apply(void 0, [(_b.sent()) + "/base/mp_gsubfile.sas"])];
-                case 7:
-                    gsubScript = _b.sent();
+                    dependencyFilePathsForCreateFile = _a.sent();
+                    return [4 /*yield*/, utils_1.readFile(config_1.getMacroCorePath() + "/base/mp_gsubfile.sas")];
+                case 6:
+                    gsubScript = _a.sent();
                     buildConfig += gsubScript + "\n";
                     return [4 /*yield*/, dependencies_1.getDependencyPaths(gsubScript, macroFolders)];
-                case 8:
-                    dependencyFilePathsForGsubScript = _b.sent();
+                case 7:
+                    dependencyFilePathsForGsubScript = _a.sent();
                     dependencyFilePaths = __spreadArray([], __read(new Set(__spreadArray(__spreadArray(__spreadArray([], __read(dependencyFilePaths)), __read(dependencyFilePathsForCreateFile)), __read(dependencyFilePathsForGsubScript)))));
-                    _b.label = 9;
-                case 9: return [4 /*yield*/, getDependencies(dependencyFilePaths)];
-                case 10:
-                    dependenciesContent = _b.sent();
+                    _a.label = 8;
+                case 8: return [4 /*yield*/, getDependencies(dependencyFilePaths)];
+                case 9:
+                    dependenciesContent = _a.sent();
                     return [4 /*yield*/, getBuildVars(target)];
-                case 11:
-                    buildVars = _b.sent();
+                case 10:
+                    buildVars = _a.sent();
                     return [2 /*return*/, "\n/**\n  * The appLoc represents the metadata or SAS Drive location of the app you\n  * are about to deploy\n  *\n  * To set an alternative appLoc, simply populate the appLoc variable prior\n  * to running this program, eg:\n  *\n  * %let apploc=/my/apploc;\n  * %inc thisfile;\n  *\n  */\n\n%global appLoc;\n%let compiled_apploc=" + appLoc + ";\n\n%let appLoc=%sysfunc(coalescec(&appLoc,&compiled_apploc));\n\n%let sasjs_clickmeservice=clickme;\n%let syscc=0;\noptions ps=max nonotes nosgen nomprint nomlogic nosource2 nosource noquotelenmax;\n/* user supplied build vars */\n" + buildVars + "\n/* user supplied build vars end */\n/* system macro dependencies for build process */\n" + dependenciesContent + "\n/* system macro dependencies for build process end*/\n/* system macros for build process */\n" + buildConfig + "\n/* system macros for build process end */\n"];
             }
         });
@@ -241,48 +239,53 @@ function getBuildInfo(target, streamWeb) {
 }
 function getCreateWebServiceScript(serverType) {
     return __awaiter(this, void 0, void 0, function () {
-        var _a, _b, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     _a = serverType;
                     switch (_a) {
-                        case types_1.ServerType.SasViya: return [3 /*break*/, 1];
-                        case types_1.ServerType.Sas9: return [3 /*break*/, 4];
+                        case utils_1.ServerType.SasViya: return [3 /*break*/, 1];
+                        case utils_1.ServerType.Sas9: return [3 /*break*/, 3];
+                        case utils_1.ServerType.Sasjs: return [3 /*break*/, 5];
                     }
                     return [3 /*break*/, 7];
-                case 1:
-                    _b = utils_1.readFile;
-                    return [4 /*yield*/, config_1.getMacroCorePath()];
-                case 2: return [4 /*yield*/, _b.apply(void 0, [(_d.sent()) + "/viya/mv_createwebservice.sas"])];
-                case 3: return [2 /*return*/, _d.sent()];
-                case 4:
-                    _c = utils_1.readFile;
-                    return [4 /*yield*/, config_1.getMacroCorePath()];
-                case 5: return [4 /*yield*/, _c.apply(void 0, [(_d.sent()) + "/meta/mm_createwebservice.sas"])];
-                case 6: return [2 /*return*/, _d.sent()];
-                case 7: throw new Error("Invalid server type: valid options are " + types_1.ServerType.SasViya + " and " + types_1.ServerType.Sas9);
+                case 1: return [4 /*yield*/, utils_1.readFile(config_1.getMacroCorePath() + "/viya/mv_createwebservice.sas")];
+                case 2: return [2 /*return*/, _b.sent()];
+                case 3: return [4 /*yield*/, utils_1.readFile(config_1.getMacroCorePath() + "/meta/mm_createwebservice.sas")
+                    // FIXME: use sasjs/mv_createwebservice.sas ones created
+                ];
+                case 4: return [2 /*return*/, _b.sent()
+                    // FIXME: use sasjs/mv_createwebservice.sas ones created
+                ];
+                case 5: return [4 /*yield*/, utils_1.readFile(config_1.getMacroCorePath() + "/viya/mv_createwebservice.sas")];
+                case 6: return [2 /*return*/, _b.sent()];
+                case 7: throw new error_1.ServerTypeError();
             }
         });
     });
 }
 function getCreateFileScript(serverType) {
     return __awaiter(this, void 0, void 0, function () {
-        var _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     _a = serverType;
                     switch (_a) {
-                        case types_1.ServerType.SasViya: return [3 /*break*/, 1];
+                        case utils_1.ServerType.SasViya: return [3 /*break*/, 1];
+                        case utils_1.ServerType.Sasjs: return [3 /*break*/, 3];
                     }
-                    return [3 /*break*/, 4];
-                case 1:
-                    _b = utils_1.readFile;
-                    return [4 /*yield*/, config_1.getMacroCorePath()];
-                case 2: return [4 /*yield*/, _b.apply(void 0, [(_c.sent()) + "/viya/mv_createfile.sas"])];
-                case 3: return [2 /*return*/, _c.sent()];
-                case 4: throw new Error("Invalid server type: valid option is " + types_1.ServerType.SasViya);
+                    return [3 /*break*/, 5];
+                case 1: return [4 /*yield*/, utils_1.readFile(config_1.getMacroCorePath() + "/viya/mv_createfile.sas")
+                    // FIXME: use sasjs/mv_createfile.sas ones created
+                ];
+                case 2: return [2 /*return*/, _b.sent()
+                    // FIXME: use sasjs/mv_createfile.sas ones created
+                ];
+                case 3: return [4 /*yield*/, utils_1.readFile(config_1.getMacroCorePath() + "/viya/mv_createfile.sas")];
+                case 4: return [2 /*return*/, _b.sent()];
+                case 5: throw new error_1.ServerTypeError([utils_1.ServerType.SasViya, utils_1.ServerType.Sasjs]);
             }
         });
     });
@@ -292,16 +295,20 @@ function getWebServiceScriptInvocation(serverType, filePath, isSASFile, encoded)
     if (isSASFile === void 0) { isSASFile = true; }
     if (encoded === void 0) { encoded = false; }
     var loc = filePath === '' ? 'services' : 'tests';
+    var encodedParam = encoded ? ', intype=BASE64' : '';
     switch (serverType) {
-        case types_1.ServerType.SasViya:
-            var encodedParam = encoded ? ', intype=BASE64' : '';
+        case utils_1.ServerType.SasViya:
             return isSASFile
                 ? "%mv_createwebservice(path=&appLoc/" + loc + "/&path, name=&service, code=sascode ,replace=yes)"
                 : "%mv_createfile(path=&appLoc/" + loc + "/&path, name=&filename, inref=filecode" + encodedParam + ")";
-        case types_1.ServerType.Sas9:
+        case utils_1.ServerType.Sas9:
             return "%mm_createwebservice(path=&appLoc/" + loc + "/&path, name=&service, code=sascode ,replace=yes)";
+        case utils_1.ServerType.Sasjs:
+            return isSASFile
+                ? "%mv_createwebservice(path=&appLoc/" + loc + "/&path, name=&service, code=sascode ,replace=yes)"
+                : "%mv_createfile(path=&appLoc/" + loc + "/&path, name=&filename, inref=filecode" + encodedParam + ")";
         default:
-            throw new Error("Invalid server type: valid options are " + types_1.ServerType.SasViya + " and " + types_1.ServerType.Sas9);
+            throw new error_1.ServerTypeError();
     }
 }
 /**
@@ -474,12 +481,16 @@ function getServiceText(serviceFileName, fileContent, serverType, testPath) {
             content += "\n put '" + escapedLine.trim() + "';";
         }
     });
-    return "%let service=" + serviceName + ";\nfilename sascode temp lrecl=32767;\ndata _null_;\nfile sascode;\n" + content + "\n\nrun;\n" + getWebServiceScriptInvocation(serverType, compileTestFile_1.isTestFile(serviceFileName) && testPath ? "" + testPath : '') + "\nfilename sascode clear;\n";
+    return "%let service=" + serviceName + ";\nfilename sascode temp lrecl=32767;\ndata _null_;\nfile sascode;\n" + content + "\n\nrun;\n" + (serverType !== utils_1.ServerType.Sasjs
+        ? getWebServiceScriptInvocation(serverType, compileTestFile_1.isTestFile(serviceFileName) && testPath ? "" + testPath : '')
+        : '') + "\nfilename sascode clear;\n";
 }
 function getFileText(fileName, fileContent, serverType) {
     var fileExtension = path_1.default.extname(fileName).substring(1).toUpperCase();
     var _a = getWebFileContent(fileContent, fileExtension), content = _a.content, maxLineLength = _a.maxLineLength;
-    return "%let filename=" + fileName + ";\nfilename filecode temp lrecl=" + maxLineLength + ";\ndata _null_;\nfile filecode;\n" + content + "\n\nrun;\n" + getWebServiceScriptInvocation(serverType, undefined, false, true) + "\nfilename filecode clear;\n";
+    return "%let filename=" + fileName + ";\nfilename filecode temp lrecl=" + maxLineLength + ";\ndata _null_;\nfile filecode;\n" + content + "\n\nrun;\n" + (serverType !== utils_1.ServerType.Sasjs
+        ? getWebServiceScriptInvocation(serverType, undefined, false, true)
+        : '') + "\nfilename filecode clear;\n";
 }
 function getWebFileContent(filecontent, type) {
     var parsedContent = '';

package/build/commands/build/internal/getLaunchPageCode.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLaunchPageCode = void 0;
+var error_1 = require("@sasjs/utils/error");
 var types_1 = require("@sasjs/utils/types");
 var SAS9Code = function (streamServiceName) { return "\noptions notes;\ndata _null_;\n format url $256.;\n rc=METADATA_GETURI(\"Stored Process Web App\",url);\n url=coalescec(url,\"localhost/SASStoredProcess\");\n urlEscaped = tranwrd(trim(url),\" \",\"%20\");\n putlog \"NOTE: SASjs Streaming App Created! Check it out here:\" ;\n putlog \"NOTE- \";putlog \"NOTE- \";putlog \"NOTE- \";putlog \"NOTE- \";\n putlog \"NOTE- \" urlEscaped +(-1) \"?_program=&appLoc/services/" + streamServiceName + "\" ;\n putlog \"NOTE- \";putlog \"NOTE- \";putlog \"NOTE- \";putlog \"NOTE- \";\nrun;\n"; };
 var SASViyaCode = function (streamServiceName) { return "\n\n/**\n  * The streamService we just deployed (as a _FILE) had the compile-time appLoc\n  * In this section we replace with the deploy-time appLoc\n  */\n\nfilename _homein filesrvc\n  folderPath=\"&apploc/services\"\n  filename=\"" + streamServiceName + ".html\"\n  recfm=v\n  lrecl=1048544;\n\n%let local_file=%sysfunc(pathname(work))/service.html;\nfilename _homeout \"&local_file\";\n\ndata _null_;\n  rc=fcopy('_homein','_homeout');\n  put rc=;\nrun;\n\n%mp_gsubfile(file=&local_file, patternvar=compiled_apploc, replacevar=apploc)\n\ndata _null_;\n  rc=fcopy('_homeout','_homein');\n  put rc=;\nrun;\n\n/* Tell the user where the app was deployed so they can open it */\noptions notes;\ndata _null_;\n if symexist('_baseurl') then do;\n   url=symget('_baseurl');\n   if subpad(url,length(url)-9,9)='SASStudio'\n     then url=substr(url,1,length(url)-11);\n   else url=\"&systcpiphostname\";\n end;\n else url=\"&systcpiphostname\";\n url=cats(url,\"/SASJobExecution?_FILE=&appLoc/services/\");\n urlEscaped = tranwrd(trim(url),\" \",\"%20\");\n putlog \"NOTE: SASjs Streaming App Created! Check it out here:\" ;\n putlog \"NOTE- \";putlog \"NOTE- \";putlog \"NOTE- \";putlog \"NOTE- \";\n putlog \"NOTE- \" urlEscaped +(-1) '" + streamServiceName + ".html&_debug=2' ;\n putlog \"NOTE- \";putlog \"NOTE- \";putlog \"NOTE- \";putlog \"NOTE- \";\nrun;\n"; };
@@ -11,7 +12,7 @@ var getLaunchPageCode = function (serverType, streamServiceName) {
         case types_1.ServerType.Sas9:
             return SAS9Code(streamServiceName);
         default:
-            throw new Error("Invalid server type: valid options are " + types_1.ServerType.SasViya + " and " + types_1.ServerType.Sas9);
+            throw new error_1.ServerTypeError([types_1.ServerType.SasViya, types_1.ServerType.Sas9]);
     }
 };
 exports.getLaunchPageCode = getLaunchPageCode;

package/build/commands/compile/compile.js

@@ -184,11 +184,10 @@ function copyFilesToBuildFolder(target) {
                             var destinationPath;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
-                                    case 0: return [4 /*yield*/, getDestinationPath_1.getDestinationServicePath(serviceFolder)];
-                                    case 1:
-                                        destinationPath = _a.sent();
+                                    case 0:
+                                        destinationPath = getDestinationPath_1.getDestinationServicePath(serviceFolder);
                                         return [4 /*yield*/, utils_1.copy(serviceFolder, destinationPath)];
-                                    case 2:
+                                    case 1:
                                         _a.sent();
                                         return [2 /*return*/];
                                 }
@@ -201,11 +200,10 @@ function copyFilesToBuildFolder(target) {
                             var destinationPath;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
-                                    case 0: return [4 /*yield*/, getDestinationPath_1.getDestinationJobPath(jobFolder)];
-                                    case 1:
-                                        destinationPath = _a.sent();
+                                    case 0:
+                                        destinationPath = getDestinationPath_1.getDestinationJobPath(jobFolder);
                                         return [4 /*yield*/, utils_1.copy(jobFolder, destinationPath)];
-                                    case 2:
+                                    case 1:
                                         _a.sent();
                                         return [2 /*return*/];
                                 }
@@ -326,14 +324,13 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
     var destinationPath, subFolders, filesNamesInPath;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, getDestinationPath_1.getDestinationServicePath(serviceFolder)];
-            case 1:
-                destinationPath = _a.sent();
+            case 0:
+                destinationPath = getDestinationPath_1.getDestinationServicePath(serviceFolder);
                 return [4 /*yield*/, utils_1.listSubFoldersInFolder(destinationPath)];
-            case 2:
+            case 1:
                 subFolders = _a.sent();
                 return [4 /*yield*/, utils_1.listFilesInFolder(destinationPath)];
-            case 3:
+            case 2:
                 filesNamesInPath = _a.sent();
                 return [4 /*yield*/, utils_1.asyncForEach(filesNamesInPath, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
                         var filePath;
@@ -354,7 +351,7 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                             }
                         });
                     }); })];
-            case 4:
+            case 3:
                 _a.sent();
                 return [4 /*yield*/, utils_1.asyncForEach(subFolders, function (subFolder) { return __awaiter(void 0, void 0, void 0, function () {
                         var fileNames;
@@ -388,7 +385,7 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                             }
                         });
                     }); })];
-            case 5:
+            case 4:
                 _a.sent();
                 return [2 /*return*/];
         }
@@ -398,14 +395,13 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
     var destinationPath, subFolders, filesNamesInPath;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, getDestinationPath_1.getDestinationJobPath(jobFolder)];
-            case 1:
-                destinationPath = _a.sent();
+            case 0:
+                destinationPath = getDestinationPath_1.getDestinationJobPath(jobFolder);
                 return [4 /*yield*/, utils_1.listSubFoldersInFolder(destinationPath)];
-            case 2:
+            case 1:
                 subFolders = _a.sent();
                 return [4 /*yield*/, utils_1.listFilesInFolder(destinationPath)];
-            case 3:
+            case 2:
                 filesNamesInPath = _a.sent();
                 return [4 /*yield*/, utils_1.asyncForEach(filesNamesInPath, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
                         var filePath;
@@ -426,7 +422,7 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                             }
                         });
                     }); })];
-            case 4:
+            case 3:
                 _a.sent();
                 return [4 /*yield*/, utils_1.asyncForEach(subFolders, function (subFolder) { return __awaiter(void 0, void 0, void 0, function () {
                         var fileNames;
@@ -460,7 +456,7 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                             }
                         });
                     }); })];
-            case 5:
+            case 4:
                 _a.sent();
                 return [2 /*return*/];
         }

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

@@ -96,11 +96,10 @@ var checkServiceFolders = function (target, exceptions) { return __awaiter(void
                         var destinationPath, _a, equal, reason;
                         return __generator(this, function (_b) {
                             switch (_b.label) {
-                                case 0: return [4 /*yield*/, getDestinationPath_1.getDestinationServicePath(serviceFolder)];
-                                case 1:
-                                    destinationPath = _b.sent();
+                                case 0:
+                                    destinationPath = getDestinationPath_1.getDestinationServicePath(serviceFolder);
                                     return [4 /*yield*/, compareFolders_1.compareFolders(serviceFolder, destinationPath, exceptions)];
-                                case 2:
+                                case 1:
                                     _a = _b.sent(), equal = _a.equal, reason = _a.reason;
                                     areServiceFoldersMatching = areServiceFoldersMatching && equal;
                                     if (!equal) {
@@ -136,11 +135,10 @@ var checkJobFolders = function (target, exceptions) { return __awaiter(void 0, v
                         var destinationPath, _a, equal, reason;
                         return __generator(this, function (_b) {
                             switch (_b.label) {
-                                case 0: return [4 /*yield*/, getDestinationPath_1.getDestinationJobPath(jobFolder)];
-                                case 1:
-                                    destinationPath = _b.sent();
+                                case 0:
+                                    destinationPath = getDestinationPath_1.getDestinationJobPath(jobFolder);
                                     return [4 /*yield*/, compareFolders_1.compareFolders(jobFolder, destinationPath, exceptions)];
-                                case 2:
+                                case 1:
                                     _a = _b.sent(), equal = _a.equal, reason = _a.reason;
                                     areJobFoldersMatching = areJobFoldersMatching && equal;
                                     if (!equal) {

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

@@ -37,9 +37,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPreCodeForServicePack = exports.compileServiceFile = void 0;
-var types_1 = require("@sasjs/utils/types");
 var config_1 = require("../../../utils/config");
 var utils_1 = require("@sasjs/utils");
+var types_1 = require("@sasjs/utils/types");
+var error_1 = require("@sasjs/utils/error");
 var loadDependencies_1 = require("./loadDependencies");
 var getServerType_1 = require("./getServerType");
 function compileServiceFile(target, filePath, macroFolders, programFolders, programVar) {
@@ -74,27 +75,26 @@ function getPreCodeForServicePack(serverType) {
             switch (_h.label) {
                 case 0:
                     content = '';
-                    return [4 /*yield*/, config_1.getMacroCorePath()];
-                case 1:
-                    macroCorePath = _h.sent();
+                    macroCorePath = config_1.getMacroCorePath();
                     _a = serverType;
                     switch (_a) {
-                        case types_1.ServerType.SasViya: return [3 /*break*/, 2];
-                        case types_1.ServerType.Sas9: return [3 /*break*/, 6];
+                        case types_1.ServerType.SasViya: return [3 /*break*/, 1];
+                        case types_1.ServerType.Sas9: return [3 /*break*/, 5];
+                        case types_1.ServerType.Sasjs: return [3 /*break*/, 9];
                     }
                     return [3 /*break*/, 10];
-                case 2:
+                case 1:
                     _b = content;
                     return [4 /*yield*/, utils_1.readFile(macroCorePath + "/base/mf_getuser.sas")];
-                case 3:
+                case 2:
                     content = _b + _h.sent();
                     _c = content;
                     return [4 /*yield*/, utils_1.readFile(macroCorePath + "/base/mp_jsonout.sas")];
-                case 4:
+                case 3:
                     content = _c + _h.sent();
                     _d = content;
                     return [4 /*yield*/, utils_1.readFile(macroCorePath + "/viya/mv_webout.sas")];
-                case 5:
+                case 4:
                     content = _d + _h.sent();
                     content +=
                         '/* if calling viya service with _job param, _program will conflict */\n' +
@@ -105,25 +105,26 @@ function getPreCodeForServicePack(serverType) {
                             '%mv_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt)\n' +
                             '%mend;\n';
                     return [3 /*break*/, 11];
-                case 6:
+                case 5:
                     _e = content;
                     return [4 /*yield*/, utils_1.readFile(macroCorePath + "/base/mf_getuser.sas")];
-                case 7:
+                case 6:
                     content = _e + _h.sent();
                     _f = content;
                     return [4 /*yield*/, utils_1.readFile(macroCorePath + "/base/mp_jsonout.sas")];
-                case 8:
+                case 7:
                     content = _f + _h.sent();
                     _g = content;
                     return [4 /*yield*/, utils_1.readFile(macroCorePath + "/meta/mm_webout.sas")];
-                case 9:
+                case 8:
                     content = _g + _h.sent();
                     content +=
                         '  %macro webout(action,ds,dslabel=,fmt=);\n' +
                             '    %mm_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt)\n' +
                             '  %mend;\n';
                     return [3 /*break*/, 11];
-                case 10: throw new Error("Invalid server type: valid options are 'SASVIYA' and 'SAS9'.");
+                case 9: return [3 /*break*/, 11];
+                case 10: throw new error_1.ServerTypeError();
                 case 11:
                     content +=
                         '/* provide additional debug info */\n' +

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

@@ -74,8 +74,8 @@ var utils_1 = require("@sasjs/utils");
 var internalModule = __importStar(require("../internal/config"));
 var test_1 = require("../../../utils/test");
 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> Dependencies </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> Dependencies </h4>\n  @li mf_abort.sas\n  @li mf_existds.sas\n\n**/\n\n%put service is finishing.  Thanks, SASjs!;";
+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;";
@@ -188,7 +188,7 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test('it should load dependencies for a job <h4> Dependencies </h4>', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test('it should load dependencies for a job <h4> SAS Macros </h4>', function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {