@sasjs/cli 3.7.6 → 3.7.9

package/build/commands/compile/compile.js

@@ -77,8 +77,7 @@ var web_1 = require("../web/web");
 var file_1 = require("../../utils/file");
 var checkCompileStatus_1 = require("./internal/checkCompileStatus");
 var compileModule = __importStar(require("./compile"));
-var getAllJobFolders_1 = require("./internal/getAllJobFolders");
-var getAllServiceFolders_1 = require("./internal/getAllServiceFolders");
+var getAllFolders_1 = require("./internal/getAllFolders");
 var compileServiceFile_1 = require("./internal/compileServiceFile");
 var compileJobFile_1 = require("./internal/compileJobFile");
 var compileTestFile_1 = require("./internal/compileTestFile");
@@ -171,10 +170,10 @@ function copyFilesToBuildFolder(target) {
                     _c.label = 2;
                 case 2:
                     _c.trys.push([2, 7, , 8]);
-                    return [4 /*yield*/, (0, getAllServiceFolders_1.getAllServiceFolders)(target)];
+                    return [4 /*yield*/, (0, getAllFolders_1.getAllFolders)(target, getAllFolders_1.SasFileType.Service)];
                 case 3:
                     serviceFolders = _c.sent();
-                    return [4 /*yield*/, (0, getAllJobFolders_1.getAllJobFolders)(target)
+                    return [4 /*yield*/, (0, getAllFolders_1.getAllFolders)(target, getAllFolders_1.SasFileType.Job)
                         // REFACTOR
                     ];
                 case 4:
@@ -231,10 +230,10 @@ function compileJobsServicesTests(target) {
             switch (_b.label) {
                 case 0:
                     _b.trys.push([0, 13, , 14]);
-                    return [4 /*yield*/, (0, getAllServiceFolders_1.getAllServiceFolders)(target)];
+                    return [4 /*yield*/, (0, getAllFolders_1.getAllFolders)(target, getAllFolders_1.SasFileType.Service)];
                 case 1:
                     serviceFolders = _b.sent();
-                    return [4 /*yield*/, (0, getAllJobFolders_1.getAllJobFolders)(target)];
+                    return [4 /*yield*/, (0, getAllFolders_1.getAllFolders)(target, getAllFolders_1.SasFileType.Job)];
                 case 2:
                     jobFolders = _b.sent();
                     return [4 /*yield*/, (0, config_1.getMacroFolders)(target)];

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

@@ -39,8 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkCompileStatus = void 0;
 var utils_1 = require("@sasjs/utils");
 var compareFolders_1 = require("./compareFolders");
-var getAllJobFolders_1 = require("./getAllJobFolders");
-var getAllServiceFolders_1 = require("./getAllServiceFolders");
+var getAllFolders_1 = require("./getAllFolders");
 var getDestinationPath_1 = require("./getDestinationPath");
 function checkCompileStatus(target, exceptions) {
     return __awaiter(this, void 0, void 0, function () {
@@ -87,7 +86,7 @@ var checkServiceFolders = function (target, exceptions) { return __awaiter(void
     var serviceFolders, areServiceFoldersMatching, reasons;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, getAllServiceFolders_1.getAllServiceFolders)(target)];
+            case 0: return [4 /*yield*/, (0, getAllFolders_1.getAllFolders)(target, getAllFolders_1.SasFileType.Service)];
             case 1:
                 serviceFolders = _a.sent();
                 areServiceFoldersMatching = true;
@@ -126,7 +125,7 @@ var checkJobFolders = function (target, exceptions) { return __awaiter(void 0, v
     var jobFolders, areJobFoldersMatching, reasons;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, getAllJobFolders_1.getAllJobFolders)(target)];
+            case 0: return [4 /*yield*/, (0, getAllFolders_1.getAllFolders)(target, getAllFolders_1.SasFileType.Job)];
             case 1:
                 jobFolders = _a.sent();
                 areJobFoldersMatching = true;

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

@@ -1,5 +1,6 @@
-import { Target } from '@sasjs/utils';
+import { TestFlow } from '../../../types';
+import { Target, Configuration } from '@sasjs/utils';
 export declare function compileTestFile(target: Target, filePath: string, testVar?: string, saveToRoot?: boolean, removeOriginalFile?: boolean): Promise<void>;
 export declare function moveTestFile(filePath: string): Promise<void>;
 export declare function copyTestMacroFiles(folderAbsolutePath: string): Promise<void>;
-export declare const compileTestFlow: (target: Target) => Promise<void>;
+export declare const compileTestFlow: (target: Target, config?: Configuration | undefined) => Promise<TestFlow | undefined>;

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

@@ -200,22 +200,35 @@ function copyTestMacroFiles(folderAbsolutePath) {
     });
 }
 exports.copyTestMacroFiles = copyTestMacroFiles;
-var compileTestFlow = function (target) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, buildDestinationFolder, buildDestinationTestFolder, testFiles, testFlow, testSetUp, testTearDown, testSetUpFileName_1, testTearDownFileName_1;
-    var _b, _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+var compileTestFlow = function (target, config) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, buildDestinationFolder, buildDestinationTestFolder, testFiles, _b, testFlow, testSetUp, testTearDown, testSetUpFileName_1, testTearDownFileName_1;
+    var _c, _d, _e, _f;
+    return __generator(this, function (_g) {
+        switch (_g.label) {
             case 0:
+                if (target.testConfig &&
+                    Object.keys(target.testConfig).includes('testFolders')) {
+                    process.logger.warn("'testFolders' is not supported 'testConfig' entry, please use 'serviceFolders' entry in 'serviceConfig' or 'jobFolders' entry in 'jobConfig'.");
+                }
                 _a = process.sasjsConstants, buildDestinationFolder = _a.buildDestinationFolder, buildDestinationTestFolder = _a.buildDestinationTestFolder;
                 return [4 /*yield*/, (0, utils_1.folderExists)(buildDestinationTestFolder)];
             case 1:
-                if (!_d.sent()) return [3 /*break*/, 4];
+                if (!_g.sent()) return [3 /*break*/, 7];
                 return [4 /*yield*/, (0, utils_1.listFilesAndSubFoldersInFolder)(buildDestinationTestFolder)];
             case 2:
-                testFiles = (_d.sent()).map(function (file) { return path_1.default.join('tests', file); });
+                testFiles = (_g.sent()).map(function (file) { return path_1.default.join('tests', file); });
+                _b = config;
+                if (_b) return [3 /*break*/, 5];
+                return [4 /*yield*/, (0, config_1.getLocalOrGlobalConfig)()];
+            case 3: return [4 /*yield*/, (_g.sent()).configuration];
+            case 4:
+                _b = (_g.sent());
+                _g.label = 5;
+            case 5:
+                config = _b;
                 testFlow = { tests: [] };
-                testSetUp = (_b = target.testConfig) === null || _b === void 0 ? void 0 : _b.testSetUp;
-                testTearDown = (_c = target.testConfig) === null || _c === void 0 ? void 0 : _c.testTearDown;
+                testSetUp = ((_c = target.testConfig) === null || _c === void 0 ? void 0 : _c.testSetUp) || ((_d = config.testConfig) === null || _d === void 0 ? void 0 : _d.testSetUp);
+                testTearDown = ((_e = target.testConfig) === null || _e === void 0 ? void 0 : _e.testTearDown) || ((_f = config.testConfig) === null || _f === void 0 ? void 0 : _f.testTearDown);
                 if (testFiles.length) {
                     if (testSetUp) {
                         testSetUpFileName_1 = getFileName(testSetUp);
@@ -236,10 +249,10 @@ var compileTestFlow = function (target) { return __awaiter(void 0, void 0, void
                     return file.split(path_1.default.sep).join('/');
                 });
                 return [4 /*yield*/, printTestCoverage(testFlow, buildDestinationFolder, target)];
-            case 3:
-                _d.sent();
-                _d.label = 4;
-            case 4: return [2 /*return*/];
+            case 6:
+                _g.sent();
+                return [2 /*return*/, Promise.resolve(testFlow)];
+            case 7: return [2 /*return*/];
         }
     });
 }); };

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

@@ -0,0 +1,6 @@
+import { Target, Configuration } from '@sasjs/utils';
+export declare enum SasFileType {
+    Service = "service",
+    Job = "job"
+}
+export declare const getAllFolders: (target: Target, type: SasFileType, rootConfig?: Configuration | undefined) => Promise<string[]>;

package/build/commands/compile/internal/{getAllJobFolders.js → getAllFolders.js}

@@ -61,29 +61,55 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllJobFolders = void 0;
+exports.getAllFolders = exports.SasFileType = void 0;
 var utils_1 = require("@sasjs/utils");
 var config_1 = require("../../../utils/config");
-function getAllJobFolders(target) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function () {
-        var configuration, allJobs, buildSourceFolder;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, (0, config_1.getLocalOrGlobalConfig)()];
-                case 1:
-                    configuration = (_c.sent()).configuration;
-                    allJobs = [];
-                    if ((_a = configuration === null || configuration === void 0 ? void 0 : configuration.jobConfig) === null || _a === void 0 ? void 0 : _a.jobFolders)
-                        allJobs = __spreadArray([], __read(configuration.jobConfig.jobFolders), false);
-                    if ((_b = target === null || target === void 0 ? void 0 : target.jobConfig) === null || _b === void 0 ? void 0 : _b.jobFolders)
-                        allJobs = __spreadArray(__spreadArray([], __read(allJobs), false), __read(target.jobConfig.jobFolders), false);
-                    allJobs = allJobs.filter(function (s) { return !!s; });
-                    buildSourceFolder = process.sasjsConstants.buildSourceFolder;
-                    allJobs = allJobs.map(function (job) { return (0, utils_1.getAbsolutePath)(job, buildSourceFolder); });
-                    return [2 /*return*/, __spreadArray([], __read(new Set(allJobs)), false)];
-            }
-        });
+var SasFileType;
+(function (SasFileType) {
+    SasFileType["Service"] = "service";
+    SasFileType["Job"] = "job";
+})(SasFileType = exports.SasFileType || (exports.SasFileType = {}));
+var getAllFolders = function (target, type, rootConfig) { return __awaiter(void 0, void 0, void 0, function () {
+    var configuration, _a, allFolders, config, folders, addFolders, buildSourceFolder;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                _a = rootConfig;
+                if (_a) return [3 /*break*/, 3];
+                return [4 /*yield*/, (0, config_1.getLocalOrGlobalConfig)()];
+            case 1: return [4 /*yield*/, (_b.sent()).configuration];
+            case 2:
+                _a = (_b.sent());
+                _b.label = 3;
+            case 3:
+                configuration = _a;
+                addFolders = function (folders) {
+                    allFolders = __spreadArray(__spreadArray([], __read((allFolders || [])), false), __read((folders || [])), false);
+                };
+                if (type === SasFileType.Service) {
+                    config = configuration.serviceConfig;
+                    folders = config === null || config === void 0 ? void 0 : config.serviceFolders;
+                    addFolders(folders);
+                    config = target.serviceConfig;
+                    folders = config === null || config === void 0 ? void 0 : config.serviceFolders;
+                }
+                else {
+                    config = configuration.jobConfig;
+                    folders = config === null || config === void 0 ? void 0 : config.jobFolders;
+                    addFolders(folders);
+                    config = target.jobConfig;
+                    folders = config === null || config === void 0 ? void 0 : config.jobFolders;
+                }
+                addFolders(folders);
+                if (!allFolders)
+                    return [2 /*return*/, []];
+                allFolders = allFolders.filter(function (p) { return !!p; });
+                buildSourceFolder = process.sasjsConstants.buildSourceFolder;
+                allFolders = allFolders.map(function (sasFile) {
+                    return (0, utils_1.getAbsolutePath)(sasFile, buildSourceFolder);
+                });
+                return [2 /*return*/, __spreadArray([], __read(new Set(allFolders)), false)];
+        }
     });
-}
-exports.getAllJobFolders = getAllJobFolders;
+}); };
+exports.getAllFolders = getAllFolders;

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

@@ -37,19 +37,18 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.identifySasFile = void 0;
-var getAllJobFolders_1 = require("./getAllJobFolders");
-var getAllServiceFolders_1 = require("./getAllServiceFolders");
+var getAllFolders_1 = require("./getAllFolders");
 var identifySasFile = function (target, sourcePath) { return __awaiter(void 0, void 0, void 0, function () {
     var serviceFolders, isService, jobFolders, isJob;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, getAllServiceFolders_1.getAllServiceFolders)(target)];
+            case 0: return [4 /*yield*/, (0, getAllFolders_1.getAllFolders)(target, getAllFolders_1.SasFileType.Service)];
             case 1:
                 serviceFolders = _a.sent();
                 isService = serviceFolders.find(function (folder) { return sourcePath.includes(folder); });
                 if (isService)
                     return [2 /*return*/, 'service'];
-                return [4 /*yield*/, (0, getAllJobFolders_1.getAllJobFolders)(target)];
+                return [4 /*yield*/, (0, getAllFolders_1.getAllFolders)(target, getAllFolders_1.SasFileType.Job)];
             case 2:
                 jobFolders = _a.sent();
                 isJob = jobFolders.find(function (folder) { return sourcePath.includes(folder); });

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

@@ -330,6 +330,43 @@ describe('compileTestFile', function () {
                 }
             });
         }); });
+        it('should log a warning is testFolders was used in root or target configuration', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var testTarget, testConfig, expectedWarn;
+            return __generator(this, function (_a) {
+                testTarget = {
+                    name: 'viya',
+                    serverUrl: '',
+                    serverType: utils_1.ServerType.SasViya,
+                    appLoc: '/Public/sasjs/jobs',
+                    macroFolders: [],
+                    programFolders: [],
+                    binaryFolders: [],
+                    testConfig: {
+                        testSetUp: '',
+                        testTearDown: '',
+                        macroVars: {},
+                        initProgram: '',
+                        termProgram: '',
+                        testFolders: ['tests']
+                    }
+                };
+                testConfig = {
+                    macroFolders: ['macros'],
+                    testConfig: {
+                        testFolders: ['tests']
+                    },
+                    defaultTarget: 'viya',
+                    targets: [testTarget]
+                };
+                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);
+                expect(process.logger.warn).toHaveBeenCalledWith(expectedWarn);
+                (0, compileTestFile_1.compileTestFlow)(testTarget, testConfig);
+                expect(process.logger.warn).toHaveBeenCalledWith(expectedWarn);
+                return [2 /*return*/];
+            });
+        }); });
     });
 });
 describe('isTestFile', function () {

package/build/commands/compile/internal/spec/getAllFolders.spec.d.ts

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

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

@@ -0,0 +1,184 @@
+"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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var getAllFolders_1 = require("../getAllFolders");
+var utils_1 = require("@sasjs/utils");
+var test_1 = require("../../../../utils/test");
+var configUtils = __importStar(require("../../../../utils/config"));
+var utils_2 = require("../../../../utils");
+var path_1 = __importDefault(require("path"));
+describe('getAllFolders', function () {
+    var config;
+    var target;
+    beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
+        var _a, _b, temp;
+        var _c, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
+                case 0: return [4 /*yield*/, (0, utils_2.setConstants)()];
+                case 1:
+                    _e.sent();
+                    _b = (_a = JSON).parse;
+                    return [4 /*yield*/, (0, utils_1.readFile)(path_1.default.join(__dirname, '..', '..', '..', '..', 'config.json'))];
+                case 2:
+                    (config = _b.apply(_a, [_e.sent()]).config);
+                    config.jobConfig = {
+                        jobFolders: ['sasjs/targets/viya/jobs'],
+                        initProgram: '',
+                        termProgram: '',
+                        macroVars: {}
+                    };
+                    temp = (0, test_1.generateTestTarget)('testTarget', '/Public/app', {
+                        serviceFolders: [
+                            path_1.default.join('sasjs', 'targetServices'),
+                            (_c = config.serviceConfig) === null || _c === void 0 ? void 0 : _c.serviceFolders[0] // duplicate
+                        ],
+                        initProgram: '',
+                        termProgram: '',
+                        macroVars: {}
+                    }, utils_1.ServerType.SasViya, {
+                        jobFolders: [
+                            path_1.default.join('sasjs', 'targetJobs'),
+                            (_d = config.jobConfig) === null || _d === void 0 ? void 0 : _d.jobFolders[0] // duplicate
+                        ],
+                        initProgram: '',
+                        termProgram: '',
+                        macroVars: {}
+                    });
+                    target = new utils_1.Target(__assign({}, temp.toJson()));
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+        return [2 /*return*/];
+    }); }); });
+    it('should get all service and job folders', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var buildSourceFolder;
+        var _a, _b, _c, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
+                case 0:
+                    jest
+                        .spyOn(configUtils, 'getLocalOrGlobalConfig')
+                        .mockImplementation(function () { return __awaiter(void 0, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            return [2 /*return*/, Promise.resolve({
+                                    configuration: config,
+                                    isLocal: true
+                                })];
+                        });
+                    }); });
+                    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 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 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);
+                        })))), false))];
+                case 2:
+                    _e.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});

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

@@ -58,7 +58,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var config_1 = require("../../../utils/config");
 var test_1 = require("../../../utils/test");
 var utils_1 = require("@sasjs/utils");
-var getAllServiceFoldersModule = __importStar(require("../internal/getAllServiceFolders"));
+var getAllFoldersModule = __importStar(require("../internal/getAllFolders"));
 var compileModule = __importStar(require("../compile"));
 describe('copyFilesToBuildFolder', function () {
     var appName;
@@ -106,9 +106,7 @@ describe('copyFilesToBuildFolder', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest
-                        .spyOn(getAllServiceFoldersModule, 'getAllServiceFolders')
-                        .mockImplementation(function () {
+                    jest.spyOn(getAllFoldersModule, 'getAllFolders').mockImplementation(function () {
                         throw new Error('Test Error');
                     });
                     return [4 /*yield*/, (0, config_1.findTargetInConfiguration)('viya')];

package/build/commands/deploy/deploy.js

@@ -259,11 +259,11 @@ function deployToSasViya(deployScriptName, target, isLocal, linesToExecute, logF
  * for printing web app url on console.
  */
 function deployToSas9(deployScriptName, target, linesToExecute, logFolder, streamConfig) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function () {
-        var username, password, sas9CredentialsError, sasjs, executionResult, appLoc, webAppStreamUrl;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
+        var username, password, sas9CredentialsError, sasjs, completedWithError, executionResult, logContent, logFilePath, appLoc, webAppStreamUrl;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
                 case 0:
                     if (target.authConfigSas9) {
                         username = target.authConfigSas9.userName;
@@ -284,6 +284,7 @@ function deployToSas9(deployScriptName, target, linesToExecute, logFolder, strea
                         appLoc: target.appLoc,
                         serverType: target.serverType
                     });
+                    completedWithError = false;
                     return [4 /*yield*/, sasjs
                             .executeScriptSAS9(linesToExecute, username, password)
                             .catch(function (err) {
@@ -292,30 +293,35 @@ function deployToSas9(deployScriptName, target, linesToExecute, logFolder, strea
                             if (err && err.errorCode === 404) {
                                 (0, utils_1.displaySasjsRunnerError)(username);
                             }
+                            completedWithError = true;
+                            return err;
                         })];
                 case 1:
-                    executionResult = _e.sent();
-                    if (!executionResult) return [3 /*break*/, 5];
-                    if (!logFolder) return [3 /*break*/, 3];
-                    return [4 /*yield*/, (0, utils_2.createFile)(path_1.default.join(logFolder, "".concat(deployScriptName.replace('.sas', ''), ".log")), executionResult !== null && executionResult !== void 0 ? executionResult : '')];
+                    executionResult = _f.sent();
+                    if (!executionResult) {
+                        return [2 /*return*/, (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error getting execution log')];
+                    }
+                    if (!logFolder) {
+                        return [2 /*return*/, (_b = process.logger) === null || _b === void 0 ? void 0 : _b.error('Unable to create log file.')];
+                    }
+                    logContent = completedWithError
+                        ? executionResult.result
+                        : executionResult;
+                    logFilePath = path_1.default.join(logFolder, "".concat(deployScriptName.replace('.sas', ''), ".log"));
+                    return [4 /*yield*/, (0, utils_2.createFile)(logFilePath, logContent !== null && logContent !== void 0 ? logContent : '')];
                 case 2:
-                    _e.sent();
-                    (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Deployment completed! Log is available at ".concat(path_1.default.join(logFolder, "".concat(deployScriptName.replace('.sas', ''), ".log"))));
-                    return [3 /*break*/, 4];
-                case 3:
-                    (_b = process.logger) === null || _b === void 0 ? void 0 : _b.error('Unable to create log file.');
-                    _e.label = 4;
-                case 4:
+                    _f.sent();
+                    if (completedWithError) {
+                        (_c = process.logger) === null || _c === void 0 ? void 0 : _c.error("Deployment failed with errors! Log is available at ".concat(logFilePath));
+                        throw new Error("Deployment failed.");
+                    }
+                    (_d = process.logger) === null || _d === void 0 ? void 0 : _d.success("Deployment completed! Log is available at ".concat(logFilePath));
                     if (streamConfig === null || streamConfig === void 0 ? void 0 : streamConfig.streamWeb) {
                         appLoc = target.appLoc.replace(/\ /g, '%20');
                         webAppStreamUrl = "".concat(target.serverUrl, "/SASStoredProcess/?_PROGRAM=").concat(appLoc, "/services/").concat(streamConfig.streamServiceName);
-                        (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info("Web app is available at ".concat(webAppStreamUrl));
+                        (_e = process.logger) === null || _e === void 0 ? void 0 : _e.info("Web app is available at ".concat(webAppStreamUrl));
                     }
-                    return [3 /*break*/, 6];
-                case 5:
-                    (_d = process.logger) === null || _d === void 0 ? void 0 : _d.error('Error getting execution log');
-                    _e.label = 6;
-                case 6: return [2 /*return*/];
+                    return [2 /*return*/];
             }
         });
     });

package/build/commands/testing/test.js

@@ -225,13 +225,14 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                                         printTestUrl = function () { return process.logger.info("Test URL: ".concat(testUrl)); };
                                         printTestUrl();
                                         handleRes = function (res) { return __awaiter(_this, void 0, void 0, function () {
-                                            var lineBreak, existingTestTarget, existingTestTarget;
+                                            var lineBreak, test_results, existingTestTarget, existingTestTarget;
                                             var _a, _b;
                                             return __generator(this, function (_c) {
                                                 switch (_c.label) {
                                                     case 0:
                                                         lineBreak = true;
-                                                        if (!res.result) {
+                                                        test_results = (_a = res.result) === null || _a === void 0 ? void 0 : _a.test_results;
+                                                        if (!test_results) {
                                                             (0, displayResult_1.displayError)({}, "Job did not return a response, to debug click ".concat(testUrl));
                                                             printCodeExample();
                                                             lineBreak = false;
@@ -258,8 +259,6 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                                                                 });
                                                             }
                                                         }
-                                                        if (!((_a = res.result) === null || _a === void 0 ? void 0 : _a.test_results))
-                                                            lineBreak = false;
                                                         if (!res.log) return [3 /*break*/, 2];
                                                         return [4 /*yield*/, (0, saveOutput_1.saveLog)(outDirectory, test, res.log, lineBreak)];
                                                     case 1:

package/build/utils/test.d.ts

@@ -1,13 +1,13 @@
 /// <reference types="jest" />
 import { ServerType, Target, TargetJson, Configuration } from '@sasjs/utils/types';
 import { Folder } from '../types';
-import { ServiceConfig } from '@sasjs/utils/types/config';
+import { ServiceConfig, JobConfig } from '@sasjs/utils/types/config';
 export declare const createTestApp: (parentFolder: string, appName: string) => Promise<void>;
 export declare const createTestJobsApp: (parentFolder: string, appName: string) => Promise<void>;
 export declare const createTestMinimalApp: (parentFolder: string, appName: string) => Promise<void>;
 export declare const removeTestApp: (parentFolder: string, appName: string) => Promise<void>;
 export declare const removeTestServerFolder: (folderPath: string, target: Target) => Promise<void>;
-export declare const generateTestTarget: (targetName: string, appLoc: string, serviceConfig?: ServiceConfig, serverType?: ServerType) => Target;
+export declare const generateTestTarget: (targetName: string, appLoc: string, serviceConfig?: ServiceConfig, serverType?: ServerType, jobConfig?: JobConfig) => Target;
 export declare const createTestGlobalTarget: (targetName: string, appLoc: string, serviceConfig?: ServiceConfig, serverType?: ServerType) => Promise<Target>;
 export declare const verifyStep: (step?: 'db' | 'compile' | 'build', buildFileName?: string, customFiles?: 'custom' | 'no') => Promise<void>;
 export declare const mockProcessExit: () => jest.SpyInstance<never, [code?: number | undefined]>;

package/build/utils/test.js

@@ -160,7 +160,7 @@ var removeTestServerFolder = function (folderPath, target) { return __awaiter(vo
     });
 }); };
 exports.removeTestServerFolder = removeTestServerFolder;
-var generateTestTarget = function (targetName, appLoc, serviceConfig, serverType) {
+var generateTestTarget = function (targetName, appLoc, serviceConfig, serverType, jobConfig) {
     if (serviceConfig === void 0) { serviceConfig = {
         serviceFolders: [path_1.default.join('sasjs', 'services')],
         initProgram: '',
@@ -168,6 +168,12 @@ var generateTestTarget = function (targetName, appLoc, serviceConfig, serverType
         macroVars: {}
     }; }
     if (serverType === void 0) { serverType = types_1.ServerType.SasViya; }
+    if (jobConfig === void 0) { jobConfig = {
+        jobFolders: [],
+        initProgram: '',
+        termProgram: '',
+        macroVars: {}
+    }; }
     dotenv_1.default.config();
     var target = new types_1.Target({
         name: targetName,
@@ -183,12 +189,9 @@ var generateTestTarget = function (targetName, appLoc, serviceConfig, serverType
             access_token: process.env.ACCESS_TOKEN,
             refresh_token: process.env.REFRESH_TOKEN
         },
-        jobConfig: {
-            jobFolders: []
-        },
+        jobConfig: jobConfig,
         serviceConfig: serviceConfig,
         testConfig: {
-            testFolders: ['tests'],
             initProgram: path_1.default.join('tests', 'testinit.sas'),
             termProgram: path_1.default.join('tests', 'testterm.sas'),
             macroVars: {

package/package.json

@@ -47,8 +47,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "^3.7.3",
-    "@sasjs/core": "4.9.0",
+    "@sasjs/adapter": "3.7.6",
+    "@sasjs/core": "4.9.3",
     "@sasjs/lint": "1.11.2",
     "@sasjs/utils": "2.36.0",
     "chalk": "4.1.2",
@@ -94,5 +94,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.7.6"
+  "version": "3.7.9"
 }

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

@@ -1,2 +0,0 @@
-import { Target } from '@sasjs/utils';
-export declare function getAllJobFolders(target: Target): Promise<string[]>;

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

@@ -1,2 +0,0 @@
-import { Target } from '@sasjs/utils';
-export declare function getAllServiceFolders(target: Target): Promise<string[]>;

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

@@ -1,91 +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 (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllServiceFolders = void 0;
-var utils_1 = require("@sasjs/utils");
-var config_1 = require("../../../utils/config");
-function getAllServiceFolders(target) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function () {
-        var configuration, allServices, buildSourceFolder;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, (0, config_1.getLocalOrGlobalConfig)()];
-                case 1:
-                    configuration = (_c.sent()).configuration;
-                    allServices = [];
-                    if ((_a = configuration === null || configuration === void 0 ? void 0 : configuration.serviceConfig) === null || _a === void 0 ? void 0 : _a.serviceFolders)
-                        allServices = __spreadArray([], __read(configuration.serviceConfig.serviceFolders), false);
-                    if ((_b = target === null || target === void 0 ? void 0 : target.serviceConfig) === null || _b === void 0 ? void 0 : _b.serviceFolders)
-                        allServices = __spreadArray(__spreadArray([], __read(allServices), false), __read(target.serviceConfig.serviceFolders), false);
-                    allServices = allServices.filter(function (p) { return !!p; });
-                    buildSourceFolder = process.sasjsConstants.buildSourceFolder;
-                    allServices = allServices.map(function (service) {
-                        return (0, utils_1.getAbsolutePath)(service, buildSourceFolder);
-                    });
-                    return [2 /*return*/, __spreadArray([], __read(new Set(allServices)), false)];
-            }
-        });
-    });
-}
-exports.getAllServiceFolders = getAllServiceFolders;