@sasjs/cli 3.16.2 → 3.18.0

package/build/utils/utils.js

@@ -86,7 +86,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSasJsServerInServerMode = exports.getNodeModulePath = exports.isSASjsProject = exports.terminateProcess = exports.prefixAppLoc = exports.loadEnvVariables = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.parseLogLines = exports.executeShellScript = exports.getUniqServicesObj = exports.removeComments = exports.setupDoxygen = exports.setupGhooks = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
+exports.isSasJsServerInServerMode = exports.getNodeModulePath = exports.isSASjsProject = exports.terminateProcess = exports.prefixAppLoc = exports.loadEnvVariables = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.parseLogLines = exports.executeShellScript = exports.getUniqServicesObj = exports.setupDoxygen = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
 var shelljs_1 = __importDefault(require("shelljs"));
 var path_1 = __importDefault(require("path"));
 var ora_1 = __importDefault(require("ora"));
@@ -95,6 +95,7 @@ var utils_1 = require("@sasjs/utils");
 var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var displayResult_1 = require("./displayResult");
 var dotenv_1 = __importDefault(require("dotenv"));
+var adm_zip_1 = __importDefault(require("adm-zip"));
 function inExistingProject(folderPath) {
     return __awaiter(this, void 0, void 0, function () {
         var packageJsonExists;
@@ -127,9 +128,11 @@ function createReactApp(folderPath) {
     return __awaiter(this, void 0, void 0, function () {
         var _this = this;
         return __generator(this, function (_a) {
-            return [2 /*return*/, new Promise(function (resolve, _) { return __awaiter(_this, void 0, void 0, function () {
+            return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
                     return __generator(this, function (_a) {
-                        createApp(folderPath, 'https://github.com/sasjs/react-seed-app.git');
+                        createApp(folderPath, 'https://github.com/sasjs/react-seed-app', 'https://github.com/sasjs/docs', function (err) {
+                            return reject(new Error(err));
+                        });
                         return [2 /*return*/, resolve()];
                     });
                 }); })];
@@ -141,9 +144,11 @@ function createAngularApp(folderPath) {
     return __awaiter(this, void 0, void 0, function () {
         var _this = this;
         return __generator(this, function (_a) {
-            return [2 /*return*/, new Promise(function (resolve, _) { return __awaiter(_this, void 0, void 0, function () {
+            return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
                     return __generator(this, function (_a) {
-                        createApp(folderPath, 'https://github.com/sasjs/angular-seed-app.git');
+                        createApp(folderPath, 'https://github.com/sasjs/angular-seed-app', 'https://github.com/sasjs/docs', function (err) {
+                            return reject(new Error(err));
+                        });
                         return [2 /*return*/, resolve()];
                     });
                 }); })];
@@ -155,9 +160,11 @@ function createMinimalApp(folderPath) {
     return __awaiter(this, void 0, void 0, function () {
         var _this = this;
         return __generator(this, function (_a) {
-            return [2 /*return*/, new Promise(function (resolve, _) { return __awaiter(_this, void 0, void 0, function () {
+            return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
                     return __generator(this, function (_a) {
-                        createApp(folderPath, 'https://github.com/sasjs/minimal-seed-app.git');
+                        createApp(folderPath, 'https://github.com/sasjs/minimal-seed-app', 'https://github.com/sasjs/docs', function (err) {
+                            return reject(new Error(err));
+                        });
                         return [2 /*return*/, resolve()];
                     });
                 }); })];
@@ -172,14 +179,13 @@ function createTemplateApp(folderPath, template) {
             return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
                     var _a, stdout, stderr, code;
                     return __generator(this, function (_b) {
-                        _a = shelljs_1.default.exec("git ls-remote https://username:password@github.com/sasjs/template_".concat(template, ".git"), { silent: true }), stdout = _a.stdout, stderr = _a.stderr, code = _a.code;
-                        if (stderr.includes('Repository not found') || code) {
+                        _a = downloadFile("https://username:password@github.com/sasjs/template_".concat(template)), stdout = _a.stdout, stderr = _a.stderr, code = _a.code;
+                        if (stderr.includes('404: Not Found') || code) {
                             return [2 /*return*/, reject(new Error("Template \"".concat(template, "\" is not a SASjs template")))];
                         }
-                        if (!stdout) {
-                            return [2 /*return*/, reject(new Error("Unable to fetch template \"".concat(template, "\"")))];
-                        }
-                        createApp(folderPath, "https://github.com/sasjs/template_".concat(template, ".git"));
+                        createApp(folderPath, "https://github.com/sasjs/template_".concat(template), 'https://github.com/sasjs/docs', function (err) {
+                            return reject(new Error(err));
+                        });
                         return [2 /*return*/, resolve()];
                     });
                 }); })];
@@ -187,37 +193,88 @@ function createTemplateApp(folderPath, template) {
     });
 }
 exports.createTemplateApp = createTemplateApp;
-function createApp(folderPath, repoUrl, installDependencies) {
+/**
+ * This function will first download / unzip the target app from repoUrl, then download / unzip the sasjs/docs repo into a subdirectory named 'docs'.
+ * Finally, if installDependencies is true, the npm install command will be executed.
+ * @param folderPath full path of the directory where desired seed app will be created
+ * @param repoUrl sasjs/{seed-app} repo url
+ * @param docsUrl sasjs/docs repo url
+ * @params installDependencies whether or not to do `npm install`
+ */
+function createApp(folderPath, repoUrl, docsUrl, errorCallback, installDependencies) {
     if (installDependencies === void 0) { installDependencies = true; }
+    //In past we used GIT to clone the repos. But many users potentially won't have GIT installed.
+    //So we will use shell tools to set up the apps.
+    var zipName = 'main.zip';
+    var zipPath = "/archive/refs/heads/";
+    var fullZipPath = "".concat(zipPath).concat(zipName);
     var spinner = (0, ora_1.default)("Creating SASjs project in ".concat(folderPath, "."));
     spinner.start();
-    var gitBranch = repoUrl.includes('template_sasonly') ? 'master' : 'main';
-    var gitVersion = (shelljs_1.default
-        .exec("git version", { silent: true })
-        .stdout.match(/(?<!git version)\d+\.\d+\.\d+/) || '')[0].replace(/\./g, '');
-    // NOTE: git version 2.13 and greater are using '--recurse-submodules' instead of '--recurse' attribute to clone submodules
-    shelljs_1.default.exec("cd \"".concat(folderPath, "\" && git clone --recurse").concat(parseInt(gitVersion) > 2130 ? '-submodules' : '', " --depth 1 -b ").concat(gitBranch, " ").concat(repoUrl, " ."), { silent: true });
-    deleteGitFolder(folderPath);
-    shelljs_1.default.rm('-f', [path_1.default.join(folderPath, '.gitmodules')]);
-    if (repoUrl.includes('react-seed-app')) {
-        deleteGitFolder(path_1.default.join(folderPath, 'public', 'docs'));
-    }
-    else if (repoUrl.includes('angular-seed-app')) {
-        deleteGitFolder(path_1.default.join(folderPath, 'docs'));
+    //Get repo zip, assuming main branch is called `main`
+    var _a = downloadFile("".concat(repoUrl).concat(fullZipPath)), stdout = _a.stdout, 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';
+        var _b = downloadFile("".concat(repoUrl).concat(zipPath).concat(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!"));
+            return;
+        }
     }
+    var zipWithoutExtension = zipName.replace('.zip', '');
+    var zip = new adm_zip_1.default(zipName);
+    zip.extractAllTo("./", true);
+    shelljs_1.default.cp('-r', "./*".concat(zipWithoutExtension, "/."), folderPath);
+    shelljs_1.default.rm('-rf', ["./*".concat(zipWithoutExtension)]);
+    shelljs_1.default.rm('-rf', ["./".concat(zipName)]);
+    loadDocsSubmodule(docsUrl, folderPath, fullZipPath);
+    shelljs_1.default.rm('-f', [path_1.default.join(folderPath, '.gitmodules')]);
     spinner.stop();
     if (installDependencies) {
         spinner.text = 'Installing dependencies...';
         spinner.start();
-        shelljs_1.default.exec("cd \"".concat(folderPath, "\" && git init && npm install"), {
+        shelljs_1.default.exec("cd \"".concat(folderPath, "\" && npm install"), {
             silent: true
         });
         spinner.stop();
     }
 }
-var deleteGitFolder = function (folderPath) {
-    return shelljs_1.default.rm('-rf', path_1.default.join(folderPath, '.git'));
-};
+/**
+ * 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 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, zip;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                docsFolderPath = "".concat(folderPath, "/public/docs") //We first look if docs submodule is inside `public` folder. (react-seed-app for example)
+                ;
+                return [4 /*yield*/, (0, utils_1.fileExists)(docsFolderPath)];
+            case 1:
+                if (!(_a.sent()))
+                    docsFolderPath = "".concat(folderPath, "/docs"); //If not, we load submodule in root
+                downloadFile("".concat(docsUrl).concat(zipPath));
+                zip = new adm_zip_1.default('main.zip');
+                zip.extractAllTo('./', true);
+                shelljs_1.default.cp('-r', "./*-main/.", docsFolderPath);
+                shelljs_1.default.rm('-rf', ["./*-main"]);
+                shelljs_1.default.rm('-rf', ["./main.zip"]);
+                return [2 /*return*/];
+        }
+    });
+}); };
+function downloadFile(url) {
+    if ((0, utils_1.isLinux)()) {
+        return shelljs_1.default.exec("wget ".concat(url), { silent: true });
+    }
+    else {
+        return shelljs_1.default.exec("curl ".concat(url, " -LO -f"), { silent: true });
+    }
+}
 function setupNpmProject(folderName) {
     return __awaiter(this, void 0, void 0, function () {
         var folderPath;
@@ -299,52 +356,6 @@ function setupGitIgnore(folderName) {
     });
 }
 exports.setupGitIgnore = setupGitIgnore;
-function setupGhooks(folderName) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function () {
-        var folderPath, packageJsonPath, packageJsonContent, packageJson, preCommitCmd, e_1;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    folderPath = path_1.default.join(process.projectDir, folderName);
-                    (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info('Installing ghooks');
-                    shelljs_1.default.exec("cd \"".concat(folderPath, "\" && npm i ghooks --save-dev"), {
-                        silent: true
-                    });
-                    _b.label = 1;
-                case 1:
-                    _b.trys.push([1, 4, , 5]);
-                    packageJsonPath = path_1.default.join(folderPath, 'package.json');
-                    return [4 /*yield*/, (0, utils_1.readFile)(packageJsonPath)];
-                case 2:
-                    packageJsonContent = _b.sent();
-                    packageJson = JSON.parse(packageJsonContent);
-                    if (!packageJson.config)
-                        packageJson.config = {};
-                    if (!packageJson.config.ghooks)
-                        packageJson.config.ghooks = {};
-                    preCommitCmd = 'sasjs lint';
-                    if (packageJson.config.ghooks['pre-commit']) {
-                        preCommitCmd = ' && sasjs lint';
-                    }
-                    else {
-                        packageJson.config.ghooks['pre-commit'] = '';
-                    }
-                    if (!/sasjs lint/.test(packageJson.config.ghooks['pre-commit']))
-                        packageJson.config.ghooks['pre-commit'] += preCommitCmd;
-                    return [4 /*yield*/, (0, utils_1.createFile)(packageJsonPath, JSON.stringify(packageJson, null, 2))];
-                case 3:
-                    _b.sent();
-                    return [3 /*break*/, 5];
-                case 4:
-                    e_1 = _b.sent();
-                    return [3 /*break*/, 5];
-                case 5: return [2 /*return*/];
-            }
-        });
-    });
-}
-exports.setupGhooks = setupGhooks;
 function setupDoxygen(folderPath) {
     return __awaiter(this, void 0, void 0, function () {
         var doxyFilesPath, doxyFolderPathSource, doxyFolderPath;
@@ -363,39 +374,6 @@ function setupDoxygen(folderPath) {
     });
 }
 exports.setupDoxygen = setupDoxygen;
-/**
- * Removes comments from a given block of text.
- * Preserves single line block comments and inline comments.
- * @param {string} text - the text to remove comments from.
- */
-function removeComments(text) {
-    if (!text)
-        return '';
-    var lines = text
-        .replace(/\r\n/g, '\n')
-        .split('\n')
-        .map(function (l) { return l.trimEnd(); });
-    var linesWithoutComment = [];
-    var inCommentBlock = false;
-    lines.forEach(function (line) {
-        if (line.includes('/*') && line.includes('*/')) {
-            linesWithoutComment.push(line);
-        }
-        else {
-            if (line.startsWith('/*') && !line.endsWith('*/')) {
-                inCommentBlock = true;
-            }
-            if (!inCommentBlock) {
-                linesWithoutComment.push(line);
-            }
-            if (line.endsWith('*/') && !line.includes('/*') && inCommentBlock) {
-                inCommentBlock = false;
-            }
-        }
-    });
-    return linesWithoutComment.filter(function (l) { return !!l.trim(); }).join('\n');
-}
-exports.removeComments = removeComments;
 function getUniqServicesObj(services) {
     var returnObj = {};
     if (!services)
@@ -419,7 +397,7 @@ function executeShellScript(filePath, logFilePath) {
                     return __generator(this, function (_b) {
                         switch (_b.label) {
                             case 0:
-                                shellCommand = (0, utils_1.isWindows)() ? "sh ".concat(filePath) : "bash ".concat(filePath);
+                                shellCommand = (0, utils_1.isWindows)() ? "".concat(filePath) : "bash ".concat(filePath);
                                 result = shelljs_1.default.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));
@@ -447,7 +425,7 @@ exports.executeShellScript = executeShellScript;
  * @param {object} logJson
  */
 function parseLogLines(logJson) {
-    var e_2, _a;
+    var e_1, _a;
     var logLines = '';
     try {
         for (var _b = __values(logJson.items), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -455,12 +433,12 @@ function parseLogLines(logJson) {
             logLines += "".concat(item.line, "\n");
         }
     }
-    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_2) throw e_2.error; }
+        finally { if (e_1) throw e_1.error; }
     }
     return logLines;
 }

package/package.json

@@ -20,6 +20,7 @@
     "preinstall": "npm run checkNodeVersion -s",
     "prepare": "git rev-parse --git-dir && git config core.hooksPath ./.git-hooks || true"
   },
+  "testServerTypes": "viya,sas9,sasjs",
   "release": {
     "branches": [
       "main"
@@ -47,10 +48,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "3.9.4",
-    "@sasjs/core": "4.32.2",
+    "@sasjs/adapter": "3.10.11",
+    "@sasjs/core": "4.35.0",
     "@sasjs/lint": "1.11.2",
-    "@sasjs/utils": "2.45.0",
+    "@sasjs/utils": "2.47.0",
     "adm-zip": "0.5.9",
     "chalk": "4.1.2",
     "csv-stringify": "5.6.5",
@@ -88,7 +89,7 @@
     "jest": "27.4.7",
     "jest-cli": "27.4.7",
     "jest-extended": "1.1.0",
-    "nodemon": "2.0.15",
+    "nodemon": "2.0.19",
     "prettier": "2.6.2",
     "ts-jest": "27.1.2",
     "ts-node": "10.4.0",
@@ -96,5 +97,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.16.2"
+  "version": "3.18.0"
 }