@sasjs/cli 3.0.4 → 3.4.0

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

@@ -175,7 +175,7 @@ describe('addTarget', function () {
                         serverType: utils_1.ServerType.Sasjs,
                         name: sasjsTargetName,
                         appLoc: '/Public/app',
-                        serverUrl: process.env.SASJS_SERVER_URL,
+                        serverUrl: process.env.SASJS_SERVER_URL || '',
                         existingTarget: {}
                     };
                     jest
@@ -374,7 +374,7 @@ describe('addTarget', function () {
                         serverType: utils_1.ServerType.Sasjs,
                         name: 'server',
                         appLoc: '/Public/app/new/location/2',
-                        serverUrl: process.env.SASJS_SERVER_URL,
+                        serverUrl: process.env.SASJS_SERVER_URL || '',
                         existingTarget: targetJson
                     };
                     jest

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

@@ -101,8 +101,8 @@ function getPreCodeForServicePack(serverType) {
                             '/* so we provide instead as __program */\n' +
                             '%global __program _program;\n' +
                             '%let _program=%sysfunc(coalescec(&__program,&_program));\n' +
-                            '%macro webout(action,ds,dslabel=,fmt=);\n' +
-                            '%mv_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt)\n' +
+                            '%macro webout(action,ds,dslabel=,fmt=,missing=NULL);\n' +
+                            '%mv_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt,missing=&missing)\n' +
                             '%mend;\n';
                     return [3 /*break*/, 14];
                 case 5:
@@ -119,8 +119,8 @@ function getPreCodeForServicePack(serverType) {
                 case 8:
                     content = _g + _l.sent();
                     content +=
-                        '  %macro webout(action,ds,dslabel=,fmt=);\n' +
-                            '    %mm_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt)\n' +
+                        '  %macro webout(action,ds,dslabel=,fmt=,missing=NULL);\n' +
+                            '    %mm_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt,missing=&missing)\n' +
                             '  %mend;\n';
                     return [3 /*break*/, 14];
                 case 9:
@@ -137,8 +137,8 @@ function getPreCodeForServicePack(serverType) {
                 case 12:
                     content = _k + _l.sent();
                     content +=
-                        '  %macro webout(action,ds,dslabel=,fmt=);\n' +
-                            '    %ms_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt)\n' +
+                        '  %macro webout(action,ds,dslabel=,fmt=,missing=NULL);\n' +
+                            '    %ms_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt,missing=&missing)\n' +
                             '  %mend;\n';
                     return [3 /*break*/, 14];
                 case 13: throw new error_1.ServerTypeError();

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

@@ -119,8 +119,8 @@ describe('sasjs cbd with server type SASJS', function () {
                     return [4 /*yield*/, utils_1.readFile(macroCorePath + "/server/ms_webout.sas")];
                 case 7:
                     ms_webout = _a.sent();
-                    webout = '  %macro webout(action,ds,dslabel=,fmt=);\n' +
-                        '    %ms_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt)\n' +
+                    webout = '  %macro webout(action,ds,dslabel=,fmt=,missing=NULL);\n' +
+                        '    %ms_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt,missing=&missing)\n' +
                         '  %mend;\n';
                     expect(sasjs.deployToSASjs).toHaveBeenCalledWith({
                         members: [

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

@@ -170,12 +170,6 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
                     if (!result)
                         result = true;
                     sessionLink = submittedJob.links.find(function (l) { return l.method === 'GET' && l.rel === 'self'; }).href;
-                    if (!returnStatusOnly) {
-                        displayResult_1.displaySuccess((waitForJob
-                            ? "Job located at '" + jobPath + "' has been executed.\nJob details"
-                            : "Job session") +
-                            (" can be found at " + (target.serverUrl + sessionLink)));
-                    }
                     if (!(output || logFile)) return [3 /*break*/, 20];
                     _c.label = 9;
                 case 9:

package/build/commands/job/internal/utils.js

@@ -46,9 +46,8 @@ var utils_2 = require("../../../utils/utils");
 var displayResult_1 = require("../../../utils/displayResult");
 var saveLog = function (logData, logFile, jobPath, returnStatusOnly) { return __awaiter(void 0, void 0, void 0, function () {
     var logPath, folderPath, parentFolderPath, logLines;
-    var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    return __generator(this, function (_a) {
+        switch (_a.label) {
             case 0:
                 if (logFile) {
                     logPath = logFile;
@@ -61,17 +60,16 @@ var saveLog = function (logData, logFile, jobPath, returnStatusOnly) { return __
                 parentFolderPath = folderPath.join(path_1.default.sep);
                 return [4 /*yield*/, utils_1.folderExists(parentFolderPath)];
             case 1:
-                if (!!(_b.sent())) return [3 /*break*/, 3];
+                if (!!(_a.sent())) return [3 /*break*/, 3];
                 return [4 /*yield*/, utils_1.createFolder(parentFolderPath)];
             case 2:
-                _b.sent();
-                _b.label = 3;
+                _a.sent();
+                _a.label = 3;
             case 3:
                 logLines = typeof logData === 'object' ? utils_2.parseLogLines(logData) : logData;
-                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Creating log file at " + logPath + " .");
                 return [4 /*yield*/, utils_1.createFile(logPath, logLines)];
             case 4:
-                _b.sent();
+                _a.sent();
                 if (!returnStatusOnly)
                     displayResult_1.displaySuccess("Log saved to " + logPath);
                 return [2 /*return*/];

package/build/commands/job/jobCommand.d.ts

@@ -3,6 +3,7 @@ import { AuthConfig, Target } from '@sasjs/utils';
 import { ReturnCode } from '../../types/command';
 import { TargetCommand } from '../../types/command/targetCommand';
 export declare class JobCommand extends TargetCommand {
+    private jobSubCommands;
     constructor(args: string[]);
     execute(): Promise<ReturnCode>;
     executeJobSasjs(sasjs: SASjs, target: Target): Promise<ReturnCode>;

package/build/commands/job/jobCommand.js

@@ -66,6 +66,7 @@ var execute_1 = require("./internal/execute");
 var JobSubCommand;
 (function (JobSubCommand) {
     JobSubCommand["Execute"] = "execute";
+    JobSubCommand["Exec"] = "exec";
 })(JobSubCommand || (JobSubCommand = {}));
 var syntax = 'job <subCommand> <jobPath> [options]';
 var usage = 'sasjs job <execute> <jobPath> [options]';
@@ -123,8 +124,11 @@ var JobCommand = /** @class */ (function (_super) {
     __extends(JobCommand, _super);
     function JobCommand(args) {
         var _this = this;
+        var jobSubCommands = Object.values(JobSubCommand);
         var subCommand = args[3];
-        var parseOptions = subCommand === JobSubCommand.Execute ? executeParseOptions : {};
+        var parseOptions = jobSubCommands.includes(subCommand)
+            ? executeParseOptions
+            : {};
         _this = _super.call(this, args, {
             parseOptions: parseOptions,
             usage: usage,
@@ -132,6 +136,7 @@ var JobCommand = /** @class */ (function (_super) {
             examples: examples,
             syntax: syntax
         }) || this;
+        _this.jobSubCommands = jobSubCommands;
         return _this;
     }
     JobCommand.prototype.execute = function () {
@@ -166,7 +171,7 @@ var JobCommand = /** @class */ (function (_super) {
                         authConfig = _e.sent();
                         if (!authConfig)
                             return [2 /*return*/, command_1.ReturnCode.InternalError];
-                        if (!(this.parsed.subCommand === JobSubCommand.Execute)) return [3 /*break*/, 5];
+                        if (!this.jobSubCommands.includes(this.parsed.subCommand)) return [3 /*break*/, 5];
                         return [4 /*yield*/, this.executeJobViya(target, sasjs, authConfig)];
                     case 4:
                         _c = _e.sent();
@@ -182,7 +187,7 @@ var JobCommand = /** @class */ (function (_super) {
                         });
                         if (typeof this.parsed.jobPath !== 'string')
                             return [2 /*return*/, command_1.ReturnCode.InvalidCommand];
-                        if (!(this.parsed.subCommand === JobSubCommand.Execute)) return [3 /*break*/, 9];
+                        if (!this.jobSubCommands.includes(this.parsed.subCommand)) return [3 /*break*/, 9];
                         return [4 /*yield*/, this.executeJobSasjs(sasjs, target)];
                     case 8:
                         _d = _e.sent();

package/build/commands/job/spec/jobCommand.spec.js

@@ -362,17 +362,24 @@ var executeCalledWith = function (_a) {
 var executeCommandWrapper = function (additionalParams, checkTarget) {
     if (checkTarget === void 0) { checkTarget = true; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var args, command, returnCode, targetInfo;
+        var subCommand, args, command, returnCode, targetInfo;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    args = __spreadArray(__spreadArray([], __read(defaultArgs)), __read(additionalParams));
+                    subCommand = 'execute';
+                    args = __spreadArray(__spreadArray([], __read(defaultArgs)), __read(additionalParams)).map(function (arg) {
+                        if (arg === 'execute') {
+                            arg = Math.random() > 0.5 ? 'exec' : arg;
+                            subCommand = arg;
+                        }
+                        return arg;
+                    });
                     command = new jobCommand_1.JobCommand(args);
                     return [4 /*yield*/, command.execute()];
                 case 1:
                     returnCode = _a.sent();
                     expect(command.name).toEqual('job');
-                    expect(command.subCommand).toEqual('execute');
+                    expect(command.subCommand).toEqual(subCommand);
                     if (!checkTarget) return [3 /*break*/, 3];
                     return [4 /*yield*/, command.getTargetInfo()];
                 case 2:

package/build/commands/shared/fetchLogFileContent.js

@@ -68,28 +68,26 @@ exports.fetchLogFileContent = void 0;
  */
 var fetchLogFileContent = function (sasjs, accessToken, logUrl, logCount) { return __awaiter(void 0, void 0, void 0, function () {
     var logJson, loglimit, start, logChunkJson, _a, _b;
-    var _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 logJson = { items: [] };
                 loglimit = logCount < 10000 ? logCount : 10000;
                 start = 0;
-                _d.label = 1;
+                _c.label = 1;
             case 1:
-                (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info("Fetching logs from line no: " + (start + 1) + " to " + (start + loglimit) + " of " + logCount + ".");
                 _b = (_a = JSON).parse;
                 return [4 /*yield*/, sasjs.fetchLogFileContent(logUrl + "?start=" + start + "&limit=" + loglimit, accessToken)];
             case 2:
-                logChunkJson = _b.apply(_a, [(_d.sent())]);
+                logChunkJson = _b.apply(_a, [(_c.sent())]);
                 if (logChunkJson.items.length === 0)
                     return [3 /*break*/, 4];
                 logJson.items = __spreadArray(__spreadArray([], __read(logJson.items)), __read(logChunkJson.items));
                 start += loglimit;
-                _d.label = 3;
+                _c.label = 3;
             case 3:
                 if (start < logCount) return [3 /*break*/, 1];
-                _d.label = 4;
+                _c.label = 4;
             case 4: return [2 /*return*/, logJson];
         }
     });

package/build/commands/testing/internal/saveOutput.d.ts

@@ -6,3 +6,4 @@ export declare const saveResultCsv: (outDirectory: string, result: TestResults,
     csvPath: string;
 }>;
 export declare const saveResultXml: (outDirectory: string, result: TestResults) => Promise<string>;
+export declare const saveCoverageLcov: (outDirectory: string, tests: string[]) => Promise<string>;

package/build/commands/testing/internal/saveOutput.js

@@ -60,7 +60,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.saveResultXml = exports.saveResultCsv = exports.saveResultJson = exports.saveLog = void 0;
+exports.saveCoverageLcov = exports.saveResultXml = exports.saveResultCsv = exports.saveResultJson = exports.saveLog = void 0;
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
 var file_1 = require("../../../utils/file");
@@ -262,3 +262,43 @@ var saveResultXml = function (outDirectory, result) { return __awaiter(void 0, v
     });
 }); };
 exports.saveResultXml = saveResultXml;
+var saveCoverageLcov = function (outDirectory, tests) { return __awaiter(void 0, void 0, void 0, function () {
+    var testsPrefixRegExp, coverageReport, coveringFile, filePath;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                testsPrefixRegExp = new RegExp("^tests/");
+                coverageReport = [];
+                coveringFile = function (filePath) { return __awaiter(void 0, void 0, void 0, function () {
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0: return [4 /*yield*/, utils_1.fileExists(path_1.default.join(process.sasjsConstants.buildDestinationFolder, filePath))];
+                            case 1: return [2 /*return*/, (_a.sent())
+                                    ? filePath
+                                    : 'standalone'];
+                        }
+                    });
+                }); };
+                return [4 /*yield*/, utils_1.asyncForEach(tests, function (test) { return __awaiter(void 0, void 0, void 0, function () {
+                        var _a, _b, _c;
+                        return __generator(this, function (_d) {
+                            switch (_d.label) {
+                                case 0:
+                                    _b = (_a = coverageReport).push;
+                                    _c = "TN:" + test.split('/').pop() + "\nSF:";
+                                    return [4 /*yield*/, coveringFile(test.replace(testsPrefixRegExp, '').replace(utils_1.testFileRegExp, '.sas'))];
+                                case 1: return [2 /*return*/, _b.apply(_a, [_c + (_d.sent()) + "\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record"])];
+                            }
+                        });
+                    }); })];
+            case 1:
+                _a.sent();
+                filePath = path_1.default.join(outDirectory, 'coverage.lcov');
+                return [4 /*yield*/, utils_1.createFile(filePath, coverageReport.join('\n'))];
+            case 2:
+                _a.sent();
+                return [2 /*return*/, filePath];
+        }
+    });
+}); };
+exports.saveCoverageLcov = saveCoverageLcov;

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

@@ -99,7 +99,7 @@ describe('sasjs test', function () {
         });
     }); });
     it('should execute tests and create result CSV, XML and JSON files using default source and output locations', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var expectedResultsJson, expectedResultsCsv, resultsFolderPath, resultsJsonPath, resultsJson, resultsCsvPath, parsedResults, resultsCsv, resultsXmlPath, resultsXml, expectedResultsXml;
+        var expectedResultsJson, expectedResultsCsv, resultsFolderPath, resultsJsonPath, resultsJson, resultsCsvPath, parsedResults, resultsCsv, resultsXmlPath, resultsXml, expectedResultsXml, coverageLcovPath, expectedCoverageLcov, coverageLcov;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -232,6 +232,15 @@ describe('sasjs test', function () {
                     resultsXml = resultsXml.replace(/testsuites id="[^ ]*"/gm, "testsuites id=\"\"");
                     resultsXml = resultsXml.replace(/testcase id="[^ ]*"/gm, "testcase id=\"\"");
                     expect(resultsXml).toEqual(expectedResultsXml);
+                    coverageLcovPath = path_1.default.join(resultsFolderPath, 'coverage.lcov');
+                    return [4 /*yield*/, expect(utils_1.fileExists(coverageLcovPath)).resolves.toEqual(true)];
+                case 9:
+                    _a.sent();
+                    expectedCoverageLcov = "TN:testsetup.sas\nSF:standalone\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:exampleprogram.test.sas\nSF:jobs/jobs/exampleprogram.sas\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:standalone.test.sas\nSF:standalone\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:examplemacro.test.sas\nSF:standalone\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:shouldFail.test.sas\nSF:standalone\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:dostuff.test.0.sas\nSF:services/admin/dostuff.sas\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:dostuff.test.1.sas\nSF:services/admin/dostuff.sas\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:testteardown.sas\nSF:standalone\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record";
+                    return [4 /*yield*/, utils_1.readFile(coverageLcovPath)];
+                case 10:
+                    coverageLcov = _a.sent();
+                    expect(coverageLcov).toEqual(expectedCoverageLcov);
                     return [2 /*return*/];
             }
         });

package/build/commands/testing/test.js

@@ -86,7 +86,7 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
     var _a, _b;
     if (testRegExps === void 0) { testRegExps = []; }
     return __awaiter(this, void 0, void 0, function () {
-        var testFlowData, testFlow, flow, sasjs, authConfig, username, password, sas9CredentialsError, result, isCodeExamplePrinted, printCodeExample, jsonPath, xmlPath, _c, csvData, csvPath, resultTable, testsCount, passedTestsCount, testsWithResultsCount;
+        var testFlowData, testFlow, flow, sasjs, authConfig, username, password, sas9CredentialsError, result, isCodeExamplePrinted, printCodeExample, jsonPath, xmlPath, _c, csvData, csvPath, coverageReportPath, resultTable, testsCount, passedTestsCount, testsWithResultsCount;
         var _this = this;
         return __generator(this, function (_d) {
             switch (_d.label) {
@@ -205,6 +205,7 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                                             testUrl = testUrl + "&_contextName=" + encodeURIComponent(target.contextName);
                                         }
                                         printTestUrl = function () { return process.logger.info("Test URL: " + testUrl); };
+                                        printTestUrl();
                                         return [4 /*yield*/, sasjs
                                                 .request(sasJobLocation, {}, { username: username, password: password }, function () {
                                                 displayResult_1.displayError(null, 'Login callback called. Request failed.');
@@ -247,7 +248,6 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                                                             }
                                                             if (!((_a = res.result) === null || _a === void 0 ? void 0 : _a.test_results))
                                                                 lineBreak = false;
-                                                            printTestUrl();
                                                             if (!res.log) return [3 /*break*/, 2];
                                                             return [4 /*yield*/, saveOutput_1.saveLog(outDirectory, test, res.log, lineBreak)];
                                                         case 1:
@@ -328,6 +328,9 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                     return [4 /*yield*/, saveOutput_1.saveResultCsv(outDirectory, result)];
                 case 7:
                     _c = _d.sent(), csvData = _c.csvData, csvPath = _c.csvPath;
+                    return [4 /*yield*/, saveOutput_1.saveCoverageLcov(outDirectory, flow)];
+                case 8:
+                    coverageReportPath = _d.sent();
                     resultTable = {};
                     if (Array.isArray(csvData)) {
                         csvData.forEach(function (item) {
@@ -353,6 +356,7 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                     testsWithResultsCount = Object.values(resultTable).filter(function (res) { return res.test_suite_result !== types_1.TestResultStatus.notProvided; }).length;
                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Tests provided results: " + (testsWithResultsCount + '/' + testsCount) + " (" + chalk_1.default.greenBright(Math.round((testsWithResultsCount / testsCount) * 100 || 0) + '%') + ")\n  Tests that pass: " + (passedTestsCount + '/' + testsWithResultsCount) + " (" + chalk_1.default.greenBright(Math.round((passedTestsCount / testsWithResultsCount) * 100 || 0) + '%') + ")\n  ");
                     displayResult_1.displaySuccess("Tests execution finished. The results are stored at:\n  " + jsonPath + "\n  " + csvPath + "\n  " + xmlPath);
+                    displayResult_1.displaySuccess("Tests coverage report:\n  " + coverageReportPath);
                     return [2 /*return*/];
             }
         });

package/build/utils/utils.js

@@ -186,11 +186,7 @@ function createApp(folderPath, repoUrl, installDependencies) {
     if (installDependencies === void 0) { installDependencies = true; }
     var spinner = ora_1.default("Creating SASjs project in " + folderPath + ".");
     spinner.start();
-    var gitBranch = repoUrl.includes('template_sasonly')
-        ? 'master'
-        : repoUrl.includes('template_jobs')
-            ? 'master'
-            : 'main';
+    var gitBranch = repoUrl.includes('template_sasonly') ? 'master' : 'main';
     shelljs_1.default.exec("cd \"" + folderPath + "\" && git clone --depth 1 -b " + gitBranch + " " + repoUrl + " .", { silent: true });
     shelljs_1.default.rm('-rf', path_1.default.join(folderPath, '.git'));
     spinner.stop();

package/package.json

@@ -49,8 +49,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "3.0.0",
-    "@sasjs/core": "2.54.1",
+    "@sasjs/adapter": "3.3.0",
+    "@sasjs/core": "^3.8.0",
     "@sasjs/lint": "1.11.2",
     "@sasjs/utils": "2.34.1",
     "chalk": "4.1.2",
@@ -97,5 +97,5 @@
     "typescript": "4.3.5",
     "util": "0.12.4"
   },
-  "version": "3.0.4"
+  "version": "3.4.0"
 }