@sasjs/cli 3.16.0 → 3.16.1

package/build/commands/web/web.js

@@ -44,10 +44,11 @@ var utils_1 = require("@sasjs/utils");
 var config_1 = require("../../utils/config");
 var path_1 = __importDefault(require("path"));
 var jsdom_1 = __importDefault(require("jsdom"));
-var sasjsout_1 = require("./internal/sasjsout");
 var adjustIframeScript_1 = require("./internal/adjustIframeScript");
 var createAssetServices_1 = require("./internal/createAssetServices");
 var updateAllTags_1 = require("./internal/updateAllTags");
+var sas9_1 = require("./internal/sas9");
+var sasViya_1 = require("./internal/sasViya");
 var exampleStreamConfig = {
     streamWeb: true,
     streamWebFolder: '/example/folder/path',
@@ -58,32 +59,32 @@ var exampleStreamConfig = {
 function createWebAppServices(target) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
-        var buildDestinationServicesFolder, streamConfig, _c, webSourcePathFull, indexHtmlPath, destinationPath, assetPathMap, indexHtml;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var buildDestinationServicesFolder, streamConfig, _c, webSourcePathFull, indexHtmlPath, destinationPath, assetPathMap, indexHtml, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
                     buildDestinationServicesFolder = process.sasjsConstants.buildDestinationServicesFolder;
                     return [4 /*yield*/, (0, config_1.getStreamConfig)(target)];
                 case 1:
-                    streamConfig = _d.sent();
+                    streamConfig = _e.sent();
                     return [4 /*yield*/, validateStreamConfig(streamConfig)];
                 case 2:
-                    _c = _d.sent(), webSourcePathFull = _c.webSourcePathFull, indexHtmlPath = _c.indexHtmlPath;
+                    _c = _e.sent(), webSourcePathFull = _c.webSourcePathFull, indexHtmlPath = _c.indexHtmlPath;
                     return [4 /*yield*/, createBuildDestinationFolder()];
                 case 3:
-                    _d.sent();
+                    _e.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:
-                    _d.sent();
+                    _e.sent();
                     if (!(target.serverType === utils_1.ServerType.Sasjs)) return [3 /*break*/, 6];
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Copying web app files for target ".concat(target.name, "..."));
                     return [4 /*yield*/, (0, utils_1.copy)(webSourcePathFull, destinationPath)];
                 case 5:
-                    _d.sent();
+                    _e.sent();
                     return [2 /*return*/];
                 case 6:
                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Compiling web app services for target ".concat(target.name, "..."));
@@ -93,10 +94,10 @@ function createWebAppServices(target) {
                             return map;
                         })];
                 case 7:
-                    assetPathMap = _d.sent();
+                    assetPathMap = _e.sent();
                     return [4 /*yield*/, (0, utils_1.readFile)(indexHtmlPath).then(function (content) { return new jsdom_1.default.JSDOM(content); })];
                 case 8:
-                    indexHtml = _d.sent();
+                    indexHtml = _e.sent();
                     return [4 /*yield*/, (0, updateAllTags_1.updateAllTags)(indexHtml, {
                             webSourcePathFull: webSourcePathFull,
                             destinationPath: destinationPath,
@@ -104,18 +105,25 @@ function createWebAppServices(target) {
                             assetPathMap: assetPathMap
                         })];
                 case 9:
-                    _d.sent();
-                    if (!(target.serverType === utils_1.ServerType.SasViya)) return [3 /*break*/, 11];
-                    indexHtml.window.document.body.innerHTML += adjustIframeScript_1.adjustIframeScript;
-                    return [4 /*yield*/, createClickMeFile(indexHtml.serialize(), streamConfig.streamServiceName)];
+                    _e.sent();
+                    _d = target.serverType;
+                    switch (_d) {
+                        case utils_1.ServerType.SasViya: return [3 /*break*/, 10];
+                        case utils_1.ServerType.Sas9: return [3 /*break*/, 12];
+                    }
+                    return [3 /*break*/, 14];
                 case 10:
-                    _d.sent();
-                    return [3 /*break*/, 13];
-                case 11: return [4 /*yield*/, createClickMeService(indexHtml.serialize(), streamConfig.streamServiceName)];
-                case 12:
-                    _d.sent();
-                    _d.label = 13;
-                case 13: return [2 /*return*/];
+                    indexHtml.window.document.body.innerHTML += adjustIframeScript_1.adjustIframeScript;
+                    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*/];
             }
         });
     });
@@ -193,60 +201,3 @@ function createTargetDestinationFolder(destinationPath) {
         });
     });
 }
-function createClickMeService(indexHtmlContent, fileName) {
-    return __awaiter(this, void 0, void 0, function () {
-        var lines, clickMeServiceContent, buildDestinationServicesFolder;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    lines = indexHtmlContent.replace(/\r\n/g, '\n').split('\n');
-                    clickMeServiceContent = "".concat(sasjsout_1.sasjsout, "\nfilename sasjs temp lrecl=99999999;\ndata _null_;\nfile sasjs;\n");
-                    lines.forEach(function (line) {
-                        var chunkedLines = (0, utils_1.chunk)(line);
-                        if (chunkedLines.length === 1) {
-                            if (chunkedLines[0].length == 0)
-                                chunkedLines[0] = ' ';
-                            clickMeServiceContent += "put '".concat(chunkedLines[0]
-                                .split("'")
-                                .join("''"), "';\n");
-                        }
-                        else {
-                            var combinedLines_1 = '';
-                            chunkedLines.forEach(function (chunkedLine, index) {
-                                var text = "put '".concat(chunkedLine.split("'").join("''"), "'");
-                                if (index !== chunkedLines.length - 1) {
-                                    text += '@;\n';
-                                }
-                                else {
-                                    text += ';\n';
-                                }
-                                combinedLines_1 += text;
-                            });
-                            clickMeServiceContent += combinedLines_1;
-                        }
-                    });
-                    clickMeServiceContent += 'run;\n%sasjsout(HTML)';
-                    buildDestinationServicesFolder = process.sasjsConstants.buildDestinationServicesFolder;
-                    return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(buildDestinationServicesFolder, "".concat(fileName, ".sas")), clickMeServiceContent)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/];
-            }
-        });
-    });
-}
-function createClickMeFile(indexHtmlContent, fileName) {
-    return __awaiter(this, void 0, void 0, function () {
-        var buildDestinationServicesFolder;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    buildDestinationServicesFolder = process.sasjsConstants.buildDestinationServicesFolder;
-                    return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(buildDestinationServicesFolder, "".concat(fileName, ".html")), indexHtmlContent)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/];
-            }
-        });
-    });
-}

package/build/constants.d.ts

@@ -13,4 +13,5 @@ export interface Constants {
     contextName: string;
     sas9CredentialsError: string;
     invalidSasError: string;
+    sas9GUID: string;
 }

package/build/utils/setConstants.js

@@ -46,7 +46,7 @@ var utils_1 = require("./utils");
 var utils_2 = require("@sasjs/utils");
 exports.contextName = 'sasjs cli compute context';
 var setConstants = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, configuration, isLocal, buildOutputFolder, buildResultsFolder, homeDir, buildSourceFolder, buildSourceDbFolder, buildDestinationFolder, buildDestinationServicesFolder, buildDestinationTestFolder, buildDestinationJobsFolder, buildDestinationDbFolder, buildDestinationDocsFolder, macroCorePath, buildDestinationResultsFolder, buildDestinationResultsLogsFolder, sas9CredentialsError, invalidSasError;
+    var _a, configuration, isLocal, buildOutputFolder, buildResultsFolder, homeDir, buildSourceFolder, buildSourceDbFolder, buildDestinationFolder, buildDestinationServicesFolder, buildDestinationTestFolder, buildDestinationJobsFolder, buildDestinationDbFolder, buildDestinationDocsFolder, macroCorePath, buildDestinationResultsFolder, buildDestinationResultsLogsFolder, sas9CredentialsError, invalidSasError, sas9GUID;
     var _b, _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -79,6 +79,7 @@ var setConstants = function () { return __awaiter(void 0, void 0, void 0, functi
                     '\n* SAS_PASSWORD' +
                     '\nPlease run "sasjs auth" for your specified target to apply the correct credentials.';
                 invalidSasError = 'Url specified does not contain a valid sas program. Please provide valid url.';
+                sas9GUID = 'pZKd6F95jECvRQlN0LCfdA==';
                 process.sasjsConstants = {
                     buildSourceFolder: buildSourceFolder,
                     buildSourceDbFolder: buildSourceDbFolder,
@@ -93,7 +94,8 @@ var setConstants = function () { return __awaiter(void 0, void 0, void 0, functi
                     macroCorePath: macroCorePath,
                     contextName: exports.contextName,
                     sas9CredentialsError: sas9CredentialsError,
-                    invalidSasError: invalidSasError
+                    invalidSasError: invalidSasError,
+                    sas9GUID: sas9GUID
                 };
                 return [2 /*return*/];
         }

package/package.json

@@ -96,5 +96,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.16.0"
+  "version": "3.16.1"
 }

package/build/commands/web/internal/getWebServiceContent.d.ts

@@ -1,2 +0,0 @@
-import { ServerType } from '@sasjs/utils';
-export declare const getWebServiceContent: (contentBase64: string, type: string | undefined, serverType: ServerType) => Promise<string>;