@sasjs/cli 3.13.3 → 3.13.6

package/build/commands/compile/compile.js

@@ -75,11 +75,11 @@ var config_1 = require("../../utils/config");
 var utils_1 = require("@sasjs/utils");
 var web_1 = require("../web/web");
 var file_1 = require("../../utils/file");
+var types_1 = require("@sasjs/utils/types");
 var checkCompileStatus_1 = require("./internal/checkCompileStatus");
 var compileModule = __importStar(require("./compile"));
 var getAllFolders_1 = require("./internal/getAllFolders");
-var compileServiceFile_1 = require("./internal/compileServiceFile");
-var compileJobFile_1 = require("./internal/compileJobFile");
+var compileFile_1 = require("./internal/compileFile");
 var compileTestFile_1 = require("./internal/compileTestFile");
 var getDestinationPath_1 = require("./internal/getDestinationPath");
 var loadDependencies_1 = require("./internal/loadDependencies");
@@ -138,7 +138,10 @@ function compile(target, forceCompile) {
                     macroTestFiles = _c.sent();
                     return [4 /*yield*/, (0, utils_1.asyncForEach)(macroTestFiles, function (macroTestFile) { return __awaiter(_this, void 0, void 0, function () {
                             return __generator(this, function (_a) {
-                                return [2 /*return*/, (0, compileServiceFile_1.compileServiceFile)(target, path_1.default.join(buildMacroTestFolder_1, macroTestFile), macroFolders, programFolders_1, undefined, compileTree)];
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, (0, compileFile_1.compileFile)(target, path_1.default.join(buildMacroTestFolder_1, macroTestFile), macroFolders, programFolders_1, undefined, compileTree, types_1.SASJsFileType.service, '')];
+                                    case 1: return [2 /*return*/, _a.sent()];
+                                }
                             });
                         }); })];
                 case 10:
@@ -326,7 +329,7 @@ function recreateBuildFolder() {
 }
 // REFACTOR: combine compileServiceFolder and compileJobFolder
 var compileServiceFolder = function (target, serviceFolder, macroFolders, programFolders, compileTree) { return __awaiter(void 0, void 0, void 0, function () {
-    var destinationPath, subFolders, filesNamesInPath;
+    var destinationPath, subFolders, sourceFiles;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -334,21 +337,21 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                 return [4 /*yield*/, (0, utils_1.listSubFoldersInFolder)(destinationPath)];
             case 1:
                 subFolders = _a.sent();
-                return [4 /*yield*/, (0, utils_1.listFilesInFolder)(destinationPath)
+                return [4 /*yield*/, (0, utils_1.listFilesInFolder)(serviceFolder)
                     // Checks if file in sasjsbuild folder exists in source folder.
                     // If not, it means that the file shouldn't be compiled.
                 ];
             case 2:
-                filesNamesInPath = _a.sent();
+                sourceFiles = _a.sent();
                 // Checks if file in sasjsbuild folder exists in source folder.
                 // If not, it means that the file shouldn't be compiled.
-                return [4 /*yield*/, (0, utils_1.asyncForEach)(filesNamesInPath, function (fileName, i) { return __awaiter(void 0, void 0, void 0, function () {
+                return [4 /*yield*/, (0, utils_1.asyncForEach)(sourceFiles, function (fileName, i) { return __awaiter(void 0, void 0, void 0, function () {
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0: return [4 /*yield*/, (0, utils_1.fileExists)(path_1.default.join(serviceFolder, fileName))];
                                 case 1:
                                     if (!(_a.sent())) {
-                                        filesNamesInPath.splice(i, 1);
+                                        sourceFiles.splice(i, 1);
                                     }
                                     return [2 /*return*/];
                             }
@@ -358,7 +361,7 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                 // Checks if file in sasjsbuild folder exists in source folder.
                 // If not, it means that the file shouldn't be compiled.
                 _a.sent();
-                return [4 /*yield*/, (0, utils_1.asyncForEach)(filesNamesInPath, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
+                return [4 /*yield*/, (0, utils_1.asyncForEach)(sourceFiles, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
                         var filePath;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
@@ -369,7 +372,7 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                                 case 1:
                                     _a.sent();
                                     return [3 /*break*/, 4];
-                                case 2: return [4 /*yield*/, (0, compileServiceFile_1.compileServiceFile)(target, filePath, macroFolders, programFolders, undefined, compileTree)];
+                                case 2: return [4 /*yield*/, (0, compileFile_1.compileFile)(target, filePath, macroFolders, programFolders, undefined, compileTree, types_1.SASJsFileType.service, serviceFolder)];
                                 case 3:
                                     _a.sent();
                                     _a.label = 4;
@@ -380,13 +383,15 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
             case 4:
                 _a.sent();
                 return [4 /*yield*/, (0, utils_1.asyncForEach)(subFolders, function (subFolder) { return __awaiter(void 0, void 0, void 0, function () {
-                        var fileNames;
+                        var sourceFolder, sourceFiles;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
-                                case 0: return [4 /*yield*/, (0, utils_1.listFilesInFolder)(path_1.default.join(serviceFolder, subFolder))];
+                                case 0:
+                                    sourceFolder = path_1.default.join(serviceFolder, subFolder);
+                                    return [4 /*yield*/, (0, utils_1.listFilesInFolder)(sourceFolder)];
                                 case 1:
-                                    fileNames = _a.sent();
-                                    return [4 /*yield*/, (0, utils_1.asyncForEach)(fileNames, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
+                                    sourceFiles = _a.sent();
+                                    return [4 /*yield*/, (0, utils_1.asyncForEach)(sourceFiles, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
                                             var filePath;
                                             return __generator(this, function (_a) {
                                                 switch (_a.label) {
@@ -397,7 +402,7 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                                                     case 1:
                                                         _a.sent();
                                                         return [3 /*break*/, 4];
-                                                    case 2: return [4 /*yield*/, (0, compileServiceFile_1.compileServiceFile)(target, filePath, macroFolders, programFolders, undefined, compileTree)];
+                                                    case 2: return [4 /*yield*/, (0, compileFile_1.compileFile)(target, filePath, macroFolders, programFolders, undefined, compileTree, types_1.SASJsFileType.service, sourceFolder)];
                                                     case 3:
                                                         _a.sent();
                                                         _a.label = 4;
@@ -419,7 +424,7 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
     });
 }); };
 var compileJobFolder = function (target, jobFolder, macroFolders, programFolders, compileTree) { return __awaiter(void 0, void 0, void 0, function () {
-    var destinationPath, subFolders, filesNamesInPath;
+    var destinationPath, subFolders, sourceFiles;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -432,16 +437,16 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                     // If not, it means that the file shouldn't be compiled.
                 ];
             case 2:
-                filesNamesInPath = _a.sent();
+                sourceFiles = _a.sent();
                 // Checks if file in sasjsbuild folder exists in source folder.
                 // If not, it means that the file shouldn't be compiled.
-                return [4 /*yield*/, (0, utils_1.asyncForEach)(filesNamesInPath, function (fileName, i) { return __awaiter(void 0, void 0, void 0, function () {
+                return [4 /*yield*/, (0, utils_1.asyncForEach)(sourceFiles, function (fileName, i) { return __awaiter(void 0, void 0, void 0, function () {
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0: return [4 /*yield*/, (0, utils_1.fileExists)(path_1.default.join(jobFolder, fileName))];
                                 case 1:
                                     if (!(_a.sent())) {
-                                        filesNamesInPath.splice(i, 1);
+                                        sourceFiles.splice(i, 1);
                                     }
                                     return [2 /*return*/];
                             }
@@ -451,7 +456,7 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                 // Checks if file in sasjsbuild folder exists in source folder.
                 // If not, it means that the file shouldn't be compiled.
                 _a.sent();
-                return [4 /*yield*/, (0, utils_1.asyncForEach)(filesNamesInPath, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
+                return [4 /*yield*/, (0, utils_1.asyncForEach)(sourceFiles, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
                         var filePath;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
@@ -462,7 +467,7 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                                 case 1:
                                     _a.sent();
                                     return [3 /*break*/, 4];
-                                case 2: return [4 /*yield*/, (0, compileJobFile_1.compileJobFile)(target, filePath, macroFolders, programFolders, undefined, compileTree)];
+                                case 2: return [4 /*yield*/, (0, compileFile_1.compileFile)(target, filePath, macroFolders, programFolders, undefined, compileTree, types_1.SASJsFileType.job, jobFolder)];
                                 case 3:
                                     _a.sent();
                                     _a.label = 4;
@@ -473,13 +478,15 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
             case 4:
                 _a.sent();
                 return [4 /*yield*/, (0, utils_1.asyncForEach)(subFolders, function (subFolder) { return __awaiter(void 0, void 0, void 0, function () {
-                        var fileNames;
+                        var sourcePath, sourceFiles;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
-                                case 0: return [4 /*yield*/, (0, utils_1.listFilesInFolder)(path_1.default.join(jobFolder, subFolder))];
+                                case 0:
+                                    sourcePath = path_1.default.join(jobFolder, subFolder);
+                                    return [4 /*yield*/, (0, utils_1.listFilesInFolder)(sourcePath)];
                                 case 1:
-                                    fileNames = _a.sent();
-                                    return [4 /*yield*/, (0, utils_1.asyncForEach)(fileNames, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
+                                    sourceFiles = _a.sent();
+                                    return [4 /*yield*/, (0, utils_1.asyncForEach)(sourceFiles, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
                                             var filePath;
                                             return __generator(this, function (_a) {
                                                 switch (_a.label) {
@@ -490,7 +497,7 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                                                     case 1:
                                                         _a.sent();
                                                         return [3 /*break*/, 4];
-                                                    case 2: return [4 /*yield*/, (0, compileJobFile_1.compileJobFile)(target, filePath, macroFolders, programFolders, undefined, compileTree)];
+                                                    case 2: return [4 /*yield*/, (0, compileFile_1.compileFile)(target, filePath, macroFolders, programFolders, undefined, compileTree, types_1.SASJsFileType.job, sourcePath)];
                                                     case 3:
                                                         _a.sent();
                                                         _a.label = 4;

package/build/commands/compile/compileSingleFile.js

@@ -43,8 +43,7 @@ exports.compileSingleFile = void 0;
 var path_1 = __importDefault(require("path"));
 var config_1 = require("../../utils/config");
 var utils_1 = require("@sasjs/utils");
-var compileServiceFile_1 = require("./internal/compileServiceFile");
-var compileJobFile_1 = require("./internal/compileJobFile");
+var compileFile_1 = require("./internal/compileFile");
 var identifySasFile_1 = require("./internal/identifySasFile");
 var loadDependencies_1 = require("./internal/loadDependencies");
 function compileSingleFile(target, subCommand, source, output, insertProgramVar) {
@@ -52,7 +51,7 @@ function compileSingleFile(target, subCommand, source, output, insertProgramVar)
     if (subCommand === void 0) { subCommand = 'identify'; }
     if (insertProgramVar === void 0) { insertProgramVar = false; }
     return __awaiter(this, void 0, void 0, function () {
-        var subCommands, commandExample, sourcePath, outputPathParts, leafFolderName, parentOutputFolder, pathExists, sourceFileName, destinationPath, sourceFileNameWithoutExt, macroFolders, programFolders, psMaxOption, programVar, compileTree, _b;
+        var subCommands, commandExample, sourcePath, outputPathParts, leafFolderName, parentOutputFolder, pathExists, sourceFileName, destinationPath, sourceFileNameWithoutExt, macroFolders, programFolders, psMaxOption, programVar, compileTree, sourceFolder, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -113,17 +112,21 @@ function compileSingleFile(target, subCommand, source, output, insertProgramVar)
                         ? "%let _program=".concat(target.appLoc, "/").concat(subCommand, "s/").concat(leafFolderName, "/").concat(sourceFileNameWithoutExt, ";\n").concat(psMaxOption)
                         : "".concat(psMaxOption);
                     compileTree = (0, loadDependencies_1.getCompileTree)(target);
+                    sourceFolder = sourcePath
+                        .split(path_1.default.sep)
+                        .slice(0, sourcePath.split(path_1.default.sep).length - 1)
+                        .join(path_1.default.sep);
                     _b = subCommand;
                     switch (_b) {
                         case subCommands.service: return [3 /*break*/, 11];
                         case subCommands.job: return [3 /*break*/, 13];
                     }
                     return [3 /*break*/, 15];
-                case 11: return [4 /*yield*/, (0, compileServiceFile_1.compileServiceFile)(target, destinationPath, macroFolders, programFolders, programVar, compileTree)];
+                case 11: return [4 /*yield*/, (0, compileFile_1.compileFile)(target, destinationPath, macroFolders, programFolders, programVar, compileTree, utils_1.SASJsFileType.service, sourceFolder)];
                 case 12:
                     _c.sent();
                     return [3 /*break*/, 16];
-                case 13: return [4 /*yield*/, (0, compileJobFile_1.compileJobFile)(target, destinationPath, macroFolders, programFolders, programVar, compileTree)];
+                case 13: return [4 /*yield*/, (0, compileFile_1.compileFile)(target, destinationPath, macroFolders, programFolders, programVar, compileTree, utils_1.SASJsFileType.job, sourceFolder)];
                 case 14:
                     _c.sent();
                     return [3 /*break*/, 16];

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

@@ -0,0 +1,15 @@
+import { CompileTree } from '@sasjs/utils';
+import { Target, ServerType, SASJsFileType } from '@sasjs/utils/types';
+/**
+ * Compiles file dependencies.
+ * @param {Target} target - SAS server configuration.
+ * @param {string} filePath - file path of the file to be compiled.
+ * @param {string[]} macroFolders - macro folders paths.
+ * @param {string[]} programFolders - program folders paths.
+ * @param {string} programVar - program variable.
+ * @param {object} compileTree - compilation tree that stores used compilation assets.
+ * @param {SASJsFileType} fileType - sasjs file type.
+ * @param {string} sourceFolder - folder path of the source folder.
+ */
+export declare function compileFile(target: Target, filePath: string, macroFolders: string[], programFolders: string[], programVar: string | undefined, compileTree: CompileTree, fileType: SASJsFileType, sourceFolder: string): Promise<void>;
+export declare function getPreCodeForServicePack(serverType: ServerType): Promise<string>;

package/build/commands/compile/internal/{compileServiceFile.js → compileFile.js}

@@ -35,22 +35,40 @@ 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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPreCodeForServicePack = exports.compileServiceFile = void 0;
+exports.getPreCodeForServicePack = exports.compileFile = void 0;
 var utils_1 = require("@sasjs/utils");
 var types_1 = require("@sasjs/utils/types");
 var error_1 = require("@sasjs/utils/error");
 var loadDependencies_1 = require("./loadDependencies");
 var getServerType_1 = require("./getServerType");
-function compileServiceFile(target, filePath, macroFolders, programFolders, programVar, compileTree) {
+var path_1 = __importDefault(require("path"));
+/**
+ * Compiles file dependencies.
+ * @param {Target} target - SAS server configuration.
+ * @param {string} filePath - file path of the file to be compiled.
+ * @param {string[]} macroFolders - macro folders paths.
+ * @param {string[]} programFolders - program folders paths.
+ * @param {string} programVar - program variable.
+ * @param {object} compileTree - compilation tree that stores used compilation assets.
+ * @param {SASJsFileType} fileType - sasjs file type.
+ * @param {string} sourceFolder - folder path of the source folder.
+ */
+function compileFile(target, filePath, macroFolders, programFolders, programVar, compileTree, fileType, sourceFolder) {
     if (programVar === void 0) { programVar = ''; }
     return __awaiter(this, void 0, void 0, function () {
         var dependencies, serverType, preCode;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, filePath, macroFolders, programFolders, (0, utils_1.isTestFile)(filePath) ? types_1.SASJsFileType.test : types_1.SASJsFileType.service, compileTree)];
+                case 0: return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, sourceFolder
+                        ? path_1.default.join(sourceFolder, filePath.split(path_1.default.sep).pop())
+                        : filePath, macroFolders, programFolders, (0, utils_1.isTestFile)(filePath) ? types_1.SASJsFileType.test : fileType, compileTree)];
                 case 1:
                     dependencies = _a.sent();
+                    if (!(fileType === types_1.SASJsFileType.service)) return [3 /*break*/, 4];
                     return [4 /*yield*/, (0, getServerType_1.getServerType)(target)];
                 case 2:
                     serverType = _a.sent();
@@ -58,15 +76,19 @@ function compileServiceFile(target, filePath, macroFolders, programFolders, prog
                 case 3:
                     preCode = _a.sent();
                     dependencies = "".concat(programVar, "\n").concat(preCode, "\n").concat(dependencies);
-                    return [4 /*yield*/, (0, utils_1.createFile)(filePath, dependencies)];
+                    return [3 /*break*/, 5];
                 case 4:
+                    dependencies = "".concat(programVar ? programVar + '\n' : '').concat(dependencies);
+                    _a.label = 5;
+                case 5: return [4 /*yield*/, (0, utils_1.createFile)(filePath, dependencies)];
+                case 6:
                     _a.sent();
                     return [2 /*return*/];
             }
         });
     });
 }
-exports.compileServiceFile = compileServiceFile;
+exports.compileFile = compileFile;
 function getPreCodeForServicePack(serverType) {
     return __awaiter(this, void 0, void 0, function () {
         var content, macroCorePath, _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;

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

@@ -72,7 +72,7 @@ var loadDependencies_1 = require("./loadDependencies");
 var file_1 = require("../../../utils/file");
 var chalk_1 = __importDefault(require("chalk"));
 var config_1 = require("../../../utils/config");
-var compileServiceFile_1 = require("./compileServiceFile");
+var compileFile_1 = require("./compileFile");
 var testsBuildFolder = function () {
     return path_1.default.join(process.projectDir, 'sasjsbuild', 'tests');
 };
@@ -97,7 +97,7 @@ function compileTestFile(target, filePath, testVar, saveToRoot, removeOriginalFi
                         compileTree]))];
                 case 3:
                     dependencies = _c.sent();
-                    return [4 /*yield*/, (0, compileServiceFile_1.getPreCodeForServicePack)(target.serverType)];
+                    return [4 /*yield*/, (0, compileFile_1.getPreCodeForServicePack)(target.serverType)];
                 case 4:
                     preCode = _c.sent();
                     dependencies = "".concat(testVar ? testVar + '\n' : '', "\n").concat(preCode, "\n").concat(dependencies);

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

@@ -75,8 +75,7 @@ var config_1 = require("../../../utils/config");
 var test_1 = require("../../../utils/test");
 var compileModule = __importStar(require("../compile"));
 var compileSingleFile_1 = require("../compileSingleFile");
-var compileJobFile = __importStar(require("../internal/compileJobFile"));
-var compileServiceFile = __importStar(require("../internal/compileServiceFile"));
+var compileFile = __importStar(require("../internal/compileFile"));
 var utils_2 = require("../../../utils");
 var compileCommand_1 = require("../compileCommand");
 describe('sasjs compile', function () {
@@ -302,7 +301,7 @@ describe('sasjs compile single file', function () {
                         return [4 /*yield*/, (0, config_1.findTargetInConfiguration)('viya')];
                     case 2:
                         target = (_a.sent()).target;
-                        jest.spyOn(compileJobFile, 'compileJobFile');
+                        jest.spyOn(compileFile, 'compileFile');
                         return [2 /*return*/];
                 }
             });
@@ -326,7 +325,7 @@ describe('sasjs compile single file', function () {
                         return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)(target, 'job', command.source, output)).toResolve()];
                     case 2:
                         _a.sent();
-                        expect(compileJobFile.compileJobFile).toHaveBeenCalled();
+                        expect(compileFile.compileFile).toHaveBeenCalled();
                         return [2 /*return*/];
                 }
             });
@@ -350,7 +349,7 @@ describe('sasjs compile single file', function () {
                         return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)(target, 'job', command.source, output)).toResolve()];
                     case 2:
                         _a.sent();
-                        expect(compileJobFile.compileJobFile).toHaveBeenCalled();
+                        expect(compileFile.compileFile).toHaveBeenCalled();
                         return [2 /*return*/];
                 }
             });
@@ -368,7 +367,7 @@ describe('sasjs compile single file', function () {
                         return [4 /*yield*/, (0, config_1.findTargetInConfiguration)('viya')];
                     case 2:
                         target = (_a.sent()).target;
-                        jest.spyOn(compileServiceFile, 'compileServiceFile');
+                        jest.spyOn(compileFile, 'compileFile');
                         return [2 /*return*/];
                 }
             });
@@ -392,7 +391,7 @@ describe('sasjs compile single file', function () {
                         return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)(target, 'service', command.source, output)).toResolve()];
                     case 2:
                         _a.sent();
-                        expect(compileServiceFile.compileServiceFile).toHaveBeenCalled();
+                        expect(compileFile.compileFile).toHaveBeenCalled();
                         return [2 /*return*/];
                 }
             });
@@ -416,7 +415,24 @@ describe('sasjs compile single file', function () {
                         return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)(target, 'service', command.source, output)).toResolve()];
                     case 2:
                         _a.sent();
-                        expect(compileServiceFile.compileServiceFile).toHaveBeenCalled();
+                        expect(compileFile.compileFile).toHaveBeenCalled();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should compile service without duplicates', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var compiledPath, compiledService;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        compiledPath = path_1.default.join(process.projectDir, 'sasjsbuild', 'services', 'admin', 'dostuff.sas');
+                        return [4 /*yield*/, compileModule.compile(target)];
+                    case 1:
+                        _a.sent();
+                        return [4 /*yield*/, (0, utils_1.readFile)(compiledPath)];
+                    case 2:
+                        compiledService = _a.sent();
+                        expect(compiledService.match(/%macro mv_webout/g).length).toEqual(1);
                         return [2 /*return*/];
                 }
             });

package/build/commands/compile/spec/{compileServiceFile.spec.js → compileFile.spec.js}

@@ -63,7 +63,7 @@ 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 compileServiceFile_1 = require("../internal/compileServiceFile");
+var compileFile_1 = require("../internal/compileFile");
 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;");
@@ -76,7 +76,7 @@ var fakeProgramLines = [
     'run;'
 ];
 var preCode = '/* 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';
-describe('compileServiceFile', function () {
+describe('compileFile', function () {
     var appName = "cli-tests-compile-service-file-".concat((0, utils_1.generateTimestamp)());
     var target = (0, test_1.generateTestTarget)(appName, '/Public/app', {
         serviceFolders: [path_1.default.join('sasjs', 'services')],
@@ -104,39 +104,77 @@ describe('compileServiceFile', function () {
             }
         });
     }); });
-    test('it should compile and create file', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var filePath, buildPath, destinationPath, compileTree, compiledContent, macrosToTest;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    (0, getInitTerm_1.mockGetProgram)(internalModule, fakeJobInit, fakeJobTerm);
-                    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);
-                    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, compileServiceFile_1.compileServiceFile)(target, destinationPath, [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], undefined, compileTree)).toResolve()];
-                case 3:
-                    _a.sent();
-                    return [4 /*yield*/, expect((0, utils_2.fileExists)(destinationPath)).resolves.toEqual(true)];
-                case 4:
-                    _a.sent();
-                    return [4 /*yield*/, (0, utils_2.readFile)(destinationPath)];
-                case 5:
-                    compiledContent = _a.sent();
-                    macrosToTest = ['mf_abort', 'mf_existds'];
-                    return [4 /*yield*/, (0, test_1.verifyCompiledService)(compiledContent, macrosToTest)];
-                case 6:
-                    _a.sent();
-                    expect(compiledContent).toEqual(expect.stringContaining(fakeProgramLines.join('\n')));
-                    expect(compiledContent).toEqual(expect.stringContaining(preCode));
-                    return [2 /*return*/];
-            }
-        });
-    }); });
+    describe('service', function () {
+        test('it should compile and create file', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var filePath, buildPath, destinationPath, compileTree, compiledContent, macrosToTest;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        (0, getInitTerm_1.mockGetProgram)(internalModule, fakeJobInit, fakeJobTerm);
+                        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);
+                        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()];
+                    case 3:
+                        _a.sent();
+                        return [4 /*yield*/, expect((0, utils_2.fileExists)(destinationPath)).resolves.toEqual(true)];
+                    case 4:
+                        _a.sent();
+                        return [4 /*yield*/, (0, utils_2.readFile)(destinationPath)];
+                    case 5:
+                        compiledContent = _a.sent();
+                        macrosToTest = ['mf_abort', 'mf_existds'];
+                        return [4 /*yield*/, (0, test_1.verifyCompiledService)(compiledContent, macrosToTest)];
+                    case 6:
+                        _a.sent();
+                        expect(compiledContent).toEqual(expect.stringContaining(fakeProgramLines.join('\n')));
+                        expect(compiledContent).toEqual(expect.stringContaining(preCode));
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+    });
+    describe('job', function () {
+        test('it should compile and create file', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var filePath, buildPath, destinationPath, compileTree, compiledContent, macrosToTest;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        (0, getInitTerm_1.mockGetProgram)(internalModule, fakeJobInit, fakeJobTerm);
+                        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);
+                        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()];
+                    case 3:
+                        _a.sent();
+                        return [4 /*yield*/, expect((0, utils_2.fileExists)(destinationPath)).resolves.toEqual(true)];
+                    case 4:
+                        _a.sent();
+                        return [4 /*yield*/, (0, utils_2.readFile)(destinationPath)];
+                    case 5:
+                        compiledContent = _a.sent();
+                        macrosToTest = ['mf_abort', 'mf_existds'];
+                        return [4 /*yield*/, (0, test_1.verifyCompiledJob)(compiledContent, macrosToTest)];
+                    case 6:
+                        _a.sent();
+                        expect(compiledContent).toEqual(expect.stringContaining(fakeProgramLines.join('\n')));
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+    });
 });

package/build/commands/deploy/deploy.js

@@ -215,7 +215,11 @@ function deployToSasViya(deployScriptName, target, isLocal, linesToExecute, logF
                     return [4 /*yield*/, getSASjsAndAuthConfig(target, isLocal)];
                 case 1:
                     _f = _g.sent(), sasjs = _f.sasjs, authConfig = _f.authConfig;
-                    return [4 /*yield*/, sasjs.executeScriptSASViya(deployScriptName, linesToExecute, contextName, authConfig)];
+                    return [4 /*yield*/, sasjs
+                            .executeScriptSASViya(deployScriptName, linesToExecute, contextName, authConfig)
+                            .catch(function (err) {
+                            process.logger.error('executeScriptSASViya Error', err);
+                        })];
                 case 2:
                     executionResult = _g.sent();
                     try {
@@ -368,7 +372,7 @@ function deployToSasjs(target, sasjs, streamConfig) {
                         .deployToSASjs(payload, undefined, authConfig)
                         .catch(function (err) {
                         var _a;
-                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error(err);
+                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('deployToSASjs Error', err);
                     })];
                 case 6:
                     result = _d.sent();

package/build/commands/help/help.js

@@ -298,11 +298,12 @@ function printHelpText() {
                     title: 'test',
                     description: [
                         "Triggers SAS unit tests.",
-                        "[2spaces]command example: sasjs test <filteringString> --source <testFlowPath> --outDirectory <folderPath> -t <targetName>",
+                        "[2spaces]command example: sasjs test <filteringString> --source <testFlowPath> --outDirectory <folderPath> -t <targetName> --force",
                         "",
                         "[2spaces]NOTE: Providing <filteringString> is optional. If not present, all tests mentioned in test flow file will be executed.",
                         "[2spaces]NOTE: Providing source flag is optional. If not present, CLI will use test flow located at sasjsbuild/testFlow.json.",
-                        "[2spaces]NOTE: Providing outDirectory flag is optional. If not present, CLI will use save outputs into sasjsresults folder."
+                        "[2spaces]NOTE: Providing outDirectory flag is optional. If not present, CLI will use save outputs into sasjsresults folder.",
+                        "[2spaces]NOTE: Providing force (--force or -f) flag is optional. If present, CLI will force command to finish running all tests and will not return an error code even when some are failing. Useful when the requirement is not to make CI Pipeline fail."
                     ]
                 }
             ];

package/build/commands/job/internal/execute/sasjs.d.ts

@@ -1,5 +1,6 @@
 import SASjs from '@sasjs/adapter/node';
-export declare function executeJobSasjs(sasjs: SASjs, jobPath: string, logFile: string | undefined): Promise<{
+import { AuthConfig } from '@sasjs/utils';
+export declare function executeJobSasjs(sasjs: SASjs, jobPath: string, logFile: string | undefined, authConfig?: AuthConfig): Promise<{
     status: string;
     message: string;
     log?: string | undefined;

package/build/commands/job/internal/execute/sasjs.js

@@ -38,14 +38,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeJobSasjs = void 0;
 var utils_1 = require("../utils");
-function executeJobSasjs(sasjs, jobPath, logFile) {
+function executeJobSasjs(sasjs, jobPath, logFile, authConfig) {
     return __awaiter(this, void 0, void 0, function () {
         var result;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, sasjs.executeJobSASjs({
                         _program: jobPath
-                    })];
+                    }, authConfig)];
                 case 1:
                     result = _a.sent();
                     if (!result) return [3 /*break*/, 5];

package/build/commands/job/jobCommand.d.ts

@@ -6,7 +6,7 @@ export declare class JobCommand extends TargetCommand {
     private jobSubCommands;
     constructor(args: string[]);
     execute(): Promise<ReturnCode>;
-    executeJobSasjs(sasjs: SASjs, target: Target): Promise<ReturnCode>;
+    executeJobSasjs(sasjs: SASjs, target: Target, authConfig: AuthConfig | undefined): Promise<ReturnCode>;
     executeJobSas9(sasjs: SASjs, target: Target, config: {
         username: string;
         password: string;