@sasjs/utils 2.35.0 → 2.36.2

package/package.json

@@ -33,32 +33,32 @@
   },
   "homepage": "https://github.com/sasjs/utils#readme",
   "devDependencies": {
-    "@sasjs/core": "^3.10.0",
-    "@types/cli-table": "^0.3.0",
+    "@sasjs/core": "3.10.0",
+    "@types/cli-table": "0.3.0",
     "@types/find": "0.2.1",
-    "@types/jest": "27.0.2",
-    "@types/rimraf": "^3.0.1",
-    "@types/valid-url": "^1.0.3",
-    "babel-jest": "27.2.4",
-    "jest": "27.2.4",
-    "jest-extended": "^1.1.0",
-    "ts-jest": "27.0.5",
+    "@types/jest": "27.4.0",
+    "@types/rimraf": "3.0.1",
+    "@types/valid-url": "1.0.3",
+    "babel-jest": "27.4.6",
+    "jest": "27.4.7",
+    "jest-extended": "1.1.0",
+    "ts-jest": "27.1.3",
     "ts-loader": "9.2.6",
-    "typescript": "4.3.5"
+    "typescript": "4.5.4"
   },
   "dependencies": {
-    "@types/fs-extra": "^9.0.13",
-    "@types/prompts": "^2.0.13",
-    "chalk": "^4.1.1",
-    "cli-table": "^0.3.6",
-    "consola": "^2.15.0",
-    "csv-stringify": "^5.6.5",
+    "@types/fs-extra": "9.0.13",
+    "@types/prompts": "2.0.13",
+    "chalk": "4.1.1",
+    "cli-table": "0.3.6",
+    "consola": "2.15.0",
+    "csv-stringify": "5.6.5",
     "find": "0.3.0",
-    "fs-extra": "^10.0.0",
-    "jwt-decode": "^3.1.2",
-    "prompts": "^2.4.1",
-    "rimraf": "^3.0.2",
-    "valid-url": "^1.0.9"
+    "fs-extra": "10.0.0",
+    "jwt-decode": "3.1.2",
+    "prompts": "2.4.1",
+    "rimraf": "3.0.2",
+    "valid-url": "1.0.9"
   },
-  "version": "2.35.0"
+  "version": "2.36.2"
 }

package/sasjsCli/getDependencies.js

@@ -61,6 +61,7 @@ var _1 = require("./");
 var utils_2 = require("../utils");
 var find_1 = __importDefault(require("find"));
 var file_1 = require("../file");
+var formatter_1 = require("../formatter");
 // REFACTOR: move logic supporting SAS Macros dependencies to this file
 var DependencyType;
 (function (DependencyType) {
@@ -84,10 +85,10 @@ var getDepInfo = function (depType, fileContent) {
     }
     var depInfo = {
         name: header,
-        header: "<h4> " + header + " </h4>",
-        config: (depType === DependencyType.Include
+        header: "<h4> ".concat(header, " </h4>"),
+        config: "".concat((depType === DependencyType.Include
             ? 'Program'
-            : depType).toLowerCase() + "Folders",
+            : depType).toLowerCase(), "Folders"),
         type: depType
     };
     return depInfo;
@@ -97,9 +98,9 @@ var getDependencies = function (fileName, fileContent, folders, depType) { retur
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                folders = utils_1.uniqArray(folders);
+                folders = (0, utils_1.uniqArray)(folders);
                 depInfo = getDepInfo(depType, fileContent);
-                deps = deconstructDependency(_1.getList(depInfo.header, fileContent), depInfo);
+                deps = deconstructDependency((0, _1.getList)(depInfo.header, fileContent), depInfo);
                 uniqDeps = [];
                 deps.forEach(function (dep) {
                     return uniqDeps.find(function (d) { return dep.fileName === d.fileName; }) || uniqDeps.push(dep);
@@ -107,17 +108,17 @@ var getDependencies = function (fileName, fileContent, folders, depType) { retur
                 if (!uniqDeps.length) return [3 /*break*/, 2];
                 foundDeps_1 = [];
                 foundDepsNames_1 = [];
-                return [4 /*yield*/, utils_2.asyncForEach(folders, function (folder) { return __awaiter(void 0, void 0, void 0, function () {
+                return [4 /*yield*/, (0, utils_2.asyncForEach)(folders, function (folder) { return __awaiter(void 0, void 0, void 0, function () {
                         return __generator(this, function (_a) {
                             switch (_a.label) {
-                                case 0: return [4 /*yield*/, utils_2.asyncForEach(uniqDeps, function (dep) { return __awaiter(void 0, void 0, void 0, function () {
+                                case 0: return [4 /*yield*/, (0, utils_2.asyncForEach)(uniqDeps, function (dep) { return __awaiter(void 0, void 0, void 0, function () {
                                         var filePaths, encodedFileContent, depContent;
                                         return __generator(this, function (_a) {
                                             switch (_a.label) {
                                                 case 0:
                                                     filePaths = find_1.default.fileSync(dep.fileName, folder);
                                                     if (!filePaths.length) return [3 /*break*/, 2];
-                                                    return [4 /*yield*/, file_1.readFile(filePaths[0], depType === DependencyType.Binary ? 'base64' : undefined)];
+                                                    return [4 /*yield*/, (0, file_1.readFile)(filePaths[0], depType === DependencyType.Binary ? 'base64' : undefined)];
                                                 case 1:
                                                     encodedFileContent = _a.sent();
                                                     depContent = compileDep(depType, encodedFileContent, dep.fileRef);
@@ -138,17 +139,17 @@ var getDependencies = function (fileName, fileContent, folders, depType) { retur
                 _a.sent();
                 notFoundDeps = deps
                     .filter(function (dep) { return !foundDepsNames_1.includes(dep.fileName); })
-                    .map(function (dep, i) { return i + 1 + ". '" + dep.fileName + "' with fileRef '" + dep.fileRef + "'"; })
+                    .map(function (dep, i) { return "".concat(i + 1, ". '").concat(dep.fileName, "' with fileRef '").concat(dep.fileRef, "'"); })
                     .join('\n');
                 if (notFoundDeps.length) {
                     depFolder = depInfo.config.replace(/([A-Z]+)/g, ' $1');
-                    depFolder = depFolder.charAt(0).toUpperCase() + depFolder.slice(1);
-                    throw new Error("Unable to load dependencies for: " + (fileName || '') + "\n" +
-                        ("The following files were listed under " + depInfo.name + " but could not be found:\n") +
-                        (notFoundDeps + "\n") +
-                        ("Please check that they exist in the folder(s) listed in the `" + depInfo.config + "` array in your sasjsconfig.json file.\n") +
-                        (depFolder + ":\n") +
-                        folders.map(function (folder) { return "- " + folder; }).join('\n'));
+                    depFolder = (0, formatter_1.capitalizeFirstChar)(depFolder);
+                    throw new Error("Unable to load dependencies for: ".concat(fileName || '', "\n") +
+                        "The following files were listed under ".concat(depInfo.name, " but could not be found:\n") +
+                        "".concat(notFoundDeps, "\n") +
+                        "Please check that they exist in the folder(s) listed in the `".concat(depInfo.config, "` array in your sasjsconfig.json file.\n") +
+                        "".concat(depFolder, ":\n") +
+                        folders.map(function (folder) { return "- ".concat(folder); }).join('\n'));
                 }
                 return [2 /*return*/, foundDeps_1.join('\n')];
             case 2: return [2 /*return*/, ''];
@@ -160,13 +161,13 @@ var deconstructDependency = function (deps, depInfo) {
     return deps.map(function (dep) {
         var _a = __read(dep.split(' ').filter(function (f) { return !!f; }), 2), fileName = _a[0], fileRef = _a[1];
         if (!fileName) {
-            throw new Error(depInfo.name + " entry is empty. Please specify " + depInfo.name + " dependencies in the format: @li <filename> <fileref>");
+            throw new Error("".concat(depInfo.name, " entry is empty. Please specify ").concat(depInfo.name, " dependencies in the format: @li <filename> <fileref>"));
         }
         if (!fileRef && depInfo.type !== DependencyType.Macro) {
-            throw new Error(depInfo.name + " " + fileName + " is missing fileref. Please specify " + depInfo.name + " dependencies in the format: @li <filename> <fileref>");
+            throw new Error("".concat(depInfo.name, " ").concat(fileName, " is missing fileref. Please specify ").concat(depInfo.name, " dependencies in the format: @li <filename> <fileref>"));
         }
         if (depInfo.type !== DependencyType.Macro)
-            _1.validateFileRef(fileRef);
+            (0, _1.validateFileRef)(fileRef);
         return { fileName: fileName, fileRef: fileRef };
     });
 };
@@ -174,7 +175,7 @@ var compileDep = function (depType, fileContent, fileRef) {
     var output = '';
     if (depType === DependencyType.Binary) {
         output = [
-            "filename _sjstmp \"%sysfunc(pathname(work))/base64_" + fileRef + "\" recfm=n;",
+            "filename _sjstmp \"%sysfunc(pathname(work))/base64_".concat(fileRef, "\" recfm=n;"),
             "data _null_;",
             "file _sjstmp;\n"
         ].join("\n");
@@ -183,14 +184,14 @@ var compileDep = function (depType, fileContent, fileRef) {
             .split('\n')
             .filter(function (l) { return !!l; });
         sourceLines.forEach(function (line) {
-            var chunkedLines = utils_2.chunk(line);
+            var chunkedLines = (0, utils_2.chunk)(line);
             if (chunkedLines.length === 1) {
-                output += "put '" + chunkedLines[0].split("'").join("''") + "';\n";
+                output += "put '".concat(chunkedLines[0].split("'").join("''"), "';\n");
             }
             else {
                 var combinedLines_1 = '';
                 chunkedLines.forEach(function (chunkedLine, index) {
-                    var text = "put '" + chunkedLine.split("'").join("''") + "'";
+                    var text = "put '".concat(chunkedLine.split("'").join("''"), "'");
                     if (index !== chunkedLines.length - 1) {
                         text += '@;\n';
                     }
@@ -204,11 +205,11 @@ var compileDep = function (depType, fileContent, fileRef) {
         });
         output += "run;\n";
         var sasCodeToDecodeBase64 = [
-            "filename " + fileRef + " \"%sysfunc(pathname(work))/sasjs_" + fileRef + "\";",
+            "filename ".concat(fileRef, " \"%sysfunc(pathname(work))/sasjs_").concat(fileRef, "\";"),
             "data _null_;",
             "length filein 8 fileout 8;",
             "filein = fopen(\"_sjstmp\",'I',4,'B');",
-            "fileout = fopen(\"" + fileRef + "\",'O',3,'B');",
+            "fileout = fopen(\"".concat(fileRef, "\",'O',3,'B');"),
             "char= '20'x;",
             "do while(fread(filein)=0);",
             "length raw $4;",
@@ -227,20 +228,20 @@ var compileDep = function (depType, fileContent, fileRef) {
         output += sasCodeToDecodeBase64.join("\n");
     }
     else if (depType === DependencyType.Include) {
-        output = "filename " + fileRef + " temp;\ndata _null_;\nfile " + fileRef + " lrecl=32767;\n";
+        output = "filename ".concat(fileRef, " temp;\ndata _null_;\nfile ").concat(fileRef, " lrecl=32767;\n");
         var sourceLines = fileContent
             .replace(/\r\n/g, '\n')
             .split('\n')
             .filter(function (l) { return !!l; });
         sourceLines.forEach(function (line) {
-            var chunkedLines = utils_2.chunk(line);
+            var chunkedLines = (0, utils_2.chunk)(line);
             if (chunkedLines.length === 1) {
-                output += "put '" + chunkedLines[0].split("'").join("''") + "';\n";
+                output += "put '".concat(chunkedLines[0].split("'").join("''"), "';\n");
             }
             else {
                 var combinedLines_2 = '';
                 chunkedLines.forEach(function (chunkedLine, index) {
-                    var text = "put '" + chunkedLine.split("'").join("''") + "'";
+                    var text = "put '".concat(chunkedLine.split("'").join("''"), "'");
                     if (index !== chunkedLines.length - 1) {
                         text += '@;\n';
                     }

package/sasjsCli/getDependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"getDependencies.js","sourceRoot":"","sources":["../../src/sasjsCli/getDependencies.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getDependencies.js","sourceRoot":"","sources":["../../src/sasjsCli/getDependencies.ts"],"names":[],"mappings":"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"}

package/sasjsCli/getDependencyPaths.js

@@ -51,10 +51,14 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+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 };
@@ -67,36 +71,36 @@ var utils_1 = require("../utils");
 var _1 = require("./");
 function getDependencyPaths(fileContent, macroFolders, macroCorePath) {
     return __awaiter(this, void 0, void 0, function () {
-        var sourcePaths, dependenciesHeader, dependencies, dependencyPaths, foundDependencies, notFoundDependencies, errorMessage;
+        var dependencyPaths, foundDependencies, sourcePaths, dependenciesHeader, dependencies, notFoundDependencies;
         var _this = this;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    sourcePaths = __spreadArray(__spreadArray([], __read(macroFolders)), [macroCorePath]);
+                    dependencyPaths = [];
+                    foundDependencies = [];
+                    sourcePaths = __spreadArray(__spreadArray([], __read(macroFolders), false), [macroCorePath], false);
                     dependenciesHeader = fileContent.includes('<h4> SAS Macros </h4>')
                         ? '<h4> SAS Macros </h4>'
                         : '<h4> Dependencies </h4>';
-                    dependencies = _1.getList(dependenciesHeader, fileContent).filter(function (d) {
+                    dependencies = (0, _1.getList)(dependenciesHeader, fileContent).filter(function (d) {
                         return d.endsWith('.sas');
                     });
-                    dependencyPaths = [];
-                    foundDependencies = [];
-                    return [4 /*yield*/, utils_1.asyncForEach(sourcePaths, function (sourcePath) { return __awaiter(_this, void 0, void 0, function () {
-                            var errorMessage;
+                    // Search dependencies recursively starting from macroFolders and ending in macroCorePath
+                    return [4 /*yield*/, (0, utils_1.asyncForEach)(sourcePaths, function (sourcePath) { return __awaiter(_this, void 0, void 0, function () {
                             var _this = this;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
-                                    case 0: return [4 /*yield*/, file_1.folderExists(sourcePath)];
+                                    case 0: return [4 /*yield*/, (0, file_1.folderExists)(sourcePath)];
                                     case 1:
                                         if (!_a.sent()) return [3 /*break*/, 3];
-                                        return [4 /*yield*/, utils_1.asyncForEach(dependencies, function (dep) { return __awaiter(_this, void 0, void 0, function () {
+                                        return [4 /*yield*/, (0, utils_1.asyncForEach)(dependencies, function (dep) { return __awaiter(_this, void 0, void 0, function () {
                                                 var filePaths, fileContent_1, _a, _b, _c, _d;
                                                 return __generator(this, function (_e) {
                                                     switch (_e.label) {
                                                         case 0:
                                                             filePaths = find_1.default.fileSync(dep, sourcePath);
                                                             if (!filePaths.length) return [3 /*break*/, 3];
-                                                            return [4 /*yield*/, file_1.readFile(filePaths[0])];
+                                                            return [4 /*yield*/, (0, file_1.readFile)(filePaths[0])];
                                                         case 1:
                                                             fileContent_1 = _e.sent();
                                                             foundDependencies.push(dep);
@@ -105,10 +109,10 @@ function getDependencyPaths(fileContent, macroFolders, macroCorePath) {
                                                             _d = [[]];
                                                             return [4 /*yield*/, getDependencyPaths(fileContent_1, macroFolders, macroCorePath)];
                                                         case 2:
-                                                            _b.apply(_a, _c.concat([__spreadArray.apply(void 0, _d.concat([__read.apply(void 0, [(_e.sent())])]))]));
+                                                            _b.apply(_a, _c.concat([__spreadArray.apply(void 0, _d.concat([__read.apply(void 0, [(_e.sent())]), false]))]));
                                                             _e.label = 3;
                                                         case 3:
-                                                            dependencyPaths.push.apply(dependencyPaths, __spreadArray([], __read(filePaths)));
+                                                            dependencyPaths.push.apply(dependencyPaths, __spreadArray([], __read(filePaths), false));
                                                             return [2 /*return*/];
                                                     }
                                                 });
@@ -117,21 +121,23 @@ function getDependencyPaths(fileContent, macroFolders, macroCorePath) {
                                         _a.sent();
                                         return [3 /*break*/, 4];
                                     case 3:
-                                        errorMessage = "Error listing dependency paths: Source path " + sourcePath + " does not exist.";
-                                        throw errorMessage;
+                                        if (macroFolders.includes(sourcePath)) {
+                                            throw "Error listing dependency paths: Source path ".concat(sourcePath, " does not exist.");
+                                        }
+                                        _a.label = 4;
                                     case 4: return [2 /*return*/];
                                 }
                             });
                         }); })];
                 case 1:
+                    // Search dependencies recursively starting from macroFolders and ending in macroCorePath
                     _a.sent();
-                    notFoundDependencies = utils_1.diff(dependencies, foundDependencies);
+                    notFoundDependencies = (0, utils_1.diff)(dependencies, foundDependencies);
                     if (notFoundDependencies.length) {
-                        errorMessage = 'Unable to locate dependencies: ' + notFoundDependencies.join(', ');
-                        throw errorMessage;
+                        throw 'Unable to locate dependencies: ' + notFoundDependencies.join(', ');
                     }
-                    dependencyPaths = _1.prioritiseDependencyOverrides(dependencies, dependencyPaths, macroFolders);
-                    return [2 /*return*/, __spreadArray([], __read(new Set(dependencyPaths)))];
+                    dependencyPaths = (0, _1.prioritiseDependencyOverrides)(dependencies, dependencyPaths, macroFolders);
+                    return [2 /*return*/, __spreadArray([], __read(new Set(dependencyPaths)), false)];
             }
         });
     });

package/sasjsCli/getDependencyPaths.js.map

@@ -1 +1 @@
-{"version":3,"file":"getDependencyPaths.js","sourceRoot":"","sources":["../../src/sasjsCli/getDependencyPaths.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AACvB,gCAAgD;AAChD,kCAA6C;AAC7C,uBAA2D;AAE3D,SAAsB,kBAAkB,CACtC,WAAmB,EACnB,YAAsB,EACtB,aAAqB;;;;;;;oBAEf,WAAW,0CAAO,YAAY,KAAE,aAAa,EAAC,CAAA;oBAE9C,kBAAkB,GAAG,WAAW,CAAC,QAAQ,CAAC,uBAAuB,CAAC;wBACtE,CAAC,CAAC,uBAAuB;wBACzB,CAAC,CAAC,yBAAyB,CAAA;oBAEzB,YAAY,GAAG,UAAO,CAAC,kBAAkB,EAAE,WAAW,CAAC,CAAC,MAAM,CAAC,UAAC,CAAC;wBACnE,OAAA,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAAlB,CAAkB,CACnB,CAAA;oBAEG,eAAe,GAAa,EAAE,CAAA;oBAC5B,iBAAiB,GAAa,EAAE,CAAA;oBAEtC,qBAAM,oBAAY,CAAC,WAAW,EAAE,UAAO,UAAU;;;;;4CAC3C,qBAAM,mBAAY,CAAC,UAAU,CAAC,EAAA;;6CAA9B,SAA8B,EAA9B,wBAA8B;wCAChC,qBAAM,oBAAY,CAAC,YAAY,EAAE,UAAO,GAAG;;;;;4DACnC,SAAS,GAAG,cAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC,CAAA;iEAC5C,SAAS,CAAC,MAAM,EAAhB,wBAAgB;4DACE,qBAAM,eAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAA;;4DAA1C,gBAAc,SAA4B;4DAChD,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;iEAC3B,CAAA,KAAA,eAAe,CAAC,IAAI,CAAA;kEAApB,eAAe;;4DACT,qBAAM,kBAAkB,CAC1B,aAAW,EACX,YAAY,EACZ,aAAa,CACd,EAAA;;4DALH,qFACK,CAAC,SAIH,CAAC,SACH;;;4DAEH,eAAe,CAAC,IAAI,OAApB,eAAe,2BAAS,SAAS,IAAC;;;;iDACnC,CAAC,EAAA;;wCAdF,SAcE,CAAA;;;wCAEI,YAAY,GAAG,iDAA+C,UAAU,qBAAkB,CAAA;wCAEhG,MAAM,YAAY,CAAA;;;;6BAErB,CAAC,EAAA;;oBAtBF,SAsBE,CAAA;oBACI,oBAAoB,GAAG,YAAI,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAA;oBAElE,IAAI,oBAAoB,CAAC,MAAM,EAAE;wBACzB,YAAY,GAChB,iCAAiC,GAAG,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;wBAErE,MAAM,YAAY,CAAA;qBACnB;oBAED,eAAe,GAAG,gCAA6B,CAC7C,YAAY,EACZ,eAAe,EACf,YAAY,CACb,CAAA;oBAED,+CAAW,IAAI,GAAG,CAAC,eAAe,CAAC,IAAC;;;;CACrC;AAzDD,gDAyDC"}
+{"version":3,"file":"getDependencyPaths.js","sourceRoot":"","sources":["../../src/sasjsCli/getDependencyPaths.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AACvB,gCAAgD;AAChD,kCAA6C;AAC7C,uBAA2D;AAE3D,SAAsB,kBAAkB,CACtC,WAAmB,EACnB,YAAsB,EACtB,aAAqB;;;;;;;oBAEjB,eAAe,GAAa,EAAE,CAAA;oBAC5B,iBAAiB,GAAa,EAAE,CAAA;oBAChC,WAAW,0CAAO,YAAY,YAAE,aAAa,SAAC,CAAA;oBAE9C,kBAAkB,GAAG,WAAW,CAAC,QAAQ,CAAC,uBAAuB,CAAC;wBACtE,CAAC,CAAC,uBAAuB;wBACzB,CAAC,CAAC,yBAAyB,CAAA;oBACvB,YAAY,GAAG,IAAA,UAAO,EAAC,kBAAkB,EAAE,WAAW,CAAC,CAAC,MAAM,CAAC,UAAC,CAAC;wBACrE,OAAA,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAAlB,CAAkB,CACnB,CAAA;oBAED,yFAAyF;oBACzF,qBAAM,IAAA,oBAAY,EAAC,WAAW,EAAE,UAAO,UAAU;;;;4CAC3C,qBAAM,IAAA,mBAAY,EAAC,UAAU,CAAC,EAAA;;6CAA9B,SAA8B,EAA9B,wBAA8B;wCAChC,qBAAM,IAAA,oBAAY,EAAC,YAAY,EAAE,UAAO,GAAG;;;;;4DACnC,SAAS,GAAG,cAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC,CAAA;iEAE5C,SAAS,CAAC,MAAM,EAAhB,wBAAgB;4DACE,qBAAM,IAAA,eAAQ,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAA;;4DAA1C,gBAAc,SAA4B;4DAEhD,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;iEAC3B,CAAA,KAAA,eAAe,CAAC,IAAI,CAAA;kEAApB,eAAe;;4DACT,qBAAM,kBAAkB,CAC1B,aAAW,EACX,YAAY,EACZ,aAAa,CACd,EAAA;;4DALH,qFACK,CAAC,SAIH,CAAC,gBACH;;;4DAGH,eAAe,CAAC,IAAI,OAApB,eAAe,2BAAS,SAAS,WAAC;;;;iDACnC,CAAC,EAAA;;wCAjBF,SAiBE,CAAA;;;wCACG,IAAI,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;4CAC5C,MAAM,sDAA+C,UAAU,qBAAkB,CAAA;yCAClF;;;;;6BACF,CAAC,EAAA;;oBAxBF,yFAAyF;oBACzF,SAuBE,CAAA;oBAEI,oBAAoB,GAAG,IAAA,YAAI,EAAC,YAAY,EAAE,iBAAiB,CAAC,CAAA;oBAElE,IAAI,oBAAoB,CAAC,MAAM,EAAE;wBAC/B,MAAM,iCAAiC,GAAG,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;qBAC1E;oBAED,eAAe,GAAG,IAAA,gCAA6B,EAC7C,YAAY,EACZ,eAAe,EACf,YAAY,CACb,CAAA;oBAED,+CAAW,IAAI,GAAG,CAAC,eAAe,CAAC,WAAC;;;;CACrC;AAvDD,gDAuDC"}

package/sasjsCli/getInitTerm.d.ts

@@ -1,29 +1,26 @@
 import { Configuration, SASJsFileType, Target } from '../types';
+export declare enum ProgramType {
+    Init = "init",
+    Term = "term"
+}
 interface getInitTermParams {
     configuration?: Configuration;
     target?: Target;
-    type: SASJsFileType;
+    fileType: SASJsFileType;
     buildSourceFolder: string;
 }
-export declare const getInitTerm: ({ configuration, target, type, buildSourceFolder }: getInitTermParams) => Promise<{
+export declare const getInitTerm: ({ configuration, target, fileType, buildSourceFolder }: getInitTermParams) => Promise<{
     init: string;
     initPath: string;
     term: string;
     termPath: string;
     startUpVars: string;
 }>;
-interface getInitTermParam {
-    configuration?: Configuration;
-    target?: Target;
-    buildSourceFolder: string;
-    type: SASJsFileType;
-}
-export declare const getInit: ({ target, configuration, buildSourceFolder, type }: getInitTermParam) => Promise<{
-    content: string;
-    filePath: string;
-}>;
-export declare const getTerm: ({ target, configuration, buildSourceFolder, type }: getInitTermParam) => Promise<{
+export declare const getProgram: ({ target, configuration, buildSourceFolder, fileType }: getInitTermParams, programType: ProgramType) => Promise<{
     content: string;
     filePath: string;
 }>;
+export declare const mockGetProgram: (module: {
+    getProgram: (param: getInitTermParams, programType: ProgramType) => {};
+}, fakeInit: string, fakeTerm: string) => void;
 export {};

package/sasjsCli/getInitTerm.js

@@ -74,33 +74,39 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTerm = exports.getInit = exports.getInitTerm = void 0;
+exports.mockGetProgram = exports.getProgram = exports.getInitTerm = exports.ProgramType = void 0;
 var file_1 = require("../file");
 var types_1 = require("../types");
 var utils_1 = require("../utils");
+var formatter_1 = require("../formatter");
+var ProgramType;
+(function (ProgramType) {
+    ProgramType["Init"] = "init";
+    ProgramType["Term"] = "term";
+})(ProgramType = exports.ProgramType || (exports.ProgramType = {}));
 var getInitTerm = function (_a) {
-    var configuration = _a.configuration, target = _a.target, type = _a.type, buildSourceFolder = _a.buildSourceFolder;
+    var configuration = _a.configuration, target = _a.target, fileType = _a.fileType, buildSourceFolder = _a.buildSourceFolder;
     return __awaiter(void 0, void 0, void 0, function () {
         var _b, init, initPath, _c, term, termPath, startUpVars;
         return __generator(this, function (_d) {
             switch (_d.label) {
-                case 0: return [4 /*yield*/, exports.getInit({
+                case 0: return [4 /*yield*/, (0, exports.getProgram)({
                         target: target,
                         configuration: configuration,
                         buildSourceFolder: buildSourceFolder,
-                        type: type
-                    })];
+                        fileType: fileType
+                    }, ProgramType.Init)];
                 case 1:
                     _b = _d.sent(), init = _b.content, initPath = _b.filePath;
-                    return [4 /*yield*/, exports.getTerm({
+                    return [4 /*yield*/, (0, exports.getProgram)({
                             target: target,
                             configuration: configuration,
                             buildSourceFolder: buildSourceFolder,
-                            type: type
-                        })];
+                            fileType: fileType
+                        }, ProgramType.Term)];
                 case 2:
                     _c = _d.sent(), term = _c.content, termPath = _c.filePath;
-                    startUpVars = getVars(type, target, configuration);
+                    startUpVars = getVars(fileType, target, configuration);
                     return [2 /*return*/, {
                             init: init,
                             initPath: initPath,
@@ -135,9 +141,9 @@ var convertVarsToSasFormat = function (vars) {
     try {
         for (var entries_1 = __values(entries), entries_1_1 = entries_1.next(); !entries_1_1.done; entries_1_1 = entries_1.next()) {
             var _b = __read(entries_1_1.value, 2), name_1 = _b[0], value = _b[1];
-            var chunks = utils_1.chunk(value);
+            var chunks = (0, utils_1.chunk)(value);
             var chunkedString = chunks.join('%trim(\n)');
-            varsContent += "%let " + name_1 + "=" + chunkedString + ";\n";
+            varsContent += "%let ".concat(name_1, "=").concat(chunkedString, ";\n");
         }
     }
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
@@ -149,31 +155,45 @@ var convertVarsToSasFormat = function (vars) {
     }
     return varsContent;
 };
-var getInit = function (_a) {
-    var target = _a.target, configuration = _a.configuration, buildSourceFolder = _a.buildSourceFolder, type = _a.type;
+var getProgram = function (_a, programType) {
+    var target = _a.target, configuration = _a.configuration, buildSourceFolder = _a.buildSourceFolder, fileType = _a.fileType;
     return __awaiter(void 0, void 0, void 0, function () {
-        var initContent, filePath, program, content;
-        var _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        return __generator(this, function (_l) {
-            switch (_l.label) {
+        var programContent, filePath, program, targetConfig, rootConfig, content;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    initContent = '', filePath = '';
-                    program = type === types_1.SASJsFileType.service
-                        ? (_c = (_b = target === null || target === void 0 ? void 0 : target.serviceConfig) === null || _b === void 0 ? void 0 : _b.initProgram) !== null && _c !== void 0 ? _c : (_d = configuration === null || configuration === void 0 ? void 0 : configuration.serviceConfig) === null || _d === void 0 ? void 0 : _d.initProgram
-                        : type === types_1.SASJsFileType.job
-                            ? (_f = (_e = target === null || target === void 0 ? void 0 : target.jobConfig) === null || _e === void 0 ? void 0 : _e.initProgram) !== null && _f !== void 0 ? _f : (_g = configuration === null || configuration === void 0 ? void 0 : configuration.jobConfig) === null || _g === void 0 ? void 0 : _g.initProgram
-                            : type === types_1.SASJsFileType.test
-                                ? (_j = (_h = target === null || target === void 0 ? void 0 : target.testConfig) === null || _h === void 0 ? void 0 : _h.initProgram) !== null && _j !== void 0 ? _j : (_k = configuration === null || configuration === void 0 ? void 0 : configuration.testConfig) === null || _k === void 0 ? void 0 : _k.initProgram
-                                : undefined;
+                    programContent = '', filePath = '';
+                    program = undefined;
+                    targetConfig = undefined;
+                    rootConfig = undefined;
+                    switch (fileType) {
+                        case types_1.SASJsFileType.service:
+                            targetConfig = target === null || target === void 0 ? void 0 : target.serviceConfig;
+                            rootConfig = configuration === null || configuration === void 0 ? void 0 : configuration.serviceConfig;
+                            break;
+                        case types_1.SASJsFileType.job:
+                            targetConfig = target === null || target === void 0 ? void 0 : target.jobConfig;
+                            rootConfig = configuration === null || configuration === void 0 ? void 0 : configuration.jobConfig;
+                            break;
+                        case types_1.SASJsFileType.test:
+                            targetConfig = target === null || target === void 0 ? void 0 : target.testConfig;
+                            rootConfig = configuration === null || configuration === void 0 ? void 0 : configuration.testConfig;
+                            break;
+                    }
+                    program =
+                        (targetConfig &&
+                            targetConfig["".concat(programType, "Program")]) ||
+                            (rootConfig &&
+                                rootConfig["".concat(programType, "Program")]);
                     if (!program) return [3 /*break*/, 2];
-                    filePath = file_1.getAbsolutePath(program, buildSourceFolder);
-                    return [4 /*yield*/, file_1.readFile(filePath)];
+                    filePath = (0, file_1.getAbsolutePath)(program, buildSourceFolder);
+                    return [4 /*yield*/, (0, file_1.readFile)(filePath)];
                 case 1:
-                    initContent = _l.sent();
-                    _l.label = 2;
+                    programContent = _b.sent();
+                    _b.label = 2;
                 case 2:
-                    content = initContent
-                        ? "\n* " + type + "Init start;\n" + initContent + "\n* " + type + "Init end;"
+                    content = programContent
+                        ? "\n* ".concat(fileType).concat((0, formatter_1.capitalizeFirstChar)(programType), " start;\n").concat(programContent, "\n* ").concat(fileType).concat((0, formatter_1.capitalizeFirstChar)(programType), " end;")
                         : '';
                     return [2 /*return*/, {
                             content: content,
@@ -183,40 +203,19 @@ var getInit = function (_a) {
         });
     });
 };
-exports.getInit = getInit;
-var getTerm = function (_a) {
-    var target = _a.target, configuration = _a.configuration, buildSourceFolder = _a.buildSourceFolder, type = _a.type;
-    return __awaiter(void 0, void 0, void 0, function () {
-        var termContent, filePath, program, content;
-        var _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        return __generator(this, function (_l) {
-            switch (_l.label) {
-                case 0:
-                    termContent = '', filePath = '';
-                    program = type === types_1.SASJsFileType.service
-                        ? (_c = (_b = target === null || target === void 0 ? void 0 : target.serviceConfig) === null || _b === void 0 ? void 0 : _b.termProgram) !== null && _c !== void 0 ? _c : (_d = configuration === null || configuration === void 0 ? void 0 : configuration.serviceConfig) === null || _d === void 0 ? void 0 : _d.termProgram
-                        : type === types_1.SASJsFileType.job
-                            ? (_f = (_e = target === null || target === void 0 ? void 0 : target.jobConfig) === null || _e === void 0 ? void 0 : _e.termProgram) !== null && _f !== void 0 ? _f : (_g = configuration === null || configuration === void 0 ? void 0 : configuration.jobConfig) === null || _g === void 0 ? void 0 : _g.termProgram
-                            : type === types_1.SASJsFileType.test
-                                ? (_j = (_h = target === null || target === void 0 ? void 0 : target.testConfig) === null || _h === void 0 ? void 0 : _h.termProgram) !== null && _j !== void 0 ? _j : (_k = configuration === null || configuration === void 0 ? void 0 : configuration.testConfig) === null || _k === void 0 ? void 0 : _k.termProgram
-                                : undefined;
-                    if (!program) return [3 /*break*/, 2];
-                    filePath = file_1.getAbsolutePath(program, buildSourceFolder);
-                    return [4 /*yield*/, file_1.readFile(filePath)];
-                case 1:
-                    termContent = _l.sent();
-                    _l.label = 2;
-                case 2:
-                    content = termContent
-                        ? "\n* " + type + "Term start;\n" + termContent + "\n* " + type + "Term end;"
-                        : '';
-                    return [2 /*return*/, {
-                            content: content,
-                            filePath: filePath
-                        }];
-            }
-        });
+exports.getProgram = getProgram;
+var mockGetProgram = function (module, fakeInit, fakeTerm) {
+    jest.spyOn(module, 'getProgram').mockImplementation(function (params, programType) {
+        return programType === ProgramType.Init
+            ? Promise.resolve({
+                content: "\n* ".concat(params.fileType, "Init start;\n").concat(fakeInit, "\n* ").concat(params.fileType, "Init end;"),
+                filePath: ''
+            })
+            : Promise.resolve({
+                content: "\n* ".concat(params.fileType, "Term start;\n").concat(fakeTerm, "\n* ").concat(params.fileType, "Term end;"),
+                filePath: ''
+            });
     });
 };
-exports.getTerm = getTerm;
+exports.mockGetProgram = mockGetProgram;
 //# sourceMappingURL=getInitTerm.js.map