@sasjs/cli 2.38.7 → 3.0.1

package/build/commands/deploy/spec/utils.js

@@ -0,0 +1,242 @@
+"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 __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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateTarget = exports.copyJobsAndServices = exports.updateLocalTarget = exports.createLocalTarget = exports.createGlobalTarget = void 0;
+var utils_1 = require("@sasjs/utils");
+var utils_2 = require("../../../utils");
+var config_1 = require("../../../utils/config");
+var dotenv_1 = __importDefault(require("dotenv"));
+var utils_3 = require("@sasjs/utils");
+var path_1 = __importDefault(require("path"));
+var utils_4 = require("../../../utils");
+var createGlobalTarget = function (serverType) {
+    if (serverType === void 0) { serverType = utils_1.ServerType.SasViya; }
+    return __awaiter(void 0, void 0, void 0, function () {
+        var timestamp, targetName, target;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    dotenv_1.default.config();
+                    timestamp = utils_1.generateTimestamp();
+                    targetName = "cli-tests-cbd-" + timestamp;
+                    return [4 /*yield*/, utils_2.setConstants()];
+                case 1:
+                    _a.sent();
+                    target = new utils_1.Target({
+                        name: targetName,
+                        serverType: serverType,
+                        serverUrl: (serverType === utils_1.ServerType.SasViya
+                            ? process.env.VIYA_SERVER_URL
+                            : process.env.SAS9_SERVER_URL),
+                        appLoc: "/Public/app/cli-tests/" + targetName,
+                        contextName: process.sasjsConstants.contextName,
+                        serviceConfig: {
+                            serviceFolders: ['sasjs/testServices', 'sasjs/testJob'],
+                            initProgram: 'sasjs/testServices/serviceinit.sas',
+                            termProgram: 'sasjs/testServices/serviceterm.sas',
+                            macroVars: {}
+                        },
+                        jobConfig: {
+                            jobFolders: ['sasjs/testJob'],
+                            initProgram: 'sasjs/testServices/serviceinit.sas',
+                            termProgram: 'sasjs/testServices/serviceterm.sas',
+                            macroVars: {}
+                        },
+                        authConfig: {
+                            client: process.env.CLIENT,
+                            secret: process.env.SECRET,
+                            access_token: process.env.ACCESS_TOKEN,
+                            refresh_token: process.env.REFRESH_TOKEN
+                        },
+                        deployConfig: {
+                            deployServicePack: true,
+                            deployScripts: []
+                        }
+                    });
+                    return [4 /*yield*/, config_1.saveToGlobalConfig(target)];
+                case 2:
+                    _a.sent();
+                    return [2 /*return*/, target];
+            }
+        });
+    });
+};
+exports.createGlobalTarget = createGlobalTarget;
+var createLocalTarget = function (serverType) {
+    if (serverType === void 0) { serverType = utils_1.ServerType.SasViya; }
+    return __awaiter(void 0, void 0, void 0, function () {
+        var timestamp, targetName, target, configContent, configJSON;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    dotenv_1.default.config();
+                    timestamp = utils_1.generateTimestamp();
+                    targetName = "cli-tests-cbd-" + timestamp;
+                    target = new utils_1.Target({
+                        name: targetName,
+                        serverType: serverType,
+                        serverUrl: (serverType === utils_1.ServerType.SasViya
+                            ? process.env.VIYA_SERVER_URL
+                            : process.env.SAS9_SERVER_URL),
+                        appLoc: "/Public/app/cli-tests/" + targetName,
+                        contextName: process.sasjsConstants.contextName,
+                        serviceConfig: {
+                            serviceFolders: ['sasjs/testServices', 'sasjs/testJob', 'sasjs/services'],
+                            initProgram: 'sasjs/testServices/serviceinit.sas',
+                            termProgram: 'sasjs/testServices/serviceterm.sas',
+                            macroVars: {}
+                        },
+                        jobConfig: {
+                            jobFolders: ['sasjs/testJob'],
+                            initProgram: 'sasjs/testServices/serviceinit.sas',
+                            termProgram: 'sasjs/testServices/serviceterm.sas',
+                            macroVars: {}
+                        },
+                        deployConfig: {
+                            deployServicePack: true,
+                            deployScripts: []
+                        }
+                    });
+                    return [4 /*yield*/, utils_3.readFile(path_1.default.join(process.projectDir, 'sasjs', 'sasjsconfig.json'))];
+                case 1:
+                    configContent = _a.sent();
+                    configJSON = JSON.parse(configContent);
+                    configJSON.targets = [
+                        __assign(__assign({}, target.toJson()), { deployConfig: {
+                                deployScripts: ['sasjs/build/copyscript.sh'],
+                                deployServicePack: true
+                            } })
+                    ];
+                    return [4 /*yield*/, utils_3.createFile(path_1.default.join(process.projectDir, 'sasjs', 'sasjsconfig.json'), JSON.stringify(configJSON, null, 2))];
+                case 2:
+                    _a.sent();
+                    return [2 /*return*/, target];
+            }
+        });
+    });
+};
+exports.createLocalTarget = createLocalTarget;
+var updateLocalTarget = function (targetName, data) { return __awaiter(void 0, void 0, void 0, function () {
+    var configContent, configJSON, target;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                dotenv_1.default.config();
+                return [4 /*yield*/, utils_3.readFile(path_1.default.join(process.projectDir, 'sasjs', 'sasjsconfig.json'))];
+            case 1:
+                configContent = _b.sent();
+                configJSON = JSON.parse(configContent);
+                target = (_a = configJSON === null || configJSON === void 0 ? void 0 : configJSON.targets) === null || _a === void 0 ? void 0 : _a.find(function (t) { return t.name === targetName; });
+                configJSON.targets = [
+                    __assign(__assign({}, target), data)
+                ];
+                return [4 /*yield*/, utils_3.createFile(path_1.default.join(process.projectDir, 'sasjs', 'sasjsconfig.json'), JSON.stringify(configJSON, null, 2))];
+            case 2:
+                _b.sent();
+                return [2 /*return*/];
+        }
+    });
+}); };
+exports.updateLocalTarget = updateLocalTarget;
+var copyJobsAndServices = function (appName) { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, utils_3.copy(path_1.default.join(__dirname, 'testJob'), path_1.default.join(__dirname, appName, 'sasjs', 'testJob'))];
+            case 1:
+                _a.sent();
+                return [4 /*yield*/, utils_3.copy(path_1.default.join(__dirname, 'testServices'), path_1.default.join(__dirname, appName, 'sasjs', 'testServices'))];
+            case 2:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    });
+}); };
+exports.copyJobsAndServices = copyJobsAndServices;
+var generateTarget = function (isLocal) {
+    dotenv_1.default.config();
+    var timestamp = utils_1.generateTimestamp();
+    var targetName = "cli-tests-cbd-" + timestamp;
+    var authConfig = isLocal
+        ? undefined
+        : {
+            client: process.env.CLIENT,
+            secret: process.env.SECRET,
+            access_token: process.env.ACCESS_TOKEN,
+            refresh_token: process.env.REFRESH_TOKEN
+        };
+    return new utils_1.Target({
+        name: targetName,
+        serverType: utils_1.ServerType.SasViya,
+        serverUrl: process.env.VIYA_SERVER_URL,
+        appLoc: "/Public/app/cli-tests/" + targetName,
+        contextName: utils_4.contextName,
+        serviceConfig: {
+            serviceFolders: ['sasjs/testServices', 'sasjs/testJob', 'sasjs/services'],
+            initProgram: 'sasjs/testServices/serviceinit.sas',
+            termProgram: 'sasjs/testServices/serviceterm.sas',
+            macroVars: {}
+        },
+        jobConfig: {
+            jobFolders: ['sasjs/testJob'],
+            initProgram: 'sasjs/testServices/serviceinit.sas',
+            termProgram: 'sasjs/testServices/serviceterm.sas',
+            macroVars: {}
+        },
+        authConfig: authConfig,
+        deployConfig: {
+            deployServicePack: true,
+            deployScripts: ['']
+        }
+    });
+};
+exports.generateTarget = generateTarget;

package/build/commands/docs/internal/getDocConfig.js

@@ -19,11 +19,13 @@ exports.getDocConfig = void 0;
  * @param {string} outDirectory- the name of the output folder, provided using command.
  */
 function getDocConfig(target, config, outDirectory) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     var buildDestinationDocsFolder = process.sasjsConstants.buildDestinationDocsFolder;
     if (!outDirectory) {
-        outDirectory = ((_a = config === null || config === void 0 ? void 0 : config.docConfig) === null || _a === void 0 ? void 0 : _a.outDirectory) || buildDestinationDocsFolder;
-        outDirectory = ((_b = target === null || target === void 0 ? void 0 : target.docConfig) === null || _b === void 0 ? void 0 : _b.outDirectory) || outDirectory;
+        outDirectory =
+            ((_a = target === null || target === void 0 ? void 0 : target.docConfig) === null || _a === void 0 ? void 0 : _a.outDirectory) ||
+                ((_b = config === null || config === void 0 ? void 0 : config.docConfig) === null || _b === void 0 ? void 0 : _b.outDirectory) ||
+                buildDestinationDocsFolder;
     }
     var serverUrl = '';
     serverUrl = ((_c = config === null || config === void 0 ? void 0 : config.docConfig) === null || _c === void 0 ? void 0 : _c.dataControllerUrl)
@@ -34,6 +36,9 @@ function getDocConfig(target, config, outDirectory) {
         : serverUrl;
     var enableLineage = (_h = (_f = (_e = target === null || target === void 0 ? void 0 : target.docConfig) === null || _e === void 0 ? void 0 : _e.enableLineage) !== null && _f !== void 0 ? _f : (_g = config === null || config === void 0 ? void 0 : config.docConfig) === null || _g === void 0 ? void 0 : _g.enableLineage) !== null && _h !== void 0 ? _h : true;
     var doxyContent = __assign(__assign({}, (_j = config === null || config === void 0 ? void 0 : config.docConfig) === null || _j === void 0 ? void 0 : _j.doxyContent), (_k = target === null || target === void 0 ? void 0 : target.docConfig) === null || _k === void 0 ? void 0 : _k.doxyContent);
+    if ((_l = doxyContent.path) === null || _l === void 0 ? void 0 : _l.startsWith('//')) {
+        throw new Error('UNC paths are not supported.\nPlease map to a network drive, or migrate the project to an existing path (with a drive letter).');
+    }
     return {
         target: target,
         serverUrl: serverUrl,

package/build/commands/docs/spec/generateDot.spec.js

@@ -60,7 +60,6 @@ var types_1 = require("../../../types");
 describe('sasjs doc lineage', function () {
     var appName = "test-app-doc-" + utils_1.generateTimestamp();
     var docOutputDefault = path_1.default.join(__dirname, appName, 'sasjsbuild', 'docs');
-    var doxyContentPath = path_1.default.join(__dirname, appName, 'sasjs', 'doxy');
     var defaultTarget;
     var defaultConfig;
     beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {

package/build/commands/docs/spec/getDocConfig.spec.d.ts

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

package/build/commands/docs/spec/getDocConfig.spec.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var getDocConfig_1 = require("../internal/getDocConfig");
+var UNCErrorMessage = "UNC paths are not supported.\nPlease map to a network drive, or migrate the project to an existing path (with a drive letter).";
+describe('getDocConfig', function () {
+    var sasjsConstants;
+    beforeAll(function () {
+        ;
+        (sasjsConstants = process.sasjsConstants);
+        process.sasjsConstants = {};
+    });
+    afterAll(function () {
+        process.sasjsConstants = sasjsConstants;
+    });
+    it('should throw for having UNC path picked up from target', function () {
+        var target = {
+            docConfig: { doxyContent: { path: '//server1/unc/path' } }
+        };
+        expect(function () { return getDocConfig_1.getDocConfig(target); }).toThrowError(UNCErrorMessage);
+    });
+    it('should throw for having UNC path picked up from config', function () {
+        var config = {
+            docConfig: { doxyContent: { path: '//server1/unc/path' } }
+        };
+        expect(function () { return getDocConfig_1.getDocConfig(undefined, config); }).toThrowError(UNCErrorMessage);
+    });
+});

package/build/commands/flow/flowCommand.js

@@ -125,7 +125,7 @@ var FlowCommand = /** @class */ (function (_super) {
                         target = (_b.sent()).target;
                         sasjs = new node_1.default({
                             serverUrl: target.serverUrl,
-                            allowInsecureRequests: target.allowInsecureRequests,
+                            httpsAgentOptions: target.httpsAgentOptions,
                             appLoc: target.appLoc,
                             serverType: target.serverType
                         });

package/build/commands/flow/spec/flow.spec.server.js

@@ -54,7 +54,7 @@ describe('sasjs flow', function () {
     var target = generateTarget();
     var sasjs = new node_1.default({
         serverUrl: target.serverUrl,
-        allowInsecureRequests: target.allowInsecureRequests,
+        httpsAgentOptions: target.httpsAgentOptions,
         appLoc: target.appLoc,
         serverType: target.serverType
     });

package/build/commands/folder/folderCommand.js

@@ -132,7 +132,7 @@ var FolderCommand = /** @class */ (function (_super) {
                         }
                         sasjs = new node_1.default({
                             serverUrl: target.serverUrl,
-                            allowInsecureRequests: target.allowInsecureRequests,
+                            httpsAgentOptions: target.httpsAgentOptions,
                             appLoc: target.appLoc,
                             serverType: target.serverType
                         });
@@ -259,7 +259,7 @@ var FolderCommand = /** @class */ (function (_super) {
                         }
                         sasjs = new node_1.default({
                             serverUrl: target.serverUrl,
-                            allowInsecureRequests: target.allowInsecureRequests,
+                            httpsAgentOptions: target.httpsAgentOptions,
                             appLoc: target.appLoc,
                             serverType: target.serverType
                         });

package/build/commands/folder/spec/folder.spec.server.js

@@ -52,7 +52,7 @@ describe('sasjs folder operations', function () {
     var target = generateTarget();
     var sasjs = new node_1.default({
         serverUrl: target.serverUrl,
-        allowInsecureRequests: target.allowInsecureRequests,
+        httpsAgentOptions: target.httpsAgentOptions,
         appLoc: target.appLoc,
         serverType: target.serverType
     });

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

@@ -0,0 +1,2 @@
+export * from './viya';
+export * from './sasjs';

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

@@ -0,0 +1,14 @@
+"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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./viya"), exports);
+__exportStar(require("./sasjs"), exports);

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

@@ -0,0 +1,8 @@
+import SASjs from '@sasjs/adapter/node';
+export declare function executeJobSasjs(sasjs: SASjs, jobPath: string, logFile: string | undefined): Promise<{
+    status: string;
+    message: string;
+    log?: string | undefined;
+    logPath?: string | undefined;
+    error?: {} | undefined;
+} | undefined>;

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

@@ -0,0 +1,69 @@
+"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 };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeJobSasjs = void 0;
+var utils_1 = require("../utils");
+function executeJobSasjs(sasjs, jobPath, logFile) {
+    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
+                    })];
+                case 1:
+                    result = _a.sent();
+                    if (!result) return [3 /*break*/, 5];
+                    if (!(result.status === 'success')) return [3 /*break*/, 4];
+                    process.logger.success('Job executed successfully!');
+                    if (!(logFile && result.log)) return [3 /*break*/, 3];
+                    return [4 /*yield*/, utils_1.saveLog(result.log, logFile, jobPath, false)];
+                case 2:
+                    _a.sent();
+                    _a.label = 3;
+                case 3: return [3 /*break*/, 5];
+                case 4:
+                    process.logger.error(result.message);
+                    process.logger.error(JSON.stringify(result.error, null, 2));
+                    _a.label = 5;
+                case 5: return [2 /*return*/, result];
+            }
+        });
+    });
+}
+exports.executeJobSasjs = executeJobSasjs;

package/build/commands/job/{execute.d.ts → internal/execute/viya.d.ts}

@@ -15,5 +15,5 @@ import { Target, AuthConfig } from '@sasjs/utils';
  * @param {string | undefined} source - an optional path to a JSON file containing macro variables.
  * @param {boolean} streamLog - a flag indicating if the logs should be streamed to the supplied log path during job execution. This is useful for getting feedback on long running jobs.
  */
-export declare function execute(sasjs: SASjs, authConfig: AuthConfig, jobPath: string, target: Target, waitForJob: boolean, output: string | boolean, logFile: string | undefined, statusFile: string | undefined, returnStatusOnly: boolean, ignoreWarnings: boolean, source: string | undefined, streamLog: boolean): Promise<any>;
+export declare function executeJobViya(sasjs: SASjs, authConfig: AuthConfig, jobPath: string, target: Target, waitForJob: boolean, output: string | boolean, logFile: string | undefined, statusFile: string | undefined, returnStatusOnly: boolean, ignoreWarnings: boolean, source: string | undefined, streamLog: boolean): Promise<any>;
 export declare function getContextName(target: Target, returnStatusOnly?: boolean): string;