@sasjs/cli 3.0.2 → 3.0.3

package/build/commands/compile/internal/loadDependencies.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -46,243 +35,67 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __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 __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVars = exports.loadDependencies = void 0;
+exports.loadDependencies = void 0;
 var utils_1 = require("@sasjs/utils");
 var config_1 = require("../../../utils/config");
-var utils_2 = require("../../../utils/utils");
-var dependencies_1 = require("../../shared/dependencies");
-var config_2 = require("./config");
-var compileTestFile_1 = require("./compileTestFile");
 function loadDependencies(target, filePath, macroFolders, programFolders, type) {
-    var _a, _b, _c, _d;
-    if (type === void 0) { type = 'service'; }
+    var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var fileContent, deprecationDate, today, deprecationDate, warningDate, today, message, init, initPath, term, termPath, serviceVars, jobVars, testVars, fileDependencyPaths, initDependencyPaths, termDependencyPaths, allDependencyPaths, initProgramDependencies, termProgramDependencies, programDependencies, dependenciesContent;
-        var _e, _f, _g, _h, _j, _k;
-        return __generator(this, function (_l) {
-            switch (_l.label) {
+        var fileContent, configuration, _b, buildSourceFolder, macroCorePath;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Loading dependencies for " + filePath);
                     return [4 /*yield*/, utils_1.readFile(filePath)];
                 case 1:
-                    fileContent = _l.sent();
-                    if (fileContent.includes('<h4> Dependencies </h4>')) {
-                        deprecationDate = new Date(2021, 10, 2);
-                        today = new Date();
-                        if (today < deprecationDate) {
-                            (_b = process.logger) === null || _b === void 0 ? void 0 : _b.warn("Please use <h4> SAS Macros </h4> syntax to specify dependencies. Specifying dependencies with a <h4> Dependencies </h4> syntax will not be supported starting from November 1, 2021.");
-                        }
-                        else {
-                            throw new Error('Using <h4> Dependencies </h4> syntax is deprecated. Please use <h4> SAS Macros </h4> instead.');
-                        }
-                    }
-                    if (fileContent.includes('<h4> SAS Programs </h4>')) {
-                        deprecationDate = new Date(2022, 4, 2);
-                        warningDate = new Date(2022, 10, 2);
-                        today = new Date();
-                        message = "Please use <h4> SAS Includes </h4> syntax to specify programs. Specifying programs with a <h4> SAS Programs </h4> syntax will not be supported starting from April 1, 2022.";
-                        if (today < warningDate)
-                            (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info(message);
-                        else if (today < deprecationDate)
-                            (_d = process.logger) === null || _d === void 0 ? void 0 : _d.warn(message);
-                        else
-                            throw new Error('Using <h4> SAS Programs </h4> syntax is deprecated. Please use <h4> SAS Includes </h4> instead.');
-                    }
-                    serviceVars = '';
-                    jobVars = '';
-                    testVars = '';
-                    if (!(type === 'service' && !compileTestFile_1.isTestFile(filePath))) return [3 /*break*/, 5];
-                    return [4 /*yield*/, exports.getVars('service', target)];
+                    fileContent = _c.sent();
+                    return [4 /*yield*/, config_1.getLocalOrGlobalConfig()];
                 case 2:
-                    serviceVars = _l.sent();
-                    return [4 /*yield*/, config_2.getServiceInit(target)];
-                case 3:
-                    (_e = _l.sent(), init = _e.content, initPath = _e.filePath);
-                    return [4 /*yield*/, config_2.getServiceTerm(target)];
-                case 4:
-                    (_f = _l.sent(), term = _f.content, termPath = _f.filePath);
-                    fileContent = fileContent
-                        ? "\n* Service start;\n" + fileContent + "\n* Service end;"
-                        : '';
-                    return [3 /*break*/, 13];
-                case 5:
-                    if (!(type === 'job' && !compileTestFile_1.isTestFile(filePath))) return [3 /*break*/, 9];
-                    return [4 /*yield*/, exports.getVars('job', target)];
-                case 6:
-                    jobVars = _l.sent();
-                    return [4 /*yield*/, config_2.getJobInit(target)];
-                case 7:
-                    (_g = _l.sent(), init = _g.content, initPath = _g.filePath);
-                    return [4 /*yield*/, config_2.getJobTerm(target)];
-                case 8:
-                    (_h = _l.sent(), term = _h.content, termPath = _h.filePath);
-                    fileContent = fileContent
-                        ? "\n* Job start;\n" + fileContent + "\n* Job end;"
-                        : '';
-                    return [3 /*break*/, 13];
-                case 9: return [4 /*yield*/, exports.getVars('test', target)];
-                case 10:
-                    testVars = _l.sent();
-                    return [4 /*yield*/, config_2.getTestInit(target)];
-                case 11:
-                    (_j = _l.sent(), init = _j.content, initPath = _j.filePath);
-                    return [4 /*yield*/, config_2.getTestTerm(target)];
-                case 12:
-                    (_k = _l.sent(), term = _k.content, termPath = _k.filePath);
-                    fileContent = fileContent
-                        ? "\n* Test start;\n" + fileContent + "\n* Test end;"
-                        : '';
-                    _l.label = 13;
-                case 13:
-                    init = init || '';
-                    initPath = initPath || '';
-                    term = term || '';
-                    termPath = termPath || '';
-                    return [4 /*yield*/, dependencies_1.getDependencyPaths(fileContent + "\n" + init + "\n" + term, macroFolders)];
-                case 14:
-                    fileDependencyPaths = _l.sent();
-                    return [4 /*yield*/, dependencies_1.getDependencyPaths(init, macroFolders)];
-                case 15:
-                    initDependencyPaths = _l.sent();
-                    return [4 /*yield*/, dependencies_1.getDependencyPaths(term, macroFolders)];
-                case 16:
-                    termDependencyPaths = _l.sent();
-                    allDependencyPaths = __spreadArray(__spreadArray(__spreadArray([], __read(initDependencyPaths)), __read(fileDependencyPaths)), __read(termDependencyPaths));
-                    return [4 /*yield*/, dependencies_1.getProgramDependencies(init, programFolders, initPath)];
-                case 17:
-                    initProgramDependencies = _l.sent();
-                    return [4 /*yield*/, dependencies_1.getProgramDependencies(term, programFolders, termPath)];
-                case 18:
-                    termProgramDependencies = _l.sent();
-                    return [4 /*yield*/, dependencies_1.getProgramDependencies(fileContent, programFolders, filePath)];
-                case 19:
-                    programDependencies = _l.sent();
-                    return [4 /*yield*/, getDependencies(allDependencyPaths)];
-                case 20:
-                    dependenciesContent = _l.sent();
-                    fileContent = "* Dependencies start;\n" + initProgramDependencies + "\n" + termProgramDependencies + "\n" + dependenciesContent + "\n* Dependencies end;\n* Programs start;\n" + programDependencies + "\n*Programs end;" + init + fileContent + term;
-                    switch (type) {
-                        case 'service':
-                            fileContent = "* Service Variables start;\n" + serviceVars + "\n*Service Variables end;\n" + fileContent;
-                            break;
-                        case 'job':
-                            fileContent = "* Job Variables start;\n" + jobVars + "\n*Job Variables end;\n" + fileContent;
-                            break;
-                        case 'test':
-                            fileContent = "* Test Variables start;\n" + testVars + "\n*Test Variables end;\n" + fileContent;
-                            break;
-                        default:
-                            break;
-                    }
-                    return [2 /*return*/, fileContent];
+                    configuration = (_c.sent()).configuration;
+                    _b = process.sasjsConstants, buildSourceFolder = _b.buildSourceFolder, macroCorePath = _b.macroCorePath;
+                    headerSyntaxNotices(fileContent);
+                    return [4 /*yield*/, utils_1.loadDependenciesFile({
+                            fileContent: fileContent,
+                            filePath: filePath,
+                            configuration: configuration,
+                            target: target,
+                            type: type,
+                            macroFolders: macroFolders,
+                            programFolders: programFolders,
+                            buildSourceFolder: buildSourceFolder,
+                            macroCorePath: macroCorePath
+                        })];
+                case 3: return [2 /*return*/, _c.sent()];
             }
         });
     });
 }
 exports.loadDependencies = loadDependencies;
-function getDependencies(filePaths) {
-    return __awaiter(this, void 0, void 0, function () {
-        var dependenciesContent;
-        var _this = this;
-        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(_this, void 0, void 0, function () {
-                            var depFileContent;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, utils_1.readFile(filePath)];
-                                    case 1:
-                                        depFileContent = _a.sent();
-                                        dependenciesContent.push(depFileContent);
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); })];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, dependenciesContent.join('\n')];
-            }
-        });
-    });
-}
-var getVars = function (varType, target) { return __awaiter(void 0, void 0, void 0, function () {
-    var getInternalVars, targetVars, configuration, commonServiceVars;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                getInternalVars = function (config) {
-                    var _a, _b, _c;
-                    return varType === 'service'
-                        ? (_a = config === null || config === void 0 ? void 0 : config.serviceConfig) === null || _a === void 0 ? void 0 : _a.macroVars
-                        : varType === 'job'
-                            ? (_b = config === null || config === void 0 ? void 0 : config.jobConfig) === null || _b === void 0 ? void 0 : _b.macroVars
-                            : varType === 'test'
-                                ? (_c = config === null || config === void 0 ? void 0 : config.testConfig) === null || _c === void 0 ? void 0 : _c.macroVars
-                                : {};
-                };
-                targetVars = getInternalVars(target);
-                return [4 /*yield*/, config_1.getLocalOrGlobalConfig()];
-            case 1:
-                configuration = (_a.sent()).configuration;
-                commonServiceVars = getInternalVars(configuration);
-                return [2 /*return*/, convertVarsToSasFormat(__assign(__assign({}, commonServiceVars), targetVars))];
+var headerSyntaxNotices = function (fileContent) {
+    var _a, _b, _c;
+    if (fileContent.includes('<h4> Dependencies </h4>')) {
+        var deprecationDate = new Date(2021, 10, 2);
+        var today = new Date();
+        if (today < deprecationDate) {
+            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.warn("Please use <h4> SAS Macros </h4> syntax to specify dependencies. Specifying dependencies with a <h4> Dependencies </h4> syntax will not be supported starting from November 1, 2021.");
         }
-    });
-}); };
-exports.getVars = getVars;
-var convertVarsToSasFormat = function (vars) {
-    var e_1, _a;
-    var entries = Object.entries(vars);
-    var varsContent = '\n';
-    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_2.chunk(value);
-            var chunkedString = chunks.join('%trim(\n)');
-            varsContent += "%let " + name_1 + "=" + chunkedString + ";\n";
+        else {
+            throw new Error('Using <h4> Dependencies </h4> syntax is deprecated. Please use <h4> SAS Macros </h4> instead.');
         }
     }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (entries_1_1 && !entries_1_1.done && (_a = entries_1.return)) _a.call(entries_1);
+    if (fileContent.includes('<h4> SAS Programs </h4>')) {
+        var deprecationDate = new Date(2022, 4, 2);
+        var warningDate = new Date(2022, 10, 2);
+        var today = new Date();
+        var message = "Please use <h4> SAS Includes </h4> syntax to specify programs. Specifying programs with a <h4> SAS Programs </h4> syntax will not be supported starting from April 1, 2022.";
+        if (today < warningDate) {
+            (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info(message);
+        }
+        else if (today < deprecationDate) {
+            (_c = process.logger) === null || _c === void 0 ? void 0 : _c.warn(message);
         }
-        finally { if (e_1) throw e_1.error; }
+        else
+            throw new Error('Using <h4> SAS Programs </h4> syntax is deprecated. Please use <h4> SAS Includes </h4> instead.');
     }
-    return varsContent;
 };

package/build/commands/compile/internal/spec/compileTestFile.spec.js

@@ -334,16 +334,16 @@ describe('compileTestFile', function () {
 });
 describe('isTestFile', function () {
     it('should return true if test SAS file', function () {
-        expect(compileTestFile_1.isTestFile('random.test.sas')).toEqual(true);
-        expect(compileTestFile_1.isTestFile('random.test.SAS')).toEqual(true);
-        expect(compileTestFile_1.isTestFile('random.test.0.sas')).toEqual(true);
-        expect(compileTestFile_1.isTestFile('random.test.10.sas')).toEqual(true);
+        expect(utils_1.isTestFile('random.test.sas')).toEqual(true);
+        expect(utils_1.isTestFile('random.test.SAS')).toEqual(true);
+        expect(utils_1.isTestFile('random.test.0.sas')).toEqual(true);
+        expect(utils_1.isTestFile('random.test.10.sas')).toEqual(true);
     });
     it('should return false if not a test SAS file', function () {
-        expect(compileTestFile_1.isTestFile('random.test.txt')).toEqual(false);
-        expect(compileTestFile_1.isTestFile('random.sas')).toEqual(false);
-        expect(compileTestFile_1.isTestFile('random.0.sas')).toEqual(false);
-        expect(compileTestFile_1.isTestFile('random.tests.sas')).toEqual(false);
+        expect(utils_1.isTestFile('random.test.txt')).toEqual(false);
+        expect(utils_1.isTestFile('random.sas')).toEqual(false);
+        expect(utils_1.isTestFile('random.0.sas')).toEqual(false);
+        expect(utils_1.isTestFile('random.tests.sas')).toEqual(false);
     });
 });
 var copyTestFiles = function (appName) { return __awaiter(void 0, void 0, void 0, function () {

package/build/commands/compile/spec/compileJobFile.spec.js

@@ -60,7 +60,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
-var internalModule = __importStar(require("../internal/config"));
+var internalModule = __importStar(require("@sasjs/utils/sasjsCli/getInitTerm"));
 var test_1 = require("../../../utils/test");
 var compileJobFile_1 = require("../internal/compileJobFile");
 var utils_2 = require("@sasjs/utils");
@@ -106,13 +106,13 @@ describe('compileJobFile', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getJobInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobInit start;\n" + fakeJobInit + "\n* JobInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getJobTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobTerm start;\n" + fakeJobTerm + "\n* JobTerm end;",
                             filePath: ''

package/build/commands/compile/spec/compileServiceFile.spec.js

@@ -60,7 +60,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
-var internalModule = __importStar(require("../internal/config"));
+var internalModule = __importStar(require("@sasjs/utils/sasjsCli/getInitTerm"));
 var test_1 = require("../../../utils/test");
 var compileServiceFile_1 = require("../internal/compileServiceFile");
 var utils_2 = require("@sasjs/utils");
@@ -107,13 +107,13 @@ describe('compileServiceFile', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getServiceInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceInit start;\n" + fakeJobInit + "\n* ServiceInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getServiceTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceTerm start;\n" + fakeJobTerm + "\n* ServiceTerm end;",
                             filePath: ''