@sasjs/cli 3.10.1 → 3.12.0

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/commands/deploy/deploy.js

@@ -330,11 +330,12 @@ function deployToSas9(deployScriptName, target, linesToExecute, logFolder, strea
  * Deploys app to `SASJS` server.
  * @param {Target} target- the target having deploy configuration.
  * @param {object} sasjs - optional configuration object of SAS adapter.
+ * @param {object} streamConfig - optional config for deploying streaming app.
  */
 function deployToSasjs(target, sasjs, streamConfig) {
     var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function () {
-        var buildDestinationFolder, finalFilePathJSON, jsonContent, payload, authConfig, e_2, result, appLoc, webAppStreamUrl;
+        var buildDestinationFolder, finalFilePathJSON, jsonContent, payload, authConfig, e_2, result, webAppStreamUrl;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
@@ -363,7 +364,7 @@ function deployToSasjs(target, sasjs, streamConfig) {
                     e_2 = _d.sent();
                     return [3 /*break*/, 5];
                 case 5: return [4 /*yield*/, sasjs
-                        .deployToSASjs(payload, undefined, authConfig)
+                        .deployToSASjs(payload, undefined, streamConfig, authConfig)
                         .catch(function (err) {
                         var _a;
                         (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error(err);
@@ -376,9 +377,8 @@ function deployToSasjs(target, sasjs, streamConfig) {
                             (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Payload example:\n".concat(JSON.stringify(result.example, null, 2)));
                         }
                     }
-                    if (streamConfig === null || streamConfig === void 0 ? void 0 : streamConfig.streamWeb) {
-                        appLoc = encodeURI(target.appLoc);
-                        webAppStreamUrl = "".concat(target.serverUrl, "/AppStream").concat(appLoc);
+                    if ((streamConfig === null || streamConfig === void 0 ? void 0 : streamConfig.streamWeb) && (result === null || result === void 0 ? void 0 : result.streamServiceName)) {
+                        webAppStreamUrl = "".concat(target.serverUrl, "/AppStream/").concat(result.streamServiceName);
                         (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info("Web app is available at ".concat(webAppStreamUrl));
                     }
                     return [2 /*return*/];

package/build/commands/deploy/spec/cbd.spec.js

@@ -78,7 +78,7 @@ describe('sasjs cbd with server type SASJS', function () {
         });
     }); });
     it("should deploy compile and build to sasjs/server", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var sasjs, customTarget, macroCorePath, mf_getuser, mp_jsonout, ms_webout, webout;
+        var sasjs, customTarget, macroCorePath, mf_getuser, mp_jsonout, ms_webout, webout, streamConfig;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -125,6 +125,13 @@ describe('sasjs cbd with server type SASJS', function () {
                         '      ,showmeta=&showmeta\n' +
                         '    )' +
                         '  %mend;\n';
+                    streamConfig = {
+                        assetPaths: [],
+                        streamServiceName: 'clickme',
+                        streamWeb: false,
+                        streamWebFolder: '',
+                        webSourcePath: ''
+                    };
                     expect(sasjs.deployToSASjs).toHaveBeenCalledWith({
                         members: [
                             {
@@ -152,7 +159,7 @@ describe('sasjs cbd with server type SASJS', function () {
                                 ]
                             }
                         ]
-                    }, undefined, undefined);
+                    }, undefined, streamConfig, undefined);
                     return [2 /*return*/];
             }
         });

package/build/commands/help/help.js

@@ -223,8 +223,8 @@ function printHelpText() {
                         "the user run a SAS job against a specified target.",
                         "The target can exist either in the local project configuration or in the global .sasjsrc file.",
                         "<sasProgramPath> - if this has a leading slash (eg /Public/app/folder/servicename) then it must be the full path. If it is a relative path (eg path/servicename) then it will be pre-pended with the appLoc - which must then be defined in the sasjs config.",
-                        "<path/to/log> - Location in which to store the log file. If not provided AND an error occurs, the log will be stored in the execution path.",
-                        "<path/to/output> - Location to store the output file. If not provided, a file named output.json will be saved in the execution path."
+                        "<path/to/log> - Location in which to store the log file. If not provided AND current directory is a sasjs project, it will be saved in sasjsresults else in the current directory",
+                        "<path/to/output> - Location to store the output file. If not provided AND current directory is a sasjs project, an output file  will be saved in the sasjsresults folder else in current directory."
                     ]
                 },
                 {

package/build/commands/request/request.js

@@ -47,7 +47,6 @@ var displayResult_1 = require("../../utils/displayResult");
 var types_1 = require("@sasjs/utils/types");
 var utils_2 = require("../../utils/utils");
 var saveLog_1 = require("../../utils/saveLog");
-var getLogFilePath_1 = require("../../utils/getLogFilePath");
 function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath, authConfig, logFile, jobPath, outputPathParam) {
     return __awaiter(this, void 0, void 0, function () {
         var dataJson, configJson, dataFile, configFile, sas9CredentialsError, sasjs, result;
@@ -150,7 +149,7 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                                             output = res;
                                         }
                                         if (!!!output) return [3 /*break*/, 4];
-                                        return [4 /*yield*/, writeOutput(outputPathParam, output, isLocal)];
+                                        return [4 /*yield*/, writeOutput(outputPathParam, output, sasJobLocation)];
                                     case 3:
                                         _a.sent();
                                         _a.label = 4;
@@ -193,20 +192,28 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
 }
 exports.runSasJob = runSasJob;
 var saveLogFile = function (sasjs, sasJobLocation, logFile, jobPath) { return __awaiter(void 0, void 0, void 0, function () {
-    var sasRequests, currentRequestLog;
+    var sasRequests, currentRequestLog, logPath, timestamp, filename;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
                 sasRequests = sasjs.getSasRequests();
                 currentRequestLog = sasRequests.find(function (x) { return x.serviceLink === sasJobLocation; });
-                if (!(currentRequestLog && jobPath)) return [3 /*break*/, 2];
-                if (!logFile)
-                    logFile = (0, getLogFilePath_1.getLogFilePath)('', jobPath || '');
-                return [4 /*yield*/, (0, saveLog_1.saveLog)(currentRequestLog.logFile, logFile, jobPath || '', false)];
+                if (!(currentRequestLog && jobPath)) return [3 /*break*/, 4];
+                if (!!logFile) return [3 /*break*/, 2];
+                return [4 /*yield*/, (0, utils_2.isSASjsProject)()];
             case 1:
-                _a.sent();
+                logPath = (_a.sent())
+                    ? path_1.default.join(process.sasjsConstants.buildDestinationResultsFolder, 'requests')
+                    : process.projectDir;
+                timestamp = (0, utils_1.generateTimestamp)();
+                filename = sasJobLocation.split(path_1.default.sep).pop();
+                logFile = path_1.default.join(logPath, "".concat(filename, "-").concat(timestamp, ".log"));
                 _a.label = 2;
-            case 2: return [2 /*return*/];
+            case 2: return [4 /*yield*/, (0, saveLog_1.saveLog)(currentRequestLog.logFile, logFile, jobPath || '', false)];
+            case 3:
+                _a.sent();
+                _a.label = 4;
+            case 4: return [2 /*return*/];
         }
     });
 }); };
@@ -214,15 +221,18 @@ var saveLogFile = function (sasjs, sasJobLocation, logFile, jobPath) { return __
  * Writes output to the file
  * @param outputPathParam path to output file
  * @param output data to be written to output file
- * @param isLocal is local target, othervise it is global
+ * @param sasJobLocation is used for output file name when outputPathParam is undefined
  * @returns output path for the file created
  */
-var writeOutput = function (outputPathParam, output, isLocal) { return __awaiter(void 0, void 0, void 0, function () {
-    var outputPath, outputFilename, outputPathArr, outputString;
+var writeOutput = function (outputPathParam, output, sasJobLocation) { return __awaiter(void 0, void 0, void 0, function () {
+    var outputPath, outputFilename, outputPathArr, timestamp, filename, outputString;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0:
-                outputPath = path_1.default.join(process.projectDir, isLocal ? '' : '');
+            case 0: return [4 /*yield*/, (0, utils_2.isSASjsProject)()];
+            case 1:
+                outputPath = (_a.sent())
+                    ? path_1.default.join(process.sasjsConstants.buildDestinationResultsFolder, 'requests')
+                    : process.projectDir;
                 if (outputPathParam && typeof outputPathParam === 'string') {
                     outputPathParam = path_1.default.join(process.projectDir, outputPathParam || '');
                     outputPathArr = outputPathParam.split(path_1.default.sep);
@@ -230,18 +240,20 @@ var writeOutput = function (outputPathParam, output, isLocal) { return __awaiter
                     outputPath = outputPathArr.join(path_1.default.sep);
                 }
                 return [4 /*yield*/, (0, utils_1.folderExists)(outputPath)];
-            case 1:
-                if (!!(_a.sent())) return [3 /*break*/, 3];
-                return [4 /*yield*/, (0, utils_1.createFolder)(outputPath)];
             case 2:
-                _a.sent();
-                _a.label = 3;
+                if (!!(_a.sent())) return [3 /*break*/, 4];
+                return [4 /*yield*/, (0, utils_1.createFolder)(outputPath)];
             case 3:
+                _a.sent();
+                _a.label = 4;
+            case 4:
                 if (outputFilename) {
                     outputPath += "".concat(path_1.default.sep).concat(outputFilename);
                 }
                 else {
-                    outputPath += "".concat(path_1.default.sep, "output.json");
+                    timestamp = (0, utils_1.generateTimestamp)();
+                    filename = sasJobLocation.split(path_1.default.sep).pop();
+                    outputPath += "".concat(path_1.default.sep).concat(filename, "-").concat(timestamp, ".json");
                 }
                 outputString = '';
                 if (typeof output === 'object') {
@@ -256,16 +268,16 @@ var writeOutput = function (outputPathParam, output, isLocal) { return __awaiter
                 else {
                     outputString = output;
                 }
-                if (!outputString) return [3 /*break*/, 5];
+                if (!outputString) return [3 /*break*/, 6];
                 return [4 /*yield*/, (0, utils_1.createFile)(outputPath, outputString)];
-            case 4:
+            case 5:
                 _a.sent();
                 (0, displayResult_1.displaySuccess)("Request finished. Output is stored at '".concat(outputPath, "'"));
-                return [3 /*break*/, 6];
-            case 5:
+                return [3 /*break*/, 7];
+            case 6:
                 (0, displayResult_1.displayError)("There was a problem with writing output file. Data not present.");
-                _a.label = 6;
-            case 6: return [2 /*return*/];
+                _a.label = 7;
+            case 7: return [2 /*return*/];
         }
     });
 }); };

package/build/commands/request/spec/request.spec.server.js

@@ -10,6 +10,25 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -54,6 +73,7 @@ var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
 var utils_2 = require("@sasjs/utils");
 var test_1 = require("../../../utils/test");
+var timeStampUtils = __importStar(require("@sasjs/utils/time"));
 var config_1 = require("../../../utils/config");
 var request_1 = require("../request");
 var build_1 = require("../../build/build");
@@ -92,14 +112,17 @@ var expectedDataObj = {
         }
     ]
 };
-var getOutputJson = function () { return __awaiter(void 0, void 0, void 0, function () { var _a, _b; return __generator(this, function (_c) {
-    switch (_c.label) {
-        case 0:
-            _b = (_a = JSON).parse;
-            return [4 /*yield*/, (0, utils_1.readFile)(path_1.default.join(process.projectDir, 'output.json'))];
-        case 1: return [2 /*return*/, _b.apply(_a, [_c.sent()])];
-    }
-}); }); };
+var getOutputJson = function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0:
+                _b = (_a = JSON).parse;
+                return [4 /*yield*/, (0, utils_1.readFile)(path_1.default.join(process.sasjsConstants.buildDestinationResultsFolder, 'requests', fileName))];
+            case 1: return [2 /*return*/, _b.apply(_a, [_c.sent()])];
+        }
+    });
+}); };
 describe('sasjs request without compute API', function () {
     var appName = 'cli-tests-request-' + (0, utils_2.generateTimestamp)();
     var target = (0, test_1.generateTestTarget)(appName, "/Public/app/cli-tests/".concat(appName), {
@@ -165,18 +188,24 @@ describe('sasjs request without compute API', function () {
         });
     }); });
     it("should execute service 'sendArr' with absolute path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendArr"), dataPathRel, undefined, authConfig)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendArr-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendArr"), dataPathRel, undefined, authConfig)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataArr.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataArr.table2);
                     return [2 /*return*/];
@@ -184,18 +213,24 @@ describe('sasjs request without compute API', function () {
         });
     }); });
     it("should execute service 'sendObj' with absolute path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendObj"), dataPathRel, undefined, authConfig)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendObj-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendObj"), dataPathRel, undefined, authConfig)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataObj.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataObj.table2);
                     return [2 /*return*/];
@@ -203,18 +238,24 @@ describe('sasjs request without compute API', function () {
         });
     }); });
     it("should execute service 'sendArr' with relative path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendArr', dataPathRel, undefined, authConfig)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendArr-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendArr', dataPathRel, undefined, authConfig)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataArr.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataArr.table2);
                     return [2 /*return*/];
@@ -222,18 +263,24 @@ describe('sasjs request without compute API', function () {
         });
     }); });
     it("should execute service 'sendObj' with relative path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendObj', dataPathRel, undefined, authConfig)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendObj-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendObj', dataPathRel, undefined, authConfig)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataObj.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataObj.table2);
                     return [2 /*return*/];
@@ -258,7 +305,7 @@ describe('sasjs request without compute API', function () {
         });
     }); });
     it("should execute service 'err' with absolute path with log path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var jobPath, log, rawLogDataStats, rawDataStats;
+        var jobPath, log, rawLogDataStats;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -268,15 +315,13 @@ describe('sasjs request without compute API', function () {
                 case 1:
                     _a.sent();
                     rawLogDataStats = (0, fs_1.statSync)(log);
-                    rawDataStats = (0, fs_1.statSync)(path_1.default.join(process.projectDir, 'output.json'));
                     expect(rawLogDataStats.size).toBeGreaterThan(10);
-                    expect(rawDataStats.size).toBeGreaterThan(10);
                     return [2 /*return*/];
             }
         });
     }); });
     it("should execute service 'err' with absolute path with default log path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var jobPath, log, rawLogDataStats, rawDataStats;
+        var jobPath, log, rawLogDataStats;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -286,9 +331,7 @@ describe('sasjs request without compute API', function () {
                 case 1:
                     _a.sent();
                     rawLogDataStats = (0, fs_1.statSync)(log);
-                    rawDataStats = (0, fs_1.statSync)(path_1.default.join(process.projectDir, 'output.json'));
                     expect(rawLogDataStats.size).toBeGreaterThan(10);
-                    expect(rawDataStats.size).toBeGreaterThan(10);
                     return [2 /*return*/];
             }
         });
@@ -355,18 +398,24 @@ describe('sasjs request with SAS9', function () {
         });
     }); });
     it("should execute service 'sendArr' with absolute path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendArr"), dataPathRel)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendArr-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendArr"), dataPathRel)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataArr.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataArr.table2);
                     return [2 /*return*/];
@@ -374,18 +423,24 @@ describe('sasjs request with SAS9', function () {
         });
     }); });
     it("should execute service 'sendObj' with absolute path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendObj"), dataPathRel)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendObj-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendObj"), dataPathRel)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataObj.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataObj.table2);
                     return [2 /*return*/];
@@ -393,18 +448,24 @@ describe('sasjs request with SAS9', function () {
         });
     }); });
     it("should execute service 'sendArr' with relative path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendArr', dataPathRel)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendArr-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendArr', dataPathRel)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataArr.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataArr.table2);
                     return [2 /*return*/];
@@ -412,18 +473,24 @@ describe('sasjs request with SAS9', function () {
         });
     }); });
     it("should execute service 'sendObj' with relative path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendObj', dataPathRel)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendObj-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendObj', dataPathRel)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataObj.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataObj.table2);
                     return [2 /*return*/];
@@ -448,7 +515,7 @@ describe('sasjs request with SAS9', function () {
         });
     }); });
     it("should execute service 'err' with absolute path with log path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var jobPath, log, rawLogDataStats, rawDataStats;
+        var jobPath, log, rawLogDataStats;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -458,15 +525,13 @@ describe('sasjs request with SAS9', function () {
                 case 1:
                     _a.sent();
                     rawLogDataStats = (0, fs_1.statSync)(log);
-                    rawDataStats = (0, fs_1.statSync)(path_1.default.join(process.projectDir, 'output.json'));
                     expect(rawLogDataStats.size).toBeGreaterThan(10);
-                    expect(rawDataStats.size).toBeGreaterThan(10);
                     return [2 /*return*/];
             }
         });
     }); });
     it("should execute service 'err' with absolute path with default log path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var jobPath, log, rawLogDataStats, rawDataStats;
+        var jobPath, log, rawLogDataStats;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -476,9 +541,7 @@ describe('sasjs request with SAS9', function () {
                 case 1:
                     _a.sent();
                     rawLogDataStats = (0, fs_1.statSync)(log);
-                    rawDataStats = (0, fs_1.statSync)(path_1.default.join(process.projectDir, 'output.json'));
                     expect(rawLogDataStats.size).toBeGreaterThan(10);
-                    expect(rawDataStats.size).toBeGreaterThan(10);
                     return [2 /*return*/];
             }
         });
@@ -544,18 +607,24 @@ describe("sasjs request with compute API", function () {
         });
     }); });
     it("should execute service 'sendArr' with absolute path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendArr"), dataPathRel, configPathRel, authConfig)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendArr-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendArr"), dataPathRel, configPathRel, authConfig)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataArr.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataArr.table2);
                     return [2 /*return*/];
@@ -563,18 +632,24 @@ describe("sasjs request with compute API", function () {
         });
     }); });
     it("should execute service 'sendObj' with absolute path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendObj"), dataPathRel, configPathRel, authConfig)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendObj-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendObj"), dataPathRel, configPathRel, authConfig)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataObj.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataObj.table2);
                     return [2 /*return*/];
@@ -582,18 +657,24 @@ describe("sasjs request with compute API", function () {
         });
     }); });
     it("should execute service 'sendArr' with relative path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendArr', dataPathRel, undefined, authConfig)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendArr-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendArr', dataPathRel, undefined, authConfig)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataArr.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataArr.table2);
                     return [2 /*return*/];
@@ -601,18 +682,24 @@ describe("sasjs request with compute API", function () {
         });
     }); });
     it("should execute service 'sendObj' with relative path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendObj', dataPathRel, undefined, authConfig)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendObj-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendObj', dataPathRel, undefined, authConfig)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataObj.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataObj.table2);
                     return [2 /*return*/];

package/build/commands/testing/test.js

@@ -122,7 +122,7 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                     flow = [];
                     if (testFlow.testSetUp)
                         flow.push(testFlow.testSetUp);
-                    if (testFlow.tests)
+                    if (testFlow.tests) {
                         flow = __spreadArray(__spreadArray([], __read(flow), false), __read(testFlow.tests.filter(function (test) {
                             var e_2, _a;
                             if (!testRegExps.length)
@@ -144,6 +144,7 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                             }
                             return match;
                         })), false);
+                    }
                     if (testFlow.testTearDown)
                         flow.push(testFlow.testTearDown);
                     sasjs = (0, createSASjsInstance_1.createSASjsInstance)({
@@ -190,7 +191,8 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                 case 7:
                     e_1 = _e.sent();
                     return [3 /*break*/, 8];
-                case 8: return [3 /*break*/, 9];
+                case 8: // FIXME: handle error properly
+                return [3 /*break*/, 9];
                 case 9:
                     result = {
                         sasjs_test_meta: []

package/build/utils/config.js

@@ -686,11 +686,10 @@ function getMacroFolders(target) {
                     return [4 /*yield*/, getLocalOrGlobalConfig()];
                 case 1:
                     localConfig = (_a.sent()).configuration;
+                    if (target === null || target === void 0 ? void 0 : target.macroFolders)
+                        macroFolders = target.macroFolders;
                     if (localConfig === null || localConfig === void 0 ? void 0 : localConfig.macroFolders) {
-                        macroFolders = localConfig.macroFolders;
-                    }
-                    if (target === null || target === void 0 ? void 0 : target.macroFolders) {
-                        macroFolders = target.macroFolders.concat(macroFolders);
+                        macroFolders = localConfig.macroFolders.concat(macroFolders);
                     }
                     buildSourceFolder = process.sasjsConstants.buildSourceFolder;
                     macroFolders = macroFolders.map(function (macroFolder) {

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.d.ts

@@ -35,3 +35,11 @@ export declare function displaySasjsRunnerError(username: string): void;
 export declare const loadEnvVariables: (fileName: string) => Promise<void>;
 export declare function prefixAppLoc(appLoc?: string, path?: string): string | null;
 export declare const terminateProcess: (status: number) => never;
+/**
+ * This function checks whether the current directory, or any of the parent
+ * directories, are part of a SASjs project.  This is done by testing for
+ * the existence of a ./sasjs/sasjsconfig.json file.
+ *
+ * @returns boolean
+ */
+export declare const isSASjsProject: () => Promise<boolean>;

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.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.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;
 var shelljs_1 = __importDefault(require("shelljs"));
 var path_1 = __importDefault(require("path"));
 var ora_1 = __importDefault(require("ora"));
@@ -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*/];
             }
         });
     });
@@ -561,3 +565,43 @@ var terminateProcess = function (status) {
     process.exit(status);
 };
 exports.terminateProcess = terminateProcess;
+/**
+ * This function checks whether the current directory, or any of the parent
+ * directories, are part of a SASjs project.  This is done by testing for
+ * the existence of a ./sasjs/sasjsconfig.json file.
+ *
+ * @returns boolean
+ */
+var isSASjsProject = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var i, currentLocation, maxLevels, _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                i = 1;
+                currentLocation = process.projectDir;
+                maxLevels = currentLocation.split(path_1.default.sep).length;
+                _b.label = 1;
+            case 1:
+                if (!(i <= maxLevels)) return [3 /*break*/, 5];
+                return [4 /*yield*/, (0, utils_1.folderExists)(path_1.default.join(currentLocation, 'sasjs'))];
+            case 2:
+                _a = (_b.sent());
+                if (!_a) return [3 /*break*/, 4];
+                return [4 /*yield*/, (0, utils_1.fileExists)(path_1.default.join(currentLocation, 'sasjs', 'sasjsconfig.json'))];
+            case 3:
+                _a = (_b.sent());
+                _b.label = 4;
+            case 4:
+                if (_a) {
+                    return [2 /*return*/, true];
+                }
+                else {
+                    currentLocation = path_1.default.join(currentLocation, '..');
+                    i++;
+                }
+                return [3 /*break*/, 1];
+            case 5: return [2 /*return*/, false];
+        }
+    });
+}); };
+exports.isSASjsProject = isSASjsProject;

package/package.json

@@ -47,10 +47,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "^3.7.14",
+    "@sasjs/adapter": "3.8.0",
     "@sasjs/core": "4.15.3",
     "@sasjs/lint": "1.11.2",
-    "@sasjs/utils": "2.39.0",
+    "@sasjs/utils": "2.40.0",
     "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.10.1"
+  "version": "3.12.0"
 }