@sasjs/utils 3.4.0 → 3.5.0

package/sasjsCli/getPreCode.js

@@ -8,92 +8,54 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPreCode = exports.preCodeViya = exports.preCodeEnd = exports.callWeboutMacro = void 0;
-var types_1 = require("../types");
-var file_1 = require("../file");
-var path_1 = __importDefault(require("path"));
-var callWeboutMacro = function (macro) {
-    return "%macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO,maxobs=MAX);\n  %".concat(macro, "(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt\n    ,missing=&missing\n    ,showmeta=&showmeta\n    ,maxobs=&maxobs\n  ) %mend;\n");
-};
+const types_1 = require("../types");
+const file_1 = require("../file");
+const path_1 = __importDefault(require("path"));
+const callWeboutMacro = (macro) => `%macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO,maxobs=MAX);
+  %${macro}(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt
+    ,missing=&missing
+    ,showmeta=&showmeta
+    ,maxobs=&maxobs
+  ) %mend;
+`;
 exports.callWeboutMacro = callWeboutMacro;
-exports.preCodeEnd = "/* provide additional debug info */\n%global _program;\n%put &=syscc;\n%put user=%mf_getuser();\n%put pgm=&_program;\n%put timestamp=%sysfunc(datetime(),datetime19.);\n";
-exports.preCodeViya = "/* if calling viya service with _job param, _program will conflict */\n/* so we provide instead as __program */\n%global __program _program;\n%let _program=%sysfunc(coalescec(&__program,&_program));\n";
+exports.preCodeEnd = `/* provide additional debug info */
+%global _program;
+%put &=syscc;
+%put user=%mf_getuser();
+%put pgm=&_program;
+%put timestamp=%sysfunc(datetime(),datetime19.);\n`;
+exports.preCodeViya = `/* if calling viya service with _job param, _program will conflict */
+/* so we provide instead as __program */
+%global __program _program;
+%let _program=%sysfunc(coalescec(&__program,&_program));
+`;
 function getPreCode(serverType, macroCorePath) {
-    return __awaiter(this, void 0, void 0, function () {
-        var mf_getuser, mp_jsonout, content, _a, _b, _c, _d;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
-                case 0: return [4 /*yield*/, (0, file_1.readFile)(path_1.default.join(macroCorePath, 'base', 'mf_getuser.sas'))];
-                case 1:
-                    mf_getuser = _e.sent();
-                    return [4 /*yield*/, (0, file_1.readFile)(path_1.default.join(macroCorePath, 'base', 'mp_jsonout.sas'))];
-                case 2:
-                    mp_jsonout = _e.sent();
-                    content = mf_getuser + mp_jsonout;
-                    _a = serverType;
-                    switch (_a) {
-                        case types_1.ServerType.SasViya: return [3 /*break*/, 3];
-                        case types_1.ServerType.Sas9: return [3 /*break*/, 5];
-                        case types_1.ServerType.Sasjs: return [3 /*break*/, 7];
-                    }
-                    return [3 /*break*/, 9];
-                case 3:
-                    _b = content;
-                    return [4 /*yield*/, (0, file_1.readFile)(path_1.default.join(macroCorePath, 'viya', 'mv_webout.sas'))];
-                case 4:
-                    content = _b + _e.sent();
-                    content += exports.preCodeViya + (0, exports.callWeboutMacro)('mv_webout');
-                    return [3 /*break*/, 9];
-                case 5:
-                    _c = content;
-                    return [4 /*yield*/, (0, file_1.readFile)(path_1.default.join(macroCorePath, 'meta', 'mm_webout.sas'))];
-                case 6:
-                    content = _c + _e.sent();
-                    content += (0, exports.callWeboutMacro)('mm_webout');
-                    return [3 /*break*/, 9];
-                case 7:
-                    _d = content;
-                    return [4 /*yield*/, (0, file_1.readFile)(path_1.default.join(macroCorePath, 'server', 'ms_webout.sas'))];
-                case 8:
-                    content = _d + _e.sent();
-                    content += (0, exports.callWeboutMacro)('ms_webout');
-                    return [3 /*break*/, 9];
-                case 9:
-                    content += exports.preCodeEnd;
-                    return [2 /*return*/, content];
-            }
-        });
+    return __awaiter(this, void 0, void 0, function* () {
+        const mf_getuser = yield (0, file_1.readFile)(path_1.default.join(macroCorePath, 'base', 'mf_getuser.sas'));
+        const mp_jsonout = yield (0, file_1.readFile)(path_1.default.join(macroCorePath, 'base', 'mp_jsonout.sas'));
+        let content = mf_getuser + mp_jsonout;
+        switch (serverType) {
+            case types_1.ServerType.SasViya:
+                content += yield (0, file_1.readFile)(path_1.default.join(macroCorePath, 'viya', 'mv_webout.sas'));
+                content += exports.preCodeViya + (0, exports.callWeboutMacro)('mv_webout');
+                break;
+            case types_1.ServerType.Sas9:
+                content += yield (0, file_1.readFile)(path_1.default.join(macroCorePath, 'meta', 'mm_webout.sas'));
+                content += (0, exports.callWeboutMacro)('mm_webout');
+                break;
+            case types_1.ServerType.Sasjs:
+                content += yield (0, file_1.readFile)(path_1.default.join(macroCorePath, 'server', 'ms_webout.sas'));
+                content += (0, exports.callWeboutMacro)('ms_webout');
+                break;
+        }
+        content += exports.preCodeEnd;
+        return content;
     });
 }
 exports.getPreCode = getPreCode;

package/sasjsCli/getPreCode.js.map

@@ -1 +1 @@
-{"version":3,"file":"getPreCode.js","sourceRoot":"","sources":["../../src/sasjsCli/getPreCode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kCAAqC;AACrC,gCAAkC;AAClC,8CAAuB;AAEhB,IAAM,eAAe,GAAG,UAAC,KAAa;IAC3C,OAAA,0FACG,KAAK,iIAKT;AANC,CAMD,CAAA;AAPY,QAAA,eAAe,mBAO3B;AACY,QAAA,UAAU,GAAG,0KAKyB,CAAA;AAEtC,QAAA,WAAW,GAAG,0MAI1B,CAAA;AAED,SAAsB,UAAU,CAC9B,UAAsB,EACtB,aAAqB;;;;;wBAEF,qBAAM,IAAA,eAAQ,EAC/B,cAAI,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CACnD,EAAA;;oBAFK,UAAU,GAAG,SAElB;oBACkB,qBAAM,IAAA,eAAQ,EAC/B,cAAI,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CACnD,EAAA;;oBAFK,UAAU,GAAG,SAElB;oBAEG,OAAO,GAAG,UAAU,GAAG,UAAU,CAAA;oBAE7B,KAAA,UAAU,CAAA;;6BACX,kBAAU,CAAC,OAAO,CAAC,CAAnB,wBAAkB;6BAQlB,kBAAU,CAAC,IAAI,CAAC,CAAhB,wBAAe;6BAQf,kBAAU,CAAC,KAAK,CAAC,CAAjB,wBAAgB;;;;oBAfnB,KAAA,OAAO,CAAA;oBAAI,qBAAM,IAAA,eAAQ,EACvB,cAAI,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,eAAe,CAAC,CAClD,EAAA;;oBAFD,OAAO,GAAP,KAAW,SAEV,CAAA;oBACD,OAAO,IAAI,mBAAW,GAAG,IAAA,uBAAe,EAAC,WAAW,CAAC,CAAA;oBAErD,wBAAK;;oBAGL,KAAA,OAAO,CAAA;oBAAI,qBAAM,IAAA,eAAQ,EACvB,cAAI,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,eAAe,CAAC,CAClD,EAAA;;oBAFD,OAAO,GAAP,KAAW,SAEV,CAAA;oBACD,OAAO,IAAI,IAAA,uBAAe,EAAC,WAAW,CAAC,CAAA;oBAEvC,wBAAK;;oBAGL,KAAA,OAAO,CAAA;oBAAI,qBAAM,IAAA,eAAQ,EACvB,cAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,EAAE,eAAe,CAAC,CACpD,EAAA;;oBAFD,OAAO,GAAP,KAAW,SAEV,CAAA;oBACD,OAAO,IAAI,IAAA,uBAAe,EAAC,WAAW,CAAC,CAAA;oBAEvC,wBAAK;;oBAGT,OAAO,IAAI,kBAAU,CAAA;oBAErB,sBAAO,OAAO,EAAA;;;;CACf;AA1CD,gCA0CC"}
+{"version":3,"file":"getPreCode.js","sourceRoot":"","sources":["../../src/sasjsCli/getPreCode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oCAAqC;AACrC,kCAAkC;AAClC,gDAAuB;AAEhB,MAAM,eAAe,GAAG,CAAC,KAAa,EAAE,EAAE,CAC/C;KACG,KAAK;;;;;CAKT,CAAA;AAPY,QAAA,eAAe,mBAO3B;AACY,QAAA,UAAU,GAAG;;;;;mDAKyB,CAAA;AAEtC,QAAA,WAAW,GAAG;;;;CAI1B,CAAA;AAED,SAAsB,UAAU,CAC9B,UAAsB,EACtB,aAAqB;;QAErB,MAAM,UAAU,GAAG,MAAM,IAAA,eAAQ,EAC/B,cAAI,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CACnD,CAAA;QACD,MAAM,UAAU,GAAG,MAAM,IAAA,eAAQ,EAC/B,cAAI,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CACnD,CAAA;QAED,IAAI,OAAO,GAAG,UAAU,GAAG,UAAU,CAAA;QAErC,QAAQ,UAAU,EAAE;YAClB,KAAK,kBAAU,CAAC,OAAO;gBACrB,OAAO,IAAI,MAAM,IAAA,eAAQ,EACvB,cAAI,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,eAAe,CAAC,CAClD,CAAA;gBACD,OAAO,IAAI,mBAAW,GAAG,IAAA,uBAAe,EAAC,WAAW,CAAC,CAAA;gBAErD,MAAK;YAEP,KAAK,kBAAU,CAAC,IAAI;gBAClB,OAAO,IAAI,MAAM,IAAA,eAAQ,EACvB,cAAI,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,eAAe,CAAC,CAClD,CAAA;gBACD,OAAO,IAAI,IAAA,uBAAe,EAAC,WAAW,CAAC,CAAA;gBAEvC,MAAK;YAEP,KAAK,kBAAU,CAAC,KAAK;gBACnB,OAAO,IAAI,MAAM,IAAA,eAAQ,EACvB,cAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,EAAE,eAAe,CAAC,CACpD,CAAA;gBACD,OAAO,IAAI,IAAA,uBAAe,EAAC,WAAW,CAAC,CAAA;gBAEvC,MAAK;SACR;QAED,OAAO,IAAI,kBAAU,CAAA;QAErB,OAAO,OAAO,CAAA;IAChB,CAAC;CAAA;AA1CD,gCA0CC"}

package/sasjsCli/loadDependenciesFile.js

@@ -8,171 +8,74 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 };
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAllDependencies = exports.loadDependenciesFile = void 0;
+const types_1 = require("../types");
+const utils_1 = require("../utils");
+const _1 = require("./");
+const file_1 = require("../file");
+const loadDependenciesFile = ({ filePath, fileContent, configuration, target, type, programFolders, macroFolders, buildSourceFolder, macroCorePath, binaryFolders, compileTree }) => __awaiter(void 0, void 0, void 0, function* () {
+    const { init, initPath, term, termPath, startUpVars, initLeaf, termLeaf } = yield (0, _1.getInitTerm)({
+        configuration,
+        target,
+        fileType: type,
+        buildSourceFolder,
+        compileTree
+    });
+    if (type !== types_1.SASJsFileType.file) {
+        fileContent = `\n* ${type} start;\n${fileContent}\n* ${type} end;`;
     }
-};
-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);
+    const fileDependencyPaths = yield (0, _1.getDependencyPaths)(`${fileContent}\n${init}\n${term}`, macroFolders, macroCorePath, compileTree);
+    const initDependencyPaths = yield (0, _1.getDependencyPaths)(init, macroFolders, macroCorePath, compileTree, initLeaf);
+    const termDependencyPaths = yield (0, _1.getDependencyPaths)(term, macroFolders, macroCorePath, compileTree, termLeaf);
+    const allDependencyPaths = [
+        ...initDependencyPaths,
+        ...fileDependencyPaths,
+        ...termDependencyPaths
+    ];
+    const initProgramDependencies = yield (0, _1.getDependencies)(initPath, init, programFolders, _1.DependencyType.Include, compileTree);
+    const termProgramDependencies = yield (0, _1.getDependencies)(termPath, term, programFolders, _1.DependencyType.Include, compileTree);
+    const programDependencies = yield (0, _1.getDependencies)(filePath, fileContent, programFolders, _1.DependencyType.Include, compileTree);
+    const binariesDeps = yield (0, _1.getDependencies)(filePath, fileContent, binaryFolders, _1.DependencyType.Binary, compileTree);
+    const dependenciesContent = yield (0, exports.getAllDependencies)(allDependencyPaths, compileTree);
+    // There is no need to add any wrapping comments for file content if SASJsFileType===File
+    if (type === types_1.SASJsFileType.file) {
+        fileContent = [
+            initProgramDependencies,
+            termProgramDependencies,
+            dependenciesContent,
+            programDependencies,
+            binariesDeps,
+            fileContent
+        ]
+            .filter((content) => content.length)
+            .join('\n');
     }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
+    else {
+        fileContent = `* SAS Macros start;\n${initProgramDependencies}\n${termProgramDependencies}\n${dependenciesContent}\n* SAS Macros end;\n* SAS Includes start;\n${programDependencies}\n* SAS Includes end;\n* Binary Files start;\n${binariesDeps}\n* Binary Files end;\n
+    ${init}${fileContent}${term}`;
+        fileContent = `* ${type} Variables start;\n${startUpVars}\n* ${type} Variables end;\n${fileContent}`;
     }
-    return ar;
-};
-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];
-        }
+    if ((type === types_1.SASJsFileType.service || type === types_1.SASJsFileType.test) &&
+        target) {
+        fileContent = `${yield (0, _1.getPreCode)(target.serverType, macroCorePath)}\n${fileContent}`;
     }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllDependencies = exports.loadDependenciesFile = void 0;
-var types_1 = require("../types");
-var utils_1 = require("../utils");
-var _1 = require("./");
-var file_1 = require("../file");
-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, binaryFolders = _a.binaryFolders, compileTree = _a.compileTree;
-    return __awaiter(void 0, void 0, void 0, function () {
-        var _b, init, initPath, term, termPath, startUpVars, initLeaf, termLeaf, fileDependencyPaths, initDependencyPaths, termDependencyPaths, allDependencyPaths, initProgramDependencies, termProgramDependencies, programDependencies, binariesDeps, dependenciesContent, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
-                case 0: return [4 /*yield*/, (0, _1.getInitTerm)({
-                        configuration: configuration,
-                        target: target,
-                        fileType: type,
-                        buildSourceFolder: buildSourceFolder,
-                        compileTree: compileTree
-                    })];
-                case 1:
-                    _b = _d.sent(), init = _b.init, initPath = _b.initPath, term = _b.term, termPath = _b.termPath, startUpVars = _b.startUpVars, initLeaf = _b.initLeaf, termLeaf = _b.termLeaf;
-                    if (type !== types_1.SASJsFileType.file) {
-                        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, compileTree)];
-                case 2:
-                    fileDependencyPaths = _d.sent();
-                    return [4 /*yield*/, (0, _1.getDependencyPaths)(init, macroFolders, macroCorePath, compileTree, initLeaf)];
-                case 3:
-                    initDependencyPaths = _d.sent();
-                    return [4 /*yield*/, (0, _1.getDependencyPaths)(term, macroFolders, macroCorePath, compileTree, termLeaf)];
-                case 4:
-                    termDependencyPaths = _d.sent();
-                    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, compileTree)];
-                case 5:
-                    initProgramDependencies = _d.sent();
-                    return [4 /*yield*/, (0, _1.getDependencies)(termPath, term, programFolders, _1.DependencyType.Include, compileTree)];
-                case 6:
-                    termProgramDependencies = _d.sent();
-                    return [4 /*yield*/, (0, _1.getDependencies)(filePath, fileContent, programFolders, _1.DependencyType.Include, compileTree)];
-                case 7:
-                    programDependencies = _d.sent();
-                    return [4 /*yield*/, (0, _1.getDependencies)(filePath, fileContent, binaryFolders, _1.DependencyType.Binary, compileTree)];
-                case 8:
-                    binariesDeps = _d.sent();
-                    return [4 /*yield*/, (0, exports.getAllDependencies)(allDependencyPaths, compileTree)
-                        // There is no need to add any wrapping comments for file content if SASJsFileType===File
-                    ];
-                case 9:
-                    dependenciesContent = _d.sent();
-                    // There is no need to add any wrapping comments for file content if SASJsFileType===File
-                    if (type === types_1.SASJsFileType.file) {
-                        fileContent = [
-                            initProgramDependencies,
-                            termProgramDependencies,
-                            dependenciesContent,
-                            programDependencies,
-                            binariesDeps,
-                            fileContent
-                        ]
-                            .filter(function (content) { return content.length; })
-                            .join('\n');
-                    }
-                    else {
-                        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);
-                    }
-                    if (!((type === types_1.SASJsFileType.service || type === types_1.SASJsFileType.test) &&
-                        target)) return [3 /*break*/, 11];
-                    _c = "".concat;
-                    return [4 /*yield*/, (0, _1.getPreCode)(target.serverType, macroCorePath)];
-                case 10:
-                    fileContent = _c.apply("", [_d.sent(), "\n"]).concat(fileContent);
-                    _d.label = 11;
-                case 11: return [2 /*return*/, fileContent];
-            }
-        });
-    });
-};
+    return fileContent;
+});
 exports.loadDependenciesFile = loadDependenciesFile;
-var getAllDependencies = function (filePaths, compileTree) { 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*/, (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:
-                                    depFileContent = '';
-                                    if (!(compileTree && Object.keys(compileTree).length)) return [3 /*break*/, 2];
-                                    return [4 /*yield*/, compileTree.getDepContent(filePath)];
-                                case 1:
-                                    depFileContent = _a.sent();
-                                    return [3 /*break*/, 4];
-                                case 2: return [4 /*yield*/, (0, file_1.readFile)(filePath)];
-                                case 3:
-                                    depFileContent = _a.sent();
-                                    _a.label = 4;
-                                case 4:
-                                    dependenciesContent.push(depFileContent);
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); })];
-            case 1:
-                _a.sent();
-                return [2 /*return*/, dependenciesContent.join('\n')];
+const getAllDependencies = (filePaths, compileTree) => __awaiter(void 0, void 0, void 0, function* () {
+    let dependenciesContent = [];
+    yield (0, utils_1.asyncForEach)([...new Set(filePaths)], (filePath) => __awaiter(void 0, void 0, void 0, function* () {
+        let depFileContent = '';
+        if (compileTree && Object.keys(compileTree).length) {
+            depFileContent = yield compileTree.getDepContent(filePath);
         }
-    });
-}); };
+        else {
+            depFileContent = yield (0, file_1.readFile)(filePath);
+        }
+        dependenciesContent.push(depFileContent);
+    }));
+    return dependenciesContent.join('\n');
+});
 exports.getAllDependencies = getAllDependencies;
 //# sourceMappingURL=loadDependenciesFile.js.map

package/sasjsCli/loadDependenciesFile.js.map

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

package/sasjsCli/prioritiseDependencyOverrides.js

@@ -1,47 +1,18 @@
 "use strict";
-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 __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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prioritiseDependencyOverrides = void 0;
-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)), false);
-    dependencyNames.forEach(function (depFileName) {
-        var paths = dependencyPaths.filter(function (p) {
-            return p.includes("".concat(pathSeparator).concat(depFileName));
-        });
-        var overriddenDependencyPaths = paths.filter(function (p) { return !p.includes('node_modules'); });
+const path_1 = __importDefault(require("path"));
+const prioritiseDependencyOverrides = (dependencyNames, dependencyPaths, macroPaths = [], pathSeparator = path_1.default.sep) => {
+    dependencyPaths = [...new Set(dependencyPaths)];
+    dependencyNames.forEach((depFileName) => {
+        const paths = dependencyPaths.filter((p) => p.includes(`${pathSeparator}${depFileName}`));
+        let overriddenDependencyPaths = paths.filter((p) => !p.includes('node_modules'));
         if (macroPaths.length) {
-            var foundInMacroPaths = overriddenDependencyPaths.filter(function (p) {
-                var pathExist = macroPaths.find(function (tm) { return p.includes(tm); });
+            const foundInMacroPaths = overriddenDependencyPaths.filter((p) => {
+                const pathExist = macroPaths.find((tm) => p.includes(tm));
                 return pathExist ? true : false;
             });
             if (foundInMacroPaths.length)
@@ -49,8 +20,8 @@ var prioritiseDependencyOverrides = function (dependencyNames, dependencyPaths,
         }
         if (overriddenDependencyPaths.length &&
             overriddenDependencyPaths.length != paths.length) {
-            var pathsToRemove_1 = paths.filter(function (el) { return overriddenDependencyPaths.indexOf(el) < 0; });
-            dependencyPaths = dependencyPaths.filter(function (el) { return pathsToRemove_1.indexOf(el) < 0; });
+            const pathsToRemove = paths.filter((el) => overriddenDependencyPaths.indexOf(el) < 0);
+            dependencyPaths = dependencyPaths.filter((el) => pathsToRemove.indexOf(el) < 0);
         }
     });
     return dependencyPaths;

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,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"}
+{"version":3,"file":"prioritiseDependencyOverrides.js","sourceRoot":"","sources":["../../src/sasjsCli/prioritiseDependencyOverrides.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AAEhB,MAAM,6BAA6B,GAAG,CAC3C,eAAyB,EACzB,eAAyB,EACzB,aAAuB,EAAE,EACzB,aAAa,GAAG,cAAI,CAAC,GAAG,EACxB,EAAE;IACF,eAAe,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;IAC/C,eAAe,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;QACtC,MAAM,KAAK,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACzC,CAAC,CAAC,QAAQ,CAAC,GAAG,aAAa,GAAG,WAAW,EAAE,CAAC,CAC7C,CAAA;QAED,IAAI,yBAAyB,GAAG,KAAK,CAAC,MAAM,CAC1C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CACnC,CAAA;QACD,IAAI,UAAU,CAAC,MAAM,EAAE;YACrB,MAAM,iBAAiB,GAAG,yBAAyB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC/D,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,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,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAChC,CAAC,EAAE,EAAE,EAAE,CAAC,yBAAyB,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,CAClD,CAAA;YACD,eAAe,GAAG,eAAe,CAAC,MAAM,CACtC,CAAC,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,CACtC,CAAA;SACF;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,eAAe,CAAA;AACxB,CAAC,CAAA;AAtCY,QAAA,6BAA6B,iCAsCzC"}

package/sasjsCli/validateFileRef.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateFileRef = void 0;
-var validateFileRef = function (fileRef) {
+const validateFileRef = (fileRef) => {
     if (!fileRef) {
         throw new Error('Missing file ref.');
     }

package/sasjsCli/validateFileRef.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateFileRef.js","sourceRoot":"","sources":["../../src/sasjsCli/validateFileRef.ts"],"names":[],"mappings":";;;AAAO,IAAM,eAAe,GAAG,UAAC,OAAe;IAC7C,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;KACrC;IAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACtB,MAAM,IAAI,KAAK,CACb,qEAAqE,CACtE,CAAA;KACF;IAED,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QAC5C,MAAM,IAAI,KAAK,CACb,+HAA+H,CAChI,CAAA;KACF;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAlBY,QAAA,eAAe,mBAkB3B"}
+{"version":3,"file":"validateFileRef.js","sourceRoot":"","sources":["../../src/sasjsCli/validateFileRef.ts"],"names":[],"mappings":";;;AAAO,MAAM,eAAe,GAAG,CAAC,OAAe,EAAW,EAAE;IAC1D,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;KACrC;IAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACtB,MAAM,IAAI,KAAK,CACb,qEAAqE,CACtE,CAAA;KACF;IAED,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QAC5C,MAAM,IAAI,KAAK,CACb,+HAA+H,CAChI,CAAA;KACF;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAlBY,QAAA,eAAe,mBAkB3B"}

package/time/timestamp.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertSecondsToHms = exports.generateTimestamp = exports.timestampToYYYYMMDDHHMMSS = void 0;
-var formatter_1 = require("../formatter");
-var timestampToYYYYMMDDHHMMSS = function (timestamp) {
-    if (timestamp === void 0) { timestamp = Date.now(); }
-    var date = new Date(timestamp);
+const formatter_1 = require("../formatter");
+const timestampToYYYYMMDDHHMMSS = (timestamp = Date.now()) => {
+    const date = new Date(timestamp);
     return ([
         date.getFullYear(),
         (0, formatter_1.padWithNumber)(date.getMonth() + 1),
@@ -18,10 +17,9 @@ var timestampToYYYYMMDDHHMMSS = function (timestamp) {
         ].join(':'));
 };
 exports.timestampToYYYYMMDDHHMMSS = timestampToYYYYMMDDHHMMSS;
-var generateTimestamp = function (sep, sepIndex) {
-    if (sep === void 0) { sep = ''; }
-    var date = new Date();
-    var timestamp = [
+const generateTimestamp = (sep = '', sepIndex) => {
+    const date = new Date();
+    let timestamp = [
         date.getUTCFullYear(),
         date.getUTCMonth() + 1,
         date.getUTCDate(),
@@ -29,7 +27,7 @@ var generateTimestamp = function (sep, sepIndex) {
         date.getUTCMinutes(),
         date.getUTCSeconds()
     ];
-    timestamp = timestamp.map(function (item) { return (0, formatter_1.padWithNumber)(item); });
+    timestamp = timestamp.map((item) => (0, formatter_1.padWithNumber)(item));
     if (sepIndex && sep && sepIndex < timestamp.length && sepIndex >= 0) {
         timestamp.splice(sepIndex, 0, sep);
     }
@@ -37,22 +35,22 @@ var generateTimestamp = function (sep, sepIndex) {
     return timestamp;
 };
 exports.generateTimestamp = generateTimestamp;
-var convertSecondsToHms = function (totalSeconds) {
+const convertSecondsToHms = (totalSeconds) => {
     if (!totalSeconds)
         return '0 second';
-    var totalMinutes = Math.floor(totalSeconds / 60);
-    var hours = Math.floor(totalMinutes / 60);
-    var minutes = totalMinutes % 60;
-    var seconds = totalSeconds % 60;
-    var result = '';
+    const totalMinutes = Math.floor(totalSeconds / 60);
+    const hours = Math.floor(totalMinutes / 60);
+    const minutes = totalMinutes % 60;
+    const seconds = totalSeconds % 60;
+    let result = '';
     if (hours > 0) {
-        result = hours + " hour".concat(hours > 1 ? 's' : '');
+        result = hours + ` hour${hours > 1 ? 's' : ''}`;
     }
     if (minutes > 0) {
-        result += "".concat(result ? ', ' : '').concat(minutes, " minute").concat(minutes > 1 ? 's' : '');
+        result += `${result ? ', ' : ''}${minutes} minute${minutes > 1 ? 's' : ''}`;
     }
     if (seconds > 0) {
-        result += "".concat(result ? ', ' : '').concat(seconds, " second").concat(seconds > 1 ? 's' : '');
+        result += `${result ? ', ' : ''}${seconds} second${seconds > 1 ? 's' : ''}`;
     }
     return result;
 };

package/time/timestamp.js.map

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

package/types/macro.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isMacroVars = void 0;
-var isMacroVars = function (arg) {
-    return arg && typeof arg.macroVars === 'object' && !Array.isArray(arg.macroVars);
-};
+const isMacroVars = (arg) => arg && typeof arg.macroVars === 'object' && !Array.isArray(arg.macroVars);
 exports.isMacroVars = isMacroVars;
 //# sourceMappingURL=macro.js.map

package/types/macro.js.map

@@ -1 +1 @@
-{"version":3,"file":"macro.js","sourceRoot":"","sources":["../../src/types/macro.ts"],"names":[],"mappings":";;;AAQO,IAAM,WAAW,GAAG,UAAC,GAAQ;IAClC,OAAA,GAAG,IAAI,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;AAAzE,CAAyE,CAAA;AAD9D,QAAA,WAAW,eACmD"}
+{"version":3,"file":"macro.js","sourceRoot":"","sources":["../../src/types/macro.ts"],"names":[],"mappings":";;;AAQO,MAAM,WAAW,GAAG,CAAC,GAAQ,EAAoB,EAAE,CACxD,GAAG,IAAI,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;AAD9D,QAAA,WAAW,eACmD"}