@sasjs/cli 6.13.0 → 6.13.2

package/build/commands/build/internal/mockSite/spec/runtime-core.spec.js

@@ -175,7 +175,8 @@ describe('browser runtime', function () {
                     expect(result.error).toBeNull();
                     parsed = JSON.parse(result.webout);
                     expect(parsed.users).toEqual([{ name: 'ann' }, { name: 'bob' }]);
-                    expect(parsed.SYSDATE).toMatch(/^\d{2}[A-Z]{3}\d{4}$/);
+                    // &SYSDATE is DATE7 - ddMMMyy - which is what %mm_webout writes
+                    expect(parsed.SYSDATE).toMatch(/^\d{2}[A-Z]{3}\d{2}$/);
                     expect(parsed.MF_GETUSER).toEqual('DEMO');
                     expect(parsed.SYSPROCESSNAME).toEqual('Browser');
                     expect(parsed.SYSSCPL).toEqual('browser');

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

@@ -215,7 +215,7 @@ describe('sasjs cbd with server type SASJS', function () {
                                                 {
                                                     name: 'appinit',
                                                     type: 'service',
-                                                    code: getCode(appinit)
+                                                    code: getCode((0, utils_1.removeHeader)(appinit))
                                                 },
                                                 {
                                                     name: 'getdata.js',
@@ -225,7 +225,7 @@ describe('sasjs cbd with server type SASJS', function () {
                                                 {
                                                     name: 'getdata',
                                                     type: 'service',
-                                                    code: getCode(getdata)
+                                                    code: getCode((0, utils_1.removeHeader)(getdata))
                                                 }
                                             ]
                                         }

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

@@ -241,4 +241,34 @@ describe('sasjs web', function () {
             }
         });
     }); }, 2 * 60 * 1000);
+    it("should stamp the target's appLoc into the copied app for a SASjs target", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var sourceFolder, sasjsTarget, copied;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    sourceFolder = 'websrc';
+                    return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(__dirname, appName, sourceFolder, 'index.html'), '<html><head><sasjs appLoc="/Public/app/default" serverType="SASJS"></sasjs></head><body></body></html>')];
+                case 1:
+                    _a.sent();
+                    sasjsTarget = {
+                        name: 'sasjs-loc',
+                        serverType: utils_1.ServerType.Sasjs,
+                        appLoc: '/Public/app/AnotherLoc',
+                        streamConfig: __assign(__assign({}, streamConfig), { webSourcePath: sourceFolder, streamWebFolder: 'websas' })
+                    };
+                    return [4 /*yield*/, expect((0, web_1.createWebAppServices)(sasjsTarget)).toResolve()];
+                case 2:
+                    _a.sent();
+                    return [4 /*yield*/, (0, utils_1.readFile)(path_1.default.join(process.sasjsConstants.buildDestinationServicesFolder, 'websas', 'index.html'))
+                        // jsdom serialises attribute names in lower case
+                    ];
+                case 3:
+                    copied = _a.sent();
+                    // jsdom serialises attribute names in lower case
+                    expect(copied.toLowerCase()).toContain('apploc="/public/app/anotherloc"');
+                    expect(copied.toLowerCase()).not.toContain('/public/app/default');
+                    return [2 /*return*/];
+            }
+        });
+    }); }, 2 * 60 * 1000);
 });

package/build/commands/web/web.js

@@ -42,10 +42,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createWebAppServices = createWebAppServices;
 var utils_1 = require("@sasjs/utils");
 var config_1 = require("../../utils/config");
+var fs_1 = __importDefault(require("fs"));
 var path_1 = __importDefault(require("path"));
 var jsdom_1 = __importDefault(require("jsdom"));
 var createAssetServices_1 = require("./internal/createAssetServices");
 var updateAllTags_1 = require("./internal/updateAllTags");
+var getTags_1 = require("./internal/getTags");
+var updateSasjsTag_1 = require("./internal/updateSasjsTag");
 var sas9_1 = require("./internal/sas9");
 var sasViya_1 = require("./internal/sasViya");
 var exampleStreamConfig = {
@@ -57,70 +60,89 @@ var exampleStreamConfig = {
 };
 function createWebAppServices(target) {
     return __awaiter(this, void 0, void 0, function () {
-        var buildDestinationServicesFolder, streamConfig, _a, webSourcePathFull, indexHtmlPath, destinationPath, assetPathMap, indexHtml, _b;
-        var _c, _d;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
+        var buildDestinationServicesFolder, streamConfig, _a, webSourcePathFull, indexHtmlPath, destinationPath, copiedIndex, indexHtml_1, _b, _c, sasjsTags, assetPathMap, indexHtml, _d;
+        var _e, _f;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
                 case 0:
                     buildDestinationServicesFolder = process.sasjsConstants.buildDestinationServicesFolder;
                     return [4 /*yield*/, (0, config_1.getStreamConfig)(target)];
                 case 1:
-                    streamConfig = _e.sent();
+                    streamConfig = _g.sent();
                     return [4 /*yield*/, validateStreamConfig(streamConfig)];
                 case 2:
-                    _a = _e.sent(), webSourcePathFull = _a.webSourcePathFull, indexHtmlPath = _a.indexHtmlPath;
+                    _a = _g.sent(), webSourcePathFull = _a.webSourcePathFull, indexHtmlPath = _a.indexHtmlPath;
                     return [4 /*yield*/, createBuildDestinationFolder()];
                 case 3:
-                    _e.sent();
+                    _g.sent();
                     destinationPath = path_1.default.join(buildDestinationServicesFolder, streamConfig.streamWebFolder);
                     return [4 /*yield*/, createTargetDestinationFolder(destinationPath)
                         // For server type SASjs, just need to copy webSourcePath
                         // to streamWebFolder, no need to create service files.
                     ];
                 case 4:
-                    _e.sent();
-                    if (!(target.serverType === utils_1.ServerType.Sasjs)) return [3 /*break*/, 6];
-                    (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info("Copying web app files for target ".concat(target.name, "..."));
-                    return [4 /*yield*/, (0, utils_1.copy)(webSourcePathFull, destinationPath)];
+                    _g.sent();
+                    if (!(target.serverType === utils_1.ServerType.Sasjs)) return [3 /*break*/, 9];
+                    (_e = process.logger) === null || _e === void 0 ? void 0 : _e.info("Copying web app files for target ".concat(target.name, "..."));
+                    return [4 /*yield*/, (0, utils_1.copy)(webSourcePathFull, destinationPath)
+                        /*
+                          The copied app carries whatever appLoc the frontend was built with, and
+                          an AppStream app gets no appLoc from its URL - so a deployment to any
+                          appLoc but that default sends every service call to the default one. The
+                          tag is set from the target here, which is the value this build deploys to.
+                        */
+                    ];
                 case 5:
-                    _e.sent();
-                    return [2 /*return*/];
+                    _g.sent();
+                    copiedIndex = path_1.default.join(destinationPath, 'index.html');
+                    _c = (_b = jsdom_1.default.JSDOM).bind;
+                    return [4 /*yield*/, (0, utils_1.readFile)(copiedIndex)];
                 case 6:
-                    (_d = process.logger) === null || _d === void 0 ? void 0 : _d.info("Compiling web app services for target ".concat(target.name, "..."));
+                    indexHtml_1 = new (_c.apply(_b, [void 0, _g.sent()]))();
+                    sasjsTags = (0, getTags_1.getSasjsTags)(indexHtml_1);
+                    if (!sasjsTags.length) return [3 /*break*/, 8];
+                    (0, updateSasjsTag_1.updateSasjsTag)(sasjsTags[0], target);
+                    return [4 /*yield*/, fs_1.default.promises.writeFile(copiedIndex, indexHtml_1.serialize())];
+                case 7:
+                    _g.sent();
+                    _g.label = 8;
+                case 8: return [2 /*return*/];
+                case 9:
+                    (_f = process.logger) === null || _f === void 0 ? void 0 : _f.info("Compiling web app services for target ".concat(target.name, "..."));
                     return [4 /*yield*/, (0, createAssetServices_1.createAssetServices)(target, destinationPath, streamConfig).then(function (map) {
                             var indexHtmlIndex = map.findIndex(function (assetPath) { return assetPath.source === 'index.html'; });
                             map.splice(indexHtmlIndex, 1);
                             return map;
                         })];
-                case 7:
-                    assetPathMap = _e.sent();
+                case 10:
+                    assetPathMap = _g.sent();
                     return [4 /*yield*/, (0, utils_1.readFile)(indexHtmlPath).then(function (content) { return new jsdom_1.default.JSDOM(content); })];
-                case 8:
-                    indexHtml = _e.sent();
+                case 11:
+                    indexHtml = _g.sent();
                     return [4 /*yield*/, (0, updateAllTags_1.updateAllTags)(indexHtml, target, {
                             webSourcePathFull: webSourcePathFull,
                             destinationPath: destinationPath,
                             serverType: target.serverType,
                             assetPathMap: assetPathMap
                         })];
-                case 9:
-                    _e.sent();
-                    _b = target.serverType;
-                    switch (_b) {
-                        case utils_1.ServerType.SasViya: return [3 /*break*/, 10];
-                        case utils_1.ServerType.Sas9: return [3 /*break*/, 12];
+                case 12:
+                    _g.sent();
+                    _d = target.serverType;
+                    switch (_d) {
+                        case utils_1.ServerType.SasViya: return [3 /*break*/, 13];
+                        case utils_1.ServerType.Sas9: return [3 /*break*/, 15];
                     }
-                    return [3 /*break*/, 14];
-                case 10: return [4 /*yield*/, (0, sasViya_1.createClickMeFile)(indexHtml.serialize(), streamConfig.streamServiceName)];
-                case 11:
-                    _e.sent();
-                    return [3 /*break*/, 15];
-                case 12: return [4 /*yield*/, (0, sas9_1.createClickMeService)(indexHtml.serialize(), streamConfig.streamServiceName)];
-                case 13:
-                    _e.sent();
-                    return [3 /*break*/, 15];
-                case 14: throw new Error("Server Type: ".concat(target.serverType, " is not supported for processing streaming index file."));
-                case 15: return [2 /*return*/];
+                    return [3 /*break*/, 17];
+                case 13: return [4 /*yield*/, (0, sasViya_1.createClickMeFile)(indexHtml.serialize(), streamConfig.streamServiceName)];
+                case 14:
+                    _g.sent();
+                    return [3 /*break*/, 18];
+                case 15: return [4 /*yield*/, (0, sas9_1.createClickMeService)(indexHtml.serialize(), streamConfig.streamServiceName)];
+                case 16:
+                    _g.sent();
+                    return [3 /*break*/, 18];
+                case 17: throw new Error("Server Type: ".concat(target.serverType, " is not supported for processing streaming index file."));
+                case 18: return [2 /*return*/];
             }
         });
     });

package/package.json

@@ -70,11 +70,11 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@sasjs/adapter": "^5.1.3",
+    "@sasjs/adapter": "5.1.3",
     "@sasjs/api": "0.2.1",
-    "@sasjs/core": "^6.1.1",
+    "@sasjs/core": "6.1.1",
     "@sasjs/lint": "5.0.0",
-    "@sasjs/utils": "^4.7.0",
+    "@sasjs/utils": "4.9.0",
     "axios": "1.20.0",
     "chalk": "4.1.2",
     "dotenv": "18.0.8",
@@ -124,5 +124,5 @@
     "ws": "8.21.0",
     "nanoid": "3.3.18"
   },
-  "version": "6.13.0"
+  "version": "6.13.2"
 }