@sasjs/cli 4.18.4 → 4.18.6

package/build/commands/build/build.js

@@ -251,10 +251,17 @@ function getBuildInfo(target, streamWeb) {
                 case 6: return [4 /*yield*/, getDepsContent(dependencyFilePaths, target, macroFolders)];
                 case 7:
                     dependenciesContent = _a.sent();
-                    return [4 /*yield*/, getBuildVars(target)];
+                    return [4 /*yield*/, getBuildVars(target)
+                        /* NOTE: keep %global as the first line - a leading /** comment block is
+                           stripped by removeHeader() when the final build file is assembled, so
+                           the guidance below must come AFTER code to survive into the output. */
+                    ];
                 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
+                    /* NOTE: keep %global as the first line - a leading /** comment block is
+                       stripped by removeHeader() when the final build file is assembled, so
+                       the guidance below must come AFTER code to survive into the output. */
+                    return [2 /*return*/, "\n%global appLoc;\n\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  * Do NOT change compiled_apploc - it is not the deploy location, it is the\n  * appLoc that was baked into the frontend files at build time.  It is used\n  * by the swap= parameter of %mv_createfile to rewrite that string to the\n  * runtime appLoc when streaming web (html/css/js) files are uploaded.\n  * Changing it breaks dynamic appLoc switching (no strings will match).\n  *\n  */\n\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")
                             : '', "\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").concat(buildVars, "\n/* user supplied build vars end */\n/* system macro dependencies for build process */\n").concat(dependenciesContent, "\n/* system macro dependencies for build process end*/\n/* system macros for build process */\n").concat((0, utils_1.removeHeader)(buildConfig), "\n/* system macros for build process end */\n")];
             }

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

@@ -144,6 +144,9 @@ describe('sasjs build', function () {
                     expect(finalSasFile.includes(commentLine1.split("'").join("'".repeat(2)))).toBeTruthy();
                     expect(commentLine2.split("'").join("'".repeat(2))).toBeTruthy();
                     expect(finalSasFile.includes(afterComment)).toBeTruthy();
+                    // The guidance comment only survives removeHeader() because `%global appLoc;`
+                    // precedes it (regex ^\s*/(\*){1,2}... does not match) - lock that in.
+                    expect(finalSasFile.includes('Do NOT change compiled_apploc')).toBeTruthy();
                     return [2 /*return*/];
             }
         });

package/package.json

@@ -120,7 +120,8 @@
     "util": "0.12.4"
   },
   "overrides": {
-    "ws": "8.21.0"
+    "ws": "8.21.0",
+    "nanoid": "3.3.18"
   },
-  "version": "4.18.4"
+  "version": "4.18.6"
 }