@sasjs/cli 4.20.4 → 4.20.5

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

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,68 @@
+"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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var shelljs_1 = __importDefault(require("shelljs"));
+var utils_1 = require("@sasjs/utils");
+var utils_2 = require("../utils");
+jest.mock('shelljs', function () { return ({
+    exec: jest.fn(function () { return ({ stdout: '', stderr: '', code: 0 }); }),
+    which: jest.fn()
+}); });
+jest.mock('@sasjs/utils', function () { return (__assign(__assign({}, jest.requireActual('@sasjs/utils')), { isLinux: jest.fn(), isWindows: jest.fn() })); });
+describe('downloadFile', function () {
+    var exec = shelljs_1.default.exec;
+    var which = shelljs_1.default.which;
+    var linux = utils_1.isLinux;
+    var windows = utils_1.isWindows;
+    beforeEach(function () {
+        jest.clearAllMocks();
+        exec.mockReturnValue({ stdout: '', stderr: '', code: 0 });
+    });
+    it('uses wget on linux when it is installed', function () {
+        linux.mockReturnValue(true);
+        windows.mockReturnValue(false);
+        which.mockReturnValue('/usr/bin/wget');
+        (0, utils_2.downloadFile)('https://example.com/main.zip', 'main.zip');
+        expect(exec).toHaveBeenCalledWith('wget https://example.com/main.zip -O main.zip', { silent: true });
+    });
+    it('falls back to curl on linux when wget is not installed', function () {
+        linux.mockReturnValue(true);
+        windows.mockReturnValue(false);
+        which.mockReturnValue(null);
+        (0, utils_2.downloadFile)('https://example.com/main.zip', 'main.zip');
+        expect(exec).toHaveBeenCalledWith('curl https://example.com/main.zip -L -f -o main.zip', { silent: true });
+    });
+    it('uses curl on linux without a filename, saving under the remote basename', function () {
+        linux.mockReturnValue(true);
+        windows.mockReturnValue(false);
+        which.mockReturnValue(null);
+        (0, utils_2.downloadFile)('https://example.com/main.zip');
+        expect(exec).toHaveBeenCalledWith('curl https://example.com/main.zip -L -f -O', { silent: true });
+    });
+    it('uses curl on macOS', function () {
+        linux.mockReturnValue(false);
+        windows.mockReturnValue(false);
+        which.mockReturnValue(null);
+        (0, utils_2.downloadFile)('https://example.com/main.zip', 'main.zip');
+        expect(exec).toHaveBeenCalledWith('curl https://example.com/main.zip -L -f -o main.zip', { silent: true });
+    });
+    it('uses powershell on windows', function () {
+        linux.mockReturnValue(false);
+        windows.mockReturnValue(true);
+        (0, utils_2.downloadFile)('https://example.com/main.zip', 'main.zip');
+        expect(exec.mock.calls[0][0]).toContain('Invoke-WebRequest https://example.com/main.zip -O main.zip');
+    });
+});

package/build/utils/utils.d.ts

@@ -1,3 +1,4 @@
+import { ShellString } from 'shelljs';
 import { Target, MacroVars } from '@sasjs/utils';
 import SASjs from '@sasjs/adapter/node';
 import { LogJson } from '../types';
@@ -7,6 +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 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

@@ -97,6 +97,7 @@ exports.createReactApp = createReactApp;
 exports.createAngularApp = createAngularApp;
 exports.createMinimalApp = createMinimalApp;
 exports.createTemplateApp = createTemplateApp;
+exports.downloadFile = downloadFile;
 exports.setupNpmProject = setupNpmProject;
 exports.setupGitIgnore = setupGitIgnore;
 exports.setupDoxygen = setupDoxygen;
@@ -258,7 +259,7 @@ function createApp(folderPath_1, repoUrl_1, docsUrl_1, errorCallback_1) {
                         zipName = 'master.zip';
                         _b = downloadFile("".concat(repoUrl).concat(zipPath).concat(zipName), zipName), stdout_1 = _b.stdout, stderr_1 = _b.stderr, code_1 = _b.code;
                         if (stderr_1.includes('404: Not Found') || code_1) {
-                            errorCallback("".concat(repoUrl).concat(zipPath, " is not SASjs repository!"));
+                            errorCallback("Could not download ".concat(repoUrl).concat(zipPath, "main.zip or master.zip - is ").concat(repoUrl, " a SASjs repository?"));
                             return [2 /*return*/];
                         }
                     }
@@ -316,7 +317,7 @@ var loadDocsSubmodule = function (docsUrl, folderPath, zipPath) { return __await
     });
 }); };
 function downloadFile(url, filename) {
-    if ((0, utils_1.isLinux)()) {
+    if ((0, utils_1.isLinux)() && shelljs_1.default.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
@@ -330,9 +331,9 @@ function downloadFile(url, filename) {
         return shelljs_1.default.exec("powershell.exe \"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest ".concat(url, " ").concat(filename ? '-O ' + filename : '', "\""), { silent: true });
     }
     else {
-        // -o <filename> writes to the given name; -O (used previously) instead saves
-        // under the remote URL's basename, ignoring `filename` - see the wget comment
-        // above for the same issue.
+        // 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 });
     }
 }

package/package.json

@@ -69,9 +69,9 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@sasjs/adapter": "^4.19.0",
-    "@sasjs/core": "5.2.9",
-    "@sasjs/lint": "2.5.0",
+    "@sasjs/adapter": "4.19.1",
+    "@sasjs/core": "5.2.10",
+    "@sasjs/lint": "4.1.0",
     "@sasjs/utils": "3.6.2",
     "chalk": "4.1.2",
     "dotenv": "17.4.2",
@@ -127,5 +127,5 @@
     "ws": "8.21.0",
     "nanoid": "3.3.18"
   },
-  "version": "4.20.4"
+  "version": "4.20.5"
 }