@sasjs/cli 3.28.0 → 4.0.1

package/build/utils/saveLog.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/build/utils/setConstants.d.ts

@@ -1,2 +1,4 @@
+import { Target } from '@sasjs/utils';
 export declare const contextName = "sasjs cli compute context";
 export declare const setConstants: () => Promise<void>;
+export declare const updateSasjsConstants: (target: Target, isLocal: boolean) => void;

package/build/utils/setConstants.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -39,7 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setConstants = exports.contextName = void 0;
+exports.updateSasjsConstants = exports.setConstants = exports.contextName = void 0;
 var path_1 = __importDefault(require("path"));
 var config_1 = require("./config");
 var utils_1 = require("./utils");
@@ -47,18 +47,17 @@ var utils_2 = require("@sasjs/utils");
 exports.contextName = 'sasjs cli compute context';
 var setConstants = function () { return __awaiter(void 0, void 0, void 0, function () {
     var _a, configuration, isLocal, buildOutputFolder, buildResultsFolder, homeDir, buildSourceFolder, buildSourceDbFolder, buildDestinationFolder, buildDestinationServicesFolder, buildDestinationTestFolder, buildDestinationJobsFolder, buildDestinationDbFolder, buildDestinationDocsFolder, macroCorePath, buildDestinationResultsFolder, buildDestinationResultsLogsFolder, sas9CredentialsError, invalidSasError, sas9GUID;
-    var _b, _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0: return [4 /*yield*/, (0, config_1.getLocalOrGlobalConfig)().catch(function () { return ({
                     configuration: null,
                     isLocal: false
                 }); })];
             case 1:
-                _a = _d.sent(), configuration = _a.configuration, isLocal = _a.isLocal;
-                buildOutputFolder = ((_b = configuration === null || configuration === void 0 ? void 0 : configuration.buildConfig) === null || _b === void 0 ? void 0 : _b.buildOutputFolder) ||
+                _a = _b.sent(), configuration = _a.configuration, isLocal = _a.isLocal;
+                buildOutputFolder = (configuration === null || configuration === void 0 ? void 0 : configuration.sasjsBuildFolder) ||
                     (isLocal ? 'sasjsbuild' : '.sasjs/sasjsbuild');
-                buildResultsFolder = ((_c = configuration === null || configuration === void 0 ? void 0 : configuration.buildConfig) === null || _c === void 0 ? void 0 : _c.buildResultsFolder) ||
+                buildResultsFolder = (configuration === null || configuration === void 0 ? void 0 : configuration.sasjsResultsFolder) ||
                     (isLocal ? 'sasjsresults' : '.sasjs/sasjsresults');
                 homeDir = require('os').homedir();
                 buildSourceFolder = path_1.default.join(isLocal ? process.projectDir : homeDir);
@@ -71,7 +70,7 @@ var setConstants = function () { return __awaiter(void 0, void 0, void 0, functi
                 buildDestinationDocsFolder = path_1.default.join(buildDestinationFolder, 'docs');
                 return [4 /*yield*/, (0, utils_1.getNodeModulePath)('@sasjs/core')];
             case 2:
-                macroCorePath = _d.sent();
+                macroCorePath = _b.sent();
                 buildDestinationResultsFolder = (0, utils_2.getAbsolutePath)(buildResultsFolder, isLocal ? process.projectDir : homeDir);
                 buildDestinationResultsLogsFolder = path_1.default.join(buildDestinationResultsFolder, 'logs');
                 sas9CredentialsError = 'The following attributes were not found:' +
@@ -102,3 +101,24 @@ var setConstants = function () { return __awaiter(void 0, void 0, void 0, functi
     });
 }); };
 exports.setConstants = setConstants;
+var updateSasjsConstants = function (target, isLocal) {
+    var homeDir = require('os').homedir();
+    if (target.sasjsBuildFolder) {
+        var buildOutputFolder = target.sasjsBuildFolder;
+        var buildDestinationFolder = (0, utils_2.getAbsolutePath)(buildOutputFolder, isLocal ? process.projectDir : homeDir);
+        process.sasjsConstants.buildDestinationFolder = buildDestinationFolder;
+        process.sasjsConstants.buildDestinationServicesFolder = path_1.default.join(buildDestinationFolder, 'services');
+        process.sasjsConstants.buildDestinationTestFolder = path_1.default.join(buildDestinationFolder, 'tests');
+        process.sasjsConstants.buildDestinationJobsFolder = path_1.default.join(buildDestinationFolder, 'jobs');
+        process.sasjsConstants.buildDestinationDbFolder = path_1.default.join(buildDestinationFolder, 'db');
+        process.sasjsConstants.buildDestinationDocsFolder = path_1.default.join(buildDestinationFolder, 'docs');
+    }
+    if (target.sasjsResultsFolder) {
+        var buildResultsFolder = target.sasjsResultsFolder;
+        var buildDestinationResultsFolder = (0, utils_2.getAbsolutePath)(buildResultsFolder, isLocal ? process.projectDir : homeDir);
+        process.sasjsConstants.buildDestinationResultsFolder =
+            buildDestinationResultsFolder;
+        process.sasjsConstants.buildDestinationResultsLogsFolder = path_1.default.join(buildDestinationResultsFolder, 'logs');
+    }
+};
+exports.updateSasjsConstants = updateSasjsConstants;

package/build/utils/setProjectDir.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/build/utils/spec/config.spec.js

@@ -1,7 +1,11 @@
 "use strict";
 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]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -33,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/build/utils/spec/file.spec.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/build/utils/spec/setConstants.spec.js

@@ -1,7 +1,11 @@
 "use strict";
 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]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -33,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/build/utils/spec/utils.spec.js

@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -82,8 +82,7 @@ describe('utils', function () {
     });
     describe('millisecondsToDdHhMmSs', function () {
         it('should throw an error if not supported type was provided', function () {
-            var error = new Error('Not supported attribute type.');
-            expect(function () { return (0, utils_1.millisecondsToDdHhMmSs)(undefined); }).toThrow(error);
+            expect(function () { return (0, utils_1.millisecondsToDdHhMmSs)(undefined); }).toThrow('Not supported attribute type.');
         });
         it('should process negative number', function () {
             expect((0, utils_1.millisecondsToDdHhMmSs)(-1000)).toEqual('0 day(s); 0 hour(s); 0 minute(s); 1 second(s)');

package/build/utils/test.d.ts

@@ -10,7 +10,7 @@ export declare const removeTestServerFolder: (folderPath: string, target: 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]>;
+export declare const mockProcessExit: () => jest.SpyInstance<never, [code?: number | undefined], any>;
 export declare const verifyFolder: (folder: Folder, parentFolderName?: string) => Promise<boolean>;
 export declare const verifyPackageJsonContent: (parentFolderName?: string) => Promise<void>;
 export declare const removeAllTargetsFromConfigs: () => Promise<void>;

package/build/utils/test.js

@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/build/utils/utils.js

@@ -29,7 +29,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/package.json

@@ -53,14 +53,14 @@
     "@sasjs/adapter": "4.1.3",
     "@sasjs/core": "4.45.4",
     "@sasjs/lint": "2.2.2",
-    "@sasjs/utils": "3.0.1",
+    "@sasjs/utils": "3.1.0",
     "adm-zip": "0.5.9",
     "chalk": "4.1.2",
     "dotenv": "10.0.0",
     "esm": "3.2.25",
     "find": "0.3.0",
     "js-base64": "3.7.2",
-    "jsdom": "19.0.0",
+    "jsdom": "21.1.0",
     "jwt-decode": "3.1.2",
     "lodash.groupby": "4.6.0",
     "lodash.uniqby": "4.7.0",
@@ -74,31 +74,33 @@
     "yargs": "17.6.2"
   },
   "devDependencies": {
-    "@babel/preset-env": "7.15.6",
-    "@babel/preset-typescript": "7.15.0",
+    "@babel/core": "7.21.0",
+    "@babel/preset-env": "7.20.2",
+    "@babel/preset-typescript": "7.21.0",
     "@types/adm-zip": "0.5.0",
     "@types/debug": "4.1.7",
     "@types/find": "0.2.1",
-    "@types/jest": "27.0.2",
-    "@types/jsdom": "16.2.15",
+    "@types/jest": "29.4.0",
+    "@types/jsdom": "21.1.0",
     "@types/lodash.groupby": "4.6.6",
     "@types/lodash.uniqby": "4.7.6",
-    "@types/node": "17.0.8",
+    "@types/node": "18.14.1",
     "@types/shelljs": "0.8.9",
     "@types/url-parse": "1.4.4",
     "@types/xml": "1.0.6",
-    "babel-jest": "27.4.6",
+    "babel-jest": "29.4.3",
     "copyfiles": "2.4.1",
-    "jest": "27.4.7",
-    "jest-cli": "27.4.7",
-    "jest-extended": "1.1.0",
+    "jest": "29.4.3",
+    "jest-cli": "29.4.3",
+    "jest-environment-jsdom": "29.4.3",
+    "jest-extended": "3.2.4",
     "nodemon": "2.0.19",
     "prettier": "2.6.2",
-    "ts-jest": "27.1.2",
+    "ts-jest": "29.0.5",
     "ts-node": "10.4.0",
     "tslib": "2.3.1",
-    "typescript": "4.5.4",
+    "typescript": "4.9.5",
     "util": "0.12.4"
   },
-  "version": "3.28.0"
+  "version": "4.0.1"
 }