@sasjs/cli 3.27.1 → 3.27.2

package/build/commands/deploy/internal/executeDeployScriptSasViya.js

@@ -54,11 +54,11 @@ var utils_1 = require("@sasjs/utils");
  * for printing web app url on console.
  */
 function executeDeployScriptSasViya(deployScriptName, target, linesToExecute, logFilePath, streamConfig) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function () {
-        var contextName, _e, sasjs, authConfig, executionResult, log, appLoc, webAppStreamUrl;
-        return __generator(this, function (_f) {
-            switch (_f.label) {
+        var contextName, _f, sasjs, authConfig, executionResult, log, appLoc, webAppStreamUrl;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
                 case 0:
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Sending ".concat(deployScriptName, " to SAS server for execution."));
                     contextName = target.contextName;
@@ -67,7 +67,7 @@ function executeDeployScriptSasViya(deployScriptName, target, linesToExecute, lo
                     }
                     return [4 /*yield*/, (0, config_1.getSASjsAndAuthConfig)(target)];
                 case 1:
-                    _e = _f.sent(), sasjs = _e.sasjs, authConfig = _e.authConfig;
+                    _f = _g.sent(), sasjs = _f.sasjs, authConfig = _f.authConfig;
                     return [4 /*yield*/, sasjs
                             .executeScript({
                             fileName: deployScriptName,
@@ -77,15 +77,24 @@ function executeDeployScriptSasViya(deployScriptName, target, linesToExecute, lo
                         })
                             .catch(function (err) {
                             process.logger.error('executeScriptSASViya Error', err);
+                            if (err.log)
+                                return { log: err.log, completedWithError: true };
+                            throw err;
                         })];
                 case 2:
-                    executionResult = _f.sent();
+                    executionResult = _g.sent();
                     try {
-                        log = executionResult.log.items
-                            ? executionResult.log.items
+                        if (typeof executionResult.log === 'string') {
+                            log = executionResult.log;
+                        }
+                        else if (executionResult.log.items) {
+                            log = executionResult.log.items
                                 .map(function (i) { return i.line; })
-                                .join(os_1.default.EOL)
-                            : JSON.stringify(executionResult.log).replace(/\\n/g, os_1.default.EOL);
+                                .join(os_1.default.EOL);
+                        }
+                        else {
+                            log = JSON.stringify(executionResult.log).replace(/\\n/g, os_1.default.EOL);
+                        }
                     }
                     catch (e) {
                         (_b = process.logger) === null || _b === void 0 ? void 0 : _b.error("An error occurred when parsing the execution response: ".concat(e.message));
@@ -93,12 +102,16 @@ function executeDeployScriptSasViya(deployScriptName, target, linesToExecute, lo
                     }
                     return [4 /*yield*/, (0, utils_1.createFile)(logFilePath, log)];
                 case 3:
-                    _f.sent();
-                    (_c = process.logger) === null || _c === void 0 ? void 0 : _c.success("Deployment completed! Log is available at ".concat(logFilePath));
+                    _g.sent();
+                    if (executionResult.completedWithError) {
+                        (_c = process.logger) === null || _c === void 0 ? void 0 : _c.error("Log is available at ".concat(logFilePath));
+                        throw new Error('Deployment process completed with error');
+                    }
+                    (_d = process.logger) === null || _d === void 0 ? void 0 : _d.success("Deployment completed! Log is available at ".concat(logFilePath));
                     if (streamConfig === null || streamConfig === void 0 ? void 0 : streamConfig.streamWeb) {
                         appLoc = encodeURI(target.appLoc);
                         webAppStreamUrl = "".concat(target.serverUrl, "/SASJobExecution?_FILE=").concat(appLoc, "/services/").concat(streamConfig.streamServiceName, ".html&_debug=2");
-                        (_d = process.logger) === null || _d === void 0 ? void 0 : _d.info("Web app is available at ".concat(webAppStreamUrl));
+                        (_e = process.logger) === null || _e === void 0 ? void 0 : _e.info("Web app is available at ".concat(webAppStreamUrl));
                     }
                     return [2 /*return*/];
             }

package/build/config.json

@@ -36,7 +36,7 @@
             },
             {
               "fileName": "buildinitviya.sas",
-              "content": "/**\n  @file buildinitviya.sas\n  @brief this executed as part of the generation of the Viya build script\n  @details  This file is inserted *after* the build macros and *before* the service code.\n\n   For an explanation of this part, see: https://sasjs.io/sasjs/sasjs-cli/#viya-deployment-script\n\n  <h4> SAS Macros </h4>\n\n**/\n\n/*\n%put buildinit script;\n\n"
+              "content": "/**\n  @file buildinitviya.sas\n  @brief this executed as part of the generation of the Viya build script\n  @details  This file is inserted *after* the build macros and *before* the service code.\n\n   For an explanation of this part, see: https://sasjs.io/sasjs/sasjs-cli/#viya-deployment-script\n\n  <h4> SAS Macros </h4>\n\n**/\n\n%put buildinit script;\n\n"
             },
             {
               "fileName": "buildterm.sas",
@@ -195,27 +195,9 @@
   ],
   "config": {
     "$schema": "https://cli.sasjs.io/sasjsconfig-schema.json",
-    "docConfig": {
-      "displayMacroCore": true,
-      "enableLineage": true,
-      "outDirectory": "",
-      "dataControllerUrl": "",
-      "doxyContent": {
-        "favIcon": "favicon.ico",
-        "footer": "new_footer.html",
-        "header": "new_header.html",
-        "layout": "DoxygenLayout.xml",
-        "logo": "logo.png",
-        "readMe": "../../README.md",
-        "stylesheet": "new_stylesheet.css",
-        "path": "./sasjs/doxy/"
-      }
-    },
     "buildConfig": {
       "initProgram": "sasjs/build/buildinit.sas",
       "termProgram": "sasjs/build/buildterm.sas",
-      "buildOutputFolder": "sasjsbuild",
-      "buildResultsFolder": "sasjsresults",
       "macroVars": {
         "name": "value",
         "numvar": "42"
@@ -236,15 +218,12 @@
     "macroFolders": ["sasjs/macros"],
     "programFolders": ["sasjs/programs"],
     "binaryFolders": ["sasjs/binaries"],
-    "serverType": "SASVIYA",
+    "defaultTarget": "viya",
     "targets": [
       {
         "name": "viya",
         "serverType": "SASVIYA",
-        "serverUrl": "https://sas.analytium.co.uk",
-        "httpsAgentOptions": {
-          "allowInsecureRequests": false
-        },
+        "serverUrl": "",
         "appLoc": "/Public/app",
         "contextName": "SAS Job Execution compute context",
         "buildConfig": {
@@ -256,10 +235,6 @@
             "extravar": "this too"
           }
         },
-        "deployConfig": {
-          "deployServicePack": true,
-          "deployScripts": ["sasjsbuild/myviyadeploy.sas"]
-        },
         "serviceConfig": {
           "serviceFolders": ["sasjs/targets/viya/services/admin"],
           "initProgram": "sasjs/build/serviceinit.sas",
@@ -269,52 +244,30 @@
             "extravar": "this too"
           }
         },
-        "jobConfig": {
-          "jobFolders": [],
-          "initProgram": "",
-          "termProgram": "",
-          "macroVars": {}
-        },
-        "streamConfig": {
-          "assetPaths": [],
-          "streamWeb": false,
-          "streamWebFolder": "webv",
-          "webSourcePath": "dist"
-        },
-        "macroFolders": ["sasjs/targets/viya/macros"],
-        "programFolders": []
+        "macroFolders": ["sasjs/targets/viya/macros"]
       },
       {
         "name": "sas9",
         "serverType": "SAS9",
-        "serverUrl": "https://sas.analytium.co.uk:8343",
+        "serverUrl": "",
         "appLoc": "/User Folders/&sysuserid/My Folder",
         "serverName": "Foundation",
         "repositoryName": "SASApp",
-        "buildConfig": {
-          "buildOutputFileName": "mysas9deploy.sas",
-          "initProgram": "",
-          "termProgram": "",
-          "macroVars": {}
-        },
         "deployConfig": {
           "deployScripts": ["sasjs/build/deploysas9.sh"],
           "deployServicePack": false
         },
         "serviceConfig": {
           "serviceFolders": ["sasjs/targets/sas9/services/admin"],
-          "initProgram": "",
-          "termProgram": "sasjs/build/servicetermother.sas",
-          "macroVars": {}
+          "termProgram": "sasjs/build/servicetermother.sas"
         },
-        "streamConfig": {
-          "assetPaths": [],
-          "streamWeb": false,
-          "streamWebFolder": "web9",
-          "webSourcePath": "dist"
-        },
-        "macroFolders": ["sasjs/targets/sas9/macros"],
-        "programFolders": []
+        "macroFolders": ["sasjs/targets/sas9/macros"]
+      },
+      {
+        "name": "sasjs",
+        "serverType": "SASJS",
+        "serverUrl": "",
+        "appLoc": "/Public/app"
       }
     ]
   }

package/build/utils/spec/setConstants.spec.js

@@ -156,26 +156,27 @@ describe('setConstants', function () {
                     return [4 /*yield*/, (0, setConstants_1.setConstants)()];
                 case 1:
                     _a.sent();
-                    verifySasjsConstants();
+                    verifySasjsConstants(undefined, false, false);
                     return [2 /*return*/];
             }
         });
     }); });
 });
-var verifySasjsConstants = function (appFolder, hasSasjsCore) {
+var verifySasjsConstants = function (appFolder, hasSasjsCore, isLocal) {
     if (hasSasjsCore === void 0) { hasSasjsCore = false; }
+    if (isLocal === void 0) { isLocal = true; }
     var prefixAppFolder = appFolder !== null && appFolder !== void 0 ? appFolder : require('os').homedir();
     var sasjsConstants = process.sasjsConstants;
     expect(sasjsConstants.buildSourceFolder).toEqual(prefixAppFolder);
     expect(sasjsConstants.buildSourceDbFolder).toEqual([prefixAppFolder, 'sasjs', 'db'].join(path_1.default.sep));
-    expect(sasjsConstants.buildDestinationFolder).toEqual([prefixAppFolder, 'sasjsbuild'].join(path_1.default.sep));
-    expect(sasjsConstants.buildDestinationServicesFolder).toEqual([prefixAppFolder, 'sasjsbuild', 'services'].join(path_1.default.sep));
-    expect(sasjsConstants.buildDestinationJobsFolder).toEqual([prefixAppFolder, 'sasjsbuild', 'jobs'].join(path_1.default.sep));
-    expect(sasjsConstants.buildDestinationDbFolder).toEqual([prefixAppFolder, 'sasjsbuild', 'db'].join(path_1.default.sep));
-    expect(sasjsConstants.buildDestinationDocsFolder).toEqual([prefixAppFolder, 'sasjsbuild', 'docs'].join(path_1.default.sep));
-    expect(sasjsConstants.buildDestinationResultsFolder).toEqual([prefixAppFolder, 'sasjsresults'].join(path_1.default.sep));
-    expect(sasjsConstants.buildDestinationResultsLogsFolder).toEqual([prefixAppFolder, 'sasjsresults', 'logs'].join(path_1.default.sep));
-    expect(sasjsConstants.buildDestinationTestFolder).toEqual([prefixAppFolder, 'sasjsbuild', 'tests'].join(path_1.default.sep));
+    expect(sasjsConstants.buildDestinationFolder).toEqual(path_1.default.join(prefixAppFolder, isLocal ? '' : '.sasjs', 'sasjsbuild'));
+    expect(sasjsConstants.buildDestinationServicesFolder).toEqual(path_1.default.join(prefixAppFolder, isLocal ? '' : '.sasjs', 'sasjsbuild', 'services'));
+    expect(sasjsConstants.buildDestinationJobsFolder).toEqual(path_1.default.join(prefixAppFolder, isLocal ? '' : '.sasjs', 'sasjsbuild', 'jobs'));
+    expect(sasjsConstants.buildDestinationDbFolder).toEqual(path_1.default.join(prefixAppFolder, isLocal ? '' : '.sasjs', 'sasjsbuild', 'db'));
+    expect(sasjsConstants.buildDestinationDocsFolder).toEqual(path_1.default.join(prefixAppFolder, isLocal ? '' : '.sasjs', 'sasjsbuild', 'docs'));
+    expect(sasjsConstants.buildDestinationResultsFolder).toEqual(path_1.default.join(prefixAppFolder, isLocal ? '' : '.sasjs', 'sasjsresults'));
+    expect(sasjsConstants.buildDestinationResultsLogsFolder).toEqual(path_1.default.join(prefixAppFolder, isLocal ? '' : '.sasjs', 'sasjsresults', 'logs'));
+    expect(sasjsConstants.buildDestinationTestFolder).toEqual(path_1.default.join(prefixAppFolder, isLocal ? '' : '.sasjs', 'sasjsbuild', 'tests'));
     var corePath = hasSasjsCore
         ? 'core'
         : path_1.default.join('cli', 'node_modules', '@sasjs', 'core');

package/package.json

@@ -50,7 +50,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "4.1.0",
+    "@sasjs/adapter": "4.1.3",
     "@sasjs/core": "4.45.4",
     "@sasjs/lint": "2.2.0",
     "@sasjs/utils": "2.52.0",
@@ -101,5 +101,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.27.1"
+  "version": "3.27.2"
 }