@sasjs/cli 3.24.1 → 3.26.0

package/build/commands/init/init.d.ts

@@ -1 +1,7 @@
 export declare function init(): Promise<void>;
+/**
+ * Creates a SASjs configuration file.
+ * Its name will be of the form 'sasjsconfig.json'
+ * @param {string} parentFolderName- the name of the project folder.
+ */
+export declare const createConfigFile: (parentFolderName: string) => Promise<void>;

package/build/commands/init/init.js

@@ -39,11 +39,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = void 0;
+exports.createConfigFile = exports.init = void 0;
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("../../utils/utils");
 var utils_2 = require("@sasjs/utils");
-var createConfigFile_1 = require("../shared/createConfigFile");
 var createLintConfigFile_1 = require("../shared/createLintConfigFile");
 function init() {
     var _a;
@@ -63,7 +62,7 @@ function init() {
                     return [4 /*yield*/, (0, utils_1.setupDoxygen)(parentFolderName)];
                 case 3:
                     _b.sent();
-                    return [4 /*yield*/, (0, createConfigFile_1.createConfigFile)(parentFolderName)];
+                    return [4 /*yield*/, (0, exports.createConfigFile)(parentFolderName)];
                 case 4:
                     _b.sent();
                     lintConfigPath = path_1.default.join(process.projectDir, parentFolderName, '.sasjslint');
@@ -80,3 +79,35 @@ function init() {
     });
 }
 exports.init = init;
+/**
+ * Creates a SASjs configuration file.
+ * Its name will be of the form 'sasjsconfig.json'
+ * @param {string} parentFolderName- the name of the project folder.
+ */
+var createConfigFile = function (parentFolderName) { return __awaiter(void 0, void 0, void 0, function () {
+    var config, configDestinationPath;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                config = {
+                    $schema: 'https://cli.sasjs.io/sasjsconfig-schema.json',
+                    macroFolders: ['sasjs/macros'],
+                    defaultTarget: 'mytarget',
+                    targets: [
+                        {
+                            name: 'mytarget',
+                            serverType: 'SASJS',
+                            serverUrl: ' ',
+                            appLoc: '/Public/apps/myapp'
+                        }
+                    ]
+                };
+                configDestinationPath = path_1.default.join(process.projectDir, parentFolderName, 'sasjs', 'sasjsconfig.json');
+                return [4 /*yield*/, (0, utils_2.createFile)(configDestinationPath, JSON.stringify(config, null, 2))];
+            case 1:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    });
+}); };
+exports.createConfigFile = createConfigFile;

package/build/commands/init/spec/init.spec.js

@@ -148,8 +148,8 @@ var verifyInit = function () { return __awaiter(void 0, void 0, void 0, function
                 return [4 /*yield*/, (0, utils_1.readFile)(gitIgnoreFilePath)];
             case 2:
                 gitIgnoreContent = _a.sent();
-                expect(gitIgnoreContent.match(/^sasjsbuild\//gm).length).toEqual(1);
-                expect(gitIgnoreContent.match(/^node_modules\//gm).length).toEqual(1);
+                expect(gitIgnoreContent.match(/^sasjsbuild/gm).length).toEqual(1);
+                expect(gitIgnoreContent.match(/^node_modules/gm).length).toEqual(1);
                 return [2 /*return*/];
         }
     });

package/build/commands/lint/lintCommand.js

@@ -57,8 +57,8 @@ var processLint_1 = require("./processLint");
 var command_1 = require("../../types/command");
 var types_1 = require("../../types");
 var utils_1 = require("../../utils");
-var syntax = 'lint [subCommand]';
-var usage = 'sasjs lint [ fix | lint ]';
+var syntax = 'lint <subCommand> [filterStrings..]';
+var usage = 'sasjs lint [ find | fix | init ]';
 var description = "Provides the capability to identify, for SAS file, whether there are any ERRORs or WARNINGs present and if so, which line number they are on.";
 var examples = [
     {
@@ -66,11 +66,41 @@ var examples = [
         description: 'Lints all .sas files in the current project.\n' +
             'All the exceptions (along with line / column numbers) will be shown in the console.'
     },
+    {
+        command: 'sasjs lint find mf_a mf_b',
+        description: 'Lints all .sas files starting from mf_a or mf_b in the current project.\n' +
+            'All the exceptions (along with line / column numbers) will be shown in the console.'
+    },
+    {
+        command: 'sasjs lint find /home/user/project/sasjs/services/appinit.sas',
+        description: 'Lints only appinit.sas file present in services folder.\n' +
+            'All the exceptions (along with line / column numbers) will be shown in the console.'
+    },
+    {
+        command: 'sasjs lint find sasjs/macros',
+        description: 'Lints all .sas files present in sasjs/macros folder.\n' +
+            'All the exceptions (along with line / column numbers) will be shown in the console.'
+    },
     {
         command: 'sasjs lint fix',
         description: 'Fixes lint violations in all .sas files in the current project.\n' +
             'All the exceptions (along with line / column numbers) will be fixed.'
     },
+    {
+        command: 'sasjs lint fix mf_a mf_b',
+        description: 'Fixes lint violations in all .sas files starting from mf_a or mf_b in the current project.\n' +
+            'All the exceptions (along with line / column numbers) will be fixed.'
+    },
+    {
+        command: 'sasjs lint fix /home/user/project/sasjs/services/appinit.sas',
+        description: 'Fixes lint violations in only appinit.sas in services folder.\n' +
+            'All the exceptions (along with line / column numbers) will be fixed.'
+    },
+    {
+        command: 'sasjs lint fix sasjs/macros/',
+        description: 'Fixes lint violations in all .sas files in the macros folder.\n' +
+            'All the exceptions (along with line / column numbers) will be fixed.'
+    },
     {
         command: 'sasjs lint init',
         description: "Creates a SASjs Lint configuration file. Its name will be of the form '.sasjslint'"
@@ -79,20 +109,25 @@ var examples = [
 var LintCommand = /** @class */ (function (_super) {
     __extends(LintCommand, _super);
     function LintCommand(args) {
-        return _super.call(this, args, {
+        var _this = this;
+        if (args.length < 4) {
+            args.splice(3, 0, 'find');
+        }
+        _this = _super.call(this, args, {
             syntax: syntax,
             usage: usage,
             description: description,
             examples: examples
         }) || this;
+        return _this;
     }
     LintCommand.prototype.execute = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var subCommand;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var _a, subCommand, filterStrings;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        subCommand = this.parsed.subCommand;
+                        _a = this.parsed, subCommand = _a.subCommand, filterStrings = _a.filterStrings;
                         if (!(subCommand === 'init')) return [3 /*break*/, 2];
                         return [4 /*yield*/, (0, initLint_1.initLint)()
                                 .then(function (res) {
@@ -106,17 +141,17 @@ var LintCommand = /** @class */ (function (_super) {
                                 (0, utils_1.displayError)(err, 'An error has occurred whilst initialising SASjs Lint.');
                                 return command_1.ReturnCode.InternalError;
                             })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 1: return [2 /*return*/, _b.sent()];
                     case 2:
                         if (!(subCommand === 'fix')) return [3 /*break*/, 4];
-                        return [4 /*yield*/, (0, processLint_1.lintFix)()
+                        return [4 /*yield*/, (0, processLint_1.lintFix)(filterStrings)
                                 .then(function () { return command_1.ReturnCode.Success; })
                                 .catch(function (err) {
                                 (0, utils_1.displayError)(err, 'An error has occurred while running SASjs Lint Fix.');
                                 return command_1.ReturnCode.LintError;
                             })];
-                    case 3: return [2 /*return*/, _a.sent()];
-                    case 4: return [4 /*yield*/, (0, processLint_1.processLint)()
+                    case 3: return [2 /*return*/, _b.sent()];
+                    case 4: return [4 /*yield*/, (0, processLint_1.processLint)(filterStrings)
                             .then(function (result) {
                             if (result.errors) {
                                 (0, utils_1.displayError)('Please fix the identified lint errors.');
@@ -133,7 +168,7 @@ var LintCommand = /** @class */ (function (_super) {
                             (0, utils_1.displayError)(err, 'An error has occurred when processing lint operation.');
                             return command_1.ReturnCode.InternalError;
                         })];
-                    case 5: return [2 /*return*/, _a.sent()];
+                    case 5: return [2 /*return*/, _b.sent()];
                 }
             });
         });

package/build/commands/lint/processLint.d.ts

@@ -3,13 +3,15 @@ interface LintResult {
     errors: boolean;
 }
 /**
- * Fixes lint violations in all .sas files in the current project
+ * Fixes lint violations in all .sas files in the current project if no filterArray is provided
+ * Otherwise fixes lint violations of only those .sas files which matches filter array
  * @returns {Promise<void>} resolves successfully when formatting has completed
  */
-export declare function lintFix(): Promise<void>;
+export declare function lintFix(filterArray?: string[]): Promise<void>;
 /**
- * Lints all .sas files in the current project
+ * Lints all .sas files in the current project if no filterArray is provided
+ * Otherwise lints .sas files which matches filter array
  * @returns an object containing booleans `warnings` and `errors`
  */
-export declare function processLint(): Promise<LintResult>;
+export declare function processLint(filterArray?: string[]): Promise<LintResult>;
 export {};

package/build/commands/lint/processLint.js

@@ -35,36 +35,146 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processLint = exports.lintFix = void 0;
+var path_1 = __importDefault(require("path"));
 var chalk_1 = __importDefault(require("chalk"));
 var lint_1 = require("@sasjs/lint");
+var utils_1 = require("@sasjs/utils");
 /**
- * Fixes lint violations in all .sas files in the current project
+ * Fixes lint violations in all .sas files in the current project if no filterArray is provided
+ * Otherwise fixes lint violations of only those .sas files which matches filter array
  * @returns {Promise<void>} resolves successfully when formatting has completed
  */
-function lintFix() {
+function lintFix(filterArray) {
+    var _a, _b, _c;
+    if (filterArray === void 0) { filterArray = []; }
     return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, lint_1.formatProject)().then(function (result) {
-                        var _a, _b, _c;
-                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Resolved ".concat(result.fixedDiagnosticsCount, " violations."));
+        var results, result, absoluteFilePaths, nonAbsoluteFilePathPatterns, regexPattern, regex_1, sasFiles, filesToLint, unfixedDiagnostics;
+        var _this = this;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    results = [];
+                    result = {
+                        updatedFilePaths: [],
+                        fixedDiagnosticsCount: 0,
+                        unfixedDiagnostics: new Map()
+                    };
+                    if (!filterArray.length) return [3 /*break*/, 5];
+                    absoluteFilePaths = filterArray.filter(function (pattern) {
+                        return path_1.default.isAbsolute(pattern);
+                    });
+                    return [4 /*yield*/, (0, utils_1.asyncForEach)(absoluteFilePaths, function (filePath) { return __awaiter(_this, void 0, void 0, function () {
+                            var formatResult, unfixedDiagnostics;
+                            var _a;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0: return [4 /*yield*/, (0, lint_1.formatFile)(filePath)];
+                                    case 1:
+                                        formatResult = _b.sent();
+                                        (_a = result.updatedFilePaths).push.apply(_a, __spreadArray([], __read(formatResult.updatedFilePaths), false));
+                                        result.fixedDiagnosticsCount += formatResult.fixedDiagnosticsCount;
+                                        unfixedDiagnostics = formatResult.unfixedDiagnostics;
+                                        if (unfixedDiagnostics.length) {
+                                            ;
+                                            result.unfixedDiagnostics.set(filePath, unfixedDiagnostics);
+                                        }
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); })
+                        // Remove absolute file path patterns.
+                        // No need to include these patterns in regex,
+                        // Because we have already formatted on these patterns
+                    ];
+                case 1:
+                    _d.sent();
+                    nonAbsoluteFilePathPatterns = filterArray.filter(function (pattern) { return !path_1.default.isAbsolute(pattern); });
+                    if (!nonAbsoluteFilePathPatterns.length) return [3 /*break*/, 4];
+                    regexPattern = nonAbsoluteFilePathPatterns
+                        .map(function (pattern) { return "(".concat(pattern, ")"); })
+                        .join('|');
+                    regex_1 = new RegExp(regexPattern);
+                    return [4 /*yield*/, (0, utils_1.listSasFilesInFolder)(process.projectDir, true, [
+                            'node_modules'
+                        ])];
+                case 2:
+                    sasFiles = _d.sent();
+                    filesToLint = sasFiles.filter(function (file) { return regex_1.test(file); });
+                    return [4 /*yield*/, (0, utils_1.asyncForEach)(filesToLint, function (file) { return __awaiter(_this, void 0, void 0, function () {
+                            var formatResult, unfixedDiagnostics;
+                            var _a;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0: return [4 /*yield*/, (0, lint_1.formatFile)(file)];
+                                    case 1:
+                                        formatResult = _b.sent();
+                                        (_a = result.updatedFilePaths).push.apply(_a, __spreadArray([], __read(formatResult.updatedFilePaths), false));
+                                        result.fixedDiagnosticsCount += formatResult.fixedDiagnosticsCount;
+                                        unfixedDiagnostics = formatResult.unfixedDiagnostics;
+                                        if (unfixedDiagnostics.length) {
+                                            ;
+                                            result.unfixedDiagnostics.set(file, unfixedDiagnostics);
+                                        }
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); })];
+                case 3:
+                    _d.sent();
+                    _d.label = 4;
+                case 4: return [3 /*break*/, 7];
+                case 5: return [4 /*yield*/, (0, lint_1.formatProject)()];
+                case 6:
+                    result = _d.sent();
+                    _d.label = 7;
+                case 7:
+                    (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Resolved ".concat(result.fixedDiagnosticsCount, " violations."));
+                    if (result.updatedFilePaths.length) {
                         (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info('Updated files:');
                         result.updatedFilePaths.forEach(function (filePath) {
                             var _a;
                             (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info(filePath);
                         });
+                    }
+                    unfixedDiagnostics = (result.unfixedDiagnostics);
+                    if (unfixedDiagnostics.size) {
                         (_c = process.logger) === null || _c === void 0 ? void 0 : _c.warn('Unresolved violations: ');
                         result.unfixedDiagnostics.forEach(function (diagnostics, filePath) {
-                            displayDiagnostics(filePath, diagnostics);
+                            if (diagnostics.length) {
+                                displayDiagnostics(filePath, diagnostics);
+                            }
                         });
-                    })];
-                case 1:
-                    _a.sent();
+                    }
                     return [2 /*return*/];
             }
         });
@@ -72,19 +182,81 @@ function lintFix() {
 }
 exports.lintFix = lintFix;
 /**
- * Lints all .sas files in the current project
+ * Lints all .sas files in the current project if no filterArray is provided
+ * Otherwise lints .sas files which matches filter array
  * @returns an object containing booleans `warnings` and `errors`
  */
-function processLint() {
+function processLint(filterArray) {
+    if (filterArray === void 0) { filterArray = []; }
     return __awaiter(this, void 0, void 0, function () {
-        var found, sasjsDiagnosticsMap;
+        var found, sasjsDiagnosticsMap, absoluteFilePaths, nonAbsoluteFilePathPatterns, regexPattern, regex_2, sasFiles, filesToLint;
+        var _this = this;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     found = { warnings: false, errors: false };
-                    return [4 /*yield*/, (0, lint_1.lintProject)()];
+                    sasjsDiagnosticsMap = new Map();
+                    if (!filterArray.length) return [3 /*break*/, 5];
+                    absoluteFilePaths = filterArray.filter(function (pattern) {
+                        return path_1.default.isAbsolute(pattern);
+                    });
+                    return [4 /*yield*/, (0, utils_1.asyncForEach)(absoluteFilePaths, function (filePath) { return __awaiter(_this, void 0, void 0, function () {
+                            var _a, _b, _c;
+                            return __generator(this, function (_d) {
+                                switch (_d.label) {
+                                    case 0:
+                                        _b = (_a = sasjsDiagnosticsMap).set;
+                                        _c = [filePath];
+                                        return [4 /*yield*/, (0, lint_1.lintFile)(filePath)];
+                                    case 1:
+                                        _b.apply(_a, _c.concat([_d.sent()]));
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); })
+                        // Remove absolute file path patterns.
+                        // No need to include these patterns in regex,
+                        // Because we have already run lint on these patterns
+                    ];
                 case 1:
+                    _a.sent();
+                    nonAbsoluteFilePathPatterns = filterArray.filter(function (pattern) { return !path_1.default.isAbsolute(pattern); });
+                    if (!nonAbsoluteFilePathPatterns.length) return [3 /*break*/, 4];
+                    regexPattern = nonAbsoluteFilePathPatterns
+                        .map(function (pattern) { return "(".concat(pattern, ")"); })
+                        .join('|');
+                    regex_2 = new RegExp(regexPattern);
+                    return [4 /*yield*/, (0, utils_1.listSasFilesInFolder)(process.projectDir, true, [
+                            'node_modules'
+                        ])];
+                case 2:
+                    sasFiles = _a.sent();
+                    filesToLint = sasFiles.filter(function (file) { return regex_2.test(file); });
+                    return [4 /*yield*/, (0, utils_1.asyncForEach)(filesToLint, function (file) { return __awaiter(_this, void 0, void 0, function () {
+                            var filePath, _a, _b, _c;
+                            return __generator(this, function (_d) {
+                                switch (_d.label) {
+                                    case 0:
+                                        filePath = path_1.default.join(process.projectDir, file);
+                                        _b = (_a = sasjsDiagnosticsMap).set;
+                                        _c = [filePath];
+                                        return [4 /*yield*/, (0, lint_1.lintFile)(filePath)];
+                                    case 1:
+                                        _b.apply(_a, _c.concat([_d.sent()]));
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); })];
+                case 3:
+                    _a.sent();
+                    _a.label = 4;
+                case 4: return [3 /*break*/, 7];
+                case 5: return [4 /*yield*/, (0, lint_1.lintProject)()];
+                case 6:
+                    // if filterArray is empty, lint whole project
                     sasjsDiagnosticsMap = _a.sent();
+                    _a.label = 7;
+                case 7:
                     sasjsDiagnosticsMap.forEach(function (sasjsDiagnostics, filePath) {
                         found.warnings =
                             found.warnings ||

package/build/commands/lint/spec/lintCommand.spec.js

@@ -94,7 +94,13 @@ describe('LintCommand', function () {
         var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['lint'], false);
         var command = new lintCommand_1.LintCommand(args);
         expect(command.name).toEqual('lint');
-        expect(command.subCommand).toEqual('');
+        expect(command.subCommand).toEqual('find');
+    });
+    it('should parse a sasjs lint command with filter strings', function () {
+        var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['lint', 'find', 'pattern1', 'pattern2'], false);
+        var command = new lintCommand_1.LintCommand(args);
+        expect(command.name).toEqual('lint');
+        expect(command.subCommand).toEqual('find');
     });
     it('should log success and return the success code when execution is successful', function () { return __awaiter(void 0, void 0, void 0, function () {
         var args, command, returnCode;
@@ -184,6 +190,12 @@ describe('LintCommand - fix', function () {
         expect(command.name).toEqual('lint');
         expect(command.subCommand).toEqual('fix');
     });
+    it('should parse sasjs lint command', function () {
+        var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['lint', 'fix', 'pattern1', 'pattern2'], false);
+        var command = new lintCommand_1.LintCommand(args);
+        expect(command.name).toEqual('lint');
+        expect(command.subCommand).toEqual('fix');
+    });
     it('should log success and return the success code when execution is successful', function () { return __awaiter(void 0, void 0, void 0, function () {
         var args, command, returnCode;
         return __generator(this, function (_a) {

package/build/commands/shared/deployToSasViyaWithServicePack.js

@@ -42,7 +42,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployToSasViyaWithServicePack = void 0;
 var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var utils_1 = require("@sasjs/utils");
-var js_base64_1 = require("js-base64");
 var utils_2 = require("../../utils");
 function deployToSasViyaWithServicePack(jsonFilePath, target, isLocal, isForced) {
     if (isForced === void 0) { isForced = false; }
@@ -91,7 +90,7 @@ var populateCodeInServicePack = function (json) {
     var _a;
     return (_a = json === null || json === void 0 ? void 0 : json.members) === null || _a === void 0 ? void 0 : _a.forEach(function (member) {
         if (member.type === utils_1.MemberType.file)
-            member.code = (0, js_base64_1.decode)(member.code);
+            member.code = Buffer.from(member.code, 'base64');
         if (member.type === utils_1.MemberType.folder)
             populateCodeInServicePack(member);
     });

package/build/types/command/commandBase.js

@@ -85,7 +85,7 @@ var subCommandMap = new Map([
     ['doc', ['init', 'lineage']],
     ['servicepack', ['deploy']],
     ['add', ['cred']],
-    ['lint', ['init', 'fix']],
+    ['lint', ['init', 'fix', 'find']],
     ['flow', ['execute']]
 ]);
 exports.defaultCommandOptions = {

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

@@ -182,7 +182,7 @@ describe('utils', function () {
                         return [4 /*yield*/, (0, utils_2.readFile)(gitFilePath)];
                     case 3:
                         gitIgnoreContent = _a.sent();
-                        expect(gitIgnoreContent.includes('sasjsbuild/')).toEqual(true);
+                        expect(gitIgnoreContent.includes('sasjsbuild')).toEqual(true);
                         return [4 /*yield*/, (0, utils_2.deleteFile)(gitFilePath)];
                     case 4:
                         _a.sent();
@@ -202,7 +202,7 @@ describe('utils', function () {
                         return [4 /*yield*/, expect((0, utils_1.setupGitIgnore)(folderPath)).toResolve()];
                     case 2:
                         _a.sent();
-                        regExp = new RegExp("^node_modules/\nsasjsbuild/\n", 'gm');
+                        regExp = new RegExp("^node_modules/\nsasjsbuild\n", 'gm');
                         return [4 /*yield*/, (0, utils_2.readFile)(gitFilePath)];
                     case 3:
                         gitIgnoreContent = _a.sent();
@@ -221,7 +221,7 @@ describe('utils', function () {
                         return [4 /*yield*/, expect((0, utils_1.setupGitIgnore)(folderPath)).toResolve()];
                     case 2:
                         _a.sent();
-                        regExp = new RegExp("^sasjsbuild/", 'gm');
+                        regExp = new RegExp("^sasjsbuild", 'gm');
                         expect(gitIgnoreContent.match(regExp)).toBeTruthy();
                         expect(gitIgnoreContent.match(regExp).length).toEqual(1);
                         return [4 /*yield*/, (0, utils_2.deleteFile)(gitFilePath)];

package/build/utils/utils.js

@@ -295,7 +295,7 @@ function setupNpmProject(folderName) {
                     var _a, _b, _c;
                     return __generator(this, function (_d) {
                         switch (_d.label) {
-                            case 0: return [4 /*yield*/, inExistingProject(folderPath)];
+                            case 0: return [4 /*yield*/, inExistingProject(folderName)];
                             case 1:
                                 isExistingProject = _d.sent();
                                 if (!isExistingProject) {
@@ -322,7 +322,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;
+        var gitIgnoreFilePath, gitIgnoreExists, gitIgnoreContent, newgitIgnoreContent, regExpSasjsBuild, regExpSasjsResults, regExpNodeModules, regExpEnv;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -335,18 +335,27 @@ function setupGitIgnore(folderName) {
                 case 2:
                     gitIgnoreContent = _c.sent();
                     newgitIgnoreContent = gitIgnoreContent;
-                    regExpSasjsBuild = new RegExp("^sasjsbuild/", 'gm');
-                    newgitIgnoreContent = newgitIgnoreContent.match(regExpSasjsBuild)
-                        ? newgitIgnoreContent
-                        : "".concat(newgitIgnoreContent ? newgitIgnoreContent + '\n' : '', "sasjsbuild/\n");
-                    regExpSasjsResults = new RegExp("^sasjsresults/", 'gm');
-                    newgitIgnoreContent = newgitIgnoreContent.match(regExpSasjsResults)
-                        ? newgitIgnoreContent
-                        : "".concat(newgitIgnoreContent ? newgitIgnoreContent + '\n' : '', "sasjsresults/\n");
-                    regExpNodeModules = new RegExp("^node_modules/", 'gm');
-                    newgitIgnoreContent = newgitIgnoreContent.match(regExpNodeModules)
-                        ? newgitIgnoreContent
-                        : "".concat(newgitIgnoreContent + '\n', "node_modules/\n");
+                    regExpSasjsBuild = new RegExp("^sasjsbuild", 'gm');
+                    regExpSasjsResults = new RegExp("^sasjsresults", 'gm');
+                    regExpNodeModules = new RegExp("^node_modules", 'gm');
+                    regExpEnv = new RegExp("^.env*", 'gm');
+                    if (newgitIgnoreContent) {
+                        if (!regExpSasjsBuild.test(newgitIgnoreContent)) {
+                            newgitIgnoreContent += '\nsasjsbuild';
+                        }
+                        if (!regExpSasjsResults.test(newgitIgnoreContent)) {
+                            newgitIgnoreContent += '\nsasjsresults';
+                        }
+                        if (!regExpNodeModules.test(newgitIgnoreContent)) {
+                            newgitIgnoreContent += '\nnode_modules';
+                        }
+                        if (!regExpEnv.test(newgitIgnoreContent)) {
+                            newgitIgnoreContent += '\n.env*';
+                        }
+                    }
+                    else {
+                        newgitIgnoreContent = 'node_modules\nsasjsbuild\nsasjsresults\n.env*\n';
+                    }
                     if (!(gitIgnoreContent !== newgitIgnoreContent)) return [3 /*break*/, 4];
                     return [4 /*yield*/, (0, utils_1.createFile)(gitIgnoreFilePath, newgitIgnoreContent)];
                 case 3:
@@ -354,7 +363,7 @@ function setupGitIgnore(folderName) {
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success('Existing .gitignore has been updated.');
                     _c.label = 4;
                 case 4: return [3 /*break*/, 7];
-                case 5: return [4 /*yield*/, (0, utils_1.createFile)(gitIgnoreFilePath, 'node_modules/\nsasjsbuild/\nsasjsresults/\n.env*\n')];
+                case 5: return [4 /*yield*/, (0, utils_1.createFile)(gitIgnoreFilePath, 'node_modules\nsasjsbuild\nsasjsresults\n.env*\n')];
                 case 6:
                     _c.sent();
                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.success('.gitignore file has been created.');

package/package.json

@@ -52,8 +52,8 @@
   "dependencies": {
     "@sasjs/adapter": "4.1.0",
     "@sasjs/core": "4.45.4",
-    "@sasjs/lint": "2.1.2",
-    "@sasjs/utils": "2.51.5",
+    "@sasjs/lint": "2.2.0",
+    "@sasjs/utils": "2.52.0",
     "adm-zip": "0.5.9",
     "chalk": "4.1.2",
     "csv-stringify": "5.6.5",
@@ -101,5 +101,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.24.1"
+  "version": "3.26.0"
 }

package/CHANGELOG.md

@@ -1,30 +0,0 @@
-# Change Log
-
-Since March 7th, 2020, the changelog is managed by github releases.  See [https://github.com/sasjs/cli/releases](https://github.com/sasjs/cli/releases).
-
-## Changes Prior to March 7th 2020
-
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
-
-<a name="1.0.4"></a>
-## [1.0.4](https://gitlab.com/macropeople/sasjs-cli/compare/v1.0.3...v1.0.4) (2020-03-07)
-
-
-### Bug Fixes
-
-* redo comment stripping logic ([84a1a91](https://gitlab.com/macropeople/sasjs-cli/commit/84a1a91))
-
-
-
-<a name="1.0.3"></a>
-## [1.0.3](https://gitlab.com/macropeople/sasjs-cli/compare/v1.0.2...v1.0.3) (2020-03-07)
-
-
-
-<a name="1.0.2"></a>
-## [1.0.2](https://gitlab.com/macropeople/sasjs-cli/compare/v1.0.1...v1.0.2) (2020-03-07)
-
-
-
-<a name="1.0.1"></a>
-## 1.0.1 (2020-03-07)