@sasjs/cli 3.12.1 → 3.12.4

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

@@ -82,6 +82,7 @@ describe('addTarget', function () {
     var viyaTargetName = "test-viya-".concat((0, utils_1.generateTimestamp)());
     var sas9TargetName = "test-sas9-".concat((0, utils_1.generateTimestamp)());
     var sasjsTargetName = "test-server-".concat((0, utils_1.generateTimestamp)());
+    var serverUrl = process.env.VIYA_SERVER_URL || '';
     var globalTestTarget;
     beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -138,7 +139,7 @@ describe('addTarget', function () {
                         serverType: utils_1.ServerType.SasViya,
                         name: viyaTargetName,
                         appLoc: '/Public/app',
-                        serverUrl: process.env.VIYA_SERVER_URL,
+                        serverUrl: serverUrl,
                         existingTarget: {}
                     };
                     jest
@@ -175,7 +176,7 @@ describe('addTarget', function () {
                         serverType: utils_1.ServerType.Sasjs,
                         name: sasjsTargetName,
                         appLoc: '/Public/app',
-                        serverUrl: process.env.SASJS_SERVER_URL || '',
+                        serverUrl: serverUrl,
                         existingTarget: {}
                     };
                     jest
@@ -211,7 +212,7 @@ describe('addTarget', function () {
                         serverType: utils_1.ServerType.Sas9,
                         name: sas9TargetName,
                         appLoc: '/Public/app',
-                        serverUrl: process.env.SAS9_SERVER_URL,
+                        serverUrl: serverUrl,
                         existingTarget: {}
                     };
                     jest
@@ -248,7 +249,7 @@ describe('addTarget', function () {
                         serverType: utils_1.ServerType.SasViya,
                         name: viyaTargetName,
                         appLoc: '/Public/app',
-                        serverUrl: process.env.VIYA_SERVER_URL,
+                        serverUrl: serverUrl,
                         existingTarget: {}
                     };
                     jest
@@ -285,12 +286,13 @@ describe('addTarget', function () {
                 case 1:
                     config = _a.sent();
                     targetJson = (config.targets || []).find(function (t) { return t.name === 'viya'; });
+                    targetJson.streamConfig.streamWeb = false;
                     commonFields = {
                         scope: targetScope_1.TargetScope.Local,
                         serverType: utils_1.ServerType.SasViya,
                         name: 'viya',
                         appLoc: '/Public/app/new/location',
-                        serverUrl: process.env.VIYA_SERVER_URL,
+                        serverUrl: serverUrl,
                         existingTarget: targetJson
                     };
                     jest
@@ -332,7 +334,7 @@ describe('addTarget', function () {
                         serverType: utils_1.ServerType.Sas9,
                         name: 'sas9',
                         appLoc: '/Public/app/new/location/2',
-                        serverUrl: process.env.VIYA_SERVER_URL,
+                        serverUrl: serverUrl,
                         existingTarget: target
                     };
                     jest
@@ -374,7 +376,7 @@ describe('addTarget', function () {
                         serverType: utils_1.ServerType.Sasjs,
                         name: 'server',
                         appLoc: '/Public/app/new/location/2',
-                        serverUrl: process.env.SASJS_SERVER_URL || '',
+                        serverUrl: serverUrl,
                         existingTarget: targetJson
                     };
                     jest
@@ -410,7 +412,7 @@ describe('addTarget', function () {
                         serverType: globalTestTarget.serverType,
                         name: globalTestTarget.name,
                         appLoc: '/Public/app/new/location/3',
-                        serverUrl: process.env.VIYA_SERVER_URL,
+                        serverUrl: serverUrl,
                         existingTarget: globalTestTarget
                     };
                     jest

package/build/commands/compile/compile.js

@@ -324,6 +324,7 @@ function recreateBuildFolder() {
         });
     });
 }
+// REFACTOR: combine compileServiceFolder and compileJobFolder
 var compileServiceFolder = function (target, serviceFolder, macroFolders, programFolders, compileTree) { return __awaiter(void 0, void 0, void 0, function () {
     var destinationPath, subFolders, filesNamesInPath;
     return __generator(this, function (_a) {
@@ -333,9 +334,30 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                 return [4 /*yield*/, (0, utils_1.listSubFoldersInFolder)(destinationPath)];
             case 1:
                 subFolders = _a.sent();
-                return [4 /*yield*/, (0, utils_1.listFilesInFolder)(destinationPath)];
+                return [4 /*yield*/, (0, utils_1.listFilesInFolder)(destinationPath)
+                    // Checks if file in sasjsbuild folder exists in source folder.
+                    // If not, it means that the file shouldn't be compiled.
+                ];
             case 2:
                 filesNamesInPath = _a.sent();
+                // Checks if file in sasjsbuild folder exists in source folder.
+                // If not, it means that the file shouldn't be compiled.
+                return [4 /*yield*/, (0, utils_1.asyncForEach)(filesNamesInPath, function (fileName, i) { return __awaiter(void 0, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, (0, utils_1.fileExists)(path_1.default.join(serviceFolder, fileName))];
+                                case 1:
+                                    if (!(_a.sent())) {
+                                        filesNamesInPath.splice(i, 1);
+                                    }
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); })];
+            case 3:
+                // Checks if file in sasjsbuild folder exists in source folder.
+                // If not, it means that the file shouldn't be compiled.
+                _a.sent();
                 return [4 /*yield*/, (0, utils_1.asyncForEach)(filesNamesInPath, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
                         var filePath;
                         return __generator(this, function (_a) {
@@ -355,7 +377,7 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                             }
                         });
                     }); })];
-            case 3:
+            case 4:
                 _a.sent();
                 return [4 /*yield*/, (0, utils_1.asyncForEach)(subFolders, function (subFolder) { return __awaiter(void 0, void 0, void 0, function () {
                         var fileNames;
@@ -389,7 +411,7 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                             }
                         });
                     }); })];
-            case 4:
+            case 5:
                 _a.sent();
                 compileTree.saveTree();
                 return [2 /*return*/];
@@ -405,9 +427,30 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                 return [4 /*yield*/, (0, utils_1.listSubFoldersInFolder)(destinationPath)];
             case 1:
                 subFolders = _a.sent();
-                return [4 /*yield*/, (0, utils_1.listFilesInFolder)(destinationPath)];
+                return [4 /*yield*/, (0, utils_1.listFilesInFolder)(destinationPath)
+                    // Checks if file in sasjsbuild folder exists in source folder.
+                    // If not, it means that the file shouldn't be compiled.
+                ];
             case 2:
                 filesNamesInPath = _a.sent();
+                // Checks if file in sasjsbuild folder exists in source folder.
+                // If not, it means that the file shouldn't be compiled.
+                return [4 /*yield*/, (0, utils_1.asyncForEach)(filesNamesInPath, function (fileName, i) { return __awaiter(void 0, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, (0, utils_1.fileExists)(path_1.default.join(jobFolder, fileName))];
+                                case 1:
+                                    if (!(_a.sent())) {
+                                        filesNamesInPath.splice(i, 1);
+                                    }
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); })];
+            case 3:
+                // Checks if file in sasjsbuild folder exists in source folder.
+                // If not, it means that the file shouldn't be compiled.
+                _a.sent();
                 return [4 /*yield*/, (0, utils_1.asyncForEach)(filesNamesInPath, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
                         var filePath;
                         return __generator(this, function (_a) {
@@ -427,7 +470,7 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                             }
                         });
                     }); })];
-            case 3:
+            case 4:
                 _a.sent();
                 return [4 /*yield*/, (0, utils_1.asyncForEach)(subFolders, function (subFolder) { return __awaiter(void 0, void 0, void 0, function () {
                         var fileNames;
@@ -461,7 +504,7 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                             }
                         });
                     }); })];
-            case 4:
+            case 5:
                 _a.sent();
                 return [2 /*return*/];
         }

package/build/commands/compile/spec/compile.spec.js

@@ -739,10 +739,10 @@ describe('sasjs compile outside project', function () {
                         return [4 /*yield*/, (0, config_1.saveGlobalRcFile)('')];
                     case 1:
                         _a.sent();
-                        process.projectDir = '';
                         return [4 /*yield*/, (0, utils_2.setConstants)()];
                     case 2:
                         _a.sent();
+                        process.projectDir = '';
                         process.currentDir = path_1.default.join(__dirname, appName);
                         return [4 /*yield*/, (0, utils_1.createFolder)(process.currentDir)];
                     case 3:
@@ -785,6 +785,38 @@ describe('sasjs compile outside project', function () {
                 }
             });
         }); });
+        it('should compile without duplicates', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var testServicePath, appPath, command, compiledTestService;
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        testServicePath = path_1.default.join('services', 'admin', 'test.sas');
+                        appPath = path_1.default.join(__dirname, appName);
+                        return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
+                    case 1:
+                        _b.sent();
+                        return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(appPath, 'sasjs', 'targets', 'viya', testServicePath), '')];
+                    case 2:
+                        _b.sent();
+                        command = new compileCommand_1.CompileCommand([
+                            'node',
+                            'sasjs',
+                            'compile',
+                            '-t',
+                            'viya'
+                        ]);
+                        return [4 /*yield*/, command.executeCompile()];
+                    case 3:
+                        _b.sent();
+                        return [4 /*yield*/, (0, utils_1.readFile)(path_1.default.join(appPath, 'sasjsbuild', testServicePath))];
+                    case 4:
+                        compiledTestService = _b.sent();
+                        expect((_a = compiledTestService.match(/^\*\sService start;$/gm)) === null || _a === void 0 ? void 0 : _a.length).toEqual(1);
+                        return [2 /*return*/];
+                }
+            });
+        }); });
     });
 });
 var prefixConfigWithPath = function (prefixPath) { return ({

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

@@ -1,8 +1,8 @@
-import { TestResults } from '../../../types';
+import { TestResults, TestResultCsv } from '../../../types';
 export declare const saveLog: (outDirectory: string, test: string, log: string, lineBreak?: boolean) => Promise<void>;
 export declare const saveResultJson: (outDirectory: string, result: TestResults) => Promise<string | false>;
 export declare const saveResultCsv: (outDirectory: string, result: TestResults, options?: {}) => Promise<{
-    csvData: {}[];
+    csvData: TestResultCsv[];
     csvPath: string;
 }>;
 export declare const saveResultXml: (outDirectory: string, result: TestResults) => Promise<string>;

package/build/commands/testing/spec/mockedAdapter/testResponses.js

@@ -19,5 +19,15 @@ exports.testResponses = {
             TEST_DESCRIPTION: 'examplemacro test.1 description',
             TEST_RESULT: 'PASS'
         }
+    ],
+    'notexisting.test': [
+        {
+            TEST_DESCRIPTION: 'examplemacro test.1 description',
+            TEST_RESULT: 'PASS'
+        },
+        {
+            TEST_DESCRIPTION: 'examplemacro test.1 description',
+            TEST_RESULT: 'FAIL'
+        }
     ]
 };

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

@@ -71,6 +71,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var path_1 = __importDefault(require("path"));
 var test_1 = require("../test");
+var types_1 = require("../../../types");
 var utils_1 = require("@sasjs/utils");
 var test_2 = require("../../../utils/test");
 var setConstants_1 = require("../../../utils/setConstants");
@@ -78,6 +79,9 @@ var dotenv_1 = __importDefault(require("dotenv"));
 var __1 = require("../..");
 var sasJsModules = __importStar(require("../../../utils/createSASjsInstance"));
 var testResponses_1 = require("./mockedAdapter/testResponses");
+var fileModule = __importStar(require("@sasjs/utils/file"));
+var utilsModule = __importStar(require("@sasjs/utils/utils"));
+var chalk_1 = __importDefault(require("chalk"));
 describe('sasjs test', function () {
     var 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";
     describe('SASVIYA', function () {
@@ -576,6 +580,25 @@ describe('sasjs test', function () {
                 }
             });
         }); });
+        it('should FAIL test suit if any test has status FAIL', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var testService;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        testService = 'notexisting';
+                        jest.spyOn(process.logger, 'table');
+                        jest.spyOn(utilsModule, 'uuidv4').mockImplementation(function () { return 'uuidv4'; });
+                        jest.spyOn(fileModule, 'readFile').mockImplementation(function () {
+                            return Promise.resolve("{\n  \"tests\": [\n    \"tests/macros/".concat(testService, ".test.sas\"\n  ],\n  \"testSetUp\": \"\",\n  \"testTearDown\": \"\"\n}"));
+                        });
+                        return [4 /*yield*/, (0, test_1.runTest)(target, undefined, undefined, undefined)];
+                    case 1:
+                        _a.sent();
+                        expect(process.logger.table).toHaveBeenCalledWith([['uuidv4', testService, chalk_1.default.redBright(types_1.TestResultStatus.fail)]], { head: ['SASjs Test ID', 'Test Target', 'Test Suite Result'] });
+                        return [2 /*return*/];
+                }
+            });
+        }); });
     });
 });
 function generateTarget(serverType) {

package/build/commands/testing/test.js

@@ -86,11 +86,12 @@ var path_1 = __importDefault(require("path"));
 var chalk_1 = __importDefault(require("chalk"));
 var utils_2 = require("../../utils/utils");
 var createSASjsInstance_1 = require("../../utils/createSASjsInstance");
+// interface
 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, _c, sas9CredentialsError, e_1, result, isCodeExamplePrinted, printCodeExample, jsonPath, xmlPath, _d, csvData, csvPath, coverageReportPath, resultTable, testsCount, passedTestsCount, testsWithResultsCount;
+        var testFlowData, testFlow, flow, sasjs, authConfig, username, password, _c, sas9CredentialsError, e_1, result, isCodeExamplePrinted, printCodeExample, jsonPath, xmlPath, _d, csvData, csvPath, coverageReportPath, resultTable, testSuites, testsCount, passedTestsCount, testsWithResultsCount;
         var _this = this;
         return __generator(this, function (_e) {
             switch (_e.label) {
@@ -300,7 +301,8 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                                                                     });
                                                                 }
                                                             }
-                                                            else if (target.serverType !== utils_1.ServerType.Sasjs) {
+                                                            else if (target.serverType === utils_1.ServerType.SasViya ||
+                                                                target.serverType === utils_1.ServerType.Sas9) {
                                                                 (0, displayResult_1.displayError)({}, "'test_results' not found in server response, to debug click ".concat(testUrl));
                                                                 printCodeExample();
                                                             }
@@ -353,11 +355,26 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                     coverageReportPath = _e.sent();
                     resultTable = {};
                     if (Array.isArray(csvData)) {
-                        csvData.forEach(function (item) {
-                            return (resultTable[item.sasjs_test_id] = {
-                                test_target: item.test_target,
-                                test_suite_result: item.test_suite_result
+                        testSuites = csvData.reduce(function (acc, item) {
+                            if (!acc.filter(function (i) { return i.sasjs_test_id === item.sasjs_test_id; }).length)
+                                acc.push(item);
+                            return acc;
+                        }, []);
+                        testSuites.forEach(function (test) {
+                            var passedTests = csvData.filter(function (item) {
+                                return item.sasjs_test_id === test.sasjs_test_id &&
+                                    item.test_suite_result === types_1.TestResultStatus.pass;
                             });
+                            var failedTests = csvData.filter(function (item) {
+                                return item.sasjs_test_id === test.sasjs_test_id &&
+                                    item.test_suite_result === types_1.TestResultStatus.fail;
+                            });
+                            resultTable[test.sasjs_test_id] = {
+                                test_target: test.test_target,
+                                test_suite_result: passedTests.length && !failedTests.length
+                                    ? types_1.TestResultStatus.pass
+                                    : types_1.TestResultStatus.fail
+                            };
                         });
                     }
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.table(Object.keys(resultTable).map(function (key) { return [

package/build/types/index.d.ts

@@ -2,6 +2,6 @@ export { CommandBase } from './command/commandBase';
 export { File, FilePath } from './file';
 export { Folder } from './folder';
 export { TargetScope } from './targetScope';
-export { TestFlow, Coverage, CoverageType, CoverageState, TestResults, TestResultStatus, TestDescription, TestResult, TestResultDescription } from './testing';
+export { TestFlow, Coverage, CoverageType, CoverageState, TestResults, TestResultStatus, TestDescription, TestResult, TestResultDescription, TestResultCsv } from './testing';
 export { Flow, FlowWave, FlowWaveJob } from './flow';
 export { ServicePack, ServicePackMember } from './servicePack';

package/build/types/testing.d.ts

@@ -42,3 +42,11 @@ export interface TestResult {
 export interface TestResults {
     sasjs_test_meta: TestDescription[];
 }
+export interface TestResultCsv {
+    test_target: string;
+    test_loc: string;
+    sasjs_test_id: string;
+    test_suite_result: TestResultStatus.pass | TestResultStatus.fail;
+    test_description: string;
+    test_url: string;
+}

package/build/utils/test.js

@@ -413,6 +413,9 @@ var updateTarget = function (targetJson, targetName, isLocal) {
                     targetIndex = config.targets.findIndex(function (t) { return t.name === targetName; });
                     if (!(targetIndex >= 0)) return [3 /*break*/, 9];
                     config.targets.splice(targetIndex, 1, __assign(__assign({}, config.targets[targetIndex]), targetJson));
+                    config = __assign(__assign({}, config), { targets: config.targets.map(function (target) { return (__assign(__assign({}, target), { serverUrl: process.env["".concat(target.serverType === types_1.ServerType.SasViya
+                                ? 'VIYA'
+                                : target.serverType, "_SERVER_URL")] })); }) });
                     if (!isLocal) return [3 /*break*/, 6];
                     return [4 /*yield*/, (0, config_1.saveLocalConfigFile)(JSON.stringify(config, null, 2))];
                 case 5:

package/package.json

@@ -47,10 +47,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "3.8.0",
+    "@sasjs/adapter": "3.8.1",
     "@sasjs/core": "4.15.3",
     "@sasjs/lint": "1.11.2",
-    "@sasjs/utils": "2.40.1",
+    "@sasjs/utils": "2.41.0",
     "chalk": "4.1.2",
     "csv-stringify": "5.6.5",
     "dotenv": "10.0.0",
@@ -94,5 +94,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.12.1"
+  "version": "3.12.4"
 }