@sasjs/cli 3.12.5 → 3.12.6

package/build/commands/add/addCredential.js

@@ -10,6 +10,25 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -54,7 +73,7 @@ exports.createEnvFileForSasjs = exports.createEnvFileForSas9 = exports.createEnv
 var path_1 = __importDefault(require("path"));
 var logger_1 = require("@sasjs/utils/logger");
 var types_1 = require("@sasjs/utils/types");
-var node_1 = __importDefault(require("@sasjs/adapter/node"));
+var node_1 = __importStar(require("@sasjs/adapter/node"));
 var auth_1 = require("../../utils/auth");
 var utils_1 = require("@sasjs/utils");
 var input_1 = require("./internal/input");
@@ -174,7 +193,12 @@ var getTokens = function (target, client, secret, httpsAgentOptions) { return __
                 });
                 return [4 /*yield*/, (0, auth_1.getNewAccessToken)(adapter, client, secret, target).catch(function (e) {
                         var _a;
-                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("An error has occurred while validating your credentials: ".concat(e, "\nPlease check your Client ID ").concat(target.serverType === types_1.ServerType.Sasjs ? '' : 'and Client Secret ', "and try again.\n"));
+                        var errorMessage = "An error has occurred while validating your credentials: ".concat(e);
+                        var checkCredentialsMessage = "Please check your Client ID ".concat(target.serverType === types_1.ServerType.Sasjs ? '' : 'and Client Secret ', "and try again.\n");
+                        var errorMessageToDisplay = e instanceof node_1.CertificateError
+                            ? errorMessage
+                            : "".concat(errorMessage, "\n").concat(checkCredentialsMessage);
+                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error(errorMessageToDisplay);
                         throw e;
                     })];
             case 1:

package/build/commands/deploy/deployCommand.js

@@ -90,7 +90,7 @@ var DeployCommand = /** @class */ (function (_super) {
                             })
                                 .catch(function (err) {
                                 var _a;
-                                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('An error has occurred when deploying services: ', err);
+                                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("An error has occurred when deploying services: ".concat(err));
                                 return command_1.ReturnCode.InternalError;
                             })];
                     case 2: return [2 /*return*/, _b.sent()];

package/build/utils/config.js

@@ -415,16 +415,20 @@ function saveGlobalRcFile(content) {
 }
 exports.saveGlobalRcFile = saveGlobalRcFile;
 function saveToGlobalConfig(target, isDefault, saveWithDefaultValues) {
+    var _a;
     if (isDefault === void 0) { isDefault = false; }
     if (saveWithDefaultValues === void 0) { saveWithDefaultValues = true; }
     return __awaiter(this, void 0, void 0, function () {
         var globalConfig, targetJson, existingTargetIndex;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0: return [4 /*yield*/, getGlobalRcFile()];
                 case 1:
-                    globalConfig = _a.sent();
+                    globalConfig = _b.sent();
                     targetJson = target.toJson(saveWithDefaultValues);
+                    if ((_a = targetJson.httpsAgentOptions) === null || _a === void 0 ? void 0 : _a.ca) {
+                        targetJson.httpsAgentOptions.ca = undefined;
+                    }
                     if (globalConfig) {
                         if (globalConfig.targets && globalConfig.targets.length) {
                             existingTargetIndex = globalConfig.targets.findIndex(function (t) { return t.name === target.name; });
@@ -446,7 +450,7 @@ function saveToGlobalConfig(target, isDefault, saveWithDefaultValues) {
                         globalConfig.defaultTarget = target.name;
                     }
                     return [4 /*yield*/, saveGlobalRcFile(JSON.stringify(globalConfig, null, 2))];
-                case 2: return [2 /*return*/, _a.sent()];
+                case 2: return [2 /*return*/, _b.sent()];
             }
         });
     });
@@ -552,20 +556,23 @@ function saveLocalConfigFile(content) {
 }
 exports.saveLocalConfigFile = saveLocalConfigFile;
 function saveToLocalConfig(target, isDefault, saveWithDefaultValues) {
-    var _a;
+    var _a, _b;
     if (isDefault === void 0) { isDefault = false; }
     if (saveWithDefaultValues === void 0) { saveWithDefaultValues = true; }
     return __awaiter(this, void 0, void 0, function () {
         var targetJson, config, existingTargetIndex, configPath;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     targetJson = target.toJson(saveWithDefaultValues);
+                    if ((_a = targetJson.httpsAgentOptions) === null || _a === void 0 ? void 0 : _a.ca) {
+                        targetJson.httpsAgentOptions.ca = undefined;
+                    }
                     return [4 /*yield*/, getLocalConfig()];
                 case 1:
-                    config = _b.sent();
+                    config = _c.sent();
                     if (config) {
-                        if ((_a = config === null || config === void 0 ? void 0 : config.targets) === null || _a === void 0 ? void 0 : _a.length) {
+                        if ((_b = config === null || config === void 0 ? void 0 : config.targets) === null || _b === void 0 ? void 0 : _b.length) {
                             existingTargetIndex = config.targets.findIndex(function (t) { return t.name === target.name; });
                             if (existingTargetIndex > -1) {
                                 config.targets[existingTargetIndex] = targetJson;
@@ -587,7 +594,7 @@ function saveToLocalConfig(target, isDefault, saveWithDefaultValues) {
                     configPath = path_1.default.join(process.projectDir, 'sasjs', 'sasjsconfig.json');
                     return [4 /*yield*/, (0, utils_1.createFile)(configPath, JSON.stringify(config, null, 2))];
                 case 2:
-                    _b.sent();
+                    _c.sent();
                     return [2 /*return*/, configPath];
             }
         });
@@ -988,32 +995,30 @@ var overrideEnvVariables = function (targetName) { return __awaiter(void 0, void
 }); };
 exports.overrideEnvVariables = overrideEnvVariables;
 var getPrecedenceOfHttpsAgentOptionsAndContent = function (config, target) { return __awaiter(void 0, void 0, void 0, function () {
-    var httpsAgentOptions, _a, _b, _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    var httpsAgentOptions, rootCas, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 httpsAgentOptions = getHttpsAgentOptionsForInsecure(__assign(__assign({ allowInsecureRequests: false }, config.httpsAgentOptions), target.httpsAgentOptions));
-                if (!httpsAgentOptions.caPath) return [3 /*break*/, 2];
+                if (httpsAgentOptions.caPath) {
+                    rootCas = require('ssl-root-cas');
+                    rootCas.addFile(path_1.default.resolve(httpsAgentOptions.caPath));
+                    httpsAgentOptions.ca = rootCas;
+                }
+                if (!httpsAgentOptions.keyPath) return [3 /*break*/, 2];
                 _a = httpsAgentOptions;
-                return [4 /*yield*/, (0, utils_1.readFile)(httpsAgentOptions.caPath)];
+                return [4 /*yield*/, (0, utils_1.readFile)(httpsAgentOptions.keyPath)];
             case 1:
-                _a.ca = _d.sent();
-                _d.label = 2;
+                _a.key = _c.sent();
+                _c.label = 2;
             case 2:
-                if (!httpsAgentOptions.keyPath) return [3 /*break*/, 4];
+                if (!httpsAgentOptions.certPath) return [3 /*break*/, 4];
                 _b = httpsAgentOptions;
-                return [4 /*yield*/, (0, utils_1.readFile)(httpsAgentOptions.keyPath)];
-            case 3:
-                _b.key = _d.sent();
-                _d.label = 4;
-            case 4:
-                if (!httpsAgentOptions.certPath) return [3 /*break*/, 6];
-                _c = httpsAgentOptions;
                 return [4 /*yield*/, (0, utils_1.readFile)(httpsAgentOptions.certPath)];
-            case 5:
-                _c.cert = _d.sent();
-                _d.label = 6;
-            case 6: return [2 /*return*/, httpsAgentOptions];
+            case 3:
+                _b.cert = _c.sent();
+                _c.label = 4;
+            case 4: return [2 /*return*/, httpsAgentOptions];
         }
     });
 }); };

package/build/utils/setConstants.js

@@ -46,7 +46,7 @@ var config_1 = require("./config");
 var utils_1 = 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, getMacroCoreGlobalPath, buildSourceFolder, buildSourceDbFolder, buildDestinationFolder, buildDestinationServicesFolder, buildDestinationTestFolder, buildDestinationJobsFolder, buildDestinationDbFolder, buildDestinationDocsFolder, macroCorePath, _b, buildDestinationResultsFolder, buildDestinationResultsLogsFolder, sas9CredentialsError, invalidSasError;
+    var _a, configuration, isLocal, buildOutputFolder, buildResultsFolder, homeDir, buildSourceFolder, buildSourceDbFolder, buildDestinationFolder, buildDestinationServicesFolder, buildDestinationTestFolder, buildDestinationJobsFolder, buildDestinationDbFolder, buildDestinationDocsFolder, macroCorePath, _b, buildDestinationResultsFolder, buildDestinationResultsLogsFolder, sas9CredentialsError, invalidSasError;
     var _c, _d;
     return __generator(this, function (_e) {
         switch (_e.label) {
@@ -61,24 +61,6 @@ var setConstants = function () { return __awaiter(void 0, void 0, void 0, functi
                 buildResultsFolder = ((_d = configuration === null || configuration === void 0 ? void 0 : configuration.buildConfig) === null || _d === void 0 ? void 0 : _d.buildResultsFolder) ||
                     (isLocal ? 'sasjsresults' : '.sasjs/sasjsresults');
                 homeDir = require('os').homedir();
-                getMacroCoreGlobalPath = function () { return __awaiter(void 0, void 0, void 0, function () {
-                    var sasjsPath, macroCoreGlobal, e_1;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0:
-                                _a.trys.push([0, 2, , 3]);
-                                return [4 /*yield*/, (0, get_installed_path_1.getInstalledPath)('@sasjs/cli')];
-                            case 1:
-                                sasjsPath = _a.sent();
-                                macroCoreGlobal = path_1.default.join(sasjsPath, 'node_modules', '@sasjs', 'core');
-                                return [2 /*return*/, macroCoreGlobal];
-                            case 2:
-                                e_1 = _a.sent();
-                                throw 'Please install SASjs cli `npm i -g @sasjs/cli`';
-                            case 3: return [2 /*return*/];
-                        }
-                    });
-                }); };
                 buildSourceFolder = path_1.default.join(isLocal ? process.projectDir : homeDir);
                 buildSourceDbFolder = path_1.default.join(isLocal ? process.projectDir : homeDir, 'sasjs', 'db');
                 buildDestinationFolder = (0, utils_1.getAbsolutePath)(buildOutputFolder, isLocal ? process.projectDir : homeDir);
@@ -90,7 +72,8 @@ var setConstants = function () { return __awaiter(void 0, void 0, void 0, functi
                 if (!isLocal) return [3 /*break*/, 2];
                 _b = path_1.default.join(buildSourceFolder, 'node_modules', '@sasjs/core');
                 return [3 /*break*/, 4];
-            case 2: return [4 /*yield*/, getMacroCoreGlobalPath()];
+            case 2: // use @sasjs/core from @sasjs/cli's dependencies
+            return [4 /*yield*/, (0, get_installed_path_1.getInstalledPath)('@sasjs/core', { local: true })];
             case 3:
                 _b = _e.sent();
                 _e.label = 4;

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

@@ -140,12 +140,5 @@ var verifySasjsConstants = function (appFolder) {
     if (appFolder)
         expect(sasjsConstants.macroCorePath).toEqual([prefixAppFolder, 'node_modules', '@sasjs', 'core'].join(path_1.default.sep));
     else
-        expect(sasjsConstants.macroCorePath).toEqual(expect.toEndWith([
-            'node_modules',
-            '@sasjs',
-            'cli',
-            'node_modules',
-            '@sasjs',
-            'core'
-        ].join(path_1.default.sep)));
+        expect(sasjsConstants.macroCorePath).toEqual(expect.toEndWith(['cli', 'node_modules', '@sasjs', 'core'].join(path_1.default.sep)));
 };

package/package.json

@@ -47,7 +47,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "3.8.2",
+    "@sasjs/adapter": "3.8.5",
     "@sasjs/core": "4.15.3",
     "@sasjs/lint": "1.11.2",
     "@sasjs/utils": "2.42.0",
@@ -66,6 +66,7 @@
     "ora": "5.4.1",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
+    "ssl-root-cas": "^1.3.1",
     "xml": "1.0.1",
     "yargs": "17.2.1"
   },
@@ -94,5 +95,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.12.5"
+  "version": "3.12.6"
 }