@sasjs/cli 3.7.7 → 3.8.0

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.4",
-    "@sasjs/core": "4.9.2",
+    "@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.7"
+  "version": "3.8.0"
 }

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;