@sasjs/cli 4.12.5 → 4.12.7

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

@@ -1,4 +1,4 @@
 import { ServerType, Target } from '@sasjs/utils';
 export declare function build(target: Target): Promise<void>;
-export declare function getWebServiceScriptInvocation(serverType: ServerType, isSASFile?: boolean, encoded?: boolean): string;
+export declare function getWebServiceScriptInvocation(serverType: ServerType, isSASFile?: boolean, encoded?: boolean, fileName?: string): string;
 export declare function getBuildVars(target: Target): Promise<string>;

package/build/commands/build/build.js

@@ -211,7 +211,7 @@ function createFinalSasFiles(target) {
 }
 function getBuildInfo(target, streamWeb) {
     return __awaiter(this, void 0, void 0, function () {
-        var buildConfig, serverType, appLoc, serverName, macroFolders, createWebServiceScript, macroCorePath, dependencyFilePaths, createFileScript, dependencyFilePathsForCreateFile, gsubScript, dependencyFilePathsForGsubScript, dependenciesContent, buildVars;
+        var buildConfig, serverType, appLoc, serverName, macroFolders, createWebServiceScript, macroCorePath, dependencyFilePaths, createFileScript, dependencyFilePathsForCreateFile, dependenciesContent, buildVars;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -228,32 +228,21 @@ function getBuildInfo(target, streamWeb) {
                     return [4 /*yield*/, (0, utils_1.getDependencyPaths)(buildConfig, macroFolders, macroCorePath)];
                 case 3:
                     dependencyFilePaths = _a.sent();
-                    if (!(target.serverType === utils_1.ServerType.SasViya && streamWeb)) return [3 /*break*/, 8];
+                    if (!(target.serverType === utils_1.ServerType.SasViya && streamWeb)) return [3 /*break*/, 6];
                     return [4 /*yield*/, getCreateFileScript(serverType)];
                 case 4:
                     createFileScript = _a.sent();
                     buildConfig += "".concat(createFileScript, "\n");
-                    return [4 /*yield*/, (0, utils_1.getDependencyPaths)(createFileScript, macroFolders, macroCorePath)
-                        // The gsubScript is used to perform the replacement of the appLoc within
-                        // the deployed index.html file.  This only happens when deploying using the
-                        // SAS Program (build.sas) approach.
-                    ];
+                    return [4 /*yield*/, (0, utils_1.getDependencyPaths)(createFileScript, macroFolders, macroCorePath)];
                 case 5:
                     dependencyFilePathsForCreateFile = _a.sent();
-                    return [4 /*yield*/, (0, utils_1.readFile)("".concat(process.sasjsConstants.macroCorePath, "/base/mp_replace.sas"))];
-                case 6:
-                    gsubScript = _a.sent();
-                    buildConfig += "".concat(gsubScript, "\n");
-                    return [4 /*yield*/, (0, utils_1.getDependencyPaths)(gsubScript, macroFolders, macroCorePath)];
+                    dependencyFilePaths = __spreadArray([], __read(new Set(__spreadArray(__spreadArray([], __read(dependencyFilePaths), false), __read(dependencyFilePathsForCreateFile), false))), false);
+                    _a.label = 6;
+                case 6: return [4 /*yield*/, getDepsContent(dependencyFilePaths, target, macroFolders)];
                 case 7:
-                    dependencyFilePathsForGsubScript = _a.sent();
-                    dependencyFilePaths = __spreadArray([], __read(new Set(__spreadArray(__spreadArray(__spreadArray([], __read(dependencyFilePaths), false), __read(dependencyFilePathsForCreateFile), false), __read(dependencyFilePathsForGsubScript), false))), false);
-                    _a.label = 8;
-                case 8: return [4 /*yield*/, getDepsContent(dependencyFilePaths, target, macroFolders)];
-                case 9:
                     dependenciesContent = _a.sent();
                     return [4 /*yield*/, getBuildVars(target)];
-                case 10:
+                case 8:
                     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=".concat(appLoc, ";\n%let appLoc=%sysfunc(coalescec(&appLoc,&compiled_apploc));\n\n\n").concat(serverType === utils_1.ServerType.Sas9
                             ? "\n/**\n  * The serverName represents the SAS 9 logical server context\n  * There is no programmatic (SAS code) way to obtain this\n  * So it is taken from the sasjsconfig file OR supplied at runtime, eg:\n  * \n  * %let apploc=/my/apploc;\n  * %let serverName=SASAppDC;\n  * %inc thisfile;\n  * \n  * /\n\n%global serverName;\n%let compiled_serverName=".concat(serverName, ";\n%let serverName=%sysfunc(coalescec(&serverName,&compiled_serverName));\n")
@@ -317,15 +306,23 @@ function getCreateFileScript(serverType) {
         });
     });
 }
-function getWebServiceScriptInvocation(serverType, isSASFile, encoded) {
+function getWebServiceScriptInvocation(serverType, isSASFile, encoded, fileName) {
+    var _a;
     if (isSASFile === void 0) { isSASFile = true; }
     if (encoded === void 0) { encoded = false; }
     var encodedParam = encoded ? ', intype=BASE64' : '';
     switch (serverType) {
         case utils_1.ServerType.SasViya:
+            var swapString = '';
+            if (fileName) {
+                var extension = ((_a = fileName === null || fileName === void 0 ? void 0 : fileName.split('.').pop()) === null || _a === void 0 ? void 0 : _a.toLowerCase()) || '';
+                if (['html', 'css', 'js'].includes(extension)) {
+                    swapString = ",swap=compiled_apploc apploc";
+                }
+            }
             return isSASFile
                 ? "%mv_createwebservice(path=&appLoc/&path, name=&service, code=sascode,replace=yes)"
-                : "%mv_createfile(path=&appLoc/&path, name=&filename, inref=filecode".concat(encodedParam, ")");
+                : "%mv_createfile(path=&appLoc/&path, name=&filename, inref=filecode".concat(encodedParam).concat(swapString, ")");
         case utils_1.ServerType.Sas9:
             return isSASFile
                 ? "%mm_createwebservice(path=&appLoc/&path, name=&service, code=sascode, server=&serverName, replace=yes)"
@@ -478,7 +475,7 @@ 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=".concat(fileName, ";\nfilename filecode temp lrecl=").concat(maxLineLength, ";\ndata _null_;\nfile filecode;\n").concat(content, "\n\nrun;\n").concat(serverType !== utils_1.ServerType.Sasjs
-        ? getWebServiceScriptInvocation(serverType, false, true)
+        ? getWebServiceScriptInvocation(serverType, false, true, fileName)
         : '', "\nfilename filecode clear;\n");
 }
 function getWebFileContent(filecontent, type) {

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

@@ -4,7 +4,7 @@ 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/".concat(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=\"".concat(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_replace(infile=\"&local_file\", findvar=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) '").concat(streamServiceName, ".html' ;\n putlog \"NOTE- \";putlog \"NOTE- \";putlog \"NOTE- \";putlog \"NOTE- \";\nrun;\n"); };
+var SASViyaCode = function (streamServiceName) { return "\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) '".concat(streamServiceName, ".html' ;\n putlog \"NOTE- \";putlog \"NOTE- \";putlog \"NOTE- \";putlog \"NOTE- \";\nrun;\n"); };
 var getLaunchPageCode = function (serverType, streamServiceName) {
     switch (serverType) {
         case types_1.ServerType.SasViya:

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

@@ -286,7 +286,9 @@ describe('deploy', function () {
                             target = new utils_1.Target(__assign(__assign({}, commonTargetFields), { serverType: utils_1.ServerType.Sasjs, deployConfig: {
                                     deployScripts: ['script.invalid']
                                 } }));
-                            return [4 /*yield*/, (0, deploy_1.deploy)(target, true)];
+                            return [4 /*yield*/, (0, deploy_1.deploy)(target, true).catch(function (err) {
+                                    // error is expected, nothing to do
+                                })];
                         case 1:
                             _a.sent();
                             expect(process.logger.error).toHaveBeenCalledWith("Unable to process script located at ".concat(path_1.default.join(process.projectDir, "script.invalid")));

package/package.json

@@ -52,7 +52,7 @@
   },
   "dependencies": {
     "@sasjs/adapter": "4.11.3",
-    "@sasjs/core": "4.57.0",
+    "@sasjs/core": "4.58.1",
     "@sasjs/lint": "2.4.3",
     "@sasjs/utils": "3.5.2",
     "adm-zip": "0.5.10",
@@ -101,5 +101,5 @@
     "typescript": "4.9.5",
     "util": "0.12.4"
   },
-  "version": "4.12.5"
+  "version": "4.12.7"
 }