@sasjs/cli 3.8.8 → 3.10.0

package/build/commands/web/web.js

@@ -56,56 +56,66 @@ var exampleStreamConfig = {
     streamServiceName: 'clickme'
 };
 function createWebAppServices(target) {
-    var _a;
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
-        var buildDestinationServicesFolder, streamConfig, _b, webSourcePathFull, indexHtmlPath, destinationPath, assetPathMap, indexHtml;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var buildDestinationServicesFolder, streamConfig, _c, webSourcePathFull, indexHtmlPath, destinationPath, assetPathMap, indexHtml;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
                     buildDestinationServicesFolder = process.sasjsConstants.buildDestinationServicesFolder;
                     return [4 /*yield*/, (0, config_1.getStreamConfig)(target)];
                 case 1:
-                    streamConfig = _c.sent();
+                    streamConfig = _d.sent();
                     return [4 /*yield*/, validateStreamConfig(streamConfig)];
                 case 2:
-                    _b = _c.sent(), webSourcePathFull = _b.webSourcePathFull, indexHtmlPath = _b.indexHtmlPath;
-                    (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Compiling web app services for target ".concat(target.name, "..."));
+                    _c = _d.sent(), webSourcePathFull = _c.webSourcePathFull, indexHtmlPath = _c.indexHtmlPath;
                     return [4 /*yield*/, createBuildDestinationFolder()];
                 case 3:
-                    _c.sent();
+                    _d.sent();
                     destinationPath = path_1.default.join(buildDestinationServicesFolder, streamConfig.streamWebFolder);
-                    return [4 /*yield*/, createTargetDestinationFolder(destinationPath)];
+                    return [4 /*yield*/, createTargetDestinationFolder(destinationPath)
+                        // For server type SASjs, just need to copy webSourcePath
+                        // to streamWebFolder, no need to create service files.
+                    ];
                 case 4:
-                    _c.sent();
+                    _d.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();
+                    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, "..."));
                     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 5:
-                    assetPathMap = _c.sent();
+                case 7:
+                    assetPathMap = _d.sent();
                     return [4 /*yield*/, (0, utils_1.readFile)(indexHtmlPath).then(function (content) { return new jsdom_1.default.JSDOM(content); })];
-                case 6:
-                    indexHtml = _c.sent();
+                case 8:
+                    indexHtml = _d.sent();
                     return [4 /*yield*/, (0, updateAllTags_1.updateAllTags)(indexHtml, {
                             webSourcePathFull: webSourcePathFull,
                             destinationPath: destinationPath,
                             serverType: target.serverType,
                             assetPathMap: assetPathMap
                         })];
-                case 7:
-                    _c.sent();
-                    if (!(target.serverType === utils_1.ServerType.SasViya)) return [3 /*break*/, 9];
+                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)];
-                case 8:
-                    _c.sent();
-                    return [3 /*break*/, 11];
-                case 9: return [4 /*yield*/, createClickMeService(indexHtml.serialize(), streamConfig.streamServiceName)];
                 case 10:
-                    _c.sent();
-                    _c.label = 11;
-                case 11: return [2 /*return*/];
+                    _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*/];
             }
         });
     });

package/build/utils/spec/removeComments.spec.d.ts

@@ -1 +1 @@
-export declare const sampleSasProgram = "/**\n  @file mv_createfolder.sas\n  @brief Creates a viya folder if that foloder does not already exist\n  @details Expects oauth token in a global macro variable (default\n    ACCESS_TOKEN).\n\n    options mprint;\n    %mv_createfolder(path=/Public)\n\n\n  @param path= The full path of the folder to be created\n  @param access_token_var= The global macro variable to contain the access token\n  @param grant_type= valid values are \"password\" or \"authorization_code\" (unquoted).\n    The default is authorization_code.\n\n\n  @version VIYA V.03.04\n  @author Allan Bowe\n  @source https://github.com/sasjs/core\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n  @li mf_getuniquefileref.sas\n  @li mf_getuniquelibref.sas\n  @li mf_isblank.sas\n\n**/\n\n/* This is a comment\nthat spans\nmultiple lines */\n\n%macro mv_createfolder(path=\n  ,access_token_var=ACCESS_TOKEN\n  ,grant_type=authorization_code\n);";
+export declare const sampleSasProgram: string;

package/build/utils/spec/removeComments.spec.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sampleSasProgram = void 0;
 var utils_1 = require("../utils");
+var utils_2 = require("@sasjs/utils");
 describe('removeComments', function () {
     test('should remove block comment', function () {
         var text = "/* test\n123\n456\n789 */";
@@ -43,4 +44,4 @@ describe('removeComments', function () {
         expect((0, utils_1.removeComments)(text)).toEqual(text);
     });
 });
-exports.sampleSasProgram = "/**\n  @file mv_createfolder.sas\n  @brief Creates a viya folder if that foloder does not already exist\n  @details Expects oauth token in a global macro variable (default\n    ACCESS_TOKEN).\n\n    options mprint;\n    %mv_createfolder(path=/Public)\n\n\n  @param path= The full path of the folder to be created\n  @param access_token_var= The global macro variable to contain the access token\n  @param grant_type= valid values are \"password\" or \"authorization_code\" (unquoted).\n    The default is authorization_code.\n\n\n  @version VIYA V.03.04\n  @author Allan Bowe\n  @source https://github.com/sasjs/core\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n  @li mf_getuniquefileref.sas\n  @li mf_getuniquelibref.sas\n  @li mf_isblank.sas\n\n**/\n\n/* This is a comment\nthat spans\nmultiple lines */\n\n%macro mv_createfolder(path=\n  ,access_token_var=ACCESS_TOKEN\n  ,grant_type=authorization_code\n);";
+exports.sampleSasProgram = "/**\n  @file mv_createfolder.sas\n  @brief Creates a viya folder if that foloder does not already exist\n  @details Expects oauth token in a global macro variable (default\n    ACCESS_TOKEN).\n\n    options mprint;\n    %mv_createfolder(path=/Public)\n\n\n  @param path= The full path of the folder to be created\n  @param access_token_var= The global macro variable to contain the access token\n  @param grant_type= valid values are \"password\" or \"authorization_code\" (unquoted).\n    The default is authorization_code.\n\n\n  @version VIYA V.03.04\n  @author Allan Bowe\n  @source https://github.com/sasjs/core\n\n  ".concat(utils_2.DependencyHeader.Macro, "\n  @li mf_abort.sas\n  @li mf_getuniquefileref.sas\n  @li mf_getuniquelibref.sas\n  @li mf_isblank.sas\n\n**/\n\n/* This is a comment\nthat spans\nmultiple lines */\n\n%macro mv_createfolder(path=\n  ,access_token_var=ACCESS_TOKEN\n  ,grant_type=authorization_code\n);");

package/build/utils/utils.d.ts

@@ -34,5 +34,4 @@ export declare function getAdapterInstance(target: Target): SASjs;
 export declare function displaySasjsRunnerError(username: string): void;
 export declare const loadEnvVariables: (fileName: string) => Promise<void>;
 export declare function prefixAppLoc(appLoc?: string, path?: string): string | null;
-export declare const isWindows: () => boolean;
 export declare const terminateProcess: (status: number) => never;

package/build/utils/utils.js

@@ -86,7 +86,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.terminateProcess = exports.isWindows = exports.prefixAppLoc = exports.loadEnvVariables = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.parseLogLines = exports.executeShellScript = exports.getUniqServicesObj = exports.removeComments = exports.setupDoxygen = exports.setupGhooks = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
+exports.terminateProcess = exports.prefixAppLoc = exports.loadEnvVariables = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.parseLogLines = exports.executeShellScript = exports.getUniqServicesObj = exports.removeComments = exports.setupDoxygen = exports.setupGhooks = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
 var shelljs_1 = __importDefault(require("shelljs"));
 var path_1 = __importDefault(require("path"));
 var ora_1 = __importDefault(require("ora"));
@@ -414,7 +414,7 @@ function executeShellScript(filePath, logFilePath) {
                     return __generator(this, function (_b) {
                         switch (_b.label) {
                             case 0:
-                                shellCommand = (0, exports.isWindows)() ? "sh ".concat(filePath) : "bash ".concat(filePath);
+                                shellCommand = (0, utils_1.isWindows)() ? "sh ".concat(filePath) : "bash ".concat(filePath);
                                 result = shelljs_1.default.exec(shellCommand, { silent: true });
                                 if (!result.code) return [3 /*break*/, 1];
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("Error: ".concat(result.stderr));
@@ -555,8 +555,6 @@ function prefixAppLoc(appLoc, path) {
         .join(' ');
 }
 exports.prefixAppLoc = prefixAppLoc;
-var isWindows = function () { return process.platform === 'win32'; };
-exports.isWindows = isWindows;
 var terminateProcess = function (status) {
     var _a;
     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Process will be terminated with the status code ".concat(status, "."));

package/package.json

@@ -50,7 +50,7 @@
     "@sasjs/adapter": "^3.7.14",
     "@sasjs/core": "4.15.3",
     "@sasjs/lint": "1.11.2",
-    "@sasjs/utils": "2.36.0",
+    "@sasjs/utils": "2.38.1",
     "chalk": "4.1.2",
     "csv-stringify": "5.6.5",
     "dotenv": "10.0.0",
@@ -94,5 +94,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.8.8"
+  "version": "3.10.0"
 }