@sasjs/cli 3.13.3 → 3.13.6

package/build/commands/job/jobCommand.js

@@ -143,7 +143,7 @@ var JobCommand = /** @class */ (function (_super) {
     JobCommand.prototype.execute = function () {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var target, sasjs, _c, authConfig, _d, username, password, _e, _f;
+            var target, sasjs, authConfig, _c, _d, username, password, _e, e_1, _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
                     case 0: return [4 /*yield*/, this.getTargetInfo()];
@@ -162,11 +162,11 @@ var JobCommand = /** @class */ (function (_super) {
                             case utils_1.ServerType.Sas9: return [3 /*break*/, 7];
                             case utils_1.ServerType.Sasjs: return [3 /*break*/, 11];
                         }
-                        return [3 /*break*/, 15];
+                        return [3 /*break*/, 19];
                     case 2: return [4 /*yield*/, (0, utils_2.getAuthConfig)(target).catch(function (err) {
                             var _a;
                             (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to execute job. Error fetching auth config: ', err);
-                            return null;
+                            return undefined;
                         })];
                     case 3:
                         authConfig = _g.sent();
@@ -213,30 +213,41 @@ var JobCommand = /** @class */ (function (_super) {
                         });
                         if (typeof this.parsed.jobPath !== 'string')
                             return [2 /*return*/, command_1.ReturnCode.InvalidCommand];
-                        if (!this.jobSubCommands.includes(this.parsed.subCommand)) return [3 /*break*/, 13];
-                        return [4 /*yield*/, this.executeJobSasjs(sasjs, target)];
+                        _g.label = 12;
                     case 12:
-                        _f = _g.sent();
-                        return [3 /*break*/, 14];
+                        _g.trys.push([12, 14, , 15]);
+                        return [4 /*yield*/, (0, utils_2.getAuthConfig)(target)];
                     case 13:
-                        _f = command_1.ReturnCode.InvalidCommand;
-                        _g.label = 14;
-                    case 14: return [2 /*return*/, _f];
+                        authConfig = _g.sent();
+                        return [3 /*break*/, 15];
+                    case 14:
+                        e_1 = _g.sent();
+                        return [3 /*break*/, 15];
                     case 15:
+                        if (!this.jobSubCommands.includes(this.parsed.subCommand)) return [3 /*break*/, 17];
+                        return [4 /*yield*/, this.executeJobSasjs(sasjs, target, authConfig)];
+                    case 16:
+                        _f = _g.sent();
+                        return [3 /*break*/, 18];
+                    case 17:
+                        _f = command_1.ReturnCode.InvalidCommand;
+                        _g.label = 18;
+                    case 18: return [2 /*return*/, _f];
+                    case 19:
                         (_b = process.logger) === null || _b === void 0 ? void 0 : _b.error("This command is not supported for specified server type.\nPlease try again with a different server type.");
                         return [2 /*return*/, command_1.ReturnCode.InternalError];
                 }
             });
         });
     };
-    JobCommand.prototype.executeJobSasjs = function (sasjs, target) {
+    JobCommand.prototype.executeJobSasjs = function (sasjs, target, authConfig) {
         return __awaiter(this, void 0, void 0, function () {
             var jobPath, returnCode;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         jobPath = (0, prefixAppLoc_1.prefixAppLoc)(target.appLoc, this.parsed.jobPath);
-                        return [4 /*yield*/, (0, execute_1.executeJobSasjs)(sasjs, jobPath, this.parsed.log)
+                        return [4 /*yield*/, (0, execute_1.executeJobSasjs)(sasjs, jobPath, this.parsed.log, authConfig)
                                 .then(function () { return command_1.ReturnCode.Success; })
                                 .catch(function (err) {
                                 var _a;

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

@@ -127,7 +127,7 @@ describe('executeJobSasjs', function () {
                 case 0: return [4 /*yield*/, (0, execute_1.executeJobSasjs)(sasjs, 'test/job', path_1.default.join(process.projectDir, 'logs'))];
                 case 1:
                     _a.sent();
-                    expect(sasjs.executeJobSASjs).toHaveBeenCalledWith({ _program: 'test/job' });
+                    expect(sasjs.executeJobSASjs).toHaveBeenCalledWith({ _program: 'test/job' }, undefined);
                     return [2 /*return*/];
             }
         });

package/build/commands/request/request.js

@@ -112,9 +112,7 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                         debug: true
                     });
                     return [4 /*yield*/, sasjs
-                            .request(sasJobLocation, dataJson, configJson, function () {
-                            (0, displayResult_1.displayError)(null, 'Login callback called. Request failed.');
-                        }, authConfig)
+                            .request(sasJobLocation, dataJson, configJson, undefined, authConfig)
                             .then(function (res) { return __awaiter(_this, void 0, void 0, function () {
                             var output;
                             return __generator(this, function (_a) {
@@ -173,7 +171,9 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                                             error = {};
                                             if (err.message)
                                                 error.message = err.message;
-                                            (0, displayResult_1.displayError)(error, 'An error occurred while executing the request.');
+                                            if (err.error.message)
+                                                error.message = err.error.message;
+                                            (0, displayResult_1.displayError)(error, "An error occurred while executing the request.");
                                         }
                                         return [4 /*yield*/, saveLogFile(sasjs, sasJobLocation, logFile, jobPath)];
                                     case 1:

package/build/commands/request/requestCommand.js

@@ -114,7 +114,7 @@ var RequestCommand = /** @class */ (function (_super) {
     }
     RequestCommand.prototype.execute = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, target, isLocal, jobPath, log, output, authConfig, _b, _c, sasProgramPath, data, config;
+            var _a, target, isLocal, jobPath, log, output, authConfig, _b, e_1, _c, sasProgramPath, data, config;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0: return [4 /*yield*/, this.getTargetInfo()];
@@ -125,16 +125,27 @@ var RequestCommand = /** @class */ (function (_super) {
                             ? (0, getLogFilePath_1.getLogFilePath)(this.parsed.log || '', jobPath || '')
                             : undefined;
                         output = this.parsed.output || undefined;
-                        if (!(target.serverType === utils_1.ServerType.SasViya)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, (0, utils_2.getAuthConfig)(target)];
-                    case 2:
-                        _b = _d.sent();
-                        return [3 /*break*/, 4];
+                        _b = target.serverType;
+                        switch (_b) {
+                            case utils_1.ServerType.SasViya: return [3 /*break*/, 2];
+                            case utils_1.ServerType.Sasjs: return [3 /*break*/, 4];
+                        }
+                        return [3 /*break*/, 8];
+                    case 2: return [4 /*yield*/, (0, utils_2.getAuthConfig)(target)];
                     case 3:
-                        _b = undefined;
-                        _d.label = 4;
+                        authConfig = _d.sent();
+                        return [3 /*break*/, 8];
                     case 4:
-                        authConfig = _b;
+                        _d.trys.push([4, 6, , 7]);
+                        return [4 /*yield*/, (0, utils_2.getAuthConfig)(target)];
+                    case 5:
+                        authConfig = _d.sent();
+                        return [3 /*break*/, 7];
+                    case 6:
+                        e_1 = _d.sent();
+                        return [3 /*break*/, 7];
+                    case 7: return [3 /*break*/, 8];
+                    case 8:
                         _c = this.parsed, sasProgramPath = _c.sasProgramPath, data = _c.data, config = _c.config;
                         return [4 /*yield*/, (0, request_1.runSasJob)(target, isLocal, sasProgramPath, data, config, authConfig, log, jobPath, output)
                                 .then(function () {
@@ -144,7 +155,7 @@ var RequestCommand = /** @class */ (function (_super) {
                                 (0, utils_2.displayError)(err, 'An error has occurred when running your SAS job.');
                                 return command_1.ReturnCode.InternalError;
                             })];
-                    case 5: return [2 /*return*/, _d.sent()];
+                    case 9: return [2 /*return*/, _d.sent()];
                 }
             });
         });

package/build/commands/shared/deployToSasViyaWithServicePack.js

@@ -73,7 +73,12 @@ function deployToSasViyaWithServicePack(jsonFilePath, target, isLocal, isForced)
                         serverUrl: target.serverUrl,
                         useComputeApi: true
                     });
-                    return [4 /*yield*/, sasjs.deployServicePack(jsonObject, undefined, undefined, access_token, isForced)];
+                    return [4 /*yield*/, sasjs
+                            .deployServicePack(jsonObject, undefined, undefined, access_token, isForced)
+                            .catch(function (err) {
+                            process.logger.error('deployServicePack error', err);
+                            throw new Error('Deploy service pack error');
+                        })];
                 case 3:
                     _a.sent();
                     return [2 /*return*/, jsonObject];

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/displayResult.js

@@ -8,7 +8,7 @@ function displaySuccess(message) {
 }
 exports.displaySuccess = displaySuccess;
 function displayError(err, errorMessage) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (errorMessage === void 0) { errorMessage = ''; }
     if (errorMessage)
         errorMessage = "".concat(errorMessage, "\n");
@@ -47,5 +47,9 @@ function displayError(err, errorMessage) {
         }
         return "".concat(errorMessage).concat(failureDetails);
     }
+    else {
+        if (errorMessage)
+            (_d = process.logger) === null || _d === void 0 ? void 0 : _d.error(errorMessage);
+    }
 }
 exports.displayError = displayError;

package/package.json

@@ -47,10 +47,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "3.8.5",
-    "@sasjs/core": "4.18.15",
+    "@sasjs/adapter": "3.9.4",
+    "@sasjs/core": "4.23.4",
     "@sasjs/lint": "1.11.2",
-    "@sasjs/utils": "2.42.0",
+    "@sasjs/utils": "2.44.0",
     "chalk": "4.1.2",
     "csv-stringify": "5.6.5",
     "dotenv": "10.0.0",
@@ -65,7 +65,7 @@
     "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"
   },
@@ -87,11 +87,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.3"
+  "version": "3.13.6"
 }

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

@@ -1,3 +0,0 @@
-import { Target } from '@sasjs/utils/types';
-import { CompileTree } from '@sasjs/utils';
-export declare function compileJobFile(target: Target, filePath: string, macroFolders: string[], programFolders: string[], programVar: string | undefined, compileTree: CompileTree): Promise<void>;

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

@@ -1,60 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.compileJobFile = void 0;
-var utils_1 = require("@sasjs/utils");
-var loadDependencies_1 = require("./loadDependencies");
-function compileJobFile(target, filePath, macroFolders, programFolders, programVar, compileTree) {
-    if (programVar === void 0) { programVar = ''; }
-    return __awaiter(this, void 0, void 0, function () {
-        var dependencies;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, filePath, macroFolders, programFolders, (0, utils_1.isTestFile)(filePath) ? utils_1.SASJsFileType.test : utils_1.SASJsFileType.job, compileTree)];
-                case 1:
-                    dependencies = _a.sent();
-                    dependencies = "".concat(programVar ? programVar + '\n' : '').concat(dependencies);
-                    return [4 /*yield*/, (0, utils_1.createFile)(filePath, dependencies)];
-                case 2:
-                    _a.sent();
-                    return [2 /*return*/];
-            }
-        });
-    });
-}
-exports.compileJobFile = compileJobFile;

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

@@ -1,4 +0,0 @@
-import { CompileTree } from '@sasjs/utils';
-import { Target, ServerType } from '@sasjs/utils/types';
-export declare function compileServiceFile(target: Target, filePath: string, macroFolders: string[], programFolders: string[], programVar: string | undefined, compileTree: CompileTree): Promise<void>;
-export declare function getPreCodeForServicePack(serverType: ServerType): Promise<string>;