@sasjs/utils 2.34.1 → 2.36.1

package/package.json

@@ -33,36 +33,32 @@
   },
   "homepage": "https://github.com/sasjs/utils#readme",
   "devDependencies": {
-    "@sasjs/core": "^2.48.6",
-    "@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/lodash.groupby": "4.6.6",
-    "@types/lodash.uniqby": "4.7.6",
-    "@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",
-    "ts-loader": "^9.2.3",
-    "typescript": "4.3.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.5.4"
   },
   "dependencies": {
-    "@types/fs-extra": "^9.0.11",
-    "@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",
-    "lodash.groupby": "4.6.0",
-    "lodash.uniqby": "4.7.0",
-    "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.34.1"
+  "version": "2.36.1"
 }

package/sasjsCli/getDependencies.d.ts

@@ -0,0 +1,6 @@
+export declare enum DependencyType {
+    Macro = "Macro",
+    Include = "Include",
+    Binary = "Binary"
+}
+export declare const getDependencies: (fileName: string | undefined, fileContent: string, folders: string[], depType: DependencyType) => Promise<string>;

package/sasjsCli/getDependencies.js

@@ -0,0 +1,260 @@
+"use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDependencies = exports.DependencyType = void 0;
+var utils_1 = require("../utils");
+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) {
+    DependencyType["Macro"] = "Macro";
+    DependencyType["Include"] = "Include";
+    DependencyType["Binary"] = "Binary";
+})(DependencyType = exports.DependencyType || (exports.DependencyType = {}));
+var getDepInfo = function (depType, fileContent) {
+    var header = '';
+    switch (depType) {
+        case DependencyType.Binary:
+            header = 'Binary Files';
+            break;
+        case DependencyType.Include:
+            header = fileContent.includes('<h4> SAS Includes </h4>')
+                ? 'SAS Includes'
+                : 'SAS Programs';
+            break;
+        default:
+            break;
+    }
+    var depInfo = {
+        name: header,
+        header: "<h4> ".concat(header, " </h4>"),
+        config: "".concat((depType === DependencyType.Include
+            ? 'Program'
+            : depType).toLowerCase(), "Folders"),
+        type: depType
+    };
+    return depInfo;
+};
+var getDependencies = function (fileName, fileContent, folders, depType) { return __awaiter(void 0, void 0, void 0, function () {
+    var depInfo, deps, uniqDeps, foundDeps_1, foundDepsNames_1, notFoundDeps, depFolder;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                folders = (0, utils_1.uniqArray)(folders);
+                depInfo = getDepInfo(depType, fileContent);
+                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);
+                });
+                if (!uniqDeps.length) return [3 /*break*/, 2];
+                foundDeps_1 = [];
+                foundDepsNames_1 = [];
+                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*/, (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*/, (0, file_1.readFile)(filePaths[0], depType === DependencyType.Binary ? 'base64' : undefined)];
+                                                case 1:
+                                                    encodedFileContent = _a.sent();
+                                                    depContent = compileDep(depType, encodedFileContent, dep.fileRef);
+                                                    foundDeps_1.push(depContent);
+                                                    foundDepsNames_1.push(dep.fileName);
+                                                    _a.label = 2;
+                                                case 2: return [2 /*return*/];
+                                            }
+                                        });
+                                    }); })];
+                                case 1:
+                                    _a.sent();
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); })];
+            case 1:
+                _a.sent();
+                notFoundDeps = deps
+                    .filter(function (dep) { return !foundDepsNames_1.includes(dep.fileName); })
+                    .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 = (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*/, ''];
+        }
+    });
+}); };
+exports.getDependencies = getDependencies;
+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("".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("".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)
+            (0, _1.validateFileRef)(fileRef);
+        return { fileName: fileName, fileRef: fileRef };
+    });
+};
+var compileDep = function (depType, fileContent, fileRef) {
+    var output = '';
+    if (depType === DependencyType.Binary) {
+        output = [
+            "filename _sjstmp \"%sysfunc(pathname(work))/base64_".concat(fileRef, "\" recfm=n;"),
+            "data _null_;",
+            "file _sjstmp;\n"
+        ].join("\n");
+        var sourceLines = fileContent
+            .replace(/\r\n/g, '\n')
+            .split('\n')
+            .filter(function (l) { return !!l; });
+        sourceLines.forEach(function (line) {
+            var chunkedLines = (0, utils_2.chunk)(line);
+            if (chunkedLines.length === 1) {
+                output += "put '".concat(chunkedLines[0].split("'").join("''"), "';\n");
+            }
+            else {
+                var combinedLines_1 = '';
+                chunkedLines.forEach(function (chunkedLine, index) {
+                    var text = "put '".concat(chunkedLine.split("'").join("''"), "'");
+                    if (index !== chunkedLines.length - 1) {
+                        text += '@;\n';
+                    }
+                    else {
+                        text += ';\n';
+                    }
+                    combinedLines_1 += text;
+                });
+                output += combinedLines_1;
+            }
+        });
+        output += "run;\n";
+        var sasCodeToDecodeBase64 = [
+            "filename ".concat(fileRef, " \"%sysfunc(pathname(work))/sasjs_").concat(fileRef, "\";"),
+            "data _null_;",
+            "length filein 8 fileout 8;",
+            "filein = fopen(\"_sjstmp\",'I',4,'B');",
+            "fileout = fopen(\"".concat(fileRef, "\",'O',3,'B');"),
+            "char= '20'x;",
+            "do while(fread(filein)=0);",
+            "length raw $4;",
+            "do i=1 to 4;",
+            "rc=fget(filein,char,1);",
+            "substr(raw,i,1)=char;",
+            "end;",
+            "rc = fput(fileout,input(raw,$base64X4.));",
+            "rc = fwrite(fileout);",
+            "end;",
+            "rc = fclose(filein);",
+            "rc = fclose(fileout);",
+            "run;",
+            "filename _sjstmp clear;"
+        ];
+        output += sasCodeToDecodeBase64.join("\n");
+    }
+    else if (depType === DependencyType.Include) {
+        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 = (0, utils_2.chunk)(line);
+            if (chunkedLines.length === 1) {
+                output += "put '".concat(chunkedLines[0].split("'").join("''"), "';\n");
+            }
+            else {
+                var combinedLines_2 = '';
+                chunkedLines.forEach(function (chunkedLine, index) {
+                    var text = "put '".concat(chunkedLine.split("'").join("''"), "'");
+                    if (index !== chunkedLines.length - 1) {
+                        text += '@;\n';
+                    }
+                    else {
+                        text += ';\n';
+                    }
+                    combinedLines_2 += text;
+                });
+                output += combinedLines_2;
+            }
+        });
+        output += 'run;';
+    }
+    return output;
+};
+//# sourceMappingURL=getDependencies.js.map

package/sasjsCli/getDependencies.js.map

@@ -0,0 +1 @@
+{"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 {};