@sasjs/cli 4.20.6 → 4.20.7

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

@@ -343,7 +343,7 @@ describe('utils', function () {
         });
     });
     describe('loadEnvVariables', function () {
-        var fileName = ".env.".concat((0, utils_2.generateTimestamp)());
+        var fileName = ".env.".concat((0, test_1.generateUniqueTimestamp)());
         var filePath = path_1.default.join(process.projectDir, fileName);
         beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
             var fileContent;
@@ -426,7 +426,7 @@ describe('utils', function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        projectDir = path_1.default.join(__dirname, "is-sasjs-project-".concat((0, utils_2.generateTimestamp)()));
+                        projectDir = path_1.default.join(__dirname, "is-sasjs-project-".concat((0, test_1.generateUniqueTimestamp)()));
                         originalProjectDir = process.projectDir;
                         return [4 /*yield*/, (0, utils_2.createFolder)(path_1.default.join(projectDir, 'sasjs'))];
                     case 1:
@@ -451,7 +451,7 @@ describe('utils', function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        projectDir = path_1.default.join(require('os').tmpdir(), "not-a-sasjs-project-".concat((0, utils_2.generateTimestamp)()));
+                        projectDir = path_1.default.join(require('os').tmpdir(), "not-a-sasjs-project-".concat((0, test_1.generateUniqueTimestamp)()));
                         originalProjectDir = process.projectDir;
                         return [4 /*yield*/, (0, utils_2.createFolder)(projectDir)];
                     case 1:
@@ -498,8 +498,8 @@ describe('utils', function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        fakeModuleName = "sasjs-test-fake-module-".concat((0, utils_2.generateTimestamp)());
-                        fromDir = path_1.default.join(require('os').tmpdir(), "getNodeModulePath-".concat((0, utils_2.generateTimestamp)()));
+                        fakeModuleName = "sasjs-test-fake-module-".concat((0, test_1.generateUniqueTimestamp)());
+                        fromDir = path_1.default.join(require('os').tmpdir(), "getNodeModulePath-".concat((0, test_1.generateUniqueTimestamp)()));
                         fakeModuleDir = path_1.default.join(fromDir, 'node_modules', fakeModuleName);
                         return [4 /*yield*/, (0, utils_2.createFolder)(fakeModuleDir)];
                     case 1:

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

@@ -43,6 +43,7 @@ var fs_1 = __importDefault(require("fs"));
 var path_1 = __importDefault(require("path"));
 var yazl_1 = __importDefault(require("yazl"));
 var utils_1 = require("@sasjs/utils");
+var test_1 = require("../test");
 var zip_1 = require("../zip");
 var utils_2 = require("@sasjs/utils");
 var makeZip = function (entries, zipPath) {
@@ -84,7 +85,7 @@ var setEntryPlatform = function (zipPath, platform) {
     fs_1.default.writeFileSync(zipPath, buffer);
 };
 describe('zip', function () {
-    var tmpRoot = path_1.default.join(__dirname, "zip-spec-".concat((0, utils_2.generateTimestamp)()));
+    var tmpRoot = path_1.default.join(__dirname, "zip-spec-".concat((0, test_1.generateUniqueTimestamp)()));
     var destDir = path_1.default.join(tmpRoot, 'dest');
     beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {

package/build/utils/test.d.ts

@@ -1,6 +1,16 @@
 import { ServerType, Target, TargetJson, Configuration } from '@sasjs/utils/types';
 import { Folder } from '../types';
 import { ServiceConfig, JobConfig } from '@sasjs/utils/types/config';
+/**
+ * A name for a test app or output folder that two specs cannot collide on.
+ *
+ * `generateTimestamp()` is second-resolution - year, month, day, hour, minute,
+ * second, and nothing finer - so two specs in one directory starting within the
+ * same second build the same folder name and clobber each other, which is what
+ * the docs specs do whenever jest runs them in parallel. The milliseconds and a
+ * short random suffix make that impossible while keeping the name readable.
+ */
+export declare const generateUniqueTimestamp: () => string;
 export declare const createTestApp: (parentFolder: string, appName: string) => Promise<void>;
 export declare const createTestJobsApp: (parentFolder: string, appName: string) => Promise<void>;
 export declare const createTestMinimalApp: (parentFolder: string, appName: string) => Promise<void>;

package/build/utils/test.js

@@ -75,7 +75,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyGitNotPresent = exports.verifyCompiledJob = exports.verifyCompiledService = exports.verifyDotFilesNotGenerated = exports.verifyDotFiles = exports.verifyDocs = exports.updateConfig = exports.updateTarget = exports.removeAllTargetsFromConfigs = exports.verifyPackageJsonContent = exports.verifyFolder = exports.mockProcessExit = exports.verifyStep = exports.createTestGlobalTarget = exports.generateTestTarget = exports.removeTestServerFolder = exports.removeTestApp = exports.createTestMinimalApp = exports.createTestJobsApp = exports.createTestApp = void 0;
+exports.verifyGitNotPresent = exports.verifyCompiledJob = exports.verifyCompiledService = exports.verifyDotFilesNotGenerated = exports.verifyDotFiles = exports.verifyDocs = exports.updateConfig = exports.updateTarget = exports.removeAllTargetsFromConfigs = exports.verifyPackageJsonContent = exports.verifyFolder = exports.mockProcessExit = exports.verifyStep = exports.createTestGlobalTarget = exports.generateTestTarget = exports.removeTestServerFolder = exports.removeTestApp = exports.createTestMinimalApp = exports.createTestJobsApp = exports.createTestApp = exports.generateUniqueTimestamp = void 0;
 var path_1 = __importDefault(require("path"));
 var dotenv_1 = __importDefault(require("dotenv"));
 var utils_1 = require("@sasjs/utils");
@@ -89,6 +89,21 @@ var builtFiles_1 = require("./fileStructures/builtFiles");
 var builtFilesCustom1_1 = require("./fileStructures/builtFilesCustom1");
 var create_1 = require("../commands/create/create");
 var setConstants_1 = require("./setConstants");
+/**
+ * A name for a test app or output folder that two specs cannot collide on.
+ *
+ * `generateTimestamp()` is second-resolution - year, month, day, hour, minute,
+ * second, and nothing finer - so two specs in one directory starting within the
+ * same second build the same folder name and clobber each other, which is what
+ * the docs specs do whenever jest runs them in parallel. The milliseconds and a
+ * short random suffix make that impossible while keeping the name readable.
+ */
+var generateUniqueTimestamp = function () {
+    return "".concat((0, utils_1.generateTimestamp)(), "-").concat(Date.now() % 1000, "-").concat(Math.random()
+        .toString(36)
+        .slice(2, 7));
+};
+exports.generateUniqueTimestamp = generateUniqueTimestamp;
 var createTestApp = function (parentFolder, appName) { return __awaiter(void 0, void 0, void 0, function () {
     var _a;
     return __generator(this, function (_b) {

package/build/utils/utils.d.ts

@@ -1,4 +1,4 @@
-import { ShellString } from 'shelljs';
+import { ShellResult } from './shell';
 import { Target, MacroVars } from '@sasjs/utils';
 import SASjs from '@sasjs/adapter/node';
 import { LogJson } from '../types';
@@ -8,7 +8,7 @@ export declare function createReactApp(folderPath: string): Promise<void>;
 export declare function createAngularApp(folderPath: string): Promise<void>;
 export declare function createMinimalApp(folderPath: string): Promise<void>;
 export declare function createTemplateApp(folderPath: string, template: string): Promise<void>;
-export declare function downloadFile(url: string, filename?: string): ShellString;
+export declare function downloadFile(url: string, filename?: string): ShellResult;
 export declare function setupNpmProject(folderName: string): Promise<void>;
 export declare function setupGitIgnore(folderName: string): Promise<void>;
 export declare function setupDoxygen(folderPath: string): Promise<void>;

package/build/utils/utils.js

@@ -110,8 +110,10 @@ exports.checkNodeVersion = checkNodeVersion;
 exports.getAdapterInstance = getAdapterInstance;
 exports.displaySasjsRunnerError = displaySasjsRunnerError;
 exports.prefixAppLoc = prefixAppLoc;
-var shelljs_1 = __importDefault(require("shelljs"));
+var shell_1 = require("./shell");
 var node_powershell_1 = require("node-powershell");
+var fs_1 = __importDefault(require("fs"));
+var os_1 = __importDefault(require("os"));
 var path_1 = __importDefault(require("path"));
 var ora_1 = __importDefault(require("ora"));
 var axios_1 = __importDefault(require("axios"));
@@ -208,15 +210,17 @@ function createTemplateApp(folderPath, template) {
         var _this = this;
         return __generator(this, function (_a) {
             return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                    var probeFile, _a, stderr, code;
+                    var probeDir, probeFile, _a, stderr, code;
                     return __generator(this, function (_b) {
                         switch (_b.label) {
                             case 0:
-                                probeFile = 'response.txt';
+                                probeDir = fs_1.default.mkdtempSync(path_1.default.join(os_1.default.tmpdir(), 'sasjs-probe-'));
+                                probeFile = path_1.default.join(probeDir, 'response.txt');
                                 _a = downloadFile("https://username:password@github.com/sasjs/template_".concat(template), probeFile), stderr = _a.stderr, code = _a.code;
                                 return [4 /*yield*/, (0, utils_1.deleteFile)(probeFile).catch(function () { })];
                             case 1:
                                 _b.sent();
+                                (0, shell_1.rm)([probeDir], true);
                                 if (stderr.includes('404: Not Found') || code) {
                                     return [2 /*return*/, reject(new Error("Template \"".concat(template, "\" is not a SASjs template")))];
                                 }
@@ -242,43 +246,64 @@ function createTemplateApp(folderPath, template) {
  */
 function createApp(folderPath_1, repoUrl_1, docsUrl_1, errorCallback_1) {
     return __awaiter(this, arguments, void 0, function (folderPath, repoUrl, docsUrl, errorCallback, installDependencies) {
-        var zipName, zipPath, fullZipPath, spinner, _a, stdout, stderr, code, _b, stdout_1, stderr_1, code_1, zipWithoutExtension;
+        var zipName, zipPath, fullZipPath, spinner, workspace, _a, stderr, code, _b, stderr_1, code_1, zipWithoutExtension, extractedFolder, err_1;
+        var _c;
         if (installDependencies === void 0) { installDependencies = true; }
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
                     zipName = 'main.zip';
                     zipPath = "/archive/refs/heads/";
                     fullZipPath = "".concat(zipPath).concat(zipName);
                     spinner = (0, ora_1.default)("Creating SASjs project in ".concat(folderPath, "."));
                     spinner.start();
-                    _a = downloadFile("".concat(repoUrl).concat(fullZipPath), zipName), stdout = _a.stdout, stderr = _a.stderr, code = _a.code;
+                    workspace = fs_1.default.mkdtempSync(path_1.default.join(os_1.default.tmpdir(), 'sasjs-create-'));
+                    _a = downloadFile("".concat(repoUrl).concat(fullZipPath), path_1.default.join(workspace, zipName)), stderr = _a.stderr, code = _a.code;
                     // If doesn't exist, we try again, but with master.zip for the zip name.
                     // Since that's the name generated from branch name.
                     if (stderr.includes('404: Not Found') || code) {
                         zipName = 'master.zip';
-                        _b = downloadFile("".concat(repoUrl).concat(zipPath).concat(zipName), zipName), stdout_1 = _b.stdout, stderr_1 = _b.stderr, code_1 = _b.code;
+                        _b = downloadFile("".concat(repoUrl).concat(zipPath).concat(zipName), path_1.default.join(workspace, zipName)), stderr_1 = _b.stderr, code_1 = _b.code;
                         if (stderr_1.includes('404: Not Found') || code_1) {
+                            spinner.stop();
+                            (0, shell_1.rm)([workspace], true);
                             errorCallback("Could not download ".concat(repoUrl).concat(zipPath, "main.zip or master.zip - is ").concat(repoUrl, " a SASjs repository?"));
                             return [2 /*return*/];
                         }
                     }
                     zipWithoutExtension = zipName.replace('.zip', '');
-                    return [4 /*yield*/, (0, zip_1.extractZip)(zipName, "./", true)];
+                    _d.label = 1;
                 case 1:
-                    _c.sent();
-                    shelljs_1.default.cp('-r', "".concat(shelljs_1.default.ls('-d', "./*".concat(zipWithoutExtension))[0], "/."), folderPath);
-                    shelljs_1.default.rm('-rf', ["./*".concat(zipWithoutExtension)]);
-                    shelljs_1.default.rm('-rf', ["./".concat(zipName)]);
-                    return [4 /*yield*/, loadDocsSubmodule(docsUrl, folderPath, fullZipPath)];
+                    _d.trys.push([1, 5, 6, 7]);
+                    return [4 /*yield*/, (0, zip_1.extractZip)(path_1.default.join(workspace, zipName), workspace, true)];
                 case 2:
-                    _c.sent();
-                    shelljs_1.default.rm('-f', [path_1.default.join(folderPath, '.gitmodules')]);
+                    _d.sent();
+                    extractedFolder = (0, shell_1.ls)(path_1.default.join(workspace, "*".concat(zipWithoutExtension)))[0];
+                    if (!extractedFolder) {
+                        spinner.stop();
+                        return [2 /*return*/, errorCallback("Could not find the unzipped ".concat(zipWithoutExtension, " folder."))];
+                    }
+                    return [4 /*yield*/, (0, shell_1.cp)("".concat(extractedFolder, "/."), folderPath)];
+                case 3:
+                    _d.sent();
+                    return [4 /*yield*/, loadDocsSubmodule(docsUrl, folderPath, workspace, fullZipPath)];
+                case 4:
+                    _d.sent();
+                    (0, shell_1.rm)([path_1.default.join(folderPath, '.gitmodules')]);
+                    return [3 /*break*/, 7];
+                case 5:
+                    err_1 = _d.sent();
+                    spinner.stop();
+                    return [2 /*return*/, errorCallback((_c = err_1 === null || err_1 === void 0 ? void 0 : err_1.message) !== null && _c !== void 0 ? _c : String(err_1))];
+                case 6:
+                    (0, shell_1.rm)([workspace], true);
+                    return [7 /*endfinally*/];
+                case 7:
                     spinner.stop();
                     if (installDependencies) {
                         spinner.text = 'Installing dependencies...';
                         spinner.start();
-                        shelljs_1.default.exec("cd \"".concat(folderPath, "\" && npm install"), {
+                        (0, shell_1.exec)("cd \"".concat(folderPath, "\" && npm install"), {
                             silent: true
                         });
                         spinner.stop();
@@ -292,10 +317,11 @@ function createApp(folderPath_1, repoUrl_1, docsUrl_1, errorCallback_1) {
  * It will download and unzip `sasjs/docs` into newly created folder into `docs` subfolder
  * @param docsUrl sasjs/docs repo url
  * @param folderPath full path to the newly created folder that contains the seed app
+ * @param workspace directory this run unpacks into
  * @param zipPath fixed path of where github puts zip for repo download
  */
-var loadDocsSubmodule = function (docsUrl, folderPath, zipPath) { return __awaiter(void 0, void 0, void 0, function () {
-    var docsFolderPath;
+var loadDocsSubmodule = function (docsUrl, folderPath, workspace, zipPath) { return __awaiter(void 0, void 0, void 0, function () {
+    var docsFolderPath, docsWorkspace, docsFolder;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -305,36 +331,44 @@ var loadDocsSubmodule = function (docsUrl, folderPath, zipPath) { return __await
             case 1:
                 if (!(_a.sent()))
                     docsFolderPath = "".concat(folderPath, "/docs"); // If not, we load submodule in root
-                downloadFile("".concat(docsUrl).concat(zipPath), 'main.zip');
-                return [4 /*yield*/, (0, zip_1.extractZip)('main.zip', './', true)];
+                docsWorkspace = path_1.default.join(workspace, 'docs');
+                fs_1.default.mkdirSync(docsWorkspace, { recursive: true });
+                downloadFile("".concat(docsUrl).concat(zipPath), path_1.default.join(docsWorkspace, 'main.zip'));
+                return [4 /*yield*/, (0, zip_1.extractZip)(path_1.default.join(docsWorkspace, 'main.zip'), docsWorkspace, true)];
             case 2:
                 _a.sent();
-                shelljs_1.default.cp('-r', "".concat(shelljs_1.default.ls('-d', "./*-main")[0], "/."), docsFolderPath);
-                shelljs_1.default.rm('-rf', ["./*-main"]);
-                shelljs_1.default.rm('-rf', ["./main.zip"]);
+                docsFolder = (0, shell_1.ls)(path_1.default.join(docsWorkspace, '*-main'))[0];
+                if (!docsFolder) {
+                    throw new Error('Could not find the unzipped docs folder.');
+                }
+                return [4 /*yield*/, (0, shell_1.cp)("".concat(docsFolder, "/."), docsFolderPath)];
+            case 3:
+                _a.sent();
                 return [2 /*return*/];
         }
     });
 }); };
 function downloadFile(url, filename) {
-    if ((0, utils_1.isLinux)() && shelljs_1.default.which('wget')) {
+    if ((0, utils_1.isLinux)() && (0, shell_1.which)('wget')) {
         // -O <filename> writes to the given name; without it, wget defaults to the
         // remote URL's basename, which silently ignores the caller's `filename` and
         // can leave an unexpectedly-named file behind (e.g. a repo-existence probe
         // meant to be discarded as `response.txt` instead landing as the repo name).
-        return shelljs_1.default.exec("wget ".concat(url).concat(filename ? ' -O ' + filename : ''), {
+        return (0, shell_1.exec)("wget ".concat(url).concat(filename ? ' -O ' + filename : ''), {
             silent: true
         });
     }
     else if ((0, utils_1.isWindows)()) {
         // First We set TLS12 & then we invoke request to download file.
-        return shelljs_1.default.exec("powershell.exe \"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest ".concat(url, " ").concat(filename ? '-O ' + filename : '', "\""), { silent: true });
+        return (0, shell_1.exec)("powershell.exe \"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest ".concat(url, " ").concat(filename ? '-O ' + filename : '', "\""), { silent: true });
     }
     else {
         // curl, on macOS and on Linux hosts without wget. -o <filename> writes to
         // the given name; -O instead saves under the remote URL's basename, ignoring
         // `filename` - see the wget note above for the same issue.
-        return shelljs_1.default.exec("curl ".concat(url, " -L -f").concat(filename ? ' -o ' + filename : ' -O'), { silent: true });
+        return (0, shell_1.exec)("curl ".concat(url, " -L -f").concat(filename ? ' -o ' + filename : ' -O'), {
+            silent: true
+        });
     }
 }
 function setupNpmProject(folderName) {
@@ -353,7 +387,7 @@ function setupNpmProject(folderName) {
                                 isExistingProject = _d.sent();
                                 if (!isExistingProject) {
                                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Initialising NPM project in ".concat(folderPath));
-                                    shelljs_1.default.exec("cd \"".concat(folderPath, "\" && npm init --yes"), {
+                                    (0, shell_1.exec)("cd \"".concat(folderPath, "\" && npm init --yes"), {
                                         silent: true
                                     });
                                 }
@@ -361,7 +395,7 @@ function setupNpmProject(folderName) {
                                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.success('Existing NPM project detected.');
                                 }
                                 (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info('Installing @sasjs/core');
-                                shelljs_1.default.exec("cd \"".concat(folderPath, "\" && npm i @sasjs/core --save"), {
+                                (0, shell_1.exec)("cd \"".concat(folderPath, "\" && npm i @sasjs/core --save"), {
                                     silent: true
                                 });
                                 return [2 /*return*/, resolve()];
@@ -465,7 +499,7 @@ function executeShellScript(filePath, logFilePath) {
                         switch (_b.label) {
                             case 0:
                                 shellCommand = (0, utils_1.isWindows)() ? "".concat(filePath) : "bash ".concat(filePath);
-                                result = shelljs_1.default.exec(shellCommand, { silent: true });
+                                result = (0, shell_1.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));
                                 reject(result.code);

package/package.json

@@ -88,7 +88,6 @@
     "node-powershell": "5.0.1",
     "ora": "5.4.1",
     "prompts": "2.4.2",
-    "shelljs": "0.10.0",
     "ssl-root-cas": "1.3.1",
     "xml": "1.0.1",
     "yargs": "17.6.2",
@@ -107,7 +106,6 @@
     "@types/lodash.groupby": "4.6.9",
     "@types/lodash.uniqby": "4.7.9",
     "@types/node": "22.10.2",
-    "@types/shelljs": "0.8.10",
     "@types/url-parse": "1.4.11",
     "@types/xml": "1.0.11",
     "@types/yauzl": "3.4.0",
@@ -130,5 +128,5 @@
     "ws": "8.21.0",
     "nanoid": "3.3.18"
   },
-  "version": "4.20.6"
+  "version": "4.20.7"
 }