@sasjs/utils 2.36.0 → 2.37.0

package/logger/logger.js

@@ -15,10 +15,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 };
@@ -41,8 +45,8 @@ var Logger = /** @class */ (function () {
             for (var _i = 1; _i < arguments.length; _i++) {
                 args[_i - 1] = arguments[_i];
             }
-            if (isLowerThanOrEqualTo_1.isLowerThanOrEqualTo(_this._logLevel, logLevel_1.LogLevel.Debug)) {
-                consola_1.default.debug.apply(consola_1.default, __spreadArray([message], __read(_this.filterArgs(args))));
+            if ((0, isLowerThanOrEqualTo_1.isLowerThanOrEqualTo)(_this._logLevel, logLevel_1.LogLevel.Debug)) {
+                consola_1.default.debug.apply(consola_1.default, __spreadArray([message], __read(_this.filterArgs(args)), false));
             }
         };
         this.info = function (message) {
@@ -50,8 +54,8 @@ var Logger = /** @class */ (function () {
             for (var _i = 1; _i < arguments.length; _i++) {
                 args[_i - 1] = arguments[_i];
             }
-            if (isLowerThanOrEqualTo_1.isLowerThanOrEqualTo(_this._logLevel, logLevel_1.LogLevel.Info)) {
-                consola_1.default.info.apply(consola_1.default, __spreadArray([message], __read(_this.filterArgs(args))));
+            if ((0, isLowerThanOrEqualTo_1.isLowerThanOrEqualTo)(_this._logLevel, logLevel_1.LogLevel.Info)) {
+                consola_1.default.info.apply(consola_1.default, __spreadArray([message], __read(_this.filterArgs(args)), false));
             }
         };
         this.success = function (message) {
@@ -59,8 +63,8 @@ var Logger = /** @class */ (function () {
             for (var _i = 1; _i < arguments.length; _i++) {
                 args[_i - 1] = arguments[_i];
             }
-            if (isLowerThanOrEqualTo_1.isLowerThanOrEqualTo(_this._logLevel, logLevel_1.LogLevel.Info)) {
-                consola_1.default.success.apply(consola_1.default, __spreadArray([message], __read(_this.filterArgs(args))));
+            if ((0, isLowerThanOrEqualTo_1.isLowerThanOrEqualTo)(_this._logLevel, logLevel_1.LogLevel.Info)) {
+                consola_1.default.success.apply(consola_1.default, __spreadArray([message], __read(_this.filterArgs(args)), false));
             }
         };
         this.warn = function (message) {
@@ -68,8 +72,8 @@ var Logger = /** @class */ (function () {
             for (var _i = 1; _i < arguments.length; _i++) {
                 args[_i - 1] = arguments[_i];
             }
-            if (isLowerThanOrEqualTo_1.isLowerThanOrEqualTo(_this._logLevel, logLevel_1.LogLevel.Warn)) {
-                consola_1.default.warn.apply(consola_1.default, __spreadArray([message], __read(args)));
+            if ((0, isLowerThanOrEqualTo_1.isLowerThanOrEqualTo)(_this._logLevel, logLevel_1.LogLevel.Warn)) {
+                consola_1.default.warn.apply(consola_1.default, __spreadArray([message], __read(args), false));
             }
         };
         this.error = function (message) {
@@ -77,8 +81,8 @@ var Logger = /** @class */ (function () {
             for (var _i = 1; _i < arguments.length; _i++) {
                 args[_i - 1] = arguments[_i];
             }
-            if (isLowerThanOrEqualTo_1.isLowerThanOrEqualTo(_this._logLevel, logLevel_1.LogLevel.Error)) {
-                consola_1.default.error.apply(consola_1.default, __spreadArray([message], __read(_this.filterArgs(args))));
+            if ((0, isLowerThanOrEqualTo_1.isLowerThanOrEqualTo)(_this._logLevel, logLevel_1.LogLevel.Error)) {
+                consola_1.default.error.apply(consola_1.default, __spreadArray([message], __read(_this.filterArgs(args)), false));
             }
         };
         this.log = function (message) {
@@ -86,7 +90,7 @@ var Logger = /** @class */ (function () {
             for (var _i = 1; _i < arguments.length; _i++) {
                 args[_i - 1] = arguments[_i];
             }
-            consola_1.default.log.apply(consola_1.default, __spreadArray([message], __read(_this.filterArgs(args))));
+            consola_1.default.log.apply(consola_1.default, __spreadArray([message], __read(_this.filterArgs(args)), false));
         };
         this.table = function (data, options, disableStyling) {
             var _a;
@@ -125,10 +129,10 @@ var Logger = /** @class */ (function () {
             }
             data.forEach(function (item) { return table.push(item); });
             _this.log((disableStyling
-                ? formatter_1.sanitizeSpecialChars(table.toString())
+                ? (0, formatter_1.sanitizeSpecialChars)(table.toString())
                 : table.toString()) + '\n');
         };
-        if (!isNullOrUndefined_1.isNullOrUndefined(logLevel) && logLevel in logLevel_1.LogLevel) {
+        if (!(0, isNullOrUndefined_1.isNullOrUndefined)(logLevel) && logLevel in logLevel_1.LogLevel) {
             this._logLevel = logLevel;
         }
     }

package/logger/logger.js.map

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

package/package.json

@@ -36,15 +36,15 @@
     "@sasjs/core": "3.10.0",
     "@types/cli-table": "0.3.0",
     "@types/find": "0.2.1",
-    "@types/jest": "27.0.2",
+    "@types/jest": "27.4.0",
     "@types/rimraf": "3.0.1",
     "@types/valid-url": "1.0.3",
-    "babel-jest": "27.2.4",
-    "jest": "27.2.4",
+    "babel-jest": "27.4.6",
+    "jest": "27.4.7",
     "jest-extended": "1.1.0",
-    "ts-jest": "27.0.5",
+    "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",
@@ -60,5 +60,5 @@
     "rimraf": "3.0.2",
     "valid-url": "1.0.9"
   },
-  "version": "2.36.0"
+  "version": "2.37.0"
 }

package/sasjsCli/getDependencies.d.ts

@@ -1,6 +1,25 @@
+import { CompileTree } from '../compileTree';
 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>;
+export declare enum DependencyHeader {
+    Macro = "<h4> SAS Macros </h4>",
+    Binary = "<h4> Binary Files </h4>",
+    Include = "<h4> SAS Includes </h4>",
+    DataInput = "<h4> Data Inputs </h4>",
+    DataOutput = "<h4> Data Outputs </h4>",
+    DeprecatedMacro = "<h4> Dependencies </h4>",
+    DeprecatedInclude = "<h4> SAS Programs </h4>"
+}
+interface DepInfo {
+    name: string;
+    header: string;
+    config: string;
+    type: DependencyType;
+}
+export declare const getDepInfo: (depType: DependencyType, fileContent: string) => DepInfo;
+export declare const getDependencies: (fileName: string | undefined, fileContent: string, folders: string[], depType: DependencyType, compileTree?: CompileTree | undefined) => Promise<string>;
+export declare const getDeprecatedHeader: (fileContent: string, header: DependencyHeader.Macro | DependencyHeader.Include) => DependencyHeader.Macro | DependencyHeader.Include | DependencyHeader.DeprecatedMacro | DependencyHeader.DeprecatedInclude;
+export {};

package/sasjsCli/getDependencies.js

@@ -55,7 +55,7 @@ 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;
+exports.getDeprecatedHeader = exports.getDependencies = exports.getDepInfo = exports.DependencyHeader = exports.DependencyType = void 0;
 var utils_1 = require("../utils");
 var _1 = require("./");
 var utils_2 = require("../utils");
@@ -69,38 +69,45 @@ var DependencyType;
     DependencyType["Include"] = "Include";
     DependencyType["Binary"] = "Binary";
 })(DependencyType = exports.DependencyType || (exports.DependencyType = {}));
+var DependencyHeader;
+(function (DependencyHeader) {
+    DependencyHeader["Macro"] = "<h4> SAS Macros </h4>";
+    DependencyHeader["Binary"] = "<h4> Binary Files </h4>";
+    DependencyHeader["Include"] = "<h4> SAS Includes </h4>";
+    DependencyHeader["DataInput"] = "<h4> Data Inputs </h4>";
+    DependencyHeader["DataOutput"] = "<h4> Data Outputs </h4>";
+    DependencyHeader["DeprecatedMacro"] = "<h4> Dependencies </h4>";
+    DependencyHeader["DeprecatedInclude"] = "<h4> SAS Programs </h4>";
+})(DependencyHeader = exports.DependencyHeader || (exports.DependencyHeader = {}));
 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 header = depType === DependencyType.Include
+        ? fileContent.includes(DependencyHeader.Include)
+            ? DependencyHeader.Include
+            : DependencyHeader.DeprecatedInclude
+        : DependencyHeader[depType];
     var depInfo = {
-        name: header,
-        header: "<h4> " + header + " </h4>",
-        config: (depType === DependencyType.Include
+        name: getHeaderName(header),
+        header: depType === DependencyType.Include
+            ? fileContent.includes(DependencyHeader.Include)
+                ? DependencyHeader.Include
+                : DependencyHeader.DeprecatedInclude
+            : DependencyHeader[depType],
+        config: "".concat((depType === DependencyType.Include
             ? 'Program'
-            : depType).toLowerCase() + "Folders",
+            : depType).toLowerCase(), "Folders"),
         type: depType
     };
     return depInfo;
 };
-var getDependencies = function (fileName, fileContent, folders, depType) { return __awaiter(void 0, void 0, void 0, function () {
+exports.getDepInfo = getDepInfo;
+var getDependencies = function (fileName, fileContent, folders, depType, compileTree) { 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 = utils_1.uniqArray(folders);
-                depInfo = getDepInfo(depType, fileContent);
-                deps = deconstructDependency(_1.getList(depInfo.header, fileContent), depInfo);
+                folders = (0, utils_1.uniqArray)(folders);
+                depInfo = (0, exports.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);
@@ -108,24 +115,34 @@ 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)];
+                                                    if (!filePaths.length) return [3 /*break*/, 5];
+                                                    encodedFileContent = '';
+                                                    if (!(compileTree &&
+                                                        Object.keys(compileTree).length &&
+                                                        depType !== DependencyType.Binary)) return [3 /*break*/, 2];
+                                                    return [4 /*yield*/, compileTree.getDepContent(filePaths[0])];
                                                 case 1:
                                                     encodedFileContent = _a.sent();
+                                                    return [3 /*break*/, 4];
+                                                case 2: return [4 /*yield*/, (0, file_1.readFile)(filePaths[0], depType === DependencyType.Binary ? 'base64' : undefined)];
+                                                case 3:
+                                                    encodedFileContent = _a.sent();
+                                                    _a.label = 4;
+                                                case 4:
                                                     depContent = compileDep(depType, encodedFileContent, dep.fileRef);
                                                     foundDeps_1.push(depContent);
                                                     foundDepsNames_1.push(dep.fileName);
-                                                    _a.label = 2;
-                                                case 2: return [2 /*return*/];
+                                                    _a.label = 5;
+                                                case 5: return [2 /*return*/];
                                             }
                                         });
                                     }); })];
@@ -139,17 +156,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 = formatter_1.capitalizeFirstChar(depFolder);
-                    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*/, ''];
@@ -157,17 +174,25 @@ var getDependencies = function (fileName, fileContent, folders, depType) { retur
     });
 }); };
 exports.getDependencies = getDependencies;
+var getDeprecatedHeader = function (fileContent, header) {
+    return fileContent.includes(header)
+        ? header
+        : header === DependencyHeader.Macro
+            ? DependencyHeader.DeprecatedMacro
+            : DependencyHeader.DeprecatedInclude;
+};
+exports.getDeprecatedHeader = getDeprecatedHeader;
 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 };
     });
 };
@@ -175,7 +200,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");
@@ -184,14 +209,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';
                     }
@@ -205,11 +230,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;",
@@ -228,20 +253,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';
                     }
@@ -257,4 +282,7 @@ var compileDep = function (depType, fileContent, fileRef) {
     }
     return output;
 };
+var getHeaderName = function (header) {
+    return header.replace(/^<h4>\s/, '').replace(/\s<\/h4>$/, '');
+};
 //# sourceMappingURL=getDependencies.js.map

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

@@ -1 +1,2 @@
-export declare function getDependencyPaths(fileContent: string, macroFolders: string[], macroCorePath: string): Promise<string[]>;
+import { CompileTree, Leaf } from '../compileTree';
+export declare function getDependencyPaths(fileContent: string, macroFolders: string[], macroCorePath: string, compileTree?: CompileTree, leaf?: Leaf): Promise<string[]>;

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 };
@@ -65,50 +69,57 @@ var find_1 = __importDefault(require("find"));
 var file_1 = require("../file");
 var utils_1 = require("../utils");
 var _1 = require("./");
-function getDependencyPaths(fileContent, macroFolders, macroCorePath) {
+function getDependencyPaths(fileContent, macroFolders, macroCorePath, compileTree, leaf) {
     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]);
-                    dependenciesHeader = fileContent.includes('<h4> SAS Macros </h4>')
-                        ? '<h4> SAS Macros </h4>'
-                        : '<h4> Dependencies </h4>';
-                    dependencies = _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;
+                    sourcePaths = __spreadArray(__spreadArray([], __read(macroFolders), false), [macroCorePath], false);
+                    dependenciesHeader = (0, _1.getDeprecatedHeader)(fileContent, _1.DependencyHeader.Macro);
+                    dependencies = (leaf === null || leaf === void 0 ? void 0 : leaf.dependencies) ||
+                        (0, _1.getList)(dependenciesHeader, fileContent).filter(function (d) { return d.endsWith('.sas'); });
+                    // 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 () {
-                                                var filePaths, fileContent_1, _a, _b, _c, _d;
+                                        return [4 /*yield*/, (0, utils_1.asyncForEach)(dependencies, function (dep) { return __awaiter(_this, void 0, void 0, function () {
+                                                var filePaths, fileContent_1, leaf_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])];
+                                                            if (!filePaths.length) return [3 /*break*/, 6];
+                                                            fileContent_1 = '';
+                                                            leaf_1 = undefined;
+                                                            if (!(compileTree && Object.keys(compileTree).length)) return [3 /*break*/, 2];
+                                                            return [4 /*yield*/, compileTree.getDepContent(filePaths[0])];
                                                         case 1:
                                                             fileContent_1 = _e.sent();
+                                                            leaf_1 = compileTree.getLeaf(filePaths[0]);
+                                                            return [3 /*break*/, 4];
+                                                        case 2: return [4 /*yield*/, (0, file_1.readFile)(filePaths[0])];
+                                                        case 3:
+                                                            fileContent_1 = _e.sent();
+                                                            _e.label = 4;
+                                                        case 4:
                                                             foundDependencies.push(dep);
                                                             _b = (_a = dependencyPaths.push).apply;
                                                             _c = [dependencyPaths];
                                                             _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())])]))]));
-                                                            _e.label = 3;
-                                                        case 3:
-                                                            dependencyPaths.push.apply(dependencyPaths, __spreadArray([], __read(filePaths)));
+                                                            return [4 /*yield*/, getDependencyPaths(fileContent_1, macroFolders, macroCorePath, compileTree, leaf_1)];
+                                                        case 5:
+                                                            _b.apply(_a, _c.concat([__spreadArray.apply(void 0, _d.concat([__read.apply(void 0, [(_e.sent())]), false]))]));
+                                                            _e.label = 6;
+                                                        case 6:
+                                                            dependencyPaths.push.apply(dependencyPaths, __spreadArray([], __read(filePaths), false));
                                                             return [2 /*return*/];
                                                     }
                                                 });
@@ -117,21 +128,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,uBAKW;AAGX,SAAsB,kBAAkB,CACtC,WAAmB,EACnB,YAAsB,EACtB,aAAqB,EACrB,WAAyB,EACzB,IAAW;;;;;;;oBAEP,eAAe,GAAa,EAAE,CAAA;oBAC5B,iBAAiB,GAAa,EAAE,CAAA;oBAChC,WAAW,0CAAO,YAAY,YAAE,aAAa,SAAC,CAAA;oBAC9C,kBAAkB,GAAG,IAAA,sBAAmB,EAC5C,WAAW,EACX,mBAAgB,CAAC,KAAK,CACvB,CAAA;oBACK,YAAY,GAChB,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY;wBAClB,IAAA,UAAO,EAAC,kBAAkB,EAAE,WAAW,CAAC,CAAC,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAlB,CAAkB,CAAC,CAAA;oBAE5E,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;4DACd,gBAAc,EAAE,CAAA;4DAChB,SAAyB,SAAS,CAAA;iEAElC,CAAA,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,CAAA,EAA9C,wBAA8C;4DAClC,qBAAM,WAAW,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAA;;4DAA3D,aAAW,GAAG,SAA6C,CAAA;4DAC3D,MAAI,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;;gEAE1B,qBAAM,IAAA,eAAQ,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAA;;4DAA1C,aAAW,GAAG,SAA4B,CAAA;;;4DAG5C,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,EACb,WAAW,EACX,MAAI,CACL,EAAA;;4DAPH,qFACK,CAAC,SAMH,CAAC,gBACH;;;4DAGH,eAAe,CAAC,IAAI,OAApB,eAAe,2BAAS,SAAS,WAAC;;;;iDACnC,CAAC,EAAA;;wCA3BF,SA2BE,CAAA;;;wCACG,IAAI,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;4CAC5C,MAAM,sDAA+C,UAAU,qBAAkB,CAAA;yCAClF;;;;;6BACF,CAAC,EAAA;;oBAlCF,yFAAyF;oBACzF,SAiCE,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;AAnED,gDAmEC"}