@sasjs/cli 4.20.9 → 5.0.3

package/build/commands/deploy/deploy.js

@@ -53,42 +53,49 @@ var internal_1 = require("./internal");
  */
 function deploy(target, isLocal) {
     return __awaiter(this, void 0, void 0, function () {
-        var streamConfig, buildDestinationFolder, finalFilePathJSON, appLoc, jsonObject, servicesFolder, webIndexFileName, buildOutputFileName, deployScriptPath, deployScripts;
+        var streamConfig, deployServicePack, buildDestinationFolder, finalFilePathJSON, appLoc, jsonObject, servicesFolder, webIndexFileName, buildOutputFileName, deployScriptPath, deployScripts;
         var _this = this;
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         return __generator(this, function (_l) {
             switch (_l.label) {
-                case 0: return [4 /*yield*/, (0, config_1.getStreamConfig)(target)];
+                case 0: return [4 /*yield*/, (0, config_1.getStreamConfig)(target)
+                    // A target that declares no deployConfig used to have one injected by the
+                    // @sasjs/utils Target constructor. That injection is gone (sasjs/utils#277),
+                    // so an absent deployConfig is treated as the historical default - deploy the
+                    // service pack - rather than refusing to deploy. An explicit
+                    // deployServicePack: false is still honoured.
+                ];
                 case 1:
                     streamConfig = _l.sent();
-                    if (!((_a = target.deployConfig) === null || _a === void 0 ? void 0 : _a.deployServicePack)) return [3 /*break*/, 7];
+                    deployServicePack = (_b = (_a = target.deployConfig) === null || _a === void 0 ? void 0 : _a.deployServicePack) !== null && _b !== void 0 ? _b : true;
+                    if (!deployServicePack) return [3 /*break*/, 7];
                     buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
                     finalFilePathJSON = path_1.default.join(buildDestinationFolder, "".concat(target.name, ".json"));
                     if (!(target.serverType === utils_1.ServerType.SasViya)) return [3 /*break*/, 3];
                     appLoc = encodeURI(target.appLoc);
-                    (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Deploying service pack to ".concat(target.serverUrl, " at location ").concat(appLoc, " ."));
+                    (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info("Deploying service pack to ".concat(target.serverUrl, " at location ").concat(appLoc, " ."));
                     return [4 /*yield*/, (0, deployToSasViyaWithServicePack_1.deployToSasViyaWithServicePack)(finalFilePathJSON, target, isLocal, true)];
                 case 2:
                     jsonObject = _l.sent();
                     servicesFolder = jsonObject === null || jsonObject === void 0 ? void 0 : jsonObject.members.find(function (member) {
                         return (member === null || member === void 0 ? void 0 : member.name) === 'services' && (member === null || member === void 0 ? void 0 : member.type) === utils_1.MemberType.folder;
                     });
-                    webIndexFileName = (_e = (_d = (_c = servicesFolder === null || servicesFolder === void 0 ? void 0 : servicesFolder.members) === null || _c === void 0 ? void 0 : _c.find(function (member) { return (member === null || member === void 0 ? void 0 : member.type) === utils_1.MemberType.file; })) === null || _d === void 0 ? void 0 : _d.name) !== null && _e !== void 0 ? _e : '';
-                    (_f = process.logger) === null || _f === void 0 ? void 0 : _f.success('Build pack has been successfully deployed.');
-                    (_g = process.logger) === null || _g === void 0 ? void 0 : _g.success(target.serverType === utils_1.ServerType.SasViya && webIndexFileName
+                    webIndexFileName = (_f = (_e = (_d = servicesFolder === null || servicesFolder === void 0 ? void 0 : servicesFolder.members) === null || _d === void 0 ? void 0 : _d.find(function (member) { return (member === null || member === void 0 ? void 0 : member.type) === utils_1.MemberType.file; })) === null || _e === void 0 ? void 0 : _e.name) !== null && _f !== void 0 ? _f : '';
+                    (_g = process.logger) === null || _g === void 0 ? void 0 : _g.success('Build pack has been successfully deployed.');
+                    (_h = process.logger) === null || _h === void 0 ? void 0 : _h.success(target.serverType === utils_1.ServerType.SasViya && webIndexFileName
                         ? "".concat(target.serverUrl, "/SASJobExecution?_file=").concat(appLoc, "/services/").concat(webIndexFileName)
                         : "".concat(target.serverUrl, "/SASJobExecution?_folder=").concat(appLoc));
                     return [3 /*break*/, 7];
                 case 3:
                     if (!(target.serverType === utils_1.ServerType.Sasjs)) return [3 /*break*/, 5];
-                    (_h = process.logger) === null || _h === void 0 ? void 0 : _h.info("Deploying service pack to ".concat(target.serverUrl, " at location ").concat(target.appLoc, " ."));
+                    (_j = process.logger) === null || _j === void 0 ? void 0 : _j.info("Deploying service pack to ".concat(target.serverUrl, " at location ").concat(target.appLoc, " ."));
                     return [4 /*yield*/, (0, internal_1.deployToSasjsWithServicePack)(finalFilePathJSON, target, streamConfig)];
                 case 4:
                     _l.sent();
                     return [3 /*break*/, 7];
                 case 5:
                     if (!(target.serverType === utils_1.ServerType.Sas9)) return [3 /*break*/, 7];
-                    buildOutputFileName = ((_j = target.buildConfig) === null || _j === void 0 ? void 0 : _j.buildOutputFileName) || "".concat(target.name, ".sas");
+                    buildOutputFileName = ((_k = target.buildConfig) === null || _k === void 0 ? void 0 : _k.buildOutputFileName) || "".concat(target.name, ".sas");
                     deployScriptPath = path_1.default.join(buildDestinationFolder, buildOutputFileName);
                     return [4 /*yield*/, (0, internal_1.executeSasScript)(deployScriptPath, target, streamConfig)];
                 case 6:
@@ -97,7 +104,7 @@ function deploy(target, isLocal) {
                 case 7: return [4 /*yield*/, (0, internal_1.getDeployScripts)(target)];
                 case 8:
                     deployScripts = _l.sent();
-                    if (deployScripts.length === 0 && !((_k = target.deployConfig) === null || _k === void 0 ? void 0 : _k.deployServicePack)) {
+                    if (deployScripts.length === 0 && !deployServicePack) {
                         throw new Error("Deployment failed.\nPlease either enable the 'deployServicePack' option or add deployment script paths to 'deployScripts' in your target's 'deployConfig'.");
                     }
                     return [4 /*yield*/, (0, utils_1.asyncForEach)(deployScripts, function (deployScript) { return __awaiter(_this, void 0, void 0, function () {

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

@@ -154,6 +154,32 @@ describe('deploy', function () {
                 }
             });
         }); });
+        it('should deploy the service pack when the target declares no deployConfig', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var target, fileTree;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        target = new utils_1.Target(__assign(__assign({}, commonTargetFields), { serverType: utils_1.ServerType.SasViya }));
+                        fileTree = {
+                            members: [
+                                {
+                                    name: 'mockedFile',
+                                    type: utils_1.MemberType.file,
+                                    code: 'mocked code'
+                                }
+                            ]
+                        };
+                        jest
+                            .spyOn(deployToSasViyaWithServicePackModule, 'deployToSasViyaWithServicePack')
+                            .mockImplementation(function () { return Promise.resolve(fileTree); });
+                        return [4 /*yield*/, (0, deploy_1.deploy)(target, true)];
+                    case 1:
+                        _a.sent();
+                        expect(deployToSasViyaWithServicePackModule.deployToSasViyaWithServicePack).toHaveBeenCalledWith(path_1.default.join(process.sasjsConstants.buildDestinationFolder, "".concat(target.name, ".json")), target, true, true);
+                        return [2 /*return*/];
+                }
+            });
+        }); });
         it('should deploy services to SASJS as a service pack', function () { return __awaiter(void 0, void 0, void 0, function () {
             var target;
             return __generator(this, function (_a) {

package/build/commands/docs/generateDocs.js

@@ -94,7 +94,7 @@ var shell_1 = require("../../utils/shell");
  */
 function generateDocs(target, config, outDirectory) {
     return __awaiter(this, void 0, void 0, function () {
-        var _a, serverUrl, newOutDirectory, enableLineage, doxyContentFromConfig, _b, macroCoreFolders, macroFolders, programFolders, serviceFolders, jobFolders, combinedFolders, PROJECT_NAME, PROJECT_BRIEF, packageJsonContent, packageJson, e_1, doxyContent, layoutFilePath, LAYOUT_FILE, readMePath, doxyParams, doxyConfigPath, spinner, pathExists, _c, stderr, code, foldersListForDot;
+        var _a, serverUrl, newOutDirectory, enableLineage, doxyContentFromConfig, _b, macroCoreFolders, macroFolders, programFolders, serviceFolders, jobFolders, combinedFolders, PROJECT_NAME, PROJECT_BRIEF, packageJsonContent, packageJson, e_1, doxyContent, layoutFilePath, LAYOUT_FILE, readMePath, doxyVariables, doxyConfigPath, spinner, pathExists, _c, stderr, code, foldersListForDot;
         var _this = this;
         var _d, _e;
         return __generator(this, function (_f) {
@@ -163,7 +163,7 @@ function generateDocs(target, config, outDirectory) {
                 case 5:
                     LAYOUT_FILE = _f.sent();
                     readMePath = path_1.default.join(doxyContent.path, doxyContent.readMe);
-                    doxyParams = setVariableCmd({
+                    doxyVariables = {
                         DOXY_HTML_OUTPUT: newOutDirectory,
                         DOXY_INPUT: "\"".concat(readMePath, "\" ").concat(combinedFolders),
                         DOXY_MAINPAGE: readMePath,
@@ -175,7 +175,7 @@ function generateDocs(target, config, outDirectory) {
                         PROJECT_BRIEF: PROJECT_BRIEF,
                         PROJECT_LOGO: path_1.default.join(doxyContent.path, doxyContent.logo),
                         PROJECT_NAME: PROJECT_NAME
-                    });
+                    };
                     return [4 /*yield*/, getDoxyConfigPath(doxyContent.path)];
                 case 6:
                     doxyConfigPath = _f.sent();
@@ -194,8 +194,9 @@ function generateDocs(target, config, outDirectory) {
                 case 9: return [4 /*yield*/, (0, utils_1.createFolder)(newOutDirectory)];
                 case 10:
                     _f.sent();
-                    _c = (0, shell_1.exec)("".concat(doxyParams, " doxygen \"").concat(doxyConfigPath, "\""), {
-                        silent: process.env.LOG_LEVEL !== utils_1.LogLevel.Debug
+                    _c = (0, shell_1.execFile)('doxygen', [doxyConfigPath], {
+                        silent: process.env.LOG_LEVEL !== utils_1.LogLevel.Debug,
+                        env: doxyVariables
                     }), stderr = _c.stderr, code = _c.code;
                     if (process.env.LOG_LEVEL !== utils_1.LogLevel.Debug)
                         spinner.stop();
@@ -228,18 +229,6 @@ function generateDocs(target, config, outDirectory) {
         });
     });
 }
-function setVariableCmd(params) {
-    var command = '';
-    if ((0, utils_1.isWindows)()) {
-        for (var param in params)
-            command += "set ".concat(param, "=").concat(params[param], " && ");
-    }
-    else {
-        for (var param in params)
-            command += "".concat(param, "='").concat(params[param], "' ");
-    }
-    return command;
-}
 var getDoxyConfigPath = function (doxyContentPath) { return __awaiter(void 0, void 0, void 0, function () {
     var doxyFilePath;
     return __generator(this, function (_a) {

package/build/commands/docs/spec/generateDocs.spec.js

@@ -555,7 +555,7 @@ describe('sasjs doc', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(shell, 'exec').mockReturnValueOnce({
+                    jest.spyOn(shell, 'execFile').mockReturnValueOnce({
                         code: 1,
                         stderr: 'error: bad config',
                         stdout: ''
@@ -571,7 +571,7 @@ describe('sasjs doc', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(shell, 'exec').mockReturnValueOnce({
+                    jest.spyOn(shell, 'execFile').mockReturnValueOnce({
                         code: 1,
                         stderr: 'command not found',
                         stdout: ''

package/build/commands/fs/fsCommand.js

@@ -107,6 +107,11 @@ var targetCommand_1 = require("../../types/command/targetCommand");
 var utils_1 = require("../../utils");
 var path_1 = __importDefault(require("path"));
 var utils_2 = require("@sasjs/utils");
+// The hash and sync helpers live in the fs subpath. The barrel no longer
+// re-exports them, because it is the only module in @sasjs/utils that imports
+// crypto, which put the whole AES/RSA/ECDSA polyfill suite into every browser
+// bundle that imported anything from the barrel (sasjs/utils#275, #283).
+var fs_1 = require("@sasjs/utils/fs");
 var executeCode_1 = require("./internal/executeCode");
 var FsSubCommand;
 (function (FsSubCommand) {
@@ -269,7 +274,7 @@ var FSCommand = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.getOutputPath()];
                     case 2:
                         outputPath = _a.sent();
-                        return [4 /*yield*/, (0, utils_2.generateCompileProgram)(folderPath)];
+                        return [4 /*yield*/, (0, fs_1.generateCompileProgram)(folderPath)];
                     case 3:
                         programContent = _a.sent();
                         return [4 /*yield*/, (0, utils_2.createFile)(outputPath, programContent)
@@ -306,7 +311,7 @@ var FSCommand = /** @class */ (function (_super) {
                     case 3:
                         _f.trys.push([3, 7, , 9]);
                         (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info('generating compile program');
-                        return [4 /*yield*/, (0, utils_2.generateCompileProgram)(localFolderPath)];
+                        return [4 /*yield*/, (0, fs_1.generateCompileProgram)(localFolderPath)];
                     case 4:
                         code = _f.sent();
                         (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info('setting fsTaregt at the start of compiled program');
@@ -383,7 +388,7 @@ var FSCommand = /** @class */ (function (_super) {
                                     case 2:
                                         _v.trys.push([2, 15, , 17]);
                                         (_h = process.logger) === null || _h === void 0 ? void 0 : _h.info('generating program to get remote hash');
-                                        return [4 /*yield*/, (0, utils_2.generateProgramToGetRemoteHash)(obj.remote)];
+                                        return [4 /*yield*/, (0, fs_1.generateProgramToGetRemoteHash)(obj.remote)];
                                     case 3:
                                         program = _v.sent();
                                         return [4 /*yield*/, createProgramFile(program, path_1.default.join(outputFolder, 'getRemoteHash.sas'))];
@@ -397,12 +402,12 @@ var FSCommand = /** @class */ (function (_super) {
                                     case 6:
                                         _v.sent();
                                         (_k = process.logger) === null || _k === void 0 ? void 0 : _k.info('extracting hashes from log');
-                                        remoteHashes = (0, utils_2.extractHashArray)(log);
+                                        remoteHashes = (0, fs_1.extractHashArray)(log);
                                         return [4 /*yield*/, createHashFile(JSON.stringify(remoteHashes, null, 2), path_1.default.join(outputFolder, 'hashesBeforeSync.json'))];
                                     case 7:
                                         _v.sent();
                                         (_l = process.logger) === null || _l === void 0 ? void 0 : _l.info('creating the hash of local folder');
-                                        return [4 /*yield*/, (0, utils_2.getHash)((0, utils_2.getAbsolutePath)(obj.local, process.projectDir))];
+                                        return [4 /*yield*/, (0, fs_1.getHash)((0, utils_2.getAbsolutePath)(obj.local, process.projectDir))];
                                     case 8:
                                         localHash = _v.sent();
                                         remoteHashMap_1 = remoteHashes.reduce(function (map, item) {
@@ -417,12 +422,12 @@ var FSCommand = /** @class */ (function (_super) {
                                             return [2 /*return*/, { value: command_1.ReturnCode.Success }];
                                         }
                                         (_o = process.logger) === null || _o === void 0 ? void 0 : _o.info('Extract differences from local and remote hash');
-                                        hashedDiff = (0, utils_2.compareHashes)(localHash, remoteHashMap_1);
+                                        hashedDiff = (0, fs_1.compareHashes)(localHash, remoteHashMap_1);
                                         return [4 /*yield*/, createHashFile(JSON.stringify(hashedDiff, null, 2), path_1.default.join(outputFolder, 'hashesDiff.json'))];
                                     case 9:
                                         _v.sent();
                                         (_p = process.logger) === null || _p === void 0 ? void 0 : _p.info('generating program to sync differences');
-                                        return [4 /*yield*/, (0, utils_2.generateProgramToSyncHashDiff)(hashedDiff, obj.remote)];
+                                        return [4 /*yield*/, (0, fs_1.generateProgramToSyncHashDiff)(hashedDiff, obj.remote)];
                                     case 10:
                                         syncProgram = _v.sent();
                                         return [4 /*yield*/, createProgramFile(syncProgram, path_1.default.join(outputFolder, 'syncProgram.sas'))];
@@ -435,7 +440,7 @@ var FSCommand = /** @class */ (function (_super) {
                                         return [4 /*yield*/, (0, utils_1.saveLog)(syncLog, path_1.default.join(outputFolder, 'sync.log'), '', false)];
                                     case 13:
                                         _v.sent();
-                                        syncedHash = (0, utils_2.extractHashArray)(syncLog);
+                                        syncedHash = (0, fs_1.extractHashArray)(syncLog);
                                         return [4 /*yield*/, createHashFile(JSON.stringify(syncedHash, null, 2), path_1.default.join(outputFolder, 'hashesAfterSync.json'))];
                                     case 14:
                                         _v.sent();
@@ -459,7 +464,7 @@ var FSCommand = /** @class */ (function (_super) {
                                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.log("* ".concat(item));
                                             });
                                         }
-                                        resourcesNotPresentLocally = (0, utils_2.findResourcesNotPresentLocally)(localHash, syncedHashMap);
+                                        resourcesNotPresentLocally = (0, fs_1.findResourcesNotPresentLocally)(localHash, syncedHashMap);
                                         if (resourcesNotPresentLocally.length) {
                                             (_s = process.logger) === null || _s === void 0 ? void 0 : _s.log('The following resources are present in remote directory but not in local:');
                                             resourcesNotPresentLocally.forEach(function (item) {

package/build/utils/config.d.ts

@@ -23,6 +23,13 @@ export declare function findTargetInConfiguration(targetName: string, targetScop
 export declare function getGlobalRcFile(): Promise<any>;
 export declare function getLocalRcFile(): Promise<Configuration | null>;
 export declare function saveGlobalRcFile(content: string): Promise<string>;
+/**
+ * Saves a target to the global SASjs config.
+ *
+ * `saveWithDefaultValues` defaults to false, so omitting it persists a minimal
+ * target - the mandatory attributes only. Pass true to write the full set of
+ * injected defaults, including a deployConfig the caller never declared.
+ */
 export declare function saveToGlobalConfig(target: Target, isDefault?: boolean, saveWithDefaultValues?: boolean): Promise<string>;
 export declare function removeFromGlobalConfig(targetName: string): Promise<void>;
 export declare function removeFromLocalConfig(targetName: string): Promise<void>;
@@ -33,6 +40,13 @@ export declare function getLocalOrGlobalConfig(): Promise<{
 }>;
 export declare function getSyncDirectories(target: Target, isLocal: boolean): Promise<SyncDirectoryMap[]>;
 export declare function saveLocalConfigFile(content: string): Promise<string>;
+/**
+ * Saves a target to the project's local sasjsconfig.json.
+ *
+ * `saveWithDefaultValues` defaults to false, so omitting it persists a minimal
+ * target - the mandatory attributes only. Pass true to write the full set of
+ * injected defaults, including a deployConfig the caller never declared.
+ */
 export declare function saveToLocalConfig(target: Target, isDefault?: boolean, saveWithDefaultValues?: boolean): Promise<string>;
 export declare function getFolders(): Promise<any>;
 /**

package/build/utils/config.js

@@ -447,12 +447,19 @@ function saveGlobalRcFile(content) {
         });
     });
 }
+/**
+ * Saves a target to the global SASjs config.
+ *
+ * `saveWithDefaultValues` defaults to false, so omitting it persists a minimal
+ * target - the mandatory attributes only. Pass true to write the full set of
+ * injected defaults, including a deployConfig the caller never declared.
+ */
 function saveToGlobalConfig(target_1) {
     return __awaiter(this, arguments, void 0, function (target, isDefault, saveWithDefaultValues) {
         var globalConfig, targetJson, existingTargetIndex;
         var _a;
         if (isDefault === void 0) { isDefault = false; }
-        if (saveWithDefaultValues === void 0) { saveWithDefaultValues = true; }
+        if (saveWithDefaultValues === void 0) { saveWithDefaultValues = false; }
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0: return [4 /*yield*/, getGlobalRcFile()];
@@ -606,12 +613,19 @@ function saveLocalConfigFile(content) {
         });
     });
 }
+/**
+ * Saves a target to the project's local sasjsconfig.json.
+ *
+ * `saveWithDefaultValues` defaults to false, so omitting it persists a minimal
+ * target - the mandatory attributes only. Pass true to write the full set of
+ * injected defaults, including a deployConfig the caller never declared.
+ */
 function saveToLocalConfig(target_1) {
     return __awaiter(this, arguments, void 0, function (target, isDefault, saveWithDefaultValues) {
         var targetJson, config, existingTargetIndex, configPath;
         var _a, _b;
         if (isDefault === void 0) { isDefault = false; }
-        if (saveWithDefaultValues === void 0) { saveWithDefaultValues = true; }
+        if (saveWithDefaultValues === void 0) { saveWithDefaultValues = false; }
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:

package/build/utils/shell.d.ts

@@ -17,15 +17,27 @@ export interface ShellResult {
     stderr: string;
     code: number;
 }
+export interface ExecOptions {
+    /**
+     * Whether the command's output also reaches this process's streams, which is
+     * how shelljs' option of the same name behaved.
+     */
+    silent?: boolean;
+    /** Extra variables for the child, on top of this process's environment. */
+    env?: NodeJS.ProcessEnv;
+}
+/** Runs a command through the platform shell. */
+export declare const exec: (command: string, options?: ExecOptions) => ShellResult;
 /**
- * Runs a command through the platform shell.
+ * Runs an executable with an argument array, without a shell.
  *
- * `silent` decides whether the command's output also reaches this process's
- * streams, which is how shelljs' option of the same name behaved.
+ * `exec` hands its command to a shell, which re-parses everything in it: a path
+ * containing a quote, `$` or `&` changes the command's meaning, and a variable
+ * assigned on the command line is no different - on Windows the assignment form
+ * does not even quote the value. Arguments and `env` given here are passed to
+ * the child as they are, so they are safe whatever they contain.
  */
-export declare const exec: (command: string, options?: {
-    silent?: boolean;
-}) => ShellResult;
+export declare const execFile: (command: string, args: string[], options?: ExecOptions) => ShellResult;
 /**
  * Copies the contents of a folder into another folder, matching
  * `cp -r <source>/. <destination>`.

package/build/utils/shell.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __values = (this && this.__values) || function(o) {
     var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
@@ -14,28 +25,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.which = exports.ls = exports.rm = exports.cp = exports.exec = void 0;
+exports.which = exports.ls = exports.rm = exports.cp = exports.execFile = exports.exec = void 0;
 var child_process_1 = require("child_process");
 var fs_1 = __importDefault(require("fs"));
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
 /**
- * Runs a command through the platform shell.
- *
- * `silent` decides whether the command's output also reaches this process's
- * streams, which is how shelljs' option of the same name behaved.
+ * The options both runners share. shelljs allowed 20MB of output; spawnSync's
+ * 1MB default kills a chatty command mid-run, and a deploy script can easily be
+ * chatty.
  */
-var exec = function (command, options) {
+var spawnOptions = function (options) { return ({
+    encoding: 'utf8',
+    stdio: ['ignore', 'pipe', 'pipe'],
+    maxBuffer: 20 * 1024 * 1024,
+    env: options.env ? __assign(__assign({}, process.env), options.env) : undefined
+}); };
+/** The result both runners answer with, from one place. */
+var toShellResult = function (result, options) {
     var _a, _b, _c;
-    if (options === void 0) { options = {}; }
-    var result = (0, child_process_1.spawnSync)(command, {
-        shell: true,
-        encoding: 'utf8',
-        stdio: ['ignore', 'pipe', 'pipe'],
-        // shelljs allowed 20MB of output; spawnSync's 1MB default kills a chatty
-        // command mid-run, and a deploy script can easily be chatty.
-        maxBuffer: 20 * 1024 * 1024
-    });
     var stdout = (_a = result.stdout) !== null && _a !== void 0 ? _a : '';
     var stderr = (_b = result.stderr) !== null && _b !== void 0 ? _b : '';
     if (!options.silent) {
@@ -56,7 +64,26 @@ var exec = function (command, options) {
     }
     return { stdout: stdout, stderr: stderr, code: (_c = result.status) !== null && _c !== void 0 ? _c : 0 };
 };
+/** Runs a command through the platform shell. */
+var exec = function (command, options) {
+    if (options === void 0) { options = {}; }
+    return toShellResult((0, child_process_1.spawnSync)(command, __assign(__assign({}, spawnOptions(options)), { shell: true })), options);
+};
 exports.exec = exec;
+/**
+ * Runs an executable with an argument array, without a shell.
+ *
+ * `exec` hands its command to a shell, which re-parses everything in it: a path
+ * containing a quote, `$` or `&` changes the command's meaning, and a variable
+ * assigned on the command line is no different - on Windows the assignment form
+ * does not even quote the value. Arguments and `env` given here are passed to
+ * the child as they are, so they are safe whatever they contain.
+ */
+var execFile = function (command, args, options) {
+    if (options === void 0) { options = {}; }
+    return toShellResult((0, child_process_1.spawnSync)(command, args, spawnOptions(options)), options);
+};
+exports.execFile = execFile;
 /**
  * Copies the contents of a folder into another folder, matching
  * `cp -r <source>/. <destination>`.

package/build/utils/spec/config.spec.js

@@ -770,6 +770,61 @@ describe('saveToGlobalConfig', function () {
             }
         });
     }); });
+    it('should persist the target with injected defaults when saveWithDefaultValues is true', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var appName, target, config, configTarget;
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    appName = 'cli-tests-config-' + (0, test_1.generateUniqueTimestamp)();
+                    target = (0, test_1.generateTestTarget)(appName, "/Public/app/cli-tests/".concat(appName));
+                    return [4 /*yield*/, (0, config_1.saveToGlobalConfig)(target, true, true)];
+                case 1:
+                    _b.sent();
+                    return [4 /*yield*/, (0, config_1.getGlobalRcFile)()];
+                case 2:
+                    config = (_b.sent());
+                    configTarget = (_a = config.targets) === null || _a === void 0 ? void 0 : _a.find(function (t) { return t.name === target.name; });
+                    expect(configTarget).toBeTruthy();
+                    expect(configTarget === null || configTarget === void 0 ? void 0 : configTarget.deployConfig).toBeTruthy();
+                    return [4 /*yield*/, (0, config_1.removeFromGlobalConfig)(target.name)];
+                case 3:
+                    _b.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should persist a minimal target when saveWithDefaultValues is false', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var appName, target, config, configTarget;
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    appName = 'cli-tests-config-' + (0, test_1.generateUniqueTimestamp)();
+                    target = new utils_1.Target({
+                        name: appName,
+                        serverUrl: 'http://test.sasjs',
+                        appLoc: "/Public/app/cli-tests/".concat(appName),
+                        serverType: utils_1.ServerType.SasViya
+                    });
+                    return [4 /*yield*/, (0, config_1.saveToGlobalConfig)(target, true)];
+                case 1:
+                    _b.sent();
+                    return [4 /*yield*/, (0, config_1.getGlobalRcFile)()];
+                case 2:
+                    config = (_b.sent());
+                    expect(config.defaultTarget).toEqual(target.name);
+                    configTarget = (_a = config.targets) === null || _a === void 0 ? void 0 : _a.find(function (t) { return t.name === target.name; });
+                    expect(configTarget).toBeTruthy();
+                    expect(configTarget === null || configTarget === void 0 ? void 0 : configTarget.deployConfig).toBeFalsy();
+                    expect(configTarget === null || configTarget === void 0 ? void 0 : configTarget.buildConfig).toBeFalsy();
+                    return [4 /*yield*/, (0, config_1.removeFromGlobalConfig)(target.name)];
+                case 3:
+                    _b.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('should not set the target as default when isDefault is false', function () { return __awaiter(void 0, void 0, void 0, function () {
         var appName, target, config, configTarget;
         var _a;
@@ -922,6 +977,60 @@ describe('saveToLocalConfig', function () {
             }
         });
     }); });
+    it('should persist the target with injected defaults when saveWithDefaultValues is true', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var appName, target, config, configTarget;
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    appName = 'cli-tests-cb-' + (0, test_1.generateUniqueTimestamp)();
+                    target = (0, test_1.generateTestTarget)(appName, "/Public/app/cli-tests/".concat(appName));
+                    return [4 /*yield*/, (0, config_1.saveToLocalConfig)(target, true, true)];
+                case 1:
+                    _b.sent();
+                    return [4 /*yield*/, (0, config_1.getLocalConfig)()];
+                case 2:
+                    config = (_b.sent());
+                    configTarget = (_a = config.targets) === null || _a === void 0 ? void 0 : _a.find(function (t) { return t.name === target.name; });
+                    expect(configTarget).toBeTruthy();
+                    expect(configTarget === null || configTarget === void 0 ? void 0 : configTarget.deployConfig).toBeTruthy();
+                    return [4 /*yield*/, (0, config_1.removeFromLocalConfig)(target.name)];
+                case 3:
+                    _b.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should persist a minimal target when saveWithDefaultValues is omitted', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var appName, target, config, configTarget;
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    appName = 'cli-tests-cb-' + (0, test_1.generateUniqueTimestamp)();
+                    target = new utils_1.Target({
+                        name: appName,
+                        serverUrl: 'http://test.sasjs',
+                        appLoc: "/Public/app/cli-tests/".concat(appName),
+                        serverType: utils_1.ServerType.SasViya
+                    });
+                    return [4 /*yield*/, (0, config_1.saveToLocalConfig)(target, true)];
+                case 1:
+                    _b.sent();
+                    return [4 /*yield*/, (0, config_1.getLocalConfig)()];
+                case 2:
+                    config = (_b.sent());
+                    configTarget = (_a = config.targets) === null || _a === void 0 ? void 0 : _a.find(function (t) { return t.name === target.name; });
+                    expect(configTarget).toBeTruthy();
+                    expect(configTarget === null || configTarget === void 0 ? void 0 : configTarget.deployConfig).toBeFalsy();
+                    expect(configTarget === null || configTarget === void 0 ? void 0 : configTarget.buildConfig).toBeFalsy();
+                    return [4 /*yield*/, (0, config_1.removeFromLocalConfig)(target.name)];
+                case 3:
+                    _b.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('should not set the target as default when isDefault is false', function () { return __awaiter(void 0, void 0, void 0, function () {
         var appName, target, config, configTarget;
         var _a;

package/build/utils/spec/shell.spec.js

@@ -54,6 +54,33 @@ describe('shell', function () {
             expect(result.stdout.length).toEqual(3 * 1024 * 1024);
         });
     });
+    describe('execFile', function () {
+        // The values below are the point: a shell would interpret each of them -
+        // `&` and `;` separate commands, `$(...)` and backticks substitute, `'`
+        // closes a quote - and on Windows the `set NAME=value` form does not quote
+        // the value at all. Nothing here is parsed, so each arrives intact.
+        var metacharacters = "a'b&c;$(echo pwned)`id`|d>e";
+        it('should answer with stdout for an executable run with an argument array', function () {
+            var result = (0, shell_1.execFile)(process.execPath, ['-e', "process.stdout.write('hello')"], { silent: true });
+            expect(result.stdout).toEqual('hello');
+            expect(result.code).toEqual(0);
+        });
+        it('should pass an argument through without the shell interpreting it', function () {
+            var result = (0, shell_1.execFile)(process.execPath, ['-e', 'process.stdout.write(process.argv[1])', metacharacters], { silent: true });
+            expect(result.stdout).toEqual(metacharacters);
+            expect(result.code).toEqual(0);
+        });
+        it('should pass an environment value through without the shell interpreting it', function () {
+            var result = (0, shell_1.execFile)(process.execPath, ['-e', 'process.stdout.write(process.env.PROBE)'], { silent: true, env: { PROBE: metacharacters } });
+            expect(result.stdout).toEqual(metacharacters);
+            expect(result.code).toEqual(0);
+        });
+        it('should answer with the exit code and stderr for an executable that fails', function () {
+            var result = (0, shell_1.execFile)(process.execPath, ['-e', "process.stderr.write('boom'); process.exit(3)"], { silent: true });
+            expect(result.code).toEqual(3);
+            expect(result.stderr).toContain('boom');
+        });
+    });
     describe('ls', function () {
         beforeEach(function () {
             fs_1.default.mkdirSync(path_1.default.join(root, 'sasjs-react-seed-app-main'));

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

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 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) {
@@ -273,24 +262,6 @@ describe('utils', function () {
             });
         });
     });
-    describe('checkNodeVersion', function () {
-        afterEach(function () {
-            jest.resetAllMocks();
-        });
-        it('should exit the process when node version is less than 12', function () {
-            var originalProcess = global.process;
-            global.process = __assign(__assign({}, originalProcess), { versions: __assign(__assign({}, originalProcess.versions), { node: '11.0.0' }) });
-            var mockExit = (0, test_1.mockProcessExit)();
-            (0, utils_1.checkNodeVersion)();
-            expect(mockExit).toHaveBeenCalledWith(1);
-            global.process = originalProcess;
-        });
-        it('should not exit the process when node version greater than 12', function () {
-            jest.spyOn(process, 'exit');
-            (0, utils_1.checkNodeVersion)();
-            expect(process.exit).toHaveBeenCalledTimes(0);
-        });
-    });
     describe('getAdapterInstance', function () {
         it('should throw an error when target is not valid', function () {
             expect(function () { return (0, utils_1.getAdapterInstance)(null); }).toThrow('Unable to create SASjs adapter instance: Invalid target.');

package/build/utils/spec/zip.spec.js

@@ -84,6 +84,32 @@ var setEntryPlatform = function (zipPath, platform) {
     }
     fs_1.default.writeFileSync(zipPath, buffer);
 };
+/**
+ * Rewrites an entry name in the archive bytes, in both the local file header
+ * and the central directory record.
+ *
+ * yazl refuses to create an entry whose name is absolute or contains `..`, so
+ * a traversal entry has to be patched in after the fact. The replacement must
+ * be the same length as the original: both records carry the name length, and
+ * changing it would move every offset that follows.
+ */
+var replaceEntryName = function (zipPath, from, to) {
+    if (from.length !== to.length)
+        throw new Error('the replacement name must be the same length');
+    var buffer = fs_1.default.readFileSync(zipPath);
+    var fromBuffer = Buffer.from(from, 'utf8');
+    var toBuffer = Buffer.from(to, 'utf8');
+    var index = buffer.indexOf(fromBuffer);
+    var replaced = 0;
+    while (index !== -1) {
+        toBuffer.copy(buffer, index);
+        replaced++;
+        index = buffer.indexOf(fromBuffer, index + 1);
+    }
+    if (!replaced)
+        throw new Error("entry name not found in the archive: ".concat(from));
+    fs_1.default.writeFileSync(zipPath, buffer);
+};
 describe('zip', function () {
     var tmpRoot = path_1.default.join(__dirname, "zip-spec-".concat((0, test_1.generateUniqueTimestamp)()));
     var destDir = path_1.default.join(tmpRoot, 'dest');
@@ -279,5 +305,33 @@ describe('zip', function () {
                 }
             });
         }); });
+        /**
+         * The safety of `path.join(destDir, entry.fileName)` rests on the entry
+         * name never containing `..` or a leading slash. That is yauzl's
+         * validateFileName, which only runs because the reader is opened with
+         * decodeStrings - so the property is pinned here rather than left to the
+         * comment that documents it.
+         */
+        it('should refuse an entry whose name traverses out of the destination', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var zipPath;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        zipPath = path_1.default.join(tmpRoot, 'traversal.zip');
+                        return [4 /*yield*/, makeZip([{ name: 'aa/evil.txt', content: 'pwned' }], zipPath)];
+                    case 1:
+                        _a.sent();
+                        replaceEntryName(zipPath, 'aa/evil.txt', '../evil.txt');
+                        return [4 /*yield*/, expect((0, zip_1.extractZip)(zipPath, destDir)).rejects.toThrow()
+                            // destDir/../evil.txt resolves to tmpRoot/evil.txt
+                        ];
+                    case 2:
+                        _a.sent();
+                        // destDir/../evil.txt resolves to tmpRoot/evil.txt
+                        expect(fs_1.default.existsSync(path_1.default.join(tmpRoot, 'evil.txt'))).toBeFalse();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
     });
 });

package/build/utils/utils.d.ts

@@ -30,7 +30,6 @@ export declare function parseLogLines(logJson: LogJson): string;
 export declare function convertToSASStatements(json: MacroVars): string;
 export declare const arrToObj: (arr: any[]) => any;
 export declare const millisecondsToDdHhMmSs: (milliseconds: number) => string;
-export declare function checkNodeVersion(): void;
 export declare function getAdapterInstance(target: Target): SASjs;
 export declare function displaySasjsRunnerError(username: string): void;
 export declare const loadEnvVariables: (fileName: string) => Promise<void>;

package/build/utils/utils.js

@@ -106,7 +106,6 @@ exports.executeShellScript = executeShellScript;
 exports.executePowerShellScript = executePowerShellScript;
 exports.parseLogLines = parseLogLines;
 exports.convertToSASStatements = convertToSASStatements;
-exports.checkNodeVersion = checkNodeVersion;
 exports.getAdapterInstance = getAdapterInstance;
 exports.displaySasjsRunnerError = displaySasjsRunnerError;
 exports.prefixAppLoc = prefixAppLoc;
@@ -646,15 +645,6 @@ var millisecondsToDdHhMmSs = function (milliseconds) {
     return "".concat(days, " day(s); ").concat(hours, " hour(s); ").concat(minutes, " minute(s); ").concat(seconds, " second(s)");
 };
 exports.millisecondsToDdHhMmSs = millisecondsToDdHhMmSs;
-function checkNodeVersion() {
-    var _a;
-    var nodeVersion = process.versions.node;
-    var majorVersion = parseInt(nodeVersion.substr(0, 2));
-    if (majorVersion < 12) {
-        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('SASjs CLI requires at least NodeJS version 12. Please upgrade NodeJS and try again.');
-        process.exit(1);
-    }
-}
 function getAdapterInstance(target) {
     if (!target) {
         throw new Error('Unable to create SASjs adapter instance: Invalid target.');

package/package.json

@@ -2,15 +2,13 @@
   "name": "@sasjs/cli",
   "description": "Command line interface for SASjs",
   "engines": {
-    "node": "^14.18.0 || >=16.10.0"
+    "node": ">=22"
   },
   "main": "index.js",
   "files": [
     "build/**/*"
   ],
   "scripts": {
-    "nodeVersionMessage": "echo \u001b[33m make sure you are running node lts version \u001b[0m",
-    "checkNodeVersion": "node -e \"console.log('\\u001b[36m', 'Checking your Node.js version...'); const v = process.versions && process.versions.node; const ok = v && (() => { const [m, n] = v.split('.').map(Number); if (m === 14) return n >= 18; if (m === 15) return false; if (m === 16) return n >= 10; return m > 16 })(); if (!ok) { console.log('\\u001b[31m', '\\u274c You must be running Node.js ^14.18.0 || >=16.10.0 to install SASjs CLI.\\nYour current version is ' + v + '.\\nPlease install a more recent version and try again.'); process.exit(1) } else { console.log('\\u001b[32m', '\\u2705 Node.js version check passed. Continuing...') } console.log('\\u001b[0m', '');\"",
     "start:ci": "npm run build && npm run set:permissions",
     "start": "nodemon --watch \"src/**/*\" --exec \"npm run build && npm run set:permissions\"",
     "set:permissions": "node -e \"require('fs').chmodSync('build/index.js', '755')\"",
@@ -71,16 +69,15 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@sasjs/adapter": "4.19.2",
-    "@sasjs/core": "5.3.0",
-    "@sasjs/lint": "4.1.2",
-    "@sasjs/utils": "3.6.5",
+    "@sasjs/adapter": "5.1.1",
+    "@sasjs/core": "5.5.2",
+    "@sasjs/lint": "4.1.4",
+    "@sasjs/utils": "4.0.1",
+    "axios": "1.20.0",
     "chalk": "4.1.2",
-    "dotenv": "17.4.2",
-    "js-base64": "3.9.3",
+    "dotenv": "18.0.8",
+    "js-base64": "3.9.4",
     "jsdom": "26.0.0",
-    "jwt-decode": "3.1.2",
-    "lodash.groupby": "4.6.0",
     "lodash.uniqby": "4.7.0",
     "node-graphviz": "0.1.1",
     "node-powershell": "5.0.1",
@@ -101,7 +98,6 @@
     "@types/find": "0.2.4",
     "@types/jest": "30.0.0",
     "@types/jsdom": "21.1.1",
-    "@types/lodash.groupby": "4.6.9",
     "@types/lodash.uniqby": "4.7.9",
     "@types/node": "22.10.2",
     "@types/prompts": "2.4.9",
@@ -109,17 +105,16 @@
     "@types/xml": "1.0.11",
     "@types/yauzl": "3.4.0",
     "@types/yazl": "3.3.1",
-    "babel-jest": "30.5.1",
+    "babel-jest": "30.5.2",
     "copyfiles": "2.4.1",
-    "jest": "30.5.1",
-    "jest-cli": "30.5.1",
-    "jest-environment-jsdom": "30.5.1",
-    "jest-extended": "4.0.2",
+    "jest": "30.5.2",
+    "jest-cli": "30.5.2",
+    "jest-environment-jsdom": "30.5.2",
+    "jest-extended": "7.0.0",
     "nodemon": "3.1.14",
-    "prettier": "3.9.6",
-    "ts-jest": "29.4.12",
+    "prettier": "3.9.10",
+    "ts-jest": "29.4.15",
     "ts-node": "10.9.2",
-    "tslib": "2.8.1",
     "typescript": "5.9.3",
     "util": "0.12.5"
   },
@@ -127,5 +122,5 @@
     "ws": "8.21.0",
     "nanoid": "3.3.18"
   },
-  "version": "4.20.9"
+  "version": "5.0.3"
 }