@sasjs/utils 2.34.1 → 2.36.1

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

package/sasjsCli/getInitTerm.js.map

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

package/sasjsCli/getList.js

@@ -29,9 +29,8 @@ var getList = function (listHeader, fileContent) {
             }
         }
         if (endIndex !== null) {
-            for (var i = startIndex; i < endIndex; i++) {
+            for (var i = startIndex; i < endIndex; i++)
                 list.push(lines[i]);
-            }
         }
     }
     return list

package/sasjsCli/getList.js.map

@@ -1 +1 @@
-{"version":3,"file":"getList.js","sourceRoot":"","sources":["../../src/sasjsCli/getList.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACI,IAAM,OAAO,GAAG,UAAC,UAAkB,EAAE,WAAmB;IAC7D,IAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,WAAW,CAAA;IACjE,IAAI,CAAC,aAAa;QAAE,OAAO,EAAE,CAAA;IAC7B,IAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;IAE9D,IAAM,IAAI,GAAG,EAAE,CAAA;IAEf,IAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAlB,CAAkB,CAAC,CAAA;IACnE,IAAI,UAAU,GAAG,IAAI,CAAA;IACrB,IAAI,QAAQ,GAAG,IAAI,CAAA;IACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrC,IAAI,IAAI,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;YAC9C,UAAU,GAAG,CAAC,GAAG,CAAC,CAAA;YAClB,MAAK;SACN;KACF;IAED,IAAI,UAAU,KAAK,IAAI,EAAE;QACvB,KAAK,IAAI,CAAC,GAAG,UAAU,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC9C,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;gBACb,QAAQ,GAAG,CAAC,CAAA;gBACZ,MAAK;aACN;SACF;QACD,IAAI,QAAQ,KAAK,IAAI,EAAE;YACrB,KAAK,IAAI,CAAC,GAAG,UAAU,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE;gBAC1C,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;aACpB;SACF;KACF;IAED,OAAO,IAAI;SACR,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAAnB,CAAmB,CAAC;SAClC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,EAAtB,CAAsB,CAAC;SAClC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,EAAE,EAAR,CAAQ,CAAC,CAAA;AACzB,CAAC,CAAA;AAnCY,QAAA,OAAO,WAmCnB"}
+{"version":3,"file":"getList.js","sourceRoot":"","sources":["../../src/sasjsCli/getList.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACI,IAAM,OAAO,GAAG,UAAC,UAAkB,EAAE,WAAmB;IAC7D,IAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,WAAW,CAAA;IAEjE,IAAI,CAAC,aAAa;QAAE,OAAO,EAAE,CAAA;IAE7B,IAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;IAC9D,IAAM,IAAI,GAAG,EAAE,CAAA;IACf,IAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAlB,CAAkB,CAAC,CAAA;IACnE,IAAI,UAAU,GAAG,IAAI,CAAA;IACrB,IAAI,QAAQ,GAAG,IAAI,CAAA;IAEnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrC,IAAI,IAAI,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;YAC9C,UAAU,GAAG,CAAC,GAAG,CAAC,CAAA;YAElB,MAAK;SACN;KACF;IAED,IAAI,UAAU,KAAK,IAAI,EAAE;QACvB,KAAK,IAAI,CAAC,GAAG,UAAU,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC9C,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;gBACb,QAAQ,GAAG,CAAC,CAAA;gBAEZ,MAAK;aACN;SACF;QAED,IAAI,QAAQ,KAAK,IAAI,EAAE;YACrB,KAAK,IAAI,CAAC,GAAG,UAAU,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE;gBAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;SAChE;KACF;IAED,OAAO,IAAI;SACR,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAAnB,CAAmB,CAAC;SAClC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,EAAtB,CAAsB,CAAC;SAClC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,EAAE,EAAR,CAAQ,CAAC,CAAA;AACzB,CAAC,CAAA;AArCY,QAAA,OAAO,WAqCnB"}

package/sasjsCli/index.d.ts

@@ -1,10 +1,7 @@
 export * from './getDependencyPaths';
 export * from './getInitTerm';
 export * from './getList';
-export * from './getProgramDependencies';
-export * from './getProgramList';
-export * from './index';
 export * from './loadDependenciesFile';
 export * from './prioritiseDependencyOverrides';
 export * from './validateFileRef';
-export * from './validateProgramsList';
+export * from './getDependencies';

package/sasjsCli/index.js

@@ -13,11 +13,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./getDependencyPaths"), exports);
 __exportStar(require("./getInitTerm"), exports);
 __exportStar(require("./getList"), exports);
-__exportStar(require("./getProgramDependencies"), exports);
-__exportStar(require("./getProgramList"), exports);
-__exportStar(require("./index"), exports);
 __exportStar(require("./loadDependenciesFile"), exports);
 __exportStar(require("./prioritiseDependencyOverrides"), exports);
 __exportStar(require("./validateFileRef"), exports);
-__exportStar(require("./validateProgramsList"), exports);
+__exportStar(require("./getDependencies"), exports);
 //# sourceMappingURL=index.js.map

package/sasjsCli/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sasjsCli/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAoC;AACpC,gDAA6B;AAC7B,4CAAyB;AACzB,2DAAwC;AACxC,mDAAgC;AAChC,0CAAuB;AACvB,yDAAsC;AACtC,kEAA+C;AAC/C,oDAAiC;AACjC,yDAAsC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sasjsCli/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAoC;AACpC,gDAA6B;AAC7B,4CAAyB;AACzB,yDAAsC;AACtC,kEAA+C;AAC/C,oDAAiC;AACjC,oDAAiC"}

package/sasjsCli/loadDependenciesFile.d.ts

@@ -8,7 +8,8 @@ interface loadDependenciesParams {
     programFolders: string[];
     macroFolders: string[];
     buildSourceFolder: string;
+    binaryFolders: string[];
     macroCorePath: string;
 }
-export declare const loadDependenciesFile: ({ filePath, fileContent, configuration, target, type, programFolders, macroFolders, buildSourceFolder, macroCorePath }: loadDependenciesParams) => Promise<string>;
+export declare const loadDependenciesFile: ({ filePath, fileContent, configuration, target, type, programFolders, macroFolders, buildSourceFolder, macroCorePath, binaryFolders }: loadDependenciesParams) => Promise<string>;
 export {};

package/sasjsCli/loadDependenciesFile.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));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadDependenciesFile = void 0;
@@ -62,61 +66,64 @@ var file_1 = require("../file");
 var utils_1 = require("../utils");
 var _1 = require("./");
 var loadDependenciesFile = function (_a) {
-    var filePath = _a.filePath, fileContent = _a.fileContent, configuration = _a.configuration, target = _a.target, type = _a.type, programFolders = _a.programFolders, macroFolders = _a.macroFolders, buildSourceFolder = _a.buildSourceFolder, macroCorePath = _a.macroCorePath;
+    var filePath = _a.filePath, fileContent = _a.fileContent, configuration = _a.configuration, target = _a.target, type = _a.type, programFolders = _a.programFolders, macroFolders = _a.macroFolders, buildSourceFolder = _a.buildSourceFolder, macroCorePath = _a.macroCorePath, binaryFolders = _a.binaryFolders;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, init, initPath, term, termPath, startUpVars, fileDependencyPaths, initDependencyPaths, termDependencyPaths, allDependencyPaths, initProgramDependencies, termProgramDependencies, programDependencies, dependenciesContent;
+        var _b, init, initPath, term, termPath, startUpVars, fileDependencyPaths, initDependencyPaths, termDependencyPaths, allDependencyPaths, initProgramDependencies, termProgramDependencies, programDependencies, binariesDeps, dependenciesContent;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, _1.getInitTerm({
+                case 0: return [4 /*yield*/, (0, _1.getInitTerm)({
                         configuration: configuration,
                         target: target,
-                        type: type,
+                        fileType: type,
                         buildSourceFolder: buildSourceFolder
                     })];
                 case 1:
                     _b = _c.sent(), init = _b.init, initPath = _b.initPath, term = _b.term, termPath = _b.termPath, startUpVars = _b.startUpVars;
-                    fileContent = "\n* " + type + " start;\n" + fileContent + "\n* " + type + " end;";
-                    return [4 /*yield*/, _1.getDependencyPaths(fileContent + "\n" + init + "\n" + term, macroFolders, macroCorePath)];
+                    fileContent = "\n* ".concat(type, " start;\n").concat(fileContent, "\n* ").concat(type, " end;");
+                    return [4 /*yield*/, (0, _1.getDependencyPaths)("".concat(fileContent, "\n").concat(init, "\n").concat(term), macroFolders, macroCorePath)];
                 case 2:
                     fileDependencyPaths = _c.sent();
-                    return [4 /*yield*/, _1.getDependencyPaths(init, macroFolders, macroCorePath)];
+                    return [4 /*yield*/, (0, _1.getDependencyPaths)(init, macroFolders, macroCorePath)];
                 case 3:
                     initDependencyPaths = _c.sent();
-                    return [4 /*yield*/, _1.getDependencyPaths(term, macroFolders, macroCorePath)];
+                    return [4 /*yield*/, (0, _1.getDependencyPaths)(term, macroFolders, macroCorePath)];
                 case 4:
                     termDependencyPaths = _c.sent();
-                    allDependencyPaths = __spreadArray(__spreadArray(__spreadArray([], __read(initDependencyPaths)), __read(fileDependencyPaths)), __read(termDependencyPaths));
-                    return [4 /*yield*/, _1.getProgramDependencies(init, programFolders, initPath)];
+                    allDependencyPaths = __spreadArray(__spreadArray(__spreadArray([], __read(initDependencyPaths), false), __read(fileDependencyPaths), false), __read(termDependencyPaths), false);
+                    return [4 /*yield*/, (0, _1.getDependencies)(initPath, init, programFolders, _1.DependencyType.Include)];
                 case 5:
                     initProgramDependencies = _c.sent();
-                    return [4 /*yield*/, _1.getProgramDependencies(term, programFolders, termPath)];
+                    return [4 /*yield*/, (0, _1.getDependencies)(termPath, term, programFolders, _1.DependencyType.Include)];
                 case 6:
                     termProgramDependencies = _c.sent();
-                    return [4 /*yield*/, _1.getProgramDependencies(fileContent, programFolders, filePath)];
+                    return [4 /*yield*/, (0, _1.getDependencies)(filePath, fileContent, programFolders, _1.DependencyType.Include)];
                 case 7:
                     programDependencies = _c.sent();
-                    return [4 /*yield*/, getDependencies(allDependencyPaths)];
+                    return [4 /*yield*/, (0, _1.getDependencies)(filePath, fileContent, binaryFolders, _1.DependencyType.Binary)];
                 case 8:
+                    binariesDeps = _c.sent();
+                    return [4 /*yield*/, getAllDependencies(allDependencyPaths)];
+                case 9:
                     dependenciesContent = _c.sent();
-                    fileContent = "* Dependencies start;\n" + initProgramDependencies + "\n" + termProgramDependencies + "\n" + dependenciesContent + "\n* Dependencies end;\n* Programs start;\n" + programDependencies + "\n*Programs end;" + init + fileContent + term;
-                    fileContent = "* " + type + " Variables start;\n" + startUpVars + "\n*" + type + " Variables end;\n" + fileContent;
+                    fileContent = "* SAS Macros start;\n".concat(initProgramDependencies, "\n").concat(termProgramDependencies, "\n").concat(dependenciesContent, "\n* SAS Macros end;\n* SAS Includes start;\n").concat(programDependencies, "\n* SAS Includes end;\n* Binary Files start;\n").concat(binariesDeps, "\n* Binary Files end;\n\n  ").concat(init).concat(fileContent).concat(term);
+                    fileContent = "* ".concat(type, " Variables start;\n").concat(startUpVars, "\n* ").concat(type, " Variables end;\n").concat(fileContent);
                     return [2 /*return*/, fileContent];
             }
         });
     });
 };
 exports.loadDependenciesFile = loadDependenciesFile;
-var getDependencies = function (filePaths) { return __awaiter(void 0, void 0, void 0, function () {
+var getAllDependencies = function (filePaths) { return __awaiter(void 0, void 0, void 0, function () {
     var dependenciesContent;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
                 dependenciesContent = [];
-                return [4 /*yield*/, utils_1.asyncForEach(__spreadArray([], __read(new Set(filePaths))), function (filePath) { return __awaiter(void 0, void 0, void 0, function () {
+                return [4 /*yield*/, (0, utils_1.asyncForEach)(__spreadArray([], __read(new Set(filePaths)), false), function (filePath) { return __awaiter(void 0, void 0, void 0, function () {
                         var depFileContent;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
-                                case 0: return [4 /*yield*/, file_1.readFile(filePath)];
+                                case 0: return [4 /*yield*/, (0, file_1.readFile)(filePath)];
                                 case 1:
                                     depFileContent = _a.sent();
                                     dependenciesContent.push(depFileContent);

package/sasjsCli/loadDependenciesFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"loadDependenciesFile.js","sourceRoot":"","sources":["../../src/sasjsCli/loadDependenciesFile.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gCAAkC;AAElC,kCAAuC;AACvC,uBAA4E;AAcrE,IAAM,oBAAoB,GAAG,UAAO,EAUlB;QATvB,QAAQ,cAAA,EACR,WAAW,iBAAA,EACX,aAAa,mBAAA,EACb,MAAM,YAAA,EACN,IAAI,UAAA,EACJ,cAAc,oBAAA,EACd,YAAY,kBAAA,EACZ,iBAAiB,uBAAA,EACjB,aAAa,mBAAA;;;;;wBAE2C,qBAAM,cAAW,CAAC;wBACxE,aAAa,eAAA;wBACb,MAAM,QAAA;wBACN,IAAI,MAAA;wBACJ,iBAAiB,mBAAA;qBAClB,CAAC,EAAA;;oBALI,KAAkD,SAKtD,EALM,IAAI,UAAA,EAAE,QAAQ,cAAA,EAAE,IAAI,UAAA,EAAE,QAAQ,cAAA,EAAE,WAAW,iBAAA;oBAOnD,WAAW,GAAG,SAAO,IAAI,iBAAY,WAAW,YAAO,IAAI,UAAO,CAAA;oBAEtC,qBAAM,qBAAkB,CAC/C,WAAW,UAAK,IAAI,UAAK,IAAM,EAClC,YAAY,EACZ,aAAa,CACd,EAAA;;oBAJK,mBAAmB,GAAG,SAI3B;oBAC2B,qBAAM,qBAAkB,CAClD,IAAI,EACJ,YAAY,EACZ,aAAa,CACd,EAAA;;oBAJK,mBAAmB,GAAG,SAI3B;oBAC2B,qBAAM,qBAAkB,CAClD,IAAI,EACJ,YAAY,EACZ,aAAa,CACd,EAAA;;oBAJK,mBAAmB,GAAG,SAI3B;oBACK,kBAAkB,wDACnB,mBAAmB,WACnB,mBAAmB,WACnB,mBAAmB,EACvB,CAAA;oBAE+B,qBAAM,yBAAsB,CAC1D,IAAI,EACJ,cAAc,EACd,QAAQ,CACT,EAAA;;oBAJK,uBAAuB,GAAG,SAI/B;oBAC+B,qBAAM,yBAAsB,CAC1D,IAAI,EACJ,cAAc,EACd,QAAQ,CACT,EAAA;;oBAJK,uBAAuB,GAAG,SAI/B;oBAE2B,qBAAM,yBAAsB,CACtD,WAAW,EACX,cAAc,EACd,QAAQ,CACT,EAAA;;oBAJK,mBAAmB,GAAG,SAI3B;oBAE2B,qBAAM,eAAe,CAAC,kBAAkB,CAAC,EAAA;;oBAA/D,mBAAmB,GAAG,SAAyC;oBAErE,WAAW,GAAG,4BAA0B,uBAAuB,UAAK,uBAAuB,UAAK,mBAAmB,kDAA6C,mBAAmB,wBAAmB,IAAI,GAAG,WAAW,GAAG,IAAM,CAAA;oBAEjO,WAAW,GAAG,OAAK,IAAI,2BAAsB,WAAW,WAAM,IAAI,yBAAoB,WAAa,CAAA;oBAEnG,sBAAO,WAAW,EAAA;;;;CACnB,CAAA;AAjEY,QAAA,oBAAoB,wBAiEhC;AAED,IAAM,eAAe,GAAG,UAAO,SAAmB;;;;;gBAC5C,mBAAmB,GAAa,EAAE,CAAA;gBACtC,qBAAM,oBAAY,0BAAK,IAAI,GAAG,CAAC,SAAS,CAAC,IAAG,UAAO,QAAQ;;;;wCAClC,qBAAM,eAAQ,CAAC,QAAQ,CAAC,EAAA;;oCAAzC,cAAc,GAAG,SAAwB;oCAC/C,mBAAmB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;;;;yBACzC,CAAC,EAAA;;gBAHF,SAGE,CAAA;gBAEF,sBAAO,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAA;;;KACtC,CAAA"}
+{"version":3,"file":"loadDependenciesFile.js","sourceRoot":"","sources":["../../src/sasjsCli/loadDependenciesFile.ts"],"names":[],"mappings":"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"}

package/sasjsCli/prioritiseDependencyOverrides.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 };
@@ -29,10 +33,10 @@ var path_1 = __importDefault(require("path"));
 var prioritiseDependencyOverrides = function (dependencyNames, dependencyPaths, macroPaths, pathSeparator) {
     if (macroPaths === void 0) { macroPaths = []; }
     if (pathSeparator === void 0) { pathSeparator = path_1.default.sep; }
-    dependencyPaths = __spreadArray([], __read(new Set(dependencyPaths)));
+    dependencyPaths = __spreadArray([], __read(new Set(dependencyPaths)), false);
     dependencyNames.forEach(function (depFileName) {
         var paths = dependencyPaths.filter(function (p) {
-            return p.includes("" + pathSeparator + depFileName);
+            return p.includes("".concat(pathSeparator).concat(depFileName));
         });
         var overriddenDependencyPaths = paths.filter(function (p) { return !p.includes('node_modules'); });
         if (macroPaths.length) {

package/sasjsCli/prioritiseDependencyOverrides.js.map

@@ -1 +1 @@
-{"version":3,"file":"prioritiseDependencyOverrides.js","sourceRoot":"","sources":["../../src/sasjsCli/prioritiseDependencyOverrides.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AAEhB,IAAM,6BAA6B,GAAG,UAC3C,eAAyB,EACzB,eAAyB,EACzB,UAAyB,EACzB,aAAwB;IADxB,2BAAA,EAAA,eAAyB;IACzB,8BAAA,EAAA,gBAAgB,cAAI,CAAC,GAAG;IAExB,eAAe,4BAAO,IAAI,GAAG,CAAC,eAAe,CAAC,EAAC,CAAA;IAC/C,eAAe,CAAC,OAAO,CAAC,UAAC,WAAW;QAClC,IAAM,KAAK,GAAG,eAAe,CAAC,MAAM,CAAC,UAAC,CAAC;YACrC,OAAA,CAAC,CAAC,QAAQ,CAAC,KAAG,aAAa,GAAG,WAAa,CAAC;QAA5C,CAA4C,CAC7C,CAAA;QAED,IAAI,yBAAyB,GAAG,KAAK,CAAC,MAAM,CAC1C,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,EAA3B,CAA2B,CACnC,CAAA;QACD,IAAI,UAAU,CAAC,MAAM,EAAE;YACrB,IAAM,iBAAiB,GAAG,yBAAyB,CAAC,MAAM,CAAC,UAAC,CAAC;gBAC3D,IAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,UAAC,EAAE,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAd,CAAc,CAAC,CAAA;gBACzD,OAAO,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAA;YACjC,CAAC,CAAC,CAAA;YACF,IAAI,iBAAiB,CAAC,MAAM;gBAC1B,yBAAyB,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAA;SACrD;QAED,IACE,yBAAyB,CAAC,MAAM;YAChC,yBAAyB,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,EAChD;YACA,IAAM,eAAa,GAAG,KAAK,CAAC,MAAM,CAChC,UAAC,EAAE,IAAK,OAAA,yBAAyB,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,EAAzC,CAAyC,CAClD,CAAA;YACD,eAAe,GAAG,eAAe,CAAC,MAAM,CACtC,UAAC,EAAE,IAAK,OAAA,eAAa,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,EAA7B,CAA6B,CACtC,CAAA;SACF;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,eAAe,CAAA;AACxB,CAAC,CAAA;AAtCY,QAAA,6BAA6B,iCAsCzC"}
+{"version":3,"file":"prioritiseDependencyOverrides.js","sourceRoot":"","sources":["../../src/sasjsCli/prioritiseDependencyOverrides.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AAEhB,IAAM,6BAA6B,GAAG,UAC3C,eAAyB,EACzB,eAAyB,EACzB,UAAyB,EACzB,aAAwB;IADxB,2BAAA,EAAA,eAAyB;IACzB,8BAAA,EAAA,gBAAgB,cAAI,CAAC,GAAG;IAExB,eAAe,4BAAO,IAAI,GAAG,CAAC,eAAe,CAAC,SAAC,CAAA;IAC/C,eAAe,CAAC,OAAO,CAAC,UAAC,WAAW;QAClC,IAAM,KAAK,GAAG,eAAe,CAAC,MAAM,CAAC,UAAC,CAAC;YACrC,OAAA,CAAC,CAAC,QAAQ,CAAC,UAAG,aAAa,SAAG,WAAW,CAAE,CAAC;QAA5C,CAA4C,CAC7C,CAAA;QAED,IAAI,yBAAyB,GAAG,KAAK,CAAC,MAAM,CAC1C,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,EAA3B,CAA2B,CACnC,CAAA;QACD,IAAI,UAAU,CAAC,MAAM,EAAE;YACrB,IAAM,iBAAiB,GAAG,yBAAyB,CAAC,MAAM,CAAC,UAAC,CAAC;gBAC3D,IAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,UAAC,EAAE,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAd,CAAc,CAAC,CAAA;gBACzD,OAAO,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAA;YACjC,CAAC,CAAC,CAAA;YACF,IAAI,iBAAiB,CAAC,MAAM;gBAC1B,yBAAyB,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAA;SACrD;QAED,IACE,yBAAyB,CAAC,MAAM;YAChC,yBAAyB,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,EAChD;YACA,IAAM,eAAa,GAAG,KAAK,CAAC,MAAM,CAChC,UAAC,EAAE,IAAK,OAAA,yBAAyB,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,EAAzC,CAAyC,CAClD,CAAA;YACD,eAAe,GAAG,eAAe,CAAC,MAAM,CACtC,UAAC,EAAE,IAAK,OAAA,eAAa,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,EAA7B,CAA6B,CACtC,CAAA;SACF;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,eAAe,CAAA;AACxB,CAAC,CAAA;AAtCY,QAAA,6BAA6B,iCAsCzC"}

package/time/timestamp.js

@@ -7,14 +7,14 @@ var timestampToYYYYMMDDHHMMSS = function (timestamp) {
     var date = new Date(timestamp);
     return ([
         date.getFullYear(),
-        formatter_1.padWithNumber(date.getMonth() + 1),
-        formatter_1.padWithNumber(date.getDate())
+        (0, formatter_1.padWithNumber)(date.getMonth() + 1),
+        (0, formatter_1.padWithNumber)(date.getDate())
     ].join('/') +
         ' ' +
         [
-            formatter_1.padWithNumber(date.getHours()),
-            formatter_1.padWithNumber(date.getMinutes()),
-            formatter_1.padWithNumber(date.getSeconds())
+            (0, formatter_1.padWithNumber)(date.getHours()),
+            (0, formatter_1.padWithNumber)(date.getMinutes()),
+            (0, formatter_1.padWithNumber)(date.getSeconds())
         ].join(':'));
 };
 exports.timestampToYYYYMMDDHHMMSS = timestampToYYYYMMDDHHMMSS;
@@ -29,7 +29,7 @@ function generateTimestamp(sep, sepIndex) {
         date.getUTCMinutes(),
         date.getUTCSeconds()
     ];
-    timestamp = timestamp.map(function (item) { return formatter_1.padWithNumber(item); });
+    timestamp = timestamp.map(function (item) { return (0, formatter_1.padWithNumber)(item); });
     if (sepIndex && sep && sepIndex < timestamp.length && sepIndex >= 0) {
         timestamp.splice(sepIndex, 0, sep);
     }

package/time/timestamp.js.map

@@ -1 +1 @@
-{"version":3,"file":"timestamp.js","sourceRoot":"","sources":["../../src/time/timestamp.ts"],"names":[],"mappings":";;;AAAA,0CAA4C;AAErC,IAAM,yBAAyB,GAAG,UAAC,SAA8B;IAA9B,0BAAA,EAAA,YAAoB,IAAI,CAAC,GAAG,EAAE;IACtE,IAAM,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAA;IAEhC,OAAO,CACL;QACE,IAAI,CAAC,WAAW,EAAE;QAClB,yBAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAClC,yBAAa,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;KAC9B,CAAC,IAAI,CAAC,GAAG,CAAC;QACX,GAAG;QACH;YACE,yBAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC9B,yBAAa,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChC,yBAAa,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;SACjC,CAAC,IAAI,CAAC,GAAG,CAAC,CACZ,CAAA;AACH,CAAC,CAAA;AAhBY,QAAA,yBAAyB,6BAgBrC;AAED,SAAgB,iBAAiB,CAAC,GAAQ,EAAE,QAAiB;IAA3B,oBAAA,EAAA,QAAQ;IACxC,IAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;IAEvB,IAAI,SAAS,GAAiC;QAC5C,IAAI,CAAC,cAAc,EAAE;QACrB,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC;QACtB,IAAI,CAAC,UAAU,EAAE;QACjB,IAAI,CAAC,WAAW,EAAE;QAClB,IAAI,CAAC,aAAa,EAAE;QACpB,IAAI,CAAC,aAAa,EAAE;KACrB,CAAA;IAED,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,UAAC,IAAI,IAAK,OAAA,yBAAa,CAAC,IAAc,CAAC,EAA7B,CAA6B,CAAC,CAAA;IAElE,IAAI,QAAQ,IAAI,GAAG,IAAI,QAAQ,GAAG,SAAS,CAAC,MAAM,IAAI,QAAQ,IAAI,CAAC,EAAE;QACnE,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,GAAG,CAAC,CAAA;KACnC;IAED,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IAE/C,OAAO,SAAS,CAAA;AAClB,CAAC;AArBD,8CAqBC"}
+{"version":3,"file":"timestamp.js","sourceRoot":"","sources":["../../src/time/timestamp.ts"],"names":[],"mappings":";;;AAAA,0CAA4C;AAErC,IAAM,yBAAyB,GAAG,UAAC,SAA8B;IAA9B,0BAAA,EAAA,YAAoB,IAAI,CAAC,GAAG,EAAE;IACtE,IAAM,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAA;IAEhC,OAAO,CACL;QACE,IAAI,CAAC,WAAW,EAAE;QAClB,IAAA,yBAAa,EAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAClC,IAAA,yBAAa,EAAC,IAAI,CAAC,OAAO,EAAE,CAAC;KAC9B,CAAC,IAAI,CAAC,GAAG,CAAC;QACX,GAAG;QACH;YACE,IAAA,yBAAa,EAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC9B,IAAA,yBAAa,EAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChC,IAAA,yBAAa,EAAC,IAAI,CAAC,UAAU,EAAE,CAAC;SACjC,CAAC,IAAI,CAAC,GAAG,CAAC,CACZ,CAAA;AACH,CAAC,CAAA;AAhBY,QAAA,yBAAyB,6BAgBrC;AAED,SAAgB,iBAAiB,CAAC,GAAQ,EAAE,QAAiB;IAA3B,oBAAA,EAAA,QAAQ;IACxC,IAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;IAEvB,IAAI,SAAS,GAAiC;QAC5C,IAAI,CAAC,cAAc,EAAE;QACrB,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC;QACtB,IAAI,CAAC,UAAU,EAAE;QACjB,IAAI,CAAC,WAAW,EAAE;QAClB,IAAI,CAAC,aAAa,EAAE;QACpB,IAAI,CAAC,aAAa,EAAE;KACrB,CAAA;IAED,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,UAAC,IAAI,IAAK,OAAA,IAAA,yBAAa,EAAC,IAAc,CAAC,EAA7B,CAA6B,CAAC,CAAA;IAElE,IAAI,QAAQ,IAAI,GAAG,IAAI,QAAQ,GAAG,SAAS,CAAC,MAAM,IAAI,QAAQ,IAAI,CAAC,EAAE;QACnE,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,GAAG,CAAC,CAAA;KACnC;IAED,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IAE/C,OAAO,SAAS,CAAA;AAClB,CAAC;AArBD,8CAqBC"}

package/types/configuration.d.ts

@@ -14,6 +14,7 @@ export interface Configuration {
     streamConfig?: StreamConfig;
     macroFolders?: string[];
     programFolders?: string[];
+    binaryFolders?: string[];
     serverType?: ServerType;
     targets?: TargetJson[];
     defaultTarget?: string;

package/types/httpsAgentOptions.d.ts

@@ -4,5 +4,5 @@ export interface HttpsAgentOptions extends https.AgentOptions {
     caPath?: string;
     keyPath?: string;
     certPath?: string;
-    allowInsecureRequests: boolean;
+    allowInsecureRequests?: boolean;
 }

package/types/target.d.ts

@@ -20,6 +20,7 @@ export interface TargetJson {
     streamConfig?: StreamConfig;
     macroFolders: string[];
     programFolders: string[];
+    binaryFolders: string[];
     isDefault?: boolean;
     testConfig?: TestConfig;
 }
@@ -54,6 +55,8 @@ export declare class Target implements TargetJson {
     private _macroFolders;
     get programFolders(): string[];
     private _programFolders;
+    get binaryFolders(): string[];
+    private _binaryFolders;
     get contextName(): string;
     private _contextName;
     get serverName(): string;