@sasjs/cli 3.13.4 → 3.14.0

package/build/commands/build/build.js

@@ -97,6 +97,7 @@ var compile_1 = require("../compile/compile");
 var config_2 = require("./internal/config");
 var getLaunchPageCode_1 = require("./internal/getLaunchPageCode");
 var types_1 = require("@sasjs/utils/types");
+var compressAndSave_1 = require("../../utils/compressAndSave");
 function build(target) {
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -114,47 +115,48 @@ function build(target) {
 }
 exports.build = build;
 function createFinalSasFiles(target) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     return __awaiter(this, void 0, void 0, function () {
-        var streamConfig, streamWeb, buildConfig, serverType, name, macroFolders, buildOutputFileName, buildDestinationFolder, finalSasFileContent, finalFilePath, finalFilePathJSON, buildInfo, buildInit, buildTerm, macroCorePath, dependencyFilePaths, dependenciesContent, _h, folderContent, folderContentJSON, servicePackSASjs, servicePack;
-        return __generator(this, function (_j) {
-            switch (_j.label) {
+        var streamConfig, streamWeb, buildConfig, serverType, name, macroFolders, buildOutputFileName, buildDestinationFolder, finalSasFileContent, finalFilePath, finalFilePathJSON, finalFilePathZipped, buildInfo, buildInit, buildTerm, macroCorePath, dependencyFilePaths, dependenciesContent, _k, folderContent, folderContentJSON, servicePackSASjs, servicePack;
+        return __generator(this, function (_l) {
+            switch (_l.label) {
                 case 0:
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info('Creating output SAS and JSON files.');
                     return [4 /*yield*/, (0, config_1.getStreamConfig)(target)];
                 case 1:
-                    streamConfig = _j.sent();
+                    streamConfig = _l.sent();
                     streamWeb = (_b = streamConfig.streamWeb) !== null && _b !== void 0 ? _b : false;
                     buildConfig = target.buildConfig, serverType = target.serverType, name = target.name;
                     return [4 /*yield*/, (0, config_1.getMacroFolders)(target)];
                 case 2:
-                    macroFolders = _j.sent();
+                    macroFolders = _l.sent();
                     buildOutputFileName = (_c = buildConfig === null || buildConfig === void 0 ? void 0 : buildConfig.buildOutputFileName) !== null && _c !== void 0 ? _c : "".concat(name, ".sas");
                     buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
                     finalSasFileContent = '';
                     finalFilePath = path_1.default.join(buildDestinationFolder, buildOutputFileName);
                     finalFilePathJSON = path_1.default.join(buildDestinationFolder, "".concat(name, ".json"));
+                    finalFilePathZipped = path_1.default.join(buildDestinationFolder, "".concat(name, ".json.zip"));
                     return [4 /*yield*/, getBuildInfo(target, streamWeb)];
                 case 3:
-                    buildInfo = _j.sent();
+                    buildInfo = _l.sent();
                     finalSasFileContent += "\n".concat(buildInfo);
                     return [4 /*yield*/, (0, config_2.getBuildInit)(target)];
                 case 4:
-                    buildInit = _j.sent();
+                    buildInit = _l.sent();
                     return [4 /*yield*/, (0, config_2.getBuildTerm)(target)];
                 case 5:
-                    buildTerm = _j.sent();
+                    buildTerm = _l.sent();
                     macroCorePath = process.sasjsConstants.macroCorePath;
                     return [4 /*yield*/, (0, utils_1.getDependencyPaths)("".concat(buildTerm, "\n").concat(buildInit), macroFolders, macroCorePath)];
                 case 6:
-                    dependencyFilePaths = _j.sent();
+                    dependencyFilePaths = _l.sent();
                     return [4 /*yield*/, getDependencies(dependencyFilePaths)];
                 case 7:
-                    dependenciesContent = _j.sent();
+                    dependenciesContent = _l.sent();
                     finalSasFileContent += "\n".concat(dependenciesContent, "\n\n").concat(buildInit, "\n");
                     return [4 /*yield*/, getFolderContent(serverType)];
                 case 8:
-                    _h = _j.sent(), folderContent = _h.folderContent, folderContentJSON = _h.folderContentJSON;
+                    _k = _l.sent(), folderContent = _k.folderContent, folderContentJSON = _k.folderContentJSON;
                     servicePackSASjs = {
                         appLoc: target.appLoc,
                         fileTree: folderContentJSON
@@ -176,7 +178,7 @@ function createFinalSasFiles(target) {
                     (_d = process.logger) === null || _d === void 0 ? void 0 : _d.debug("Creating file ".concat(finalFilePath, " ."));
                     return [4 /*yield*/, (0, utils_1.createFile)(finalFilePath, finalSasFileContent)];
                 case 9:
-                    _j.sent();
+                    _l.sent();
                     (_e = process.logger) === null || _e === void 0 ? void 0 : _e.success("File ".concat(finalFilePath, " has been created."));
                     (_f = process.logger) === null || _f === void 0 ? void 0 : _f.debug("Creating file ".concat(finalFilePathJSON, " ."));
                     servicePack = target.serverType === utils_1.ServerType.Sasjs
@@ -184,8 +186,13 @@ function createFinalSasFiles(target) {
                         : folderContentJSON;
                     return [4 /*yield*/, (0, utils_1.createFile)(finalFilePathJSON, JSON.stringify(servicePack, null, 1))];
                 case 10:
-                    _j.sent();
+                    _l.sent();
                     (_g = process.logger) === null || _g === void 0 ? void 0 : _g.success("File ".concat(finalFilePathJSON, " has been created."));
+                    (_h = process.logger) === null || _h === void 0 ? void 0 : _h.debug("Creating file ".concat(finalFilePathZipped, " ."));
+                    return [4 /*yield*/, (0, compressAndSave_1.compressAndSave)(finalFilePathZipped, JSON.stringify(servicePack, null, 1))];
+                case 11:
+                    _l.sent();
+                    (_j = process.logger) === null || _j === void 0 ? void 0 : _j.success("File ".concat(finalFilePathZipped, " has been created."));
                     return [2 /*return*/];
             }
         });

package/build/commands/compile/compile.js

@@ -329,7 +329,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;
+    var destinationPath, subFolders, sourceFiles;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -337,21 +337,21 @@ 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)(serviceFolder)
                     // 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();
+                sourceFiles = _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 [4 /*yield*/, (0, utils_1.asyncForEach)(sourceFiles, 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);
+                                        sourceFiles.splice(i, 1);
                                     }
                                     return [2 /*return*/];
                             }
@@ -361,7 +361,7 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                 // 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 () {
+                return [4 /*yield*/, (0, utils_1.asyncForEach)(sourceFiles, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
                         var filePath;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
@@ -383,15 +383,15 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
             case 4:
                 _a.sent();
                 return [4 /*yield*/, (0, utils_1.asyncForEach)(subFolders, function (subFolder) { return __awaiter(void 0, void 0, void 0, function () {
-                        var sourceFolder, fileNames;
+                        var sourceFolder, sourceFiles;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
                                     sourceFolder = path_1.default.join(serviceFolder, subFolder);
                                     return [4 /*yield*/, (0, utils_1.listFilesInFolder)(sourceFolder)];
                                 case 1:
-                                    fileNames = _a.sent();
-                                    return [4 /*yield*/, (0, utils_1.asyncForEach)(fileNames, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
+                                    sourceFiles = _a.sent();
+                                    return [4 /*yield*/, (0, utils_1.asyncForEach)(sourceFiles, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
                                             var filePath;
                                             return __generator(this, function (_a) {
                                                 switch (_a.label) {
@@ -424,7 +424,7 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
     });
 }); };
 var compileJobFolder = function (target, jobFolder, macroFolders, programFolders, compileTree) { return __awaiter(void 0, void 0, void 0, function () {
-    var destinationPath, subFolders, filesNamesInPath;
+    var destinationPath, subFolders, sourceFiles;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -437,16 +437,16 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                     // If not, it means that the file shouldn't be compiled.
                 ];
             case 2:
-                filesNamesInPath = _a.sent();
+                sourceFiles = _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 [4 /*yield*/, (0, utils_1.asyncForEach)(sourceFiles, 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);
+                                        sourceFiles.splice(i, 1);
                                     }
                                     return [2 /*return*/];
                             }
@@ -456,7 +456,7 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                 // 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 () {
+                return [4 /*yield*/, (0, utils_1.asyncForEach)(sourceFiles, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
                         var filePath;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
@@ -478,15 +478,15 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
             case 4:
                 _a.sent();
                 return [4 /*yield*/, (0, utils_1.asyncForEach)(subFolders, function (subFolder) { return __awaiter(void 0, void 0, void 0, function () {
-                        var sourcePath, fileNames;
+                        var sourcePath, sourceFiles;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
                                     sourcePath = path_1.default.join(jobFolder, subFolder);
-                                    return [4 /*yield*/, (0, utils_1.listFilesInFolder)(path_1.default.join(jobFolder, subFolder))];
+                                    return [4 /*yield*/, (0, utils_1.listFilesInFolder)(sourcePath)];
                                 case 1:
-                                    fileNames = _a.sent();
-                                    return [4 /*yield*/, (0, utils_1.asyncForEach)(fileNames, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
+                                    sourceFiles = _a.sent();
+                                    return [4 /*yield*/, (0, utils_1.asyncForEach)(sourceFiles, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
                                             var filePath;
                                             return __generator(this, function (_a) {
                                                 switch (_a.label) {

package/build/commands/compile/internal/compileFile.d.ts

@@ -1,4 +1,15 @@
 import { CompileTree } from '@sasjs/utils';
 import { Target, ServerType, SASJsFileType } from '@sasjs/utils/types';
+/**
+ * Compiles file dependencies.
+ * @param {Target} target - SAS server configuration.
+ * @param {string} filePath - file path of the file to be compiled.
+ * @param {string[]} macroFolders - macro folders paths.
+ * @param {string[]} programFolders - program folders paths.
+ * @param {string} programVar - program variable.
+ * @param {object} compileTree - compilation tree that stores used compilation assets.
+ * @param {SASJsFileType} fileType - sasjs file type.
+ * @param {string} sourceFolder - folder path of the source folder.
+ */
 export declare function compileFile(target: Target, filePath: string, macroFolders: string[], programFolders: string[], programVar: string | undefined, compileTree: CompileTree, fileType: SASJsFileType, sourceFolder: string): Promise<void>;
 export declare function getPreCodeForServicePack(serverType: ServerType): Promise<string>;

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

@@ -46,6 +46,17 @@ var error_1 = require("@sasjs/utils/error");
 var loadDependencies_1 = require("./loadDependencies");
 var getServerType_1 = require("./getServerType");
 var path_1 = __importDefault(require("path"));
+/**
+ * Compiles file dependencies.
+ * @param {Target} target - SAS server configuration.
+ * @param {string} filePath - file path of the file to be compiled.
+ * @param {string[]} macroFolders - macro folders paths.
+ * @param {string[]} programFolders - program folders paths.
+ * @param {string} programVar - program variable.
+ * @param {object} compileTree - compilation tree that stores used compilation assets.
+ * @param {SASJsFileType} fileType - sasjs file type.
+ * @param {string} sourceFolder - folder path of the source folder.
+ */
 function compileFile(target, filePath, macroFolders, programFolders, programVar, compileTree, fileType, sourceFolder) {
     if (programVar === void 0) { programVar = ''; }
     return __awaiter(this, void 0, void 0, function () {

package/build/commands/help/help.js

@@ -298,11 +298,12 @@ function printHelpText() {
                     title: 'test',
                     description: [
                         "Triggers SAS unit tests.",
-                        "[2spaces]command example: sasjs test <filteringString> --source <testFlowPath> --outDirectory <folderPath> -t <targetName>",
+                        "[2spaces]command example: sasjs test <filteringString> --source <testFlowPath> --outDirectory <folderPath> -t <targetName> --force",
                         "",
                         "[2spaces]NOTE: Providing <filteringString> is optional. If not present, all tests mentioned in test flow file will be executed.",
                         "[2spaces]NOTE: Providing source flag is optional. If not present, CLI will use test flow located at sasjsbuild/testFlow.json.",
-                        "[2spaces]NOTE: Providing outDirectory flag is optional. If not present, CLI will use save outputs into sasjsresults folder."
+                        "[2spaces]NOTE: Providing outDirectory flag is optional. If not present, CLI will use save outputs into sasjsresults folder.",
+                        "[2spaces]NOTE: Providing force (--force or -f) flag is optional. If present, CLI will force command to finish running all tests and will not return an error code even when some are failing. Useful when the requirement is not to make CI Pipeline fail."
                     ]
                 }
             ];

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

@@ -127,7 +127,8 @@ describe('TestCommand', function () {
                         '--outDirectory',
                         'path-to-out',
                         '--source',
-                        'path-to-source'
+                        'path-to-source',
+                        '--force'
                     ], false);
                     command = new testCommand_1.TestCommand(args);
                     return [4 /*yield*/, command.getTargetInfo()];
@@ -155,7 +156,8 @@ describe('TestCommand', function () {
                         '--out',
                         'path-to-out',
                         '-s',
-                        'path-to-source'
+                        'path-to-source',
+                        '-f'
                     ], false);
                     command = new testCommand_1.TestCommand(args);
                     return [4 /*yield*/, command.getTargetInfo()];
@@ -179,7 +181,7 @@ describe('TestCommand', function () {
                     return [4 /*yield*/, command.execute()];
                 case 1:
                     _a.sent();
-                    expect(testModule.runTest).toHaveBeenCalledWith(target, undefined, undefined, undefined);
+                    expect(testModule.runTest).toHaveBeenCalledWith(target, undefined, undefined, undefined, false);
                     return [2 /*return*/];
             }
         });

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

@@ -217,7 +217,7 @@ describe('sasjs test', function () {
                             ]
                         };
                         expectedResultsCsv = "test_target,test_loc,sasjs_test_id,test_suite_result,test_description,test_url\ntestsetup,tests/testsetup.sas,sasjs_test_id,not provided,,".concat(testUrlLink('testsetup'), "\nexampleprogram,tests/jobs/jobs/exampleprogram.test.sas,sasjs_test_id,not provided,,").concat(testUrlLink('jobs/jobs/exampleprogram.test'), "\nstandalone,tests/jobs/jobs/standalone.test.sas,sasjs_test_id,not provided,,").concat(testUrlLink('jobs/jobs/standalone.test'), "\nexamplemacro,tests/macros/examplemacro.test.sas,sasjs_test_id,PASS,examplemacro test.1 description,").concat(testUrlLink('macros/examplemacro.test'), "\ndostuff,tests/services/admin/dostuff.test.0.sas,sasjs_test_id,FAIL,dostuff 0 test description,").concat(testUrlLink('services/admin/dostuff.test.0'), "\ndostuff,tests/services/admin/dostuff.test.1.sas,sasjs_test_id,PASS,dostuff 1 test description,").concat(testUrlLink('services/admin/dostuff.test.1'), "\ntestteardown,tests/testteardown.sas,sasjs_test_id,not provided,,").concat(testUrlLink('testteardown'), "\n");
-                        return [4 /*yield*/, (0, test_1.runTest)(target)];
+                        return [4 /*yield*/, (0, test_1.runTest)(target, undefined, undefined, undefined, true)];
                     case 1:
                         _a.sent();
                         resultsFolderPath = path_1.default.join(__dirname, target.name, 'sasjsresults');
@@ -330,7 +330,7 @@ describe('sasjs test', function () {
                         return [4 /*yield*/, (0, utils_1.copy)(path_1.default.join(__dirname, target.name, 'sasjsbuild', 'testFlow.json'), path_1.default.join(__dirname, target.name, movedTestFlow))];
                     case 1:
                         _a.sent();
-                        return [4 /*yield*/, (0, test_1.runTest)(target, ['jobs/standalone', 'shouldFail', 'services/admin/dostuff.test.0'], outputFolder, movedTestFlow)];
+                        return [4 /*yield*/, (0, test_1.runTest)(target, ['jobs/standalone', 'shouldFail', 'services/admin/dostuff.test.0'], outputFolder, movedTestFlow, true)];
                     case 2:
                         _a.sent();
                         resultsFolderPath = path_1.default.join(__dirname, target.name, outputFolder);
@@ -531,7 +531,7 @@ describe('sasjs test', function () {
                             ]
                         };
                         expectedResultsCsv = "test_target,test_loc,sasjs_test_id,test_suite_result,test_description,test_url\ntestsetup,tests/testsetup.sas,sasjs_test_id,not provided,,".concat(testUrlLink('testsetup'), "\nexampleprogram,tests/jobs/jobs/exampleprogram.test.sas,sasjs_test_id,not provided,,").concat(testUrlLink('jobs/jobs/exampleprogram.test'), "\nstandalone,tests/jobs/jobs/standalone.test.sas,sasjs_test_id,not provided,,").concat(testUrlLink('jobs/jobs/standalone.test'), "\nexamplemacro,tests/macros/examplemacro.test.sas,sasjs_test_id,PASS,examplemacro test.1 description,").concat(testUrlLink('macros/examplemacro.test'), "\nshouldFail,tests/macros/shouldFail.test.sas,sasjs_test_id,not provided,,").concat(testUrlLink('macros/shouldFail.test'), "\ndostuff,tests/services/admin/dostuff.test.0.sas,sasjs_test_id,FAIL,dostuff 0 test description,").concat(testUrlLink('services/admin/dostuff.test.0'), "\ndostuff,tests/services/admin/dostuff.test.1.sas,sasjs_test_id,PASS,dostuff 1 test description,").concat(testUrlLink('services/admin/dostuff.test.1'), "\ntestteardown,tests/testteardown.sas,sasjs_test_id,not provided,,").concat(testUrlLink('testteardown'), "\n");
-                        return [4 /*yield*/, (0, test_1.runTest)(target, undefined, undefined, undefined)];
+                        return [4 /*yield*/, (0, test_1.runTest)(target, undefined, undefined, undefined, true)];
                     case 1:
                         _a.sent();
                         resultsFolderPath = path_1.default.join(__dirname, target.name, 'sasjsresults');
@@ -591,7 +591,7 @@ describe('sasjs test', function () {
                         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)];
+                        return [4 /*yield*/, (0, test_1.runTest)(target, undefined, undefined, undefined, true)];
                     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'] });
@@ -599,6 +599,34 @@ describe('sasjs test', function () {
                 }
             });
         }); });
+        it('should fail on tests failing', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var error;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, (0, test_1.runTest)(target).catch(function (err) {
+                            return err;
+                        })];
+                    case 1:
+                        error = _a.sent();
+                        expect(error).toEqual('6 tests completed with failures!');
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should not throw error on tests failing', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var error;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, (0, test_1.runTest)(target, undefined, undefined, undefined, true).catch(function (err) {
+                            return err;
+                        })];
+                    case 1:
+                        error = _a.sent();
+                        expect(error).toBeUndefined();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
     });
 });
 function generateTarget(serverType) {

package/build/commands/testing/test.d.ts

@@ -1,3 +1,3 @@
 import { Target } from '@sasjs/utils';
-export declare function runTest(target: Target, testRegExps?: string[], outDirectory?: string, flowSourcePath?: string): Promise<undefined>;
+export declare function runTest(target: Target, testRegExps?: string[], outDirectory?: string, flowSourcePath?: string, force?: boolean): Promise<undefined>;
 export declare const getTestUrl: (target: Target, jobLocation: string) => string;

package/build/commands/testing/test.js

@@ -87,11 +87,11 @@ 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) {
+function runTest(target, testRegExps, outDirectory, flowSourcePath, force) {
     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, testSuites, 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, failedTestsCount, testsWithoutResultCount, errorMessage;
         var _this = this;
         return __generator(this, function (_e) {
             switch (_e.label) {
@@ -394,6 +394,17 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Tests provided results: ".concat(testsWithResultsCount + '/' + testsCount, " (").concat(chalk_1.default.greenBright(Math.round((testsWithResultsCount / testsCount) * 100 || 0) + '%'), ")\n  Tests that pass: ").concat(passedTestsCount + '/' + testsWithResultsCount, " (").concat(chalk_1.default.greenBright(Math.round((passedTestsCount / testsWithResultsCount) * 100 || 0) + '%'), ")\n  "));
                     (0, displayResult_1.displaySuccess)("Tests execution finished. The results are stored at:\n  ".concat(jsonPath, "\n  ").concat(csvPath, "\n  ").concat(xmlPath));
                     (0, displayResult_1.displaySuccess)("Tests coverage report:\n  ".concat(coverageReportPath));
+                    if (!force) {
+                        failedTestsCount = testsWithResultsCount - passedTestsCount;
+                        testsWithoutResultCount = testsCount - testsWithResultsCount;
+                        errorMessage = '';
+                        if (testsWithoutResultCount > 0)
+                            errorMessage = "".concat(testsWithoutResultCount, " ").concat(testsWithoutResultCount === 1 ? 'test' : 'tests', " failed to complete!\n");
+                        if (failedTestsCount > 0)
+                            errorMessage += "".concat(failedTestsCount, " ").concat(failedTestsCount === 1 ? 'test' : 'tests', " completed with failures!");
+                        if (errorMessage)
+                            return [2 /*return*/, Promise.reject(errorMessage)];
+                    }
                     return [2 /*return*/];
             }
         });

package/build/commands/testing/testCommand.js

@@ -57,15 +57,15 @@ var targetCommand_1 = require("../../types/command/targetCommand");
 var utils_1 = require("../../utils");
 var test_1 = require("./test");
 var syntax = 'test [filteringString..]';
-var usage = 'Usage: sasjs test [filtering-strings..] --source <test-flow-path> --outDirectory <folder-path> --target <target-name>';
+var usage = 'Usage: sasjs test [filtering-strings..] --source <test-flow-path> --outDirectory <folder-path> --target <target-name> --force';
 var description = 'Triggers SAS unit tests.';
 var examples = [
     {
-        command: 'sasjs test jobs/standalone1 jobs/standalone2 --source <test-flow-path> --outDirectory <folder-path> --target <target-name>',
+        command: 'sasjs test jobs/standalone1 jobs/standalone2 --source <test-flow-path> --outDirectory <folder-path> --target <target-name> --force',
         description: ''
     },
     {
-        command: 'sasjs test jobs/standalone1 jobs/standalone2 -s <test-flow-path> --out <folder-path> --t <target-name>',
+        command: 'sasjs test jobs/standalone1 jobs/standalone2 -s <test-flow-path> --out <folder-path> -t <target-name> -f',
         description: ''
     }
 ];
@@ -77,12 +77,18 @@ var TestCommand = /** @class */ (function (_super) {
                 outDirectory: {
                     type: 'string',
                     alias: 'out',
-                    description: 'Path to output folder for tests resuls.'
+                    description: 'Path to output folder for tests results.'
                 },
                 source: {
                     type: 'string',
                     alias: 's',
                     description: 'Test flow located at source will be executed.'
+                },
+                force: {
+                    type: 'boolean',
+                    default: false,
+                    alias: 'f',
+                    description: 'If present, CLI will force command to finish running all tests and will not return an error code even when some are failing.'
                 }
             },
             syntax: syntax,
@@ -93,14 +99,14 @@ var TestCommand = /** @class */ (function (_super) {
     }
     TestCommand.prototype.execute = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var target, _a, filteringString, outDirectory, source;
+            var target, _a, filteringString, outDirectory, source, force;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, this.getTargetInfo()];
                     case 1:
                         target = (_b.sent()).target;
-                        _a = this.parsed, filteringString = _a.filteringString, outDirectory = _a.outDirectory, source = _a.source;
-                        return [4 /*yield*/, (0, test_1.runTest)(target, filteringString, outDirectory, source)
+                        _a = this.parsed, filteringString = _a.filteringString, outDirectory = _a.outDirectory, source = _a.source, force = _a.force;
+                        return [4 /*yield*/, (0, test_1.runTest)(target, filteringString, outDirectory, source, force)
                                 .then(function () {
                                 return command_1.ReturnCode.Success;
                             })

package/build/commands/web/internal/sasjsout.d.ts

@@ -1 +1 @@
-export declare const sasjsout = "\n%macro sasjsout(type,fref=sasjs);\n%global sysprocessmode SYS_JES_JOB_URI;\n%if \"&sysprocessmode\"=\"SAS Compute Server\" %then %do;\n  %if &type=HTML %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name=\"_webout.json\"\n      contenttype=\"text/html\";\n  %end;\n  %else %if &type=JS or &type=JS64 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.js'\n      contenttype='application/javascript';\n  %end;\n  %else %if &type=CSS or &type=CSS64 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.css'\n      contenttype='text/css';\n  %end;\n  %else %if &type=PNG or &type=GIF or &type=JPEG or &type=JPG %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\"\n      name=\"_webout.%lowcase(&type)\"\n      contenttype=\"image/%lowcase(&type)\" lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=ICO %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.ico'\n      contenttype='image/vnd.microsoft.icon' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=JSON %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.json'\n      contenttype='application/json' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=MP3 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.mp3'\n      contenttype='audio/mpeg' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=WAV %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.wav'\n      contenttype='audio/x-wav' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=OGG %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.ogg'\n      contenttype='audio/ogg' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=WOFF or &type=WOFF2 or &type=TTF %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\"\n      contenttype=\"font/%lowcase(&type)\";\n  %end;\n  %else %if &type=MP4 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\"\n      contenttype=\"video/mp4\";\n  %end;\n%end;\n%else %do;\n  %if &type=JS or &type=JS64 %then %do;\n    %let rc=%sysfunc(stpsrv_header(\n      Content-type,application/javascript%str(;)charset=UTF-8\n    ));\n  %end;\n  %else %if &type=CSS or &type=CSS64 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,text/css));\n  %end;\n  %else %if &type=PNG or &type=GIF or &type=JPEG or &type=JPG %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/%lowcase(&type)));\n  %end;\n  %else %if &type=ICO %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/vnd.microsoft.icon));\n  %end;\n  %else %if &type=JSON %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,application/json));\n  %end;\n  %else %if &type=MP3 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,audio/mpeg));\n  %end;\n  %else %if &type=WAV %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,audio/x-wav));\n  %end;\n  %else %if &type=OGG %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,audio/ogg));\n  %end;\n  %else %if &type=WOFF or &type=WOFF2 or &type=TTF %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,font/%lowcase(&type)));\n  %end;\n  %else %if &type=MP4 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,video/mp4));\n  %end;\n%end;\n%if &type=HTML %then %do;\n  /*\n  We need to perform some substitutions -eg to get the APPLOC and SERVERTYPE.\n  Therefore the developer should avoid writing lines that exceed 32k\n  characters (eg base64 encoded images) as they will get truncated when passing\n  through the datastep.  This could of course be re-written using LUA, removing\n  the length restriction.  Pull requests are welcome!\n  */\n  filename _sjs temp;\n  data _null_;\n    file _sjs lrecl=32767 encoding='utf-8';\n    infile &fref lrecl=32767;\n    input;\n    length appLoc expanded_path $1048;\n    if _n_=1 then do;\n      retain pgm \"&_program\" appLoc expanded_path;\n      /* index is deployed in the /services/ folder under the appLoc */\n      appLoc=substr(pgm,1,find(pgm,'/services/')-1);\n      expanded_path=cats('?_PROGRAM=',appLoc,'/services/');\n    end;\n    if find(_infile_,' appLoc: ') then put '    appLoc: ' apploc:$quote1048. ',';\n    else if find(_infile_,' serverType: ') then do;\n      if symexist('_metaperson') then put '    serverType: \"SAS9\" ,';\n      else put '    serverType: \"SASVIYA\" ,';\n    end;\n    else if find(_infile_,' hostUrl: ') then do;\n      /* nothing - we are streaming, so remove to default as hostname */\n    end;\n    else do;\n      length newline $32767;\n      /* during SAS9 compilation, dependencies are assigned three slashes /// */\n      newline=tranwrd(_infile_,'?_PROGRAM=///',cats(expanded_path));\n      put newline;\n    end;\n  run;\n  %let fref=_sjs;\n%end;\n\n/**\n  * In SAS9, JS & CSS files are base64 encoded to avoid UTF8 issues in WLATIN1\n  * metadata - so in this case, decode and stream byte by byte.\n  * */\n%if &type=GIF or &type=PNG or &type=JPG or &type=JPEG or &type=ICO or &type=MP3\nor &type=JS64 or &type=CSS64 or &type=WAV or &type=OGG or &type=WOFF\nor &type=WOFF2 or &type=TTF or &type=MP4\n%then %do;\n  data _null_;\n    length filein 8 fileout 8;\n    filein = fopen(\"&fref\",'I',4,'B');\n    fileout = fopen(\"_webout\",'A',1,'B');\n    char= '20'x;\n    do while(fread(filein)=0);\n      length raw $4 ;\n      do i=1 to 4;\n        rc=fget(filein,char,1);\n        substr(raw,i,1)=char;\n      end;\n      rc = fput(fileout, input(raw,$base64X4.));\n      rc =fwrite(fileout);\n    end;\n    rc = fclose(filein);\n    rc = fclose(fileout);\n  run;\n%end;\n%else %do;\n  data _null_;\n    length filein 8 fileid 8;\n    filein = fopen(\"&fref\",'I',1,'B');\n    fileid = fopen(\"_webout\",'A',1,'B');\n    rec = '20'x;\n    do while(fread(filein)=0);\n      rc = fget(filein,rec,1);\n      rc = fput(fileid, rec);\n      rc =fwrite(fileid);\n    end;\n    rc = fclose(filein);\n    rc = fclose(fileid);\n  run;\n%end;\n%mend;";
+export declare const sasjsout = "\n%macro sasjsout(type,fref=sasjs);\n%global sysprocessmode SYS_JES_JOB_URI;\n%if \"&sysprocessmode\"=\"SAS Compute Server\" %then %do;\n  %if &type=HTML %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name=\"_webout.json\"\n      contenttype=\"text/html\";\n  %end;\n  %else %if &type=JS or &type=JS64 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.js'\n      contenttype='application/javascript';\n  %end;\n  %else %if &type=CSS or &type=CSS64 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.css'\n      contenttype='text/css';\n  %end;\n  %else %if &type=PNG or &type=GIF or &type=JPEG or &type=JPG %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\"\n      name=\"_webout.%lowcase(&type)\"\n      contenttype=\"image/%lowcase(&type)\" lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=ICO %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.ico'\n      contenttype='image/vnd.microsoft.icon' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=JSON %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.json'\n      contenttype='application/json' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=MP3 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.mp3'\n      contenttype='audio/mpeg' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=WAV %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.wav'\n      contenttype='audio/x-wav' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=OGG %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.ogg'\n      contenttype='audio/ogg' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=WOFF or &type=WOFF2 or &type=TTF %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\"\n      contenttype=\"font/%lowcase(&type)\";\n  %end;\n  %else %if &type=MP4 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\"\n      contenttype=\"video/mp4\";\n  %end;\n%end;\n%else %do;\n  %if &type=JS or &type=JS64 %then %do;\n    %let rc=%sysfunc(stpsrv_header(\n      Content-type,application/javascript%str(;)charset=UTF-8\n    ));\n  %end;\n  %else %if &type=CSS or &type=CSS64 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,text/css));\n  %end;\n  %else %if &type=PNG or &type=GIF or &type=JPEG or &type=JPG %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/%lowcase(&type)));\n  %end;\n  %else %if &type=ICO %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/vnd.microsoft.icon));\n  %end;\n  %else %if &type=JSON %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,application/json));\n  %end;\n  %else %if &type=MP3 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,audio/mpeg));\n  %end;\n  %else %if &type=WAV %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,audio/x-wav));\n  %end;\n  %else %if &type=OGG %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,audio/ogg));\n  %end;\n  %else %if &type=WOFF or &type=WOFF2 or &type=TTF %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,font/%lowcase(&type)));\n  %end;\n  %else %if &type=MP4 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,video/mp4));\n  %end;\n%end;\n%if &type=HTML %then %do;\n  /*\n  We need to perform some substitutions -eg to get the APPLOC and SERVERTYPE.\n  Therefore the developer should avoid writing lines that exceed 32k\n  characters (eg base64 encoded images) as they will get truncated when passing\n  through the datastep.  This could of course be re-written using LUA, removing\n  the length restriction.  Pull requests are welcome!\n  */\n  filename _sjs temp;\n  data _null_;\n    file _sjs lrecl=32767 encoding='utf-8';\n    infile &fref lrecl=32767;\n    input;\n    length appLoc expanded_path $1048;\n    if _n_=1 then do;\n      retain pgm \"&_program\" appLoc expanded_path;\n      /* index is deployed in the /services/ folder under the appLoc */\n      appLoc=substr(pgm,1,find(pgm,'/services/')-1);\n      expanded_path=cats('?_PROGRAM=',appLoc,'/services/');\n    end;\n    if find(_infile_,' appLoc: ') then put '    appLoc: ' apploc:$quote1048. ',';\n    else if find(_infile_,' serverType: ') then do;\n      if symexist('_metaperson') then put '    serverType: \"SAS9\" ,';\n      else put '    serverType: \"SASVIYA\" ,';\n    end;\n    else if find(_infile_,' serverUrl: ') then do;\n      /* nothing - we are streaming, so remove to default as hostname */\n    end;\n    else do;\n      /* More recently, SASjs apps avoid inline JS to allow strict CSP */\n      length infile in1 in2 $32767;\n      infile=cats(_infile_);\n      spos1=index(upcase(infile),'APPLOC=\"');\n      if spos1>0 then do;\n        in1=substr(infile,1,spos1+7);\n        in2=subpad(infile,spos1+8);\n        in2=substr(in2,index(in2,'\"'));\n        infile=cats(in1,appLoc,in2);\n        putlog \"new apploc:  \" infile=;\n      end;\n      /* find & replace serverType in HTML attributes */\n      spos2=index(upcase(infile),'SERVERTYPE=\"');\n      if spos2>0 then do;\n        in1=substr(infile,1,spos2+11);\n        in2=subpad(infile,spos2+12);\n        in2=substr(in2,index(in2,'\"'));\n        if symexist('sasjsprocessmode') then infile=cats(in1,\"SASJS\",in2);\n        else if \"&sysprocessmode\"=\"SAS Object Server\"\n        or \"&sysprocessmode\"= \"SAS Compute Server\"\n        then infile=cats(in1,\"SASVIYA\",in2);\n        else infile=cats(in1,\"SAS9\",in2);\n        putlog \"new servertype:  \" infile=;\n      end;\n      /* find & replace serverUrl in HTML attributes */\n      spos3=index(upcase(infile),'SERVERURL=\"');\n      if spos3>0 then do;\n        in1=substr(infile,1,spos3+10);\n        in2=subpad(infile,spos3+11);\n        in2=substr(in2,index(in2,'\"'));\n        infile=cats(in1,in2);\n        putlog \"new serverUrl:  \" infile=;\n      end;\n      if sum(spos1,spos2,spos3)>0 then put infile;\n      else do;\n        /* during SAS9 sasjs compile, dependencies get three slashes /// */\n        infile=tranwrd(_infile_,'?_PROGRAM=///',cats(expanded_path));\n        put infile;\n      end;\n    end;\n  run;\n  %let fref=_sjs;\n%end;\n\n/**\n  * In SAS9, JS & CSS files are base64 encoded to avoid UTF8 issues in WLATIN1\n  * metadata - so in this case, decode and stream byte by byte.\n  * */\n%if &type=GIF or &type=PNG or &type=JPG or &type=JPEG or &type=ICO or &type=MP3\nor &type=JS64 or &type=CSS64 or &type=WAV or &type=OGG or &type=WOFF\nor &type=WOFF2 or &type=TTF or &type=MP4\n%then %do;\n  data _null_;\n    length filein 8 fileout 8;\n    filein = fopen(\"&fref\",'I',4,'B');\n    fileout = fopen(\"_webout\",'A',1,'B');\n    char= '20'x;\n    do while(fread(filein)=0);\n      length raw $4 ;\n      do i=1 to 4;\n        rc=fget(filein,char,1);\n        substr(raw,i,1)=char;\n      end;\n      rc = fput(fileout, input(raw,$base64X4.));\n      rc =fwrite(fileout);\n    end;\n    rc = fclose(filein);\n    rc = fclose(fileout);\n  run;\n%end;\n%else %do;\n  data _null_;\n    length filein 8 fileid 8;\n    filein = fopen(\"&fref\",'I',1,'B');\n    fileid = fopen(\"_webout\",'A',1,'B');\n    rec = '20'x;\n    do while(fread(filein)=0);\n      rc = fget(filein,rec,1);\n      rc = fput(fileid, rec);\n      rc =fwrite(fileid);\n    end;\n    rc = fclose(filein);\n    rc = fclose(fileid);\n  run;\n%end;\n%mend;";

package/build/commands/web/internal/sasjsout.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sasjsout = void 0;
-exports.sasjsout = "\n%macro sasjsout(type,fref=sasjs);\n%global sysprocessmode SYS_JES_JOB_URI;\n%if \"&sysprocessmode\"=\"SAS Compute Server\" %then %do;\n  %if &type=HTML %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name=\"_webout.json\"\n      contenttype=\"text/html\";\n  %end;\n  %else %if &type=JS or &type=JS64 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.js'\n      contenttype='application/javascript';\n  %end;\n  %else %if &type=CSS or &type=CSS64 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.css'\n      contenttype='text/css';\n  %end;\n  %else %if &type=PNG or &type=GIF or &type=JPEG or &type=JPG %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\"\n      name=\"_webout.%lowcase(&type)\"\n      contenttype=\"image/%lowcase(&type)\" lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=ICO %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.ico'\n      contenttype='image/vnd.microsoft.icon' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=JSON %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.json'\n      contenttype='application/json' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=MP3 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.mp3'\n      contenttype='audio/mpeg' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=WAV %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.wav'\n      contenttype='audio/x-wav' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=OGG %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.ogg'\n      contenttype='audio/ogg' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=WOFF or &type=WOFF2 or &type=TTF %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\"\n      contenttype=\"font/%lowcase(&type)\";\n  %end;\n  %else %if &type=MP4 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\"\n      contenttype=\"video/mp4\";\n  %end;\n%end;\n%else %do;\n  %if &type=JS or &type=JS64 %then %do;\n    %let rc=%sysfunc(stpsrv_header(\n      Content-type,application/javascript%str(;)charset=UTF-8\n    ));\n  %end;\n  %else %if &type=CSS or &type=CSS64 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,text/css));\n  %end;\n  %else %if &type=PNG or &type=GIF or &type=JPEG or &type=JPG %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/%lowcase(&type)));\n  %end;\n  %else %if &type=ICO %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/vnd.microsoft.icon));\n  %end;\n  %else %if &type=JSON %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,application/json));\n  %end;\n  %else %if &type=MP3 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,audio/mpeg));\n  %end;\n  %else %if &type=WAV %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,audio/x-wav));\n  %end;\n  %else %if &type=OGG %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,audio/ogg));\n  %end;\n  %else %if &type=WOFF or &type=WOFF2 or &type=TTF %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,font/%lowcase(&type)));\n  %end;\n  %else %if &type=MP4 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,video/mp4));\n  %end;\n%end;\n%if &type=HTML %then %do;\n  /*\n  We need to perform some substitutions -eg to get the APPLOC and SERVERTYPE.\n  Therefore the developer should avoid writing lines that exceed 32k\n  characters (eg base64 encoded images) as they will get truncated when passing\n  through the datastep.  This could of course be re-written using LUA, removing\n  the length restriction.  Pull requests are welcome!\n  */\n  filename _sjs temp;\n  data _null_;\n    file _sjs lrecl=32767 encoding='utf-8';\n    infile &fref lrecl=32767;\n    input;\n    length appLoc expanded_path $1048;\n    if _n_=1 then do;\n      retain pgm \"&_program\" appLoc expanded_path;\n      /* index is deployed in the /services/ folder under the appLoc */\n      appLoc=substr(pgm,1,find(pgm,'/services/')-1);\n      expanded_path=cats('?_PROGRAM=',appLoc,'/services/');\n    end;\n    if find(_infile_,' appLoc: ') then put '    appLoc: ' apploc:$quote1048. ',';\n    else if find(_infile_,' serverType: ') then do;\n      if symexist('_metaperson') then put '    serverType: \"SAS9\" ,';\n      else put '    serverType: \"SASVIYA\" ,';\n    end;\n    else if find(_infile_,' hostUrl: ') then do;\n      /* nothing - we are streaming, so remove to default as hostname */\n    end;\n    else do;\n      length newline $32767;\n      /* during SAS9 compilation, dependencies are assigned three slashes /// */\n      newline=tranwrd(_infile_,'?_PROGRAM=///',cats(expanded_path));\n      put newline;\n    end;\n  run;\n  %let fref=_sjs;\n%end;\n\n/**\n  * In SAS9, JS & CSS files are base64 encoded to avoid UTF8 issues in WLATIN1\n  * metadata - so in this case, decode and stream byte by byte.\n  * */\n%if &type=GIF or &type=PNG or &type=JPG or &type=JPEG or &type=ICO or &type=MP3\nor &type=JS64 or &type=CSS64 or &type=WAV or &type=OGG or &type=WOFF\nor &type=WOFF2 or &type=TTF or &type=MP4\n%then %do;\n  data _null_;\n    length filein 8 fileout 8;\n    filein = fopen(\"&fref\",'I',4,'B');\n    fileout = fopen(\"_webout\",'A',1,'B');\n    char= '20'x;\n    do while(fread(filein)=0);\n      length raw $4 ;\n      do i=1 to 4;\n        rc=fget(filein,char,1);\n        substr(raw,i,1)=char;\n      end;\n      rc = fput(fileout, input(raw,$base64X4.));\n      rc =fwrite(fileout);\n    end;\n    rc = fclose(filein);\n    rc = fclose(fileout);\n  run;\n%end;\n%else %do;\n  data _null_;\n    length filein 8 fileid 8;\n    filein = fopen(\"&fref\",'I',1,'B');\n    fileid = fopen(\"_webout\",'A',1,'B');\n    rec = '20'x;\n    do while(fread(filein)=0);\n      rc = fget(filein,rec,1);\n      rc = fput(fileid, rec);\n      rc =fwrite(fileid);\n    end;\n    rc = fclose(filein);\n    rc = fclose(fileid);\n  run;\n%end;\n%mend;";
+exports.sasjsout = "\n%macro sasjsout(type,fref=sasjs);\n%global sysprocessmode SYS_JES_JOB_URI;\n%if \"&sysprocessmode\"=\"SAS Compute Server\" %then %do;\n  %if &type=HTML %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name=\"_webout.json\"\n      contenttype=\"text/html\";\n  %end;\n  %else %if &type=JS or &type=JS64 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.js'\n      contenttype='application/javascript';\n  %end;\n  %else %if &type=CSS or &type=CSS64 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.css'\n      contenttype='text/css';\n  %end;\n  %else %if &type=PNG or &type=GIF or &type=JPEG or &type=JPG %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\"\n      name=\"_webout.%lowcase(&type)\"\n      contenttype=\"image/%lowcase(&type)\" lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=ICO %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.ico'\n      contenttype='image/vnd.microsoft.icon' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=JSON %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.json'\n      contenttype='application/json' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=MP3 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.mp3'\n      contenttype='audio/mpeg' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=WAV %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.wav'\n      contenttype='audio/x-wav' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=OGG %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.ogg'\n      contenttype='audio/ogg' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=WOFF or &type=WOFF2 or &type=TTF %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\"\n      contenttype=\"font/%lowcase(&type)\";\n  %end;\n  %else %if &type=MP4 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\"\n      contenttype=\"video/mp4\";\n  %end;\n%end;\n%else %do;\n  %if &type=JS or &type=JS64 %then %do;\n    %let rc=%sysfunc(stpsrv_header(\n      Content-type,application/javascript%str(;)charset=UTF-8\n    ));\n  %end;\n  %else %if &type=CSS or &type=CSS64 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,text/css));\n  %end;\n  %else %if &type=PNG or &type=GIF or &type=JPEG or &type=JPG %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/%lowcase(&type)));\n  %end;\n  %else %if &type=ICO %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/vnd.microsoft.icon));\n  %end;\n  %else %if &type=JSON %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,application/json));\n  %end;\n  %else %if &type=MP3 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,audio/mpeg));\n  %end;\n  %else %if &type=WAV %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,audio/x-wav));\n  %end;\n  %else %if &type=OGG %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,audio/ogg));\n  %end;\n  %else %if &type=WOFF or &type=WOFF2 or &type=TTF %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,font/%lowcase(&type)));\n  %end;\n  %else %if &type=MP4 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,video/mp4));\n  %end;\n%end;\n%if &type=HTML %then %do;\n  /*\n  We need to perform some substitutions -eg to get the APPLOC and SERVERTYPE.\n  Therefore the developer should avoid writing lines that exceed 32k\n  characters (eg base64 encoded images) as they will get truncated when passing\n  through the datastep.  This could of course be re-written using LUA, removing\n  the length restriction.  Pull requests are welcome!\n  */\n  filename _sjs temp;\n  data _null_;\n    file _sjs lrecl=32767 encoding='utf-8';\n    infile &fref lrecl=32767;\n    input;\n    length appLoc expanded_path $1048;\n    if _n_=1 then do;\n      retain pgm \"&_program\" appLoc expanded_path;\n      /* index is deployed in the /services/ folder under the appLoc */\n      appLoc=substr(pgm,1,find(pgm,'/services/')-1);\n      expanded_path=cats('?_PROGRAM=',appLoc,'/services/');\n    end;\n    if find(_infile_,' appLoc: ') then put '    appLoc: ' apploc:$quote1048. ',';\n    else if find(_infile_,' serverType: ') then do;\n      if symexist('_metaperson') then put '    serverType: \"SAS9\" ,';\n      else put '    serverType: \"SASVIYA\" ,';\n    end;\n    else if find(_infile_,' serverUrl: ') then do;\n      /* nothing - we are streaming, so remove to default as hostname */\n    end;\n    else do;\n      /* More recently, SASjs apps avoid inline JS to allow strict CSP */\n      length infile in1 in2 $32767;\n      infile=cats(_infile_);\n      spos1=index(upcase(infile),'APPLOC=\"');\n      if spos1>0 then do;\n        in1=substr(infile,1,spos1+7);\n        in2=subpad(infile,spos1+8);\n        in2=substr(in2,index(in2,'\"'));\n        infile=cats(in1,appLoc,in2);\n        putlog \"new apploc:  \" infile=;\n      end;\n      /* find & replace serverType in HTML attributes */\n      spos2=index(upcase(infile),'SERVERTYPE=\"');\n      if spos2>0 then do;\n        in1=substr(infile,1,spos2+11);\n        in2=subpad(infile,spos2+12);\n        in2=substr(in2,index(in2,'\"'));\n        if symexist('sasjsprocessmode') then infile=cats(in1,\"SASJS\",in2);\n        else if \"&sysprocessmode\"=\"SAS Object Server\"\n        or \"&sysprocessmode\"= \"SAS Compute Server\"\n        then infile=cats(in1,\"SASVIYA\",in2);\n        else infile=cats(in1,\"SAS9\",in2);\n        putlog \"new servertype:  \" infile=;\n      end;\n      /* find & replace serverUrl in HTML attributes */\n      spos3=index(upcase(infile),'SERVERURL=\"');\n      if spos3>0 then do;\n        in1=substr(infile,1,spos3+10);\n        in2=subpad(infile,spos3+11);\n        in2=substr(in2,index(in2,'\"'));\n        infile=cats(in1,in2);\n        putlog \"new serverUrl:  \" infile=;\n      end;\n      if sum(spos1,spos2,spos3)>0 then put infile;\n      else do;\n        /* during SAS9 sasjs compile, dependencies get three slashes /// */\n        infile=tranwrd(_infile_,'?_PROGRAM=///',cats(expanded_path));\n        put infile;\n      end;\n    end;\n  run;\n  %let fref=_sjs;\n%end;\n\n/**\n  * In SAS9, JS & CSS files are base64 encoded to avoid UTF8 issues in WLATIN1\n  * metadata - so in this case, decode and stream byte by byte.\n  * */\n%if &type=GIF or &type=PNG or &type=JPG or &type=JPEG or &type=ICO or &type=MP3\nor &type=JS64 or &type=CSS64 or &type=WAV or &type=OGG or &type=WOFF\nor &type=WOFF2 or &type=TTF or &type=MP4\n%then %do;\n  data _null_;\n    length filein 8 fileout 8;\n    filein = fopen(\"&fref\",'I',4,'B');\n    fileout = fopen(\"_webout\",'A',1,'B');\n    char= '20'x;\n    do while(fread(filein)=0);\n      length raw $4 ;\n      do i=1 to 4;\n        rc=fget(filein,char,1);\n        substr(raw,i,1)=char;\n      end;\n      rc = fput(fileout, input(raw,$base64X4.));\n      rc =fwrite(fileout);\n    end;\n    rc = fclose(filein);\n    rc = fclose(fileout);\n  run;\n%end;\n%else %do;\n  data _null_;\n    length filein 8 fileid 8;\n    filein = fopen(\"&fref\",'I',1,'B');\n    fileid = fopen(\"_webout\",'A',1,'B');\n    rec = '20'x;\n    do while(fread(filein)=0);\n      rc = fget(filein,rec,1);\n      rc = fput(fileid, rec);\n      rc =fwrite(fileid);\n    end;\n    rc = fclose(filein);\n    rc = fclose(fileid);\n  run;\n%end;\n%mend;";

package/build/utils/compressAndSave.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Creates a zip file.
+ * Having single JSON file in it.
+ * @param {string} saveTo - full path to save the file.
+ * @param {string} contents - contents of JSON file.
+ */
+export declare const compressAndSave: (saveTo: string, contents: string) => Promise<void>;

package/build/utils/compressAndSave.js

@@ -0,0 +1,67 @@
+"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 };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compressAndSave = void 0;
+var path_1 = __importDefault(require("path"));
+var adm_zip_1 = __importDefault(require("adm-zip"));
+/**
+ * Creates a zip file.
+ * Having single JSON file in it.
+ * @param {string} saveTo - full path to save the file.
+ * @param {string} contents - contents of JSON file.
+ */
+var compressAndSave = function (saveTo, contents) { return __awaiter(void 0, void 0, void 0, function () {
+    var zip, filenameInZip;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                zip = new adm_zip_1.default();
+                filenameInZip = path_1.default.basename(saveTo, path_1.default.extname(saveTo));
+                // add file directly
+                zip.addFile(filenameInZip, Buffer.from(contents, 'utf8'), 'entry comment goes here');
+                return [4 /*yield*/, zip.writeZipPromise(saveTo, { overwrite: true })];
+            case 1:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    });
+}); };
+exports.compressAndSave = compressAndSave;

package/build/utils/fileStructures/builtFiles.js

@@ -6,7 +6,8 @@ var builtFiles = function (buildFileName) {
         folderName: 'sasjsbuild',
         files: [
             { fileName: "".concat(buildFileName, ".sas") },
-            { fileName: "".concat(buildFileName, ".json") }
+            { fileName: "".concat(buildFileName, ".json") },
+            { fileName: "".concat(buildFileName, ".json.zip") }
         ],
         subFolders: [
             {

package/build/utils/fileStructures/builtFilesCustom1.js

@@ -6,7 +6,8 @@ var builtFilesCustom1 = function (buildFileName) {
         folderName: 'sasjsbuild',
         files: [
             { fileName: "".concat(buildFileName, ".sas") },
-            { fileName: "".concat(buildFileName, ".json") }
+            { fileName: "".concat(buildFileName, ".json") },
+            { fileName: "".concat(buildFileName, ".json.zip") }
         ],
         subFolders: [
             {

package/build/utils/index.d.ts

@@ -3,7 +3,7 @@ export * from './config';
 export * from './displayResult';
 export * from './file';
 export * from './loadEnvVariables';
-export * from './setProjectDir';
 export * from './setConstants';
+export * from './setProjectDir';
 export * from './utils';
 export * from './validateTargetName';

package/build/utils/index.js

@@ -15,7 +15,7 @@ __exportStar(require("./config"), exports);
 __exportStar(require("./displayResult"), exports);
 __exportStar(require("./file"), exports);
 __exportStar(require("./loadEnvVariables"), exports);
-__exportStar(require("./setProjectDir"), exports);
 __exportStar(require("./setConstants"), exports);
+__exportStar(require("./setProjectDir"), exports);
 __exportStar(require("./utils"), exports);
 __exportStar(require("./validateTargetName"), exports);

package/package.json

@@ -51,6 +51,7 @@
     "@sasjs/core": "4.23.4",
     "@sasjs/lint": "1.11.2",
     "@sasjs/utils": "2.44.0",
+    "adm-zip": "0.5.9",
     "chalk": "4.1.2",
     "csv-stringify": "5.6.5",
     "dotenv": "10.0.0",
@@ -65,13 +66,14 @@
     "ora": "5.4.1",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "ssl-root-cas": "^1.3.1",
+    "ssl-root-cas": "1.3.1",
     "xml": "1.0.1",
     "yargs": "17.2.1"
   },
   "devDependencies": {
     "@babel/preset-env": "7.15.6",
     "@babel/preset-typescript": "7.15.0",
+    "@types/adm-zip": "0.5.0",
     "@types/find": "0.2.1",
     "@types/jest": "27.0.2",
     "@types/jsdom": "16.2.13",
@@ -87,11 +89,12 @@
     "jest-cli": "27.4.7",
     "jest-extended": "1.1.0",
     "nodemon": "2.0.15",
+    "prettier": "2.6.2",
     "ts-jest": "27.1.2",
     "ts-node": "10.4.0",
     "tslib": "2.3.1",
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.13.4"
+  "version": "3.14.0"
 }