@sasjs/cli 3.11.0 → 3.12.2

package/build/commands/add/addTarget.js

@@ -60,7 +60,7 @@ var addCredential_1 = require("./addCredential");
 function addTarget(insecure) {
     var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function () {
-        var _d, scope, serverType, name, appLoc, serverUrl, existingTarget, saveWithDefaultValues, targetJson, target, filePath, _e, _f, serverName, repositoryName, userName, password, _g, contextName, updatedViyaTarget, updatedSasjsTarget, isDefault;
+        var _d, scope, serverType, name, appLoc, serverUrl, existingTarget, targetJson, target, filePath, _e, _f, serverName, repositoryName, userName, password, _g, contextName, updatedViyaTarget, updatedSasjsTarget, isDefault;
         return __generator(this, function (_h) {
             switch (_h.label) {
                 case 0:
@@ -69,10 +69,9 @@ function addTarget(insecure) {
                     return [4 /*yield*/, (0, input_1.getCommonFields)()];
                 case 1:
                     _d = _h.sent(), scope = _d.scope, serverType = _d.serverType, name = _d.name, appLoc = _d.appLoc, serverUrl = _d.serverUrl, existingTarget = _d.existingTarget;
-                    saveWithDefaultValues = !existingTarget;
                     targetJson = __assign(__assign({}, existingTarget), { name: name, serverType: serverType, serverUrl: serverUrl, appLoc: appLoc });
                     target = new types_1.Target(targetJson);
-                    return [4 /*yield*/, (0, saveConfig_1.saveConfig)(scope, target, false, saveWithDefaultValues)];
+                    return [4 /*yield*/, (0, saveConfig_1.saveConfig)(scope, target, false, false)];
                 case 2:
                     filePath = _h.sent();
                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Target configuration has been saved to ".concat(filePath, " ."));
@@ -98,11 +97,7 @@ function addTarget(insecure) {
                 case 6:
                     _g = _h.sent(), contextName = _g.contextName, updatedViyaTarget = _g.target;
                     targetJson = {
-                        contextName: contextName,
-                        deployConfig: {
-                            deployServicePack: true,
-                            deployScripts: []
-                        }
+                        contextName: contextName
                     };
                     targetJson = __assign(__assign({}, updatedViyaTarget.toJson(false)), targetJson);
                     return [3 /*break*/, 10];
@@ -115,7 +110,7 @@ function addTarget(insecure) {
                 case 10: return [4 /*yield*/, (0, input_1.getIsDefault)()];
                 case 11:
                     isDefault = _h.sent();
-                    return [4 /*yield*/, (0, saveConfig_1.saveConfig)(scope, new types_1.Target(targetJson), isDefault, saveWithDefaultValues)];
+                    return [4 /*yield*/, (0, saveConfig_1.saveConfig)(scope, new types_1.Target(targetJson), isDefault, false)];
                 case 12:
                     filePath = _h.sent();
                     (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info("Target configuration has been saved to ".concat(filePath));

package/build/commands/compile/compile.js

@@ -324,6 +324,7 @@ function recreateBuildFolder() {
         });
     });
 }
+// REFACTOR: combine compileServiceFolder and compileJobFolder
 var compileServiceFolder = function (target, serviceFolder, macroFolders, programFolders, compileTree) { return __awaiter(void 0, void 0, void 0, function () {
     var destinationPath, subFolders, filesNamesInPath;
     return __generator(this, function (_a) {
@@ -333,9 +334,30 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                 return [4 /*yield*/, (0, utils_1.listSubFoldersInFolder)(destinationPath)];
             case 1:
                 subFolders = _a.sent();
-                return [4 /*yield*/, (0, utils_1.listFilesInFolder)(destinationPath)];
+                return [4 /*yield*/, (0, utils_1.listFilesInFolder)(destinationPath)
+                    // Checks if file in sasjsbuild folder exists in source folder.
+                    // If not, it means that the file shouldn't be compiled.
+                ];
             case 2:
                 filesNamesInPath = _a.sent();
+                // Checks if file in sasjsbuild folder exists in source folder.
+                // If not, it means that the file shouldn't be compiled.
+                return [4 /*yield*/, (0, utils_1.asyncForEach)(filesNamesInPath, function (fileName, i) { return __awaiter(void 0, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, (0, utils_1.fileExists)(path_1.default.join(serviceFolder, fileName))];
+                                case 1:
+                                    if (!(_a.sent())) {
+                                        filesNamesInPath.splice(i, 1);
+                                    }
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); })];
+            case 3:
+                // Checks if file in sasjsbuild folder exists in source folder.
+                // If not, it means that the file shouldn't be compiled.
+                _a.sent();
                 return [4 /*yield*/, (0, utils_1.asyncForEach)(filesNamesInPath, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
                         var filePath;
                         return __generator(this, function (_a) {
@@ -355,7 +377,7 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                             }
                         });
                     }); })];
-            case 3:
+            case 4:
                 _a.sent();
                 return [4 /*yield*/, (0, utils_1.asyncForEach)(subFolders, function (subFolder) { return __awaiter(void 0, void 0, void 0, function () {
                         var fileNames;
@@ -389,7 +411,7 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                             }
                         });
                     }); })];
-            case 4:
+            case 5:
                 _a.sent();
                 compileTree.saveTree();
                 return [2 /*return*/];
@@ -405,9 +427,30 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                 return [4 /*yield*/, (0, utils_1.listSubFoldersInFolder)(destinationPath)];
             case 1:
                 subFolders = _a.sent();
-                return [4 /*yield*/, (0, utils_1.listFilesInFolder)(destinationPath)];
+                return [4 /*yield*/, (0, utils_1.listFilesInFolder)(destinationPath)
+                    // Checks if file in sasjsbuild folder exists in source folder.
+                    // If not, it means that the file shouldn't be compiled.
+                ];
             case 2:
                 filesNamesInPath = _a.sent();
+                // Checks if file in sasjsbuild folder exists in source folder.
+                // If not, it means that the file shouldn't be compiled.
+                return [4 /*yield*/, (0, utils_1.asyncForEach)(filesNamesInPath, function (fileName, i) { return __awaiter(void 0, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, (0, utils_1.fileExists)(path_1.default.join(jobFolder, fileName))];
+                                case 1:
+                                    if (!(_a.sent())) {
+                                        filesNamesInPath.splice(i, 1);
+                                    }
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); })];
+            case 3:
+                // Checks if file in sasjsbuild folder exists in source folder.
+                // If not, it means that the file shouldn't be compiled.
+                _a.sent();
                 return [4 /*yield*/, (0, utils_1.asyncForEach)(filesNamesInPath, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
                         var filePath;
                         return __generator(this, function (_a) {
@@ -427,7 +470,7 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                             }
                         });
                     }); })];
-            case 3:
+            case 4:
                 _a.sent();
                 return [4 /*yield*/, (0, utils_1.asyncForEach)(subFolders, function (subFolder) { return __awaiter(void 0, void 0, void 0, function () {
                         var fileNames;
@@ -461,7 +504,7 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                             }
                         });
                     }); })];
-            case 4:
+            case 5:
                 _a.sent();
                 return [2 /*return*/];
         }

package/build/commands/compile/spec/compile.spec.js

@@ -739,10 +739,10 @@ describe('sasjs compile outside project', function () {
                         return [4 /*yield*/, (0, config_1.saveGlobalRcFile)('')];
                     case 1:
                         _a.sent();
-                        process.projectDir = '';
                         return [4 /*yield*/, (0, utils_2.setConstants)()];
                     case 2:
                         _a.sent();
+                        process.projectDir = '';
                         process.currentDir = path_1.default.join(__dirname, appName);
                         return [4 /*yield*/, (0, utils_1.createFolder)(process.currentDir)];
                     case 3:
@@ -785,6 +785,38 @@ describe('sasjs compile outside project', function () {
                 }
             });
         }); });
+        it('should compile without duplicates', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var testServicePath, appPath, command, compiledTestService;
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        testServicePath = path_1.default.join('services', 'admin', 'test.sas');
+                        appPath = path_1.default.join(__dirname, appName);
+                        return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
+                    case 1:
+                        _b.sent();
+                        return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(appPath, 'sasjs', 'targets', 'viya', testServicePath), '')];
+                    case 2:
+                        _b.sent();
+                        command = new compileCommand_1.CompileCommand([
+                            'node',
+                            'sasjs',
+                            'compile',
+                            '-t',
+                            'viya'
+                        ]);
+                        return [4 /*yield*/, command.executeCompile()];
+                    case 3:
+                        _b.sent();
+                        return [4 /*yield*/, (0, utils_1.readFile)(path_1.default.join(appPath, 'sasjsbuild', testServicePath))];
+                    case 4:
+                        compiledTestService = _b.sent();
+                        expect((_a = compiledTestService.match(/^\*\sService start;$/gm)) === null || _a === void 0 ? void 0 : _a.length).toEqual(1);
+                        return [2 /*return*/];
+                }
+            });
+        }); });
     });
 });
 var prefixConfigWithPath = function (prefixPath) { return ({

package/build/commands/create/spec/angularAppFiles.js

@@ -126,6 +126,11 @@ exports.angularAppFiles = {
                     subFolders: []
                 }
             ]
+        },
+        {
+            folderName: 'docs',
+            files: [{ fileName: 'index.html' }],
+            subFolders: []
         }
     ]
 };

package/build/commands/create/spec/create.spec.js

@@ -140,6 +140,9 @@ describe('sasjs create', function () {
                     _a.sent();
                     return [4 /*yield*/, verifyCreateWeb('.', 'react')];
                 case 4:
+                    _a.sent();
+                    return [4 /*yield*/, (0, test_1.verifyGitNotPresent)(process.projectDir)];
+                case 5:
                     _a.sent();
                     return [2 /*return*/];
             }
@@ -164,6 +167,9 @@ describe('sasjs create', function () {
                     _a.sent();
                     return [4 /*yield*/, verifyCreateWeb('test-react-app', 'react')];
                 case 4:
+                    _a.sent();
+                    return [4 /*yield*/, (0, test_1.verifyGitNotPresent)(process.projectDir)];
+                case 5:
                     _a.sent();
                     return [2 /*return*/];
             }
@@ -212,6 +218,9 @@ describe('sasjs create', function () {
                     _a.sent();
                     return [4 /*yield*/, verifyCreateWeb('test-angular-app', 'angular')];
                 case 4:
+                    _a.sent();
+                    return [4 /*yield*/, (0, test_1.verifyGitNotPresent)(process.projectDir)];
+                case 5:
                     _a.sent();
                     return [2 /*return*/];
             }

package/build/commands/create/spec/reactAppFiles.js

@@ -77,6 +77,17 @@ exports.reactAppFiles = {
                     subFolders: []
                 }
             ]
+        },
+        {
+            folderName: 'public',
+            files: [],
+            subFolders: [
+                {
+                    folderName: 'docs',
+                    files: [{ fileName: 'index.html' }],
+                    subFolders: []
+                }
+            ]
         }
     ]
 };

package/build/utils/test.d.ts

@@ -21,3 +21,4 @@ export declare const verifyDotFiles: (docsFolder: string) => Promise<void>;
 export declare const verifyDotFilesNotGenerated: (docsFolder: string) => Promise<void>;
 export declare const verifyCompiledService: (compiledContent: string, macrosToTest: string[], checkInit?: boolean, checkTerm?: boolean) => Promise<void>;
 export declare const verifyCompiledJob: (compiledContent: string, macrosToTest: string[], checkInit?: boolean, checkTerm?: boolean) => Promise<void>;
+export declare const verifyGitNotPresent: (folder: string) => Promise<void>;

package/build/utils/test.js

@@ -50,7 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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 = void 0;
 var path_1 = __importDefault(require("path"));
 var dotenv_1 = __importDefault(require("dotenv"));
 var utils_1 = require("@sasjs/utils");
@@ -629,3 +629,20 @@ var verifyCompile = function (compiledContent, macrosToTest, checkInit, checkTer
         return [2 /*return*/];
     });
 }); };
+var verifyGitNotPresent = function (folder) { return __awaiter(void 0, void 0, void 0, function () {
+    var gitFolderOrModules;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, (0, utils_1.listFilesAndSubFoldersInFolder)(folder, true)];
+            case 1:
+                gitFolderOrModules = (_a.sent()).filter(function (sub) {
+                    return /\.git$/.test(sub) ||
+                        new RegExp(".git".concat(utils_1.pathSepEscaped)).test(sub) ||
+                        /\.gitmodules/.test(sub);
+                });
+                expect(gitFolderOrModules.length).toEqual(0);
+                return [2 /*return*/];
+        }
+    });
+}); };
+exports.verifyGitNotPresent = verifyGitNotPresent;

package/build/utils/utils.js

@@ -191,8 +191,19 @@ function createApp(folderPath, repoUrl, installDependencies) {
     var spinner = (0, ora_1.default)("Creating SASjs project in ".concat(folderPath, "."));
     spinner.start();
     var gitBranch = repoUrl.includes('template_sasonly') ? 'master' : 'main';
-    shelljs_1.default.exec("cd \"".concat(folderPath, "\" && git clone --depth 1 -b ").concat(gitBranch, " ").concat(repoUrl, " ."), { silent: true });
-    shelljs_1.default.rm('-rf', path_1.default.join(folderPath, '.git'));
+    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'));
+    }
     spinner.stop();
     if (installDependencies) {
         spinner.text = 'Installing dependencies...';
@@ -203,6 +214,9 @@ function createApp(folderPath, repoUrl, installDependencies) {
         spinner.stop();
     }
 }
+var deleteGitFolder = function (folderPath) {
+    return shelljs_1.default.rm('-rf', path_1.default.join(folderPath, '.git'));
+};
 function setupNpmProject(folderName) {
     return __awaiter(this, void 0, void 0, function () {
         var folderPath;
@@ -241,7 +255,7 @@ exports.setupNpmProject = setupNpmProject;
 function setupGitIgnore(folderName) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
-        var gitIgnoreFilePath, gitIgnoreExists, gitIgnoreContent, newgitIgnoreContent, regExpSasjsBuild, regExpSasjsResults, regExpNodeModules, folderPath, gitDirectoryExists;
+        var gitIgnoreFilePath, gitIgnoreExists, gitIgnoreContent, newgitIgnoreContent, regExpSasjsBuild, regExpSasjsResults, regExpNodeModules;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -278,17 +292,7 @@ function setupGitIgnore(folderName) {
                     _c.sent();
                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.success('.gitignore file has been created.');
                     _c.label = 7;
-                case 7:
-                    folderPath = path_1.default.join(process.projectDir, folderName);
-                    return [4 /*yield*/, (0, utils_1.folderExists)(path_1.default.join(folderPath, '.git'))];
-                case 8:
-                    gitDirectoryExists = _c.sent();
-                    if (!gitDirectoryExists) {
-                        shelljs_1.default.exec("cd ".concat(folderName, " && git init"), {
-                            silent: true
-                        });
-                    }
-                    return [2 /*return*/];
+                case 7: return [2 /*return*/];
             }
         });
     });

package/package.json

@@ -50,7 +50,7 @@
     "@sasjs/adapter": "3.8.0",
     "@sasjs/core": "4.15.3",
     "@sasjs/lint": "1.11.2",
-    "@sasjs/utils": "2.40.0",
+    "@sasjs/utils": "2.40.1",
     "chalk": "4.1.2",
     "csv-stringify": "5.6.5",
     "dotenv": "10.0.0",
@@ -94,5 +94,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.11.0"
+  "version": "3.12.2"
 }