@sasjs/cli 4.3.0 → 4.4.1

package/build/commands/add/addCommand.js

@@ -156,7 +156,7 @@ var AddCommand = /** @class */ (function (_super) {
                             })
                                 .catch(function (err) {
                                 var _a;
-                                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error adding credentials: ', err.toString());
+                                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error adding credentials.', err.toString());
                                 return command_1.ReturnCode.InternalError;
                             })];
                     case 2: return [2 /*return*/, _b.sent()];
@@ -176,7 +176,7 @@ var AddCommand = /** @class */ (function (_super) {
                         })
                             .catch(function (err) {
                             var _a;
-                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error adding target: ', err);
+                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error adding target.', err);
                             return command_1.ReturnCode.InternalError;
                         })];
                     case 1: return [2 /*return*/, _a.sent()];

package/build/commands/add/addCredential.js

@@ -10,29 +10,6 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = 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];
-}));
-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) {
@@ -77,7 +54,7 @@ exports.createEnvFileForSasjs = exports.createEnvFileForSas9 = exports.createEnv
 var path_1 = __importDefault(require("path"));
 var logger_1 = require("@sasjs/utils/logger");
 var types_1 = require("@sasjs/utils/types");
-var node_1 = __importStar(require("@sasjs/adapter/node"));
+var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var auth_1 = require("../../utils/auth");
 var utils_1 = require("../../utils");
 var utils_2 = require("@sasjs/utils");
@@ -123,7 +100,9 @@ var addCredential = function (target, insecure, targetScope) { return __awaiter(
             case 4: return [4 /*yield*/, (0, input_1.getCredentialsInputForViya)(target.name)];
             case 5:
                 _b = _j.sent(), client = _b.client, secret = _b.secret;
-                return [4 /*yield*/, (0, exports.getTokens)(target, client, secret, httpsAgentOptions)];
+                return [4 /*yield*/, (0, exports.getTokens)(target, client, secret, httpsAgentOptions).catch(function (err) {
+                        throw err;
+                    })];
             case 6:
                 _c = _j.sent(), access_token = _c.access_token, refresh_token = _c.refresh_token;
                 if (!(targetScope === targetScope_1.TargetScope.Local)) return [3 /*break*/, 8];
@@ -202,15 +181,8 @@ var getTokens = function (target, client, secret, httpsAgentOptions) { return __
                     httpsAgentOptions: httpsAgentOptions,
                     debug: ((_b = process.logger) === null || _b === void 0 ? void 0 : _b.logLevel) === logger_1.LogLevel.Debug
                 });
-                return [4 /*yield*/, (0, auth_1.getNewAccessToken)(adapter, client, secret, target).catch(function (e) {
-                        var _a;
-                        var errorMessage = "An error has occurred while validating your credentials: ".concat(e);
-                        var checkCredentialsMessage = "Please check your Client ID ".concat(target.serverType === types_1.ServerType.Sasjs ? '' : 'and Client Secret ', "and try again.\n");
-                        var errorMessageToDisplay = e instanceof node_1.CertificateError
-                            ? errorMessage
-                            : "".concat(errorMessage, "\n").concat(checkCredentialsMessage);
-                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error(errorMessageToDisplay);
-                        throw e;
+                return [4 /*yield*/, (0, auth_1.getNewAccessToken)(adapter, client, secret, target).catch(function (err) {
+                        throw err;
                     })];
             case 1:
                 _a = _c.sent(), access_token = _a.access_token, refresh_token = _a.refresh_token;

package/build/commands/add/spec/addCommand.spec.js

@@ -92,6 +92,7 @@ var setConstantsUtils = __importStar(require("../../../utils/setConstants"));
 var utils_1 = require("@sasjs/utils");
 var types_1 = require("../../../types");
 var command_1 = require("../../../types/command");
+var node_1 = require("@sasjs/adapter/node");
 describe('AddCommand', function () {
     var defaultArgs = ['node', 'sasjs'];
     beforeEach(function () {
@@ -252,20 +253,21 @@ describe('AddCommand - cred', function () {
         });
     }); });
     it('should return the error code when execution was unsuccessful', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var args, command, returnCode;
+        var args, loginError, command, returnCode;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['add', 'cred', '-t', 'test'], false);
+                    loginError = new node_1.LoginRequiredError("Error while fetching access token from /SASLogon/oauth/token\nThrown by the @sasjs/adapter getAccessTokenForViya function.\nPayload:\n{\n  \"grant_type\": \"authorization_code\",\n  \"code\": \"hD8O7b7t6i\"\n}\nHeaders:\n{\n  \"Authorization\": \"Basic NEdMQXBwOjRHTEFwcDE=\",\n  \"Accept\": \"application/json\"\n}\nClientId: 4GLApp\nClientSecret: 4GLApp1\n\nResponse from Viya is below.\nAuth error: {\n  \"error\": \"invalid_token\",\n  \"error_description\": \"No scopes were granted\"\n}\nPlease check your Client ID and Client Secret and try again.");
                     jest
                         .spyOn(addCredentialModule, 'addCredential')
-                        .mockImplementation(function () { return Promise.reject(new Error('Test Error')); });
+                        .mockImplementation(function () { return Promise.reject(loginError); });
                     command = new addCommand_1.AddCommand(args);
                     return [4 /*yield*/, command.execute()];
                 case 1:
                     returnCode = _a.sent();
                     expect(returnCode).toEqual(command_1.ReturnCode.InternalError);
-                    expect(process.logger.error).toHaveBeenCalledWith('Error adding credentials: ', new Error('Test Error').toString());
+                    expect(process.logger.error).toHaveBeenCalledWith('Error adding credentials.', loginError.toString());
                     return [2 /*return*/];
             }
         });

package/build/commands/create/spec/angularAppFiles.js

@@ -42,8 +42,7 @@ exports.angularAppFiles = {
                 { fileName: 'index.html' },
                 { fileName: 'main.ts' },
                 { fileName: 'polyfills.ts' },
-                { fileName: 'styles.scss' },
-                { fileName: 'test.ts' }
+                { fileName: 'styles.scss' }
             ],
             subFolders: [
                 {

package/build/commands/deploy/internal/executeDeployScriptSasViya.js

@@ -88,9 +88,7 @@ function executeDeployScriptSasViya(deployScriptName, target, linesToExecute, lo
                             log = executionResult.log;
                         }
                         else if (executionResult.log.items) {
-                            log = executionResult.log.items
-                                .map(function (i) { return i.line; })
-                                .join(os_1.default.EOL);
+                            log = executionResult.log.items.map(function (i) { return i.line; }).join(os_1.default.EOL);
                         }
                         else {
                             log = JSON.stringify(executionResult.log).replace(/\\n/g, os_1.default.EOL);

package/build/commands/request/request.js

@@ -118,13 +118,18 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
-                                        if (!((res && res.errorCode) || res.error)) return [3 /*break*/, 2];
+                                        if (!((res && res.errorCode) || (res && res.error))) return [3 /*break*/, 2];
                                         (0, displayResult_1.displayError)('Request finished with errors.');
                                         return [4 /*yield*/, saveLogFile(sasjs, sasJobLocation, logFile, jobPath)];
                                     case 1:
                                         _a.sent();
                                         return [2 /*return*/];
                                     case 2:
+                                        if (res === undefined) {
+                                            process.logger.warn('WEBOUT is not present in response payload.');
+                                        }
+                                        _a.label = 3;
+                                    case 3:
                                         output = '';
                                         if (res === null || res === void 0 ? void 0 : res.result)
                                             res = res.result;
@@ -146,13 +151,13 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                                         else {
                                             output = res;
                                         }
-                                        if (!!!output) return [3 /*break*/, 4];
+                                        if (!!!output) return [3 /*break*/, 5];
                                         return [4 /*yield*/, writeOutput(outputPathParam, output, sasJobLocation)];
-                                    case 3:
+                                    case 4:
                                         _a.sent();
-                                        _a.label = 4;
-                                    case 4: return [4 /*yield*/, saveLogFile(sasjs, sasJobLocation, logFile, jobPath)];
-                                    case 5:
+                                        _a.label = 5;
+                                    case 5: return [4 /*yield*/, saveLogFile(sasjs, sasJobLocation, logFile, jobPath)];
+                                    case 6:
                                         _a.sent();
                                         result = true;
                                         return [2 /*return*/];

package/build/commands/run/spec/run.spec.server.viya.js

@@ -382,7 +382,7 @@ describe('sasjs run with Viya', function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        logPart = "SASjs Streaming App Created! Check it out here:\n      \n      \n      \n      \n      sas.analytium.co.uk/SASJobExecution?_FILE=".concat(target.appLoc, "/services/clickme.html&_debug=2\n");
+                        logPart = "SASjs Streaming App Created! Check it out here:\n      \n      \n      \n      \n      your-sas-server.com/SASJobExecution?_FILE=".concat(target.appLoc, "/services/clickme.html&_debug=2\n");
                         return [4 /*yield*/, (0, build_1.build)(target)];
                     case 1:
                         _a.sent();

package/build/commands/shared/fetchLogFileContent.d.ts

@@ -1,9 +1,5 @@
 import SASjs from '@sasjs/adapter/node';
-interface LogJson {
-    items: {
-        line: string;
-    }[];
-}
+import { LogJson } from '../../types';
 /**
  * Fetches content of the log file
  * @param {object} sasjs - configuration object of SAS adapter.
@@ -13,4 +9,3 @@ interface LogJson {
  * @returns an object containing log lines in 'items' array.
  */
 export declare const fetchLogFileContent: (sasjs: SASjs, accessToken: string, logUrl: string, logCount: number) => Promise<LogJson>;
-export {};

package/build/types/index.d.ts

@@ -4,3 +4,4 @@ export { Folder } from './folder';
 export { TargetScope } from './targetScope';
 export { TestFlow, Coverage, CoverageType, CoverageState, TestResults, TestResultStatus, TestDescription, TestResult, TestResultDescription, TestResultCsv } from './testing';
 export { Flow, FlowWave, FlowWaveJob } from './flow';
+export * from './log';

package/build/types/index.js

@@ -1,4 +1,18 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = 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];
+}));
+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 });
 exports.TestResultStatus = exports.CoverageState = exports.CoverageType = exports.TargetScope = exports.CommandBase = void 0;
 var commandBase_1 = require("./command/commandBase");
@@ -9,3 +23,4 @@ var testing_1 = require("./testing");
 Object.defineProperty(exports, "CoverageType", { enumerable: true, get: function () { return testing_1.CoverageType; } });
 Object.defineProperty(exports, "CoverageState", { enumerable: true, get: function () { return testing_1.CoverageState; } });
 Object.defineProperty(exports, "TestResultStatus", { enumerable: true, get: function () { return testing_1.TestResultStatus; } });
+__exportStar(require("./log"), exports);

package/build/types/log.d.ts

@@ -0,0 +1,7 @@
+export interface LogLine {
+    line: string;
+}
+export interface LogJson {
+    items: LogLine[];
+    error?: object;
+}

package/build/types/log.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/utils/auth.js

@@ -42,6 +42,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNewAccessToken = exports.refreshTokens = exports.isRefreshTokenExpiring = exports.isAccessTokenExpiring = exports.getAuthCode = exports.getAuthUrl = void 0;
 var utils_1 = require("@sasjs/utils");
 var jwt_decode_1 = __importDefault(require("jwt-decode"));
+var node_1 = require("@sasjs/adapter/node");
 var getAuthUrl = function (serverType, serverUrl, clientId) {
     return serverType === utils_1.ServerType.Sasjs
         ? "".concat(serverUrl, "/#/SASjsLogon?client_id=").concat(clientId, "&response_type=code")
@@ -124,7 +125,16 @@ function getNewAccessToken(sasjsInstance, clientId, clientSecret, target) {
                     return [4 /*yield*/, getAuthCode(authUrl)];
                 case 1:
                     authCode = _b.sent();
-                    return [4 /*yield*/, sasjsInstance.getAccessToken(clientId, clientSecret, authCode)];
+                    return [4 /*yield*/, sasjsInstance
+                            .getAccessToken(clientId, clientSecret, authCode)
+                            .catch(function (err) {
+                            var errorMessage = "An error has occurred while validating your credentials.\n".concat(err);
+                            var checkCredentialsMessage = "Please check your Client ID ".concat(target.serverType === utils_1.ServerType.Sasjs ? '' : 'and Client Secret ', "and try again.\n");
+                            var errorMessageToDisplay = err instanceof node_1.CertificateError
+                                ? errorMessage
+                                : "".concat(errorMessage, "\n").concat(checkCredentialsMessage);
+                            throw errorMessageToDisplay;
+                        })];
                 case 2:
                     _a = _b.sent(), access_token = _a.access_token, refresh_token = _a.refresh_token;
                     return [2 /*return*/, { access_token: access_token, refresh_token: refresh_token }];

package/build/utils/saveLog.d.ts

@@ -1 +1,2 @@
-export declare const saveLog: (logData: any, logFile: string | undefined, jobPath: string, returnStatusOnly: boolean, silent?: boolean) => Promise<void>;
+import { LogJson } from '../types';
+export declare const saveLog: (logData: LogJson | string, logFile: string | undefined, jobPath: string, returnStatusOnly: boolean, silent?: boolean) => Promise<void>;

package/build/utils/saveLog.js

@@ -46,17 +46,18 @@ var _1 = require(".");
 var saveLog = function (logData, logFile, jobPath, returnStatusOnly, silent) {
     if (silent === void 0) { silent = false; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var logPath, folderPath, parentFolderPath, logLines;
+        var error, logPath, folderPath, parentFolderPath, logLines;
         var _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    if (logFile) {
-                        logPath = logFile;
-                    }
-                    else {
-                        logPath = path_1.default.join(process.projectDir, "".concat(jobPath.split(path_1.default.sep).slice(-1).pop(), ".log"));
+                    if (typeof logData !== 'string') {
+                        error = logData.error;
+                        if (error)
+                            throw JSON.stringify(error, null, 2);
                     }
+                    logPath = logFile ||
+                        path_1.default.join(process.projectDir, "".concat(jobPath.split(path_1.default.sep).slice(-1).pop(), ".log"));
                     folderPath = logPath.split(path_1.default.sep);
                     folderPath.pop();
                     parentFolderPath = folderPath.join(path_1.default.sep);

package/build/utils/spec/saveLog.spec.d.ts

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

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

@@ -0,0 +1,88 @@
+"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 (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]) {
+                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 });
+var saveLog_1 = require("../saveLog");
+describe('saveLog', function () {
+    it('should throw an error if there is an error in logData', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var errorObject, expectedError, logData;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    errorObject = {
+                        errorCode: 5737,
+                        message: 'This is the root node of a diagnostic error.',
+                        details: ['Details are available from the nested error objects.'],
+                        errors: [
+                            {
+                                errorCode: 5738,
+                                message: 'The Compute provider for the Job Execution service failed to create job log file "4A3C0C80-87F3-4B44-A94A-68AF37E32521.log".',
+                                details: [
+                                    'Log or listing output could not be streamed to the Files service.'
+                                ],
+                                errors: [
+                                    {
+                                        errorCode: 5208,
+                                        message: 'Log or listing output could not be streamed to the Files service.',
+                                        details: [
+                                            'The file "FileResource1684161631532" cannot be uploaded because it is larger than 100 megabytes.',
+                                            'Files service errorCode=124009 httpStatusCode=400.'
+                                        ],
+                                        links: [],
+                                        version: 2,
+                                        httpStatusCode: 500
+                                    }
+                                ],
+                                links: [],
+                                version: 2,
+                                httpStatusCode: 500
+                            }
+                        ],
+                        links: [],
+                        version: 2,
+                        httpStatusCode: 207
+                    };
+                    expectedError = JSON.stringify(errorObject, null, 2);
+                    logData = { items: [], error: errorObject };
+                    return [4 /*yield*/, expect(function () { return (0, saveLog_1.saveLog)(logData, undefined, '', true); }).rejects.toEqual(expectedError)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});

package/build/utils/utils.d.ts

@@ -1,5 +1,6 @@
 import { Target, MacroVars } from '@sasjs/utils';
 import SASjs from '@sasjs/adapter/node';
+import { LogJson } from '../types';
 export declare function inExistingProject(folderPath: string): Promise<boolean>;
 export declare function diff(a: any[], b: any[]): any[];
 export declare function createReactApp(folderPath: string): Promise<void>;
@@ -16,11 +17,7 @@ export declare function executePowerShellScript(filePath: string, logFilePath: s
  * Extracts plain text job log from fetched json log
  * @param {object} logJson
  */
-export declare function parseLogLines(logJson: {
-    items: {
-        line: string;
-    }[];
-}): string;
+export declare function parseLogLines(logJson: LogJson): string;
 /**
  * Converts MacroVars JSON from command source param to sas statements
  * The JSON must have the following structure:

package/package.json

@@ -50,7 +50,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "4.3.4",
+    "@sasjs/adapter": "4.5.1",
     "@sasjs/core": "4.45.4",
     "@sasjs/lint": "2.3.0",
     "@sasjs/utils": "3.3.0",
@@ -60,7 +60,7 @@
     "esm": "3.2.25",
     "find": "0.3.0",
     "js-base64": "3.7.2",
-    "jsdom": "21.1.0",
+    "jsdom": "22.1.0",
     "jwt-decode": "3.1.2",
     "lodash.groupby": "4.6.0",
     "lodash.uniqby": "4.7.0",
@@ -81,7 +81,7 @@
     "@types/debug": "4.1.7",
     "@types/find": "0.2.1",
     "@types/jest": "29.4.0",
-    "@types/jsdom": "21.1.0",
+    "@types/jsdom": "21.1.1",
     "@types/lodash.groupby": "4.6.6",
     "@types/lodash.uniqby": "4.7.6",
     "@types/node": "18.14.1",
@@ -102,5 +102,5 @@
     "typescript": "4.9.5",
     "util": "0.12.4"
   },
-  "version": "4.3.0"
+  "version": "4.4.1"
 }