@sasjs/cli 4.0.7 → 4.1.1

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

@@ -0,0 +1,25 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./checkCompileStatus"), exports);
+__exportStar(require("./compareFolders"), exports);
+__exportStar(require("./compileFile"), exports);
+__exportStar(require("./compileTestFile"), exports);
+__exportStar(require("./copySyncFolder"), exports);
+__exportStar(require("./getAllFolders"), exports);
+__exportStar(require("./getDestinationPath"), exports);
+__exportStar(require("./identifySasFile"), exports);
+__exportStar(require("./loadDependencies"), exports);

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

@@ -50,7 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var compileTestFile_1 = require("../compileTestFile");
+var __1 = require("../");
 var utils_1 = require("@sasjs/utils");
 var test_1 = require("../../../../utils/test");
 var path_1 = __importDefault(require("path"));
@@ -171,7 +171,7 @@ describe('compileTestFile', function () {
                         return [4 /*yield*/, (0, compile_1.compile)(target)];
                     case 1:
                         _d.sent();
-                        return [4 /*yield*/, (0, compileTestFile_1.compileTestFlow)(target)];
+                        return [4 /*yield*/, (0, __1.compileTestFlow)(target)];
                     case 2:
                         _d.sent();
                         testFlowPath = path_1.default.join(buildPath, 'testFlow.json');
@@ -304,9 +304,9 @@ describe('compileTestFile', function () {
                 };
                 expectedWarn = "'testFolders' is not supported 'testConfig' entry, please use 'serviceFolders' entry in 'serviceConfig' or 'jobFolders' entry in 'jobConfig'.";
                 jest.spyOn(process.logger, 'warn');
-                (0, compileTestFile_1.compileTestFlow)(testTarget);
+                (0, __1.compileTestFlow)(testTarget);
                 expect(process.logger.warn).toHaveBeenCalledWith(expectedWarn);
-                (0, compileTestFile_1.compileTestFlow)(testTarget, testConfig);
+                (0, __1.compileTestFlow)(testTarget, testConfig);
                 expect(process.logger.warn).toHaveBeenCalledWith(expectedWarn);
                 return [2 /*return*/];
             });

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

@@ -98,7 +98,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var getAllFolders_1 = require("../getAllFolders");
+var __1 = require("../");
 var utils_1 = require("@sasjs/utils");
 var test_1 = require("../../../../utils/test");
 var configUtils = __importStar(require("../../../../utils/config"));
@@ -167,14 +167,14 @@ describe('getAllFolders', function () {
                         });
                     }); });
                     buildSourceFolder = process.sasjsConstants.buildSourceFolder;
-                    return [4 /*yield*/, expect((0, getAllFolders_1.getAllFolders)(target, getAllFolders_1.SasFileType.Service, config)).resolves.toEqual(__spreadArray([], __read(new Set(Array.prototype.concat((_a = config.serviceConfig) === null || _a === void 0 ? void 0 : _a.serviceFolders.map(function (folder) {
+                    return [4 /*yield*/, expect((0, __1.getAllFolders)(target, __1.SasFileType.Service, config)).resolves.toEqual(__spreadArray([], __read(new Set(Array.prototype.concat((_a = config.serviceConfig) === null || _a === void 0 ? void 0 : _a.serviceFolders.map(function (folder) {
                             return path_1.default.join(buildSourceFolder, folder);
                         }), (_b = target.serviceConfig) === null || _b === void 0 ? void 0 : _b.serviceFolders.map(function (folder) {
                             return path_1.default.join(buildSourceFolder, folder);
                         })))), false))];
                 case 1:
                     _e.sent();
-                    return [4 /*yield*/, expect((0, getAllFolders_1.getAllFolders)(target, getAllFolders_1.SasFileType.Job, config)).resolves.toEqual(__spreadArray([], __read(new Set(Array.prototype.concat((_c = config.jobConfig) === null || _c === void 0 ? void 0 : _c.jobFolders.map(function (folder) {
+                    return [4 /*yield*/, expect((0, __1.getAllFolders)(target, __1.SasFileType.Job, config)).resolves.toEqual(__spreadArray([], __read(new Set(Array.prototype.concat((_c = config.jobConfig) === null || _c === void 0 ? void 0 : _c.jobFolders.map(function (folder) {
                             return path_1.default.join(buildSourceFolder, folder);
                         }), (_d = target.jobConfig) === null || _d === void 0 ? void 0 : _d.jobFolders.map(function (folder) {
                             return path_1.default.join(buildSourceFolder, folder);

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

@@ -41,7 +41,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 compareFolders_1 = require("../internal/compareFolders");
+var internal_1 = require("../internal");
 describe('compareFolders', function () {
     var sourceFolderPath;
     var destinationFolderPath;
@@ -82,7 +82,7 @@ describe('compareFolders', function () {
             switch (_a.label) {
                 case 0:
                     nonExistentSourcePath = path_1.default.join(__dirname, 'nothing');
-                    return [4 /*yield*/, expect((0, compareFolders_1.compareFolders)(nonExistentSourcePath, destinationFolderPath)).rejects.toThrowError("Source path ".concat(nonExistentSourcePath, " does not exist. Please check the `serviceFolders` and `jobFolders` in your target configuration and try again."))];
+                    return [4 /*yield*/, expect((0, internal_1.compareFolders)(nonExistentSourcePath, destinationFolderPath)).rejects.toThrowError("Source path ".concat(nonExistentSourcePath, " does not exist. Please check the `serviceFolders` and `jobFolders` in your target configuration and try again."))];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];
@@ -95,7 +95,7 @@ describe('compareFolders', function () {
             switch (_a.label) {
                 case 0:
                     nonExistentDestinationPath = path_1.default.join(__dirname, 'nothing');
-                    return [4 /*yield*/, (0, compareFolders_1.compareFolders)(sourceFolderPath, nonExistentDestinationPath)];
+                    return [4 /*yield*/, (0, internal_1.compareFolders)(sourceFolderPath, nonExistentDestinationPath)];
                 case 1:
                     response = _a.sent();
                     expect(response.equal).toBeFalse();
@@ -111,7 +111,7 @@ describe('compareFolders', function () {
                 case 0: return [4 /*yield*/, (0, utils_1.createFolder)(path_1.default.join(sourceFolderPath, 'missing-subfolder'))];
                 case 1:
                     _a.sent();
-                    return [4 /*yield*/, (0, compareFolders_1.compareFolders)(sourceFolderPath, destinationFolderPath)];
+                    return [4 /*yield*/, (0, internal_1.compareFolders)(sourceFolderPath, destinationFolderPath)];
                 case 2:
                     response = _a.sent();
                     expect(response.equal).toBeFalse();
@@ -130,7 +130,7 @@ describe('compareFolders', function () {
                     return [4 /*yield*/, (0, utils_1.createFolder)(path_1.default.join(sourceFolderPath, 'missing-subfolder-2'))];
                 case 2:
                     _a.sent();
-                    return [4 /*yield*/, (0, compareFolders_1.compareFolders)(sourceFolderPath, destinationFolderPath)];
+                    return [4 /*yield*/, (0, internal_1.compareFolders)(sourceFolderPath, destinationFolderPath)];
                 case 3:
                     response = _a.sent();
                     expect(response.equal).toBeFalse();
@@ -146,7 +146,7 @@ describe('compareFolders', function () {
                 case 0: return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(sourceFolderPath, 'test.sas'), "%put 'hello, world!'")];
                 case 1:
                     _a.sent();
-                    return [4 /*yield*/, (0, compareFolders_1.compareFolders)(sourceFolderPath, destinationFolderPath)];
+                    return [4 /*yield*/, (0, internal_1.compareFolders)(sourceFolderPath, destinationFolderPath)];
                 case 2:
                     response = _a.sent();
                     expect(response.equal).toBeFalse();
@@ -165,7 +165,7 @@ describe('compareFolders', function () {
                     return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(sourceFolderPath, 'test2.sas'), "%put 'hello, world!'")];
                 case 2:
                     _a.sent();
-                    return [4 /*yield*/, (0, compareFolders_1.compareFolders)(sourceFolderPath, destinationFolderPath)];
+                    return [4 /*yield*/, (0, internal_1.compareFolders)(sourceFolderPath, destinationFolderPath)];
                 case 3:
                     response = _a.sent();
                     expect(response.equal).toBeFalse();
@@ -184,7 +184,7 @@ describe('compareFolders', function () {
                     return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(destinationFolderPath, 'test1.sas'), "%put 'hello, world!'")];
                 case 2:
                     _a.sent();
-                    return [4 /*yield*/, (0, compareFolders_1.compareFolders)(sourceFolderPath, destinationFolderPath)];
+                    return [4 /*yield*/, (0, internal_1.compareFolders)(sourceFolderPath, destinationFolderPath)];
                 case 3:
                     response = _a.sent();
                     expect(response.equal).toBeTrue();

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

@@ -67,9 +67,8 @@ var utils_1 = require("@sasjs/utils");
 var internalModule = __importStar(require("@sasjs/utils/sasjsCli/getInitTerm"));
 var getInitTerm_1 = require("@sasjs/utils/sasjsCli/getInitTerm");
 var test_1 = require("../../../utils/test");
-var compileFile_1 = require("../internal/compileFile");
+var internal_1 = require("../internal");
 var utils_2 = require("@sasjs/utils");
-var loadDependencies_1 = require("../internal/loadDependencies");
 var fakeJobInit = "/**\n  @file\n  @brief This code is inserted into the beginning of each Viya Job.\n  @details Inserted during the `sasjs compile` step.  Add any code here that\n  should go at the beginning of every deployed job.\n\n  The path to this file should be listed in the `jobInit` property of the\n  sasjsconfig file.\n\n  ".concat(utils_1.DependencyHeader.DeprecatedInclude, "\n  @li test.sas TEST\n\n  ").concat(utils_1.DependencyHeader.Macro, "\n  @li examplemacro.sas\n\n**/\n\n%example(Job Init is executing!)\n\n%let mylib=WORK;");
 var fakeJobTerm = "/**\n  @file serviceterm.sas\n  @brief this file is called at the end of every service\n  @details  This file is included at the *end* of every service.\n\n  ".concat(utils_1.DependencyHeader.Macro, "\n  @li mf_abort.sas\n  @li mf_existds.sas\n\n**/\n\n%put service is finishing.  Thanks, SASjs!;");
 var fakeProgramLines = [
@@ -118,14 +117,14 @@ describe('compileFile', function () {
                         filePath = path_1.default.join(__dirname, './service.sas');
                         buildPath = path_1.default.join(process.projectDir, 'sasjsbuild');
                         destinationPath = path_1.default.join(buildPath, 'service.sas');
-                        compileTree = (0, loadDependencies_1.getCompileTree)(target);
+                        compileTree = (0, internal_1.getCompileTree)(target);
                         return [4 /*yield*/, (0, utils_2.createFolder)(buildPath)];
                     case 1:
                         _a.sent();
                         return [4 /*yield*/, (0, utils_2.copy)(filePath, destinationPath)];
                     case 2:
                         _a.sent();
-                        return [4 /*yield*/, expect((0, compileFile_1.compileFile)(target, destinationPath, [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], undefined, compileTree, utils_1.SASJsFileType.service, __dirname)).toResolve()];
+                        return [4 /*yield*/, expect((0, internal_1.compileFile)(target, destinationPath, [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], undefined, compileTree, utils_1.SASJsFileType.service, __dirname)).toResolve()];
                     case 3:
                         _a.sent();
                         return [4 /*yield*/, expect((0, utils_2.fileExists)(destinationPath)).resolves.toEqual(true)];
@@ -155,14 +154,14 @@ describe('compileFile', function () {
                         filePath = path_1.default.join(__dirname, './service.sas');
                         buildPath = path_1.default.join(process.projectDir, 'sasjsbuild');
                         destinationPath = path_1.default.join(buildPath, 'service.sas');
-                        compileTree = (0, loadDependencies_1.getCompileTree)(target);
+                        compileTree = (0, internal_1.getCompileTree)(target);
                         return [4 /*yield*/, (0, utils_2.createFolder)(buildPath)];
                     case 1:
                         _a.sent();
                         return [4 /*yield*/, (0, utils_2.copy)(filePath, destinationPath)];
                     case 2:
                         _a.sent();
-                        return [4 /*yield*/, expect((0, compileFile_1.compileFile)(target, destinationPath, [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], undefined, compileTree, utils_1.SASJsFileType.job, __dirname)).toResolve()];
+                        return [4 /*yield*/, expect((0, internal_1.compileFile)(target, destinationPath, [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], undefined, compileTree, utils_1.SASJsFileType.job, __dirname)).toResolve()];
                     case 3:
                         _a.sent();
                         return [4 /*yield*/, expect((0, utils_2.fileExists)(destinationPath)).resolves.toEqual(true)];

package/build/commands/compile/spec/compileSingleFile.spec.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,162 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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 });
+var compileSingleFile_1 = require("../compileSingleFile");
+var identifySasFileModule = __importStar(require("../internal/identifySasFile"));
+var fileModule = __importStar(require("@sasjs/utils/file"));
+var configModule = __importStar(require("../../../utils/config"));
+var loadDependenciesModule = __importStar(require("../internal/loadDependencies"));
+var compileTestFileModule = __importStar(require("../internal/compileTestFile"));
+var internal_1 = require("../internal");
+describe('compileSingleFile', function () {
+    it('should throw an error provided not supported subcommand', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var expectedError;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    expectedError = new Error("Unsupported context command. Supported commands are:\n".concat(Object.values(compileSingleFile_1.CompileSingleFileSubCommands).join('\n')));
+                    return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)({}, 'WRONG', 'testSource', 'testOutput')).rejects.toEqual(expectedError)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should throw an error source was not provided', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var expectedError;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    expectedError = new Error("'--source' flag is missing (eg 'sasjs compile <command> --source myjob.sas --target targetName -output /some/folder')");
+                    return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)({}, compileSingleFile_1.CompileSingleFileSubCommands.Test, '', 'testOutput')).rejects.toEqual(expectedError)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should throw an error provided source path is not valid', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var expectedError;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    expectedError = new Error("Provide a valid path to source file (eg 'sasjs compile <command> --source myjob.sas --target targetName -output /some/folder')");
+                    return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)({}, compileSingleFile_1.CompileSingleFileSubCommands.Test, 'not valid', 'testOutput', false, 'testCurrentDir')).rejects.toEqual(expectedError)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it("should identify sas file if a sub command is 'identify'", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var testFile;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    testFile = 'testSource.test.sas';
+                    jest
+                        .spyOn(fileModule, 'fileExists')
+                        .mockImplementation(function (filePath) {
+                        return Promise.resolve(filePath.includes(testFile));
+                    });
+                    jest.spyOn(fileModule, 'copy').mockImplementation(function () { return Promise.resolve(); });
+                    jest
+                        .spyOn(configModule, 'getMacroFolders')
+                        .mockImplementation(function () { return Promise.resolve([]); });
+                    jest
+                        .spyOn(configModule, 'getProgramFolders')
+                        .mockImplementation(function () { return Promise.resolve([]); });
+                    jest
+                        .spyOn(loadDependenciesModule, 'getCompileTree')
+                        .mockImplementation(function () { return ({ saveTree: function () { return Promise.resolve(); } }); });
+                    jest
+                        .spyOn(compileTestFileModule, 'compileTestFile')
+                        .mockImplementation(function () { return Promise.resolve(); });
+                    jest.spyOn(identifySasFileModule, 'identifySasFile');
+                    return [4 /*yield*/, (0, compileSingleFile_1.compileSingleFile)({}, 'identify', testFile, 'testOutput', false, 'testCurrentDir')];
+                case 1:
+                    _a.sent();
+                    expect(identifySasFileModule.identifySasFile).toHaveBeenCalledTimes(1);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it("should throw an error if a sas file was not identified", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var identificationError, expectedError;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    identificationError = "Unable to identify file as ".concat(internal_1.SasFileType.Service, ", ").concat(internal_1.SasFileType.Job, " or ").concat(internal_1.SasFileType.Test);
+                    jest
+                        .spyOn(fileModule, 'fileExists')
+                        .mockImplementation(function () { return Promise.resolve(true); });
+                    jest
+                        .spyOn(identifySasFileModule, 'identifySasFile')
+                        .mockImplementation(function () { return Promise.reject(identificationError); });
+                    expectedError = "Single file compilation failed. ".concat(identificationError);
+                    return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)({}, 'identify', 'testSource.sas', 'testOutput', false, 'testCurrentDir')).rejects.toEqual(expectedError)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});

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

@@ -79,8 +79,8 @@ var internalModule = __importStar(require("@sasjs/utils/sasjsCli/getInitTerm"));
 var getInitTerm_1 = require("@sasjs/utils/sasjsCli/getInitTerm");
 var test_1 = require("../../../utils/test");
 var utils_2 = require("../../../utils");
+var internal_1 = require("../internal");
 var loadDependencies_1 = require("../internal/loadDependencies");
-var getAllFolders_1 = require("../internal/getAllFolders");
 var fakeInit = "/**\n  @file serviceinit.sas\n  @brief this file is called with every service\n  @details  This file is included in *every* service, *after* the macros and *before* the service code.\n\n  ".concat(utils_1.DependencyHeader.Macro, "\n  @li mf_abort.sas\n\n**/\n\noptions\n  DATASTMTCHK=ALLKEYWORDS /* some sites have this enabled */\n  PS=MAX /* reduce log size slightly */\n;\n%put service is starting!!;");
 var fakeTerm = "/**\n  @file serviceterm.sas\n  @brief this file is called at the end of every service\n  @details  This file is included at the *end* of every service.\n\n  ".concat(utils_1.DependencyHeader.Macro, "\n  @li mf_abort.sas\n  @li mf_existds.sas\n\n**/\n\n%put service is finishing.  Thanks, SASjs!;");
 var fakeInit2 = "/**\n  @file serviceinit.sas\n  @brief this file is called with every service\n  @details  This file is included in *every* service, *after* the macros and *before* the service code.\n\n  ".concat(utils_1.DependencyHeader.Macro, "\n  @li mf_abort.sas\n\n**/\n\noptions\n  DATASTMTCHK=ALLKEYWORDS /* some sites have this enabled */\n  PS=MAX /* reduce log size slightly */\n;\n%put service is starting!!;");
@@ -183,7 +183,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Service));
+                    expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Service));
                     expect(/\* ServiceInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceTerm start;/.test(dependencies)).toEqual(true);
@@ -203,7 +203,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Job));
+                    expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Job));
                     expect(/\* JobInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* JobInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* JobTerm start;/.test(dependencies)).toEqual(true);
@@ -223,7 +223,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Service));
+                    expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Service));
                     expect(/\* ServiceInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceTerm start;/.test(dependencies)).toEqual(true);
@@ -243,7 +243,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Job));
+                    expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Job));
                     expect(/\* JobInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* JobInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* JobTerm start;/.test(dependencies)).toEqual(true);
@@ -263,7 +263,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Service));
+                    expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Service));
                     expect(/\* ServiceInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceTerm start;/.test(dependencies)).toEqual(true);
@@ -283,7 +283,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Job));
+                    expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Job));
                     expect(/\* JobInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* JobInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* JobTerm start;/.test(dependencies)).toEqual(true);
@@ -303,7 +303,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Service));
+                    expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Service));
                     expect(/\* ServiceInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceTerm start;/.test(dependencies)).toEqual(true);
@@ -323,7 +323,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Job));
+                    expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Job));
                     expect(/\* JobInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* JobInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* JobTerm start;/.test(dependencies)).toEqual(true);
@@ -343,7 +343,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Job));
+                    expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Job));
                     expect(/\* JobInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* JobInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* JobTerm start;/.test(dependencies)).toEqual(true);
@@ -366,7 +366,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Job));
+                    expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Job));
                     expect(/\* JobInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* JobInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* JobTerm start;/.test(dependencies)).toEqual(true);
@@ -388,7 +388,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Service));
+                    expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Service));
                     expect(/\* ServiceInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceTerm start;/.test(dependencies)).toEqual(true);
@@ -411,7 +411,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Service));
+                    expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Service));
                     expect(/\* ServiceInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceTerm start;/.test(dependencies)).toEqual(true);

package/build/commands/help/help.js

@@ -209,12 +209,13 @@ function printHelpText() {
                 },
                 {
                     name: 'run',
-                    title: 'run <sasFilePath> -t <targetName> --source /local/run.json -l <log/file/path>',
+                    title: 'run <sasFilePath> -t <targetName> --source /local/run.json -l <log/file/path> --compile',
                     description: [
                         "lets the user run a given SAS file against a specified target.",
                         "The target can exist either in the local project configuration or in the global .sasjsrc file.",
                         "Providing log flag (--log or -l) is optional. If not present, the log is stored locally with a timestamp. If present, CLI will fetch and save the log to the specified location. If a relative location, it will be relative to the directory in which the command is invoked.",
-                        "Providing source flag (--source or -s) is optional. It should point to a JSON file with the following structure:  {\"macroVars\": {\"var1\": \"val1\", \"var2\": \"val2\"}}. These will be parsed into SAS \"%let\" statements and pre-append to the SAS code being run."
+                        "Providing source flag (--source or -s) is optional. It should point to a JSON file with the following structure:  {\"macroVars\": {\"var1\": \"val1\", \"var2\": \"val2\"}}. These will be parsed into SAS \"%let\" statements and pre-append to the SAS code being run.",
+                        "Providing compile flag (--compile or -c) is optional. It is used to compile the program prior to execution. Useful for including dependent macros and includes. More info here: https://cli.sasjs.io/compile"
                     ]
                 },
                 {

package/build/commands/run/run.js

@@ -72,7 +72,7 @@ var utils_1 = require("@sasjs/utils");
 var __1 = require("../");
 var utils_2 = require("../../utils/");
 var axios_1 = __importDefault(require("axios"));
-var getDestinationPath_1 = require("../compile/internal/getDestinationPath");
+var internal_1 = require("../compile/internal");
 var saveLog_1 = require("../../utils/saveLog");
 var parseSourceFile_1 = require("../../utils/parseSourceFile");
 /**
@@ -104,7 +104,7 @@ function runSasCode(target, filePath, compile, logFile, source) {
                     sourcefilePathParts = path_1.default.normalize(filePath).split(path_1.default.sep);
                     sourcefilePathParts.splice(-1, 1);
                     sourceFolderPath = sourcefilePathParts.join(path_1.default.sep);
-                    return [4 /*yield*/, (0, __1.compileSingleFile)(target, 'identify', filePath, (0, getDestinationPath_1.getDestinationServicePath)(sourceFolderPath), true)];
+                    return [4 /*yield*/, (0, __1.compileSingleFile)(target, 'identify', filePath, (0, internal_1.getDestinationServicePath)(sourceFolderPath), true)];
                 case 3:
                     (filePath = (_c.sent()).destinationPath);
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("File Compiled and placed at: ".concat(filePath, " ."));

package/build/types/command/commandBase.js

@@ -79,7 +79,7 @@ exports.CommandBase = exports.defaultCommandOptions = void 0;
 var yargs_1 = __importDefault(require("yargs"));
 var unalias_1 = require("./unalias");
 var subCommandMap = new Map([
-    ['compile', ['job', 'service', 'identify']],
+    ['compile', ['job', 'service', 'test', 'identify']],
     ['context', ['create', 'delete', 'edit', 'export', 'list']],
     ['folder', ['create', 'delete', 'list']],
     ['doc', ['init', 'lineage']],

package/package.json

@@ -53,7 +53,7 @@
     "@sasjs/adapter": "4.1.6",
     "@sasjs/core": "4.45.4",
     "@sasjs/lint": "2.2.2",
-    "@sasjs/utils": "3.1.0",
+    "@sasjs/utils": "3.2.0",
     "adm-zip": "0.5.9",
     "chalk": "4.1.2",
     "dotenv": "10.0.0",
@@ -102,5 +102,5 @@
     "typescript": "4.9.5",
     "util": "0.12.4"
   },
-  "version": "4.0.7"
+  "version": "4.1.1"
 }

package/build/commands/compile/internal/getServerType.d.ts

@@ -1,9 +0,0 @@
-import { Target } from '@sasjs/utils';
-import { ServerType } from '@sasjs/utils/types';
-/**
- * Returns server type for 'compile' step.
- * If target is not present, it looks for serverType at root level
- * Default value for serverType is 'SASVIYA'
- * @param {Target} target- the target to check server type.
- */
-export declare function getServerType(target: Target): Promise<ServerType>;

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

@@ -1,60 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) 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.getServerType = void 0;
-var types_1 = require("@sasjs/utils/types");
-/**
- * Returns server type for 'compile' step.
- * If target is not present, it looks for serverType at root level
- * Default value for serverType is 'SASVIYA'
- * @param {Target} target- the target to check server type.
- */
-function getServerType(target) {
-    return __awaiter(this, void 0, void 0, function () {
-        var configuration;
-        return __generator(this, function (_a) {
-            if (target === null || target === void 0 ? void 0 : target.serverType)
-                return [2 /*return*/, target.serverType];
-            configuration = process.sasjsConfig;
-            return [2 /*return*/, (configuration === null || configuration === void 0 ? void 0 : configuration.serverType)
-                    ? configuration.serverType
-                    : types_1.ServerType.SasViya];
-        });
-    });
-}
-exports.getServerType = getServerType;