@sasjs/cli 3.0.3 → 3.3.0

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

@@ -7,7 +7,10 @@ exports.reactAppFiles = {
         { fileName: 'package.json' },
         { fileName: 'package-lock.json' },
         { fileName: 'tsconfig.json' },
-        { fileName: 'README.md' }
+        { fileName: 'README.md' },
+        { fileName: 'webpack.common.js' },
+        { fileName: 'webpack.dev.js' },
+        { fileName: 'webpack.prod.js' }
     ],
     subFolders: [
         {
@@ -36,12 +39,9 @@ exports.reactAppFiles = {
             folderName: 'src',
             files: [
                 { fileName: 'App.scss' },
-                { fileName: 'cached_data.ts' },
                 { fileName: 'index.scss' },
                 { fileName: 'index.tsx' },
-                { fileName: 'logo.svg' },
-                { fileName: 'react-app-env.d.ts' },
-                { fileName: 'serviceWorker.ts' }
+                { fileName: 'logo.svg' }
             ],
             subFolders: [
                 {

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

@@ -47,6 +47,7 @@ var build_1 = require("../../build/build");
 var deploy_1 = require("../deploy");
 var utils_2 = require("./utils");
 var config_1 = require("../../../utils/config");
+var utils_3 = require("../../../utils");
 describe('sasjs cbd with server type SASJS', function () {
     var target;
     var appName;
@@ -77,7 +78,7 @@ describe('sasjs cbd with server type SASJS', function () {
         });
     }); });
     it("should deploy compile and build to sasjs/server", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var sasjs, customTarget;
+        var sasjs, customTarget, macroCorePath, mf_getuser, mp_jsonout, ms_webout, webout;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -108,6 +109,19 @@ describe('sasjs cbd with server type SASJS', function () {
                     return [4 /*yield*/, deploy_1.deploy(customTarget, true, sasjs)];
                 case 4:
                     _a.sent();
+                    macroCorePath = process.sasjsConstants.macroCorePath;
+                    return [4 /*yield*/, utils_1.readFile(macroCorePath + "/base/mf_getuser.sas")];
+                case 5:
+                    mf_getuser = _a.sent();
+                    return [4 /*yield*/, utils_1.readFile(macroCorePath + "/base/mp_jsonout.sas")];
+                case 6:
+                    mp_jsonout = _a.sent();
+                    return [4 /*yield*/, utils_1.readFile(macroCorePath + "/server/ms_webout.sas")];
+                case 7:
+                    ms_webout = _a.sent();
+                    webout = '  %macro webout(action,ds,dslabel=,fmt=);\n' +
+                        '    %ms_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt)\n' +
+                        '  %mend;\n';
                     expect(sasjs.deployToSASjs).toHaveBeenCalledWith({
                         members: [
                             {
@@ -121,12 +135,14 @@ describe('sasjs cbd with server type SASJS', function () {
                                             {
                                                 name: 'appinit',
                                                 type: 'service',
-                                                code: '/* provide additional debug info */\n%global _program;\n%put &=syscc;\n%put user=%mf_getuser();\n%put pgm=&_program;\n%put timestamp=%sysfunc(datetime(),datetime19.);\n* Service Variables start;\n*Service Variables end;\n* Dependencies start;\n* Dependencies end;\n* Programs start;\n*Programs end;\n* Service start;\nproc sql;\ncreate table areas as select distinct area\n  from sashelp.springs;\n%webout(OPEN)\n%webout(OBJ,areas)\n%webout(CLOSE)\n* Service end;'
+                                                code: utils_3.removeComments("" + mf_getuser + mp_jsonout + ms_webout + webout +
+                                                    '/* provide additional debug info */\n%global _program;\n%put &=syscc;\n%put user=%mf_getuser();\n%put pgm=&_program;\n%put timestamp=%sysfunc(datetime(),datetime19.);\n* Service Variables start;\n*Service Variables end;\n* Dependencies start;\n* Dependencies end;\n* Programs start;\n*Programs end;\n* Service start;\nproc sql;\ncreate table areas as select distinct area\n  from sashelp.springs;\n%webout(OPEN)\n%webout(OBJ,areas)\n%webout(CLOSE)\n* Service end;')
                                             },
                                             {
                                                 name: 'getdata',
                                                 type: 'service',
-                                                code: '/* provide additional debug info */\n%global _program;\n%put &=syscc;\n%put user=%mf_getuser();\n%put pgm=&_program;\n%put timestamp=%sysfunc(datetime(),datetime19.);\n* Service Variables start;\n*Service Variables end;\n* Dependencies start;\n* Dependencies end;\n* Programs start;\n*Programs end;\n* Service start;\n%webout(FETCH)\nproc sql;\ncreate table springs as select * from sashelp.springs\n  where area in (select area from work.areas);\n%webout(OPEN)\n%webout(OBJ,springs)\n%webout(CLOSE)\n* Service end;'
+                                                code: utils_3.removeComments("" + mf_getuser + mp_jsonout + ms_webout + webout +
+                                                    '/* provide additional debug info */\n%global _program;\n%put &=syscc;\n%put user=%mf_getuser();\n%put pgm=&_program;\n%put timestamp=%sysfunc(datetime(),datetime19.);\n* Service Variables start;\n*Service Variables end;\n* Dependencies start;\n* Dependencies end;\n* Programs start;\n*Programs end;\n* Service start;\n%webout(FETCH)\nproc sql;\ncreate table springs as select * from sashelp.springs\n  where area in (select area from work.areas);\n%webout(OPEN)\n%webout(OBJ,springs)\n%webout(CLOSE)\n* Service end;')
                                             }
                                         ]
                                     }

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

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

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

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

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

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

package/build/commands/job/jobCommand.js

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

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

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

package/build/commands/shared/fetchLogFileContent.js

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

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

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

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

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

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

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

package/build/commands/testing/test.js

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

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

@@ -1,4 +1,5 @@
 import { JSDOM } from 'jsdom';
 export declare const getScriptTags: (parsedHtml: JSDOM) => HTMLScriptElement[];
-export declare const getLinkTags: (parsedHtml: JSDOM) => HTMLLinkElement[];
+export declare const getStyleTags: (parsedHtml: JSDOM) => HTMLLinkElement[];
 export declare const getFaviconTags: (parsedHtml: JSDOM) => HTMLLinkElement[];
+export declare const getImgTags: (parsedHtml: JSDOM) => HTMLImageElement[];

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

@@ -1,21 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFaviconTags = exports.getLinkTags = exports.getScriptTags = void 0;
+exports.getImgTags = exports.getFaviconTags = exports.getStyleTags = exports.getScriptTags = void 0;
 var getScriptTags = function (parsedHtml) {
-    return Array.from(parsedHtml.window.document.querySelectorAll('script'));
+    return Array.from(parsedHtml.window.document.getElementsByTagName('script'));
 };
 exports.getScriptTags = getScriptTags;
-var getLinkTags = function (parsedHtml) {
-    var linkTags = Array.from(parsedHtml.window.document.querySelectorAll('link')).filter(function (s) { return s.getAttribute('rel') === 'stylesheet'; });
-    return linkTags;
+var getStyleTags = function (parsedHtml) {
+    return Array.from(parsedHtml.window.document.getElementsByTagName('link')).filter(function (s) { return s.getAttribute('rel') === 'stylesheet'; });
 };
-exports.getLinkTags = getLinkTags;
+exports.getStyleTags = getStyleTags;
 var getFaviconTags = function (parsedHtml) {
-    var linkTags = Array.from(parsedHtml.window.document.querySelectorAll('link')).filter(function (s) {
-        return s.getAttribute('rel') &&
-            s.getAttribute('rel') &&
-            s.getAttribute('rel').includes('icon');
-    });
-    return linkTags;
+    return Array.from(parsedHtml.window.document.getElementsByTagName('link')).filter(function (s) { var _a; return (_a = s.getAttribute('rel')) === null || _a === void 0 ? void 0 : _a.includes('icon'); });
 };
 exports.getFaviconTags = getFaviconTags;
+var getImgTags = function (parsedHtml) {
+    return Array.from(parsedHtml.window.document.getElementsByTagName('img')).filter(function (s) { return s.getAttribute('src'); });
+};
+exports.getImgTags = getImgTags;

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 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.png'\n      contenttype='image/png' 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%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 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/png));\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%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/* stream byte by byte */\n/* in SAS9, JS & CSS files are base64 encoded to avoid UTF8 issues in WLATIN1 metadata */\n%if &type=PNG or &type=ICO or &type=MP3 or &type=JS64 or &type=CSS64 or &type=WAV or &type=OGG\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 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.png'\n      contenttype='image/png' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=JPG %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.jpg'\n      contenttype='image/jpg' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=JPEG %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.jpeg'\n      contenttype='image/jpeg' 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%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 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/png));\n  %end;\n  %else %if &type=JPG %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/jpg));\n  %end;\n  %else %if &type=JPEG %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/jpeg));\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%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/* stream byte by byte */\n/* in SAS9, JS & CSS files are base64 encoded to avoid UTF8 issues in WLATIN1 metadata */\n%if &type=PNG or &type=JPG or &type=JPEG or &type=ICO or &type=MP3 or &type=JS64 or &type=CSS64 or &type=WAV or &type=OGG\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 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.png'\n      contenttype='image/png' 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%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 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/png));\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%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/* stream byte by byte */\n/* in SAS9, JS & CSS files are base64 encoded to avoid UTF8 issues in WLATIN1 metadata */\n%if &type=PNG or &type=ICO or &type=MP3 or &type=JS64 or &type=CSS64 or &type=WAV or &type=OGG\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 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.png'\n      contenttype='image/png' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=JPG %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.jpg'\n      contenttype='image/jpg' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=JPEG %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.jpeg'\n      contenttype='image/jpeg' 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%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 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/png));\n  %end;\n  %else %if &type=JPG %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/jpg));\n  %end;\n  %else %if &type=JPEG %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/jpeg));\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%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/* stream byte by byte */\n/* in SAS9, JS & CSS files are base64 encoded to avoid UTF8 issues in WLATIN1 metadata */\n%if &type=PNG or &type=JPG or &type=JPEG or &type=ICO or &type=MP3 or &type=JS64 or &type=CSS64 or &type=WAV or &type=OGG\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/spec/updateLinkTag.spec.d.ts

@@ -0,0 +1,4 @@
+/**
+ * @jest-environment jsdom
+ */
+export {};

package/build/commands/web/internal/spec/updateLinkTag.spec.js

@@ -0,0 +1,32 @@
+"use strict";
+/**
+ * @jest-environment jsdom
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+var updateLinkTag_1 = require("../updateLinkTag");
+describe('updateLinkTag', function () {
+    it("should update href of link tag", function () {
+        var linkTag = document.createElement('link');
+        linkTag.setAttribute('href', './style.css');
+        var assetPathMap = [];
+        var sasProgramPath = '/SASJobExecution?_FILE=appLoc/services/streamWebFolder/style.css';
+        assetPathMap.push({
+            source: 'style.css',
+            target: sasProgramPath
+        });
+        updateLinkTag_1.updateLinkTag(linkTag, assetPathMap);
+        expect(linkTag.getAttribute('href')).toEqual(sasProgramPath);
+    });
+    it("should update src of image tag", function () {
+        var imgTag = document.createElement('img');
+        imgTag.setAttribute('src', './image.jpeg');
+        var assetPathMap = [];
+        var sasProgramPath = '/SASJobExecution?_FILE=appLoc/services/streamWebFolder/image.jpeg';
+        assetPathMap.push({
+            source: 'image.jpeg',
+            target: sasProgramPath
+        });
+        updateLinkTag_1.updateLinkTag(imgTag, assetPathMap, 'image');
+        expect(imgTag.getAttribute('src')).toEqual(sasProgramPath);
+    });
+});

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

@@ -35,16 +35,37 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateAllTags = void 0;
 var utils_1 = require("@sasjs/utils");
 var getTags_1 = require("./getTags");
 var updateScriptTag_1 = require("./updateScriptTag");
-var updateLinkHref_1 = require("./updateLinkHref");
+var updateLinkTag_1 = require("./updateLinkTag");
 var updateAllTags = function (parsedHtml, _a) {
     var webSourcePathFull = _a.webSourcePathFull, destinationPath = _a.destinationPath, serverType = _a.serverType, assetPathMap = _a.assetPathMap;
     return __awaiter(void 0, void 0, void 0, function () {
-        var assetsNotFound, scriptTags, linkTags, faviconTags, notFoundErrors;
+        var assetsNotFound, scriptTags, styleTags, faviconTags, linkTags, imgTags, notFoundErrors;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -62,21 +83,25 @@ var updateAllTags = function (parsedHtml, _a) {
                         }); })];
                 case 1:
                     _b.sent();
-                    linkTags = getTags_1.getLinkTags(parsedHtml);
-                    linkTags.forEach(function (linkTag) {
+                    styleTags = getTags_1.getStyleTags(parsedHtml);
+                    faviconTags = getTags_1.getFaviconTags(parsedHtml);
+                    linkTags = __spreadArray(__spreadArray([], __read(styleTags)), __read(faviconTags));
+                    linkTags.forEach(function (tag) {
                         try {
-                            updateLinkHref_1.updateLinkHref(linkTag, assetPathMap);
+                            updateLinkTag_1.updateLinkTag(tag, assetPathMap);
                         }
                         catch (error) {
+                            console.log(tag, error);
                             assetsNotFound.push(error);
                         }
                     });
-                    faviconTags = getTags_1.getFaviconTags(parsedHtml);
-                    faviconTags.forEach(function (faviconTag) {
+                    imgTags = getTags_1.getImgTags(parsedHtml);
+                    imgTags.forEach(function (tag) {
                         try {
-                            updateLinkHref_1.updateLinkHref(faviconTag, assetPathMap);
+                            updateLinkTag_1.updateLinkTag(tag, assetPathMap, 'image');
                         }
                         catch (error) {
+                            console.log(tag, error);
                             assetsNotFound.push(error);
                         }
                     });

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

@@ -0,0 +1,4 @@
+export declare const updateLinkTag: (linkTag: HTMLLinkElement | HTMLImageElement, assetPathMap: {
+    source: string;
+    target: string;
+}[], tagType?: 'link' | 'image') => void;