@sasjs/cli 3.15.1 → 3.16.1

package/README.md

@@ -78,6 +78,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/sabhas"><img src="https://avatars.githubusercontent.com/u/82647447?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sabir Hassan</b></sub></a><br /><a href="https://github.com/sasjs/cli/commits?author=sabhas" title="Code">💻</a> <a href="https://github.com/sasjs/cli/pulls?q=is%3Apr+reviewed-by%3Asabhas" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/sasjs/cli/commits?author=sabhas" title="Tests">⚠️</a> <a href="#ideas-sabhas" title="Ideas, Planning, & Feedback">🤔</a></td>
     <td align="center"><a href="https://github.com/VladislavParhomchik"><img src="https://avatars.githubusercontent.com/u/83717836?v=4?s=100" width="100px;" alt=""/><br /><sub><b>VladislavParhomchik</b></sub></a><br /><a href="https://github.com/sasjs/cli/commits?author=VladislavParhomchik" title="Tests">⚠️</a> <a href="https://github.com/sasjs/cli/pulls?q=is%3Apr+reviewed-by%3AVladislavParhomchik" title="Reviewed Pull Requests">👀</a></td>
   </tr>
+  <tr>
+    <td align="center"><a href="http://rudvfaden.github.io/"><img src="https://avatars.githubusercontent.com/u/2445577?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rud Faden</b></sub></a><br /><a href="https://github.com/sasjs/cli/issues?q=author%3Arudvfaden" title="Bug reports">🐛</a></td>
+  </tr>
 </table>
 
 <!-- markdownlint-restore -->

package/build/commands/build/build.js

@@ -200,12 +200,12 @@ function createFinalSasFiles(target) {
 }
 function getBuildInfo(target, streamWeb) {
     return __awaiter(this, void 0, void 0, function () {
-        var buildConfig, serverType, appLoc, macroFolders, createWebServiceScript, macroCorePath, dependencyFilePaths, createFileScript, dependencyFilePathsForCreateFile, gsubScript, dependencyFilePathsForGsubScript, dependenciesContent, buildVars;
+        var buildConfig, serverType, appLoc, serverName, macroFolders, createWebServiceScript, macroCorePath, dependencyFilePaths, createFileScript, dependencyFilePathsForCreateFile, gsubScript, dependencyFilePathsForGsubScript, dependenciesContent, buildVars;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     buildConfig = '';
-                    serverType = target.serverType, appLoc = target.appLoc;
+                    serverType = target.serverType, appLoc = target.appLoc, serverName = target.serverName;
                     return [4 /*yield*/, (0, config_1.getMacroFolders)(target)];
                 case 1:
                     macroFolders = _a.sent();
@@ -244,7 +244,7 @@ function getBuildInfo(target, streamWeb) {
                     return [4 /*yield*/, getBuildVars(target)];
                 case 10:
                     buildVars = _a.sent();
-                    return [2 /*return*/, "\n/**\n  * The appLoc represents the metadata or SAS Drive location of the app you\n  * are about to deploy\n  *\n  * To set an alternative appLoc, simply populate the appLoc variable prior\n  * to running this program, eg:\n  *\n  * %let apploc=/my/apploc;\n  * %inc thisfile;\n  *\n  */\n\n%global appLoc;\n%let compiled_apploc=".concat(appLoc, ";\n\n%let appLoc=%sysfunc(coalescec(&appLoc,&compiled_apploc));\n\n%let sasjs_clickmeservice=clickme;\n%let syscc=0;\noptions ps=max nonotes nosgen nomprint nomlogic nosource2 nosource noquotelenmax;\n/* user supplied build vars */\n").concat(buildVars, "\n/* user supplied build vars end */\n/* system macro dependencies for build process */\n").concat(dependenciesContent, "\n/* system macro dependencies for build process end*/\n/* system macros for build process */\n").concat(buildConfig, "\n/* system macros for build process end */\n")];
+                    return [2 /*return*/, "\n/**\n  * The appLoc represents the metadata or SAS Drive location of the app you\n  * are about to deploy\n  *\n  * To set an alternative appLoc, simply populate the appLoc variable prior\n  * to running this program, eg:\n  *\n  * %let apploc=/my/apploc;\n  * %inc thisfile;\n  *\n  */\n\n%global appLoc serverName;\n%let compiled_apploc=".concat(appLoc, ";\n\n").concat(serverType === utils_1.ServerType.Sas9 ? "%let serverName=".concat(serverName, ";") : '', "\n\n%let appLoc=%sysfunc(coalescec(&appLoc,&compiled_apploc));\n\n%let sasjs_clickmeservice=clickme;\n%let syscc=0;\noptions ps=max nonotes nosgen nomprint nomlogic nosource2 nosource noquotelenmax;\n/* user supplied build vars */\n").concat(buildVars, "\n/* user supplied build vars end */\n/* system macro dependencies for build process */\n").concat(dependenciesContent, "\n/* system macro dependencies for build process end*/\n/* system macros for build process */\n").concat(buildConfig, "\n/* system macros for build process end */\n")];
             }
         });
     });
@@ -314,7 +314,7 @@ function getWebServiceScriptInvocation(serverType, isSASFile, encoded) {
                 ? "%mv_createwebservice(path=&appLoc/&path, name=&service, code=sascode ,replace=yes)"
                 : "%mv_createfile(path=&appLoc/&path, name=&filename, inref=filecode".concat(encodedParam, ")");
         case utils_1.ServerType.Sas9:
-            return "%mm_createwebservice(path=&appLoc/&path, name=&service, code=sascode ,replace=yes)";
+            return "%mm_createwebservice(path=&appLoc/&path, name=&service, code=sascode, server=&serverName, replace=yes)";
         case utils_1.ServerType.Sasjs:
             return isSASFile
                 ? "%mv_createwebservice(path=&appLoc/&path, name=&service, code=sascode ,replace=yes)"

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

@@ -131,7 +131,7 @@ describe('compileTestFile', function () {
                                         testVar = replaceLineBreaks("* Test Variables start;\n\n%let ".concat(Object.keys(target.testConfig.macroVars)[0], "=").concat(Object.values(target.testConfig.macroVars)[0], ";\n\n* Test Variables end;"));
                                         testInit = replaceLineBreaks("* TestInit start;\n\n\n%put testing, init;\n* TestInit end;");
                                         testTerm = replaceLineBreaks("* TestTerm start;\n\n\n%put testing, termed;\n* TestTerm end;");
-                                        mvWebout = "%macro mv_webout(action,ds,fref=_mvwtemp,dslabel=,fmt=Y,stream=Y,missing=NULL<br>  ,showmeta=NO<br>);";
+                                        mvWebout = "%macro mv_webout(action,ds,fref=_mvwtemp,dslabel=,fmt=Y,stream=Y,missing=NULL<br>  ,showmeta=N";
                                         expect(testFileContent.indexOf(testVar)).toBeGreaterThan(-1);
                                         expect(testFileContent.indexOf(testInit)).toBeGreaterThan(-1);
                                         expect(testFileContent.indexOf(testTerm)).toBeGreaterThan(-1);
@@ -315,6 +315,7 @@ describe('compileTestFile', function () {
             });
         }); });
         it('should not log 0/0 coverage', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var totalCalls;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -322,10 +323,11 @@ describe('compileTestFile', function () {
                         return [4 /*yield*/, (0, compile_1.compile)(target)];
                     case 1:
                         _a.sent();
-                        expect(process.logger.info).toHaveBeenCalledTimes(15);
+                        totalCalls = 16;
+                        expect(process.logger.info).toHaveBeenCalledTimes(totalCalls);
                         expect(process.logger.info).toHaveBeenNthCalledWith(13, "Test coverage:");
                         expect(process.logger.info).toHaveBeenNthCalledWith(14, "Services coverage: 0/4 (".concat(chalk_1.default.greenBright('0%'), ")"));
-                        expect(process.logger.info).toHaveBeenLastCalledWith("Overall coverage: 0/4 (".concat(chalk_1.default.greenBright('0%'), ")"));
+                        expect(process.logger.info).toHaveBeenNthCalledWith(totalCalls - 1, "Overall coverage: 0/4 (".concat(chalk_1.default.greenBright('0%'), ")"));
                         return [2 /*return*/];
                 }
             });

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

@@ -39,7 +39,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var path_1 = __importDefault(require("path"));
 var node_1 = __importDefault(require("@sasjs/adapter/node"));
+var js_base64_1 = require("js-base64");
 var utils_1 = require("@sasjs/utils");
 var test_1 = require("../../../utils/test");
 var types_1 = require("../../../types");
@@ -78,7 +80,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, macroCorePath, mf_getuser, mp_jsonout, ms_webout, webout, streamConfig;
+        var sasjs, customTarget, macroCorePath, mf_getuser, mp_jsonout, ms_webout, webout, mocksPath, appinitJSPath, getdataJSPath, appinitJSContents, getdataJSContents;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -90,6 +92,13 @@ describe('sasjs cbd with server type SASJS', function () {
                             message: 'message'
                         });
                     });
+                    return [4 /*yield*/, (0, test_1.updateConfig)({
+                            serviceConfig: {
+                                serviceFolders: ['sasjs/services/common']
+                            }
+                        })];
+                case 1:
+                    _a.sent();
                     return [4 /*yield*/, (0, utils_2.updateLocalTarget)(target.name, {
                             jobConfig: undefined,
                             serviceConfig: undefined,
@@ -98,26 +107,26 @@ describe('sasjs cbd with server type SASJS', function () {
                                 deployScripts: ["sasjsbuild/".concat(target.name, ".sas")]
                             }
                         })];
-                case 1:
+                case 2:
                     _a.sent();
                     return [4 /*yield*/, (0, config_1.findTargetInConfiguration)(target.name, types_1.TargetScope.Local)];
-                case 2:
+                case 3:
                     customTarget = (_a.sent()).target;
                     return [4 /*yield*/, expect((0, build_1.build)(customTarget)).toResolve()];
-                case 3:
+                case 4:
                     _a.sent();
                     return [4 /*yield*/, (0, deploy_1.deploy)(customTarget, true, sasjs)];
-                case 4:
+                case 5:
                     _a.sent();
                     macroCorePath = process.sasjsConstants.macroCorePath;
                     return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/base/mf_getuser.sas"))];
-                case 5:
+                case 6:
                     mf_getuser = _a.sent();
                     return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/base/mp_jsonout.sas"))];
-                case 6:
+                case 7:
                     mp_jsonout = _a.sent();
                     return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/server/ms_webout.sas"))];
-                case 7:
+                case 8:
                     ms_webout = _a.sent();
                     webout = '  %macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO);\n' +
                         '    %ms_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt\n' +
@@ -125,13 +134,15 @@ describe('sasjs cbd with server type SASJS', function () {
                         '      ,showmeta=&showmeta\n' +
                         '    )' +
                         '  %mend;\n';
-                    streamConfig = {
-                        assetPaths: [],
-                        streamServiceName: 'clickme',
-                        streamWeb: false,
-                        streamWebFolder: '',
-                        webSourcePath: ''
-                    };
+                    mocksPath = path_1.default.join(__dirname, appName, 'sasjs', 'mocks');
+                    appinitJSPath = path_1.default.join(mocksPath, 'services', 'common', 'appinit.js');
+                    getdataJSPath = path_1.default.join(mocksPath, 'services', 'common', 'getdata.js');
+                    return [4 /*yield*/, (0, utils_1.readFile)(appinitJSPath)];
+                case 9:
+                    appinitJSContents = _a.sent();
+                    return [4 /*yield*/, (0, utils_1.readFile)(getdataJSPath)];
+                case 10:
+                    getdataJSContents = _a.sent();
                     expect(sasjs.deployToSASjs).toHaveBeenCalledWith({
                         appLoc: target.appLoc,
                         fileTree: {
@@ -144,17 +155,27 @@ describe('sasjs cbd with server type SASJS', function () {
                                             name: 'common',
                                             type: 'folder',
                                             members: [
+                                                {
+                                                    name: 'appinit.js',
+                                                    type: 'file',
+                                                    code: (0, js_base64_1.encode)(appinitJSContents)
+                                                },
                                                 {
                                                     name: 'appinit',
                                                     type: 'service',
                                                     code: (0, utils_3.removeComments)("".concat(mf_getuser).concat(mp_jsonout).concat(ms_webout).concat(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* SAS Macros start;\n* SAS Macros end;\n* SAS Includes start;\n* SAS Includes end;\n* Binary Files start;\n* Binary Files 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;')
+                                                        '/* 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* SAS Macros start;\n* SAS Macros end;\n* SAS Includes start;\n* SAS Includes end;\n* Binary Files start;\n* Binary Files end;\n* Service start;\nproc sql;\ncreate table areas as select distinct area\n  from mydb.springs;\n%webout(OPEN)\n%webout(OBJ,areas)\n%webout(CLOSE)\n* Service end;')
+                                                },
+                                                {
+                                                    name: 'getdata.js',
+                                                    type: 'file',
+                                                    code: (0, js_base64_1.encode)(getdataJSContents)
                                                 },
                                                 {
                                                     name: 'getdata',
                                                     type: 'service',
                                                     code: (0, utils_3.removeComments)("".concat(mf_getuser).concat(mp_jsonout).concat(ms_webout).concat(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* SAS Macros start;\n* SAS Macros end;\n* SAS Includes start;\n* SAS Includes end;\n* Binary Files start;\n* Binary Files 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;')
+                                                        '/* 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* SAS Macros start;\n* SAS Macros end;\n* SAS Includes start;\n* SAS Includes end;\n* Binary Files start;\n* Binary Files end;\n* Service start;\n%webout(FETCH)\nproc sql;\ncreate table springs as select * from mydb.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/testing/spec/testing.spec.js

@@ -81,7 +81,9 @@ var sasJsModules = __importStar(require("../../../utils/createSASjsInstance"));
 var testResponses_1 = require("./mockedAdapter/testResponses");
 var fileModule = __importStar(require("@sasjs/utils/file"));
 var utilsModule = __importStar(require("@sasjs/utils/utils"));
+var configUtils = __importStar(require("../../../utils/config"));
 var chalk_1 = __importDefault(require("chalk"));
+var mocks_1 = require("../../context/spec/mocks");
 describe('sasjs test', function () {
     var expectedCoverageLcov = "TN:testsetup.sas\nSF:standalone\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:exampleprogram.test.sas\nSF:jobs/jobs/exampleprogram.sas\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:standalone.test.sas\nSF:standalone\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:examplemacro.test.sas\nSF:standalone\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:shouldFail.test.sas\nSF:standalone\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:dostuff.test.0.sas\nSF:services/admin/dostuff.sas\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:dostuff.test.1.sas\nSF:services/admin/dostuff.sas\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record\nTN:testteardown.sas\nSF:standalone\nFNF:1\nFNH:1\nLF:1\nLH:1\nBRF:1\nBRH:1\nend_of_record";
     describe('SASVIYA', function () {
@@ -701,6 +703,9 @@ var copyTestFiles = function (appName) { return __awaiter(void 0, void 0, void 0
     });
 }); };
 var setupMocksForSASVIYA = function () {
+    jest
+        .spyOn(configUtils, 'getAuthConfig')
+        .mockImplementation(function () { return Promise.resolve(mocks_1.mockAuthConfig); });
     jest
         .spyOn(sasJsModules, 'createSASjsInstance')
         .mockImplementation(function (config) {

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

@@ -1,5 +1,14 @@
 import { StreamConfig, Target } from '@sasjs/utils';
-export declare const createAssetServices: (target: Target, destinationPath: string, streamConfig: StreamConfig) => Promise<{
+export interface AssetPathMap {
     source: string;
     target: string;
-}[]>;
+}
+/**
+ * Creates all the asset services for web streaming.
+ * Also prepares an asset-path Map based on server type.
+ * @param {Target} target the target to create asset service.
+ * @param {string} destinationPath the location of web streaming files.
+ * @param {StreamConfig} streamConfig stream configuration to be used.
+ * @returns {AssetPathMap[]} list of all the sources specified along server based paths.
+ */
+export declare const createAssetServices: (target: Target, destinationPath: string, { webSourcePath, streamWebFolder, assetPaths }: StreamConfig) => Promise<AssetPathMap[]>;

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

@@ -68,47 +68,67 @@ exports.createAssetServices = void 0;
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
 var lodash_uniqby_1 = __importDefault(require("lodash.uniqby"));
-var getWebServiceContent_1 = require("./getWebServiceContent");
-var createAssetServices = function (target, destinationPath, streamConfig) { return __awaiter(void 0, void 0, void 0, function () {
-    var webSourcePath, streamWebFolder, assetPaths, assetPathMap;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                webSourcePath = streamConfig.webSourcePath, streamWebFolder = streamConfig.streamWebFolder, assetPaths = streamConfig.assetPaths;
-                assetPathMap = [];
-                return [4 /*yield*/, (0, utils_1.asyncForEach)(__spreadArray([path_1.default.join(process.projectDir, webSourcePath)], __read((assetPaths !== null && assetPaths !== void 0 ? assetPaths : [])), false), function (assetPath) { return __awaiter(void 0, void 0, void 0, function () {
-                        var fullAssetPath, assetPathExists, assetPathMapNested;
-                        var _a;
-                        return __generator(this, function (_b) {
-                            switch (_b.label) {
-                                case 0:
-                                    fullAssetPath = path_1.default.isAbsolute(assetPath)
-                                        ? assetPath
-                                        : path_1.default.isAbsolute(webSourcePath)
-                                            ? path_1.default.join(webSourcePath, assetPath)
-                                            : path_1.default.join(process.projectDir, webSourcePath, assetPath);
-                                    return [4 /*yield*/, (0, utils_1.folderExists)(fullAssetPath)];
-                                case 1:
-                                    assetPathExists = _b.sent();
-                                    if (!assetPathExists) {
-                                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.warn("Assets path '".concat(fullAssetPath, "' present in 'streamConfig' doesn't exist."));
+var getAssetPath_1 = require("./getAssetPath");
+var sas9_1 = require("./sas9");
+/**
+ * Creates all the asset services for web streaming.
+ * Also prepares an asset-path Map based on server type.
+ * @param {Target} target the target to create asset service.
+ * @param {string} destinationPath the location of web streaming files.
+ * @param {StreamConfig} streamConfig stream configuration to be used.
+ * @returns {AssetPathMap[]} list of all the sources specified along server based paths.
+ */
+var createAssetServices = function (target, destinationPath, _a) {
+    var webSourcePath = _a.webSourcePath, streamWebFolder = _a.streamWebFolder, assetPaths = _a.assetPaths;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var assetPathMap;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    assetPathMap = [];
+                    return [4 /*yield*/, (0, utils_1.asyncForEach)(__spreadArray([path_1.default.join(process.projectDir, webSourcePath)], __read((assetPaths !== null && assetPaths !== void 0 ? assetPaths : [])), false), function (assetPath) { return __awaiter(void 0, void 0, void 0, function () {
+                            var fullAssetPath, assetPathExists, assetPathMapNested;
+                            var _a;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0:
+                                        fullAssetPath = path_1.default.isAbsolute(assetPath)
+                                            ? assetPath
+                                            : path_1.default.isAbsolute(webSourcePath)
+                                                ? path_1.default.join(webSourcePath, assetPath)
+                                                : path_1.default.join(process.projectDir, webSourcePath, assetPath);
+                                        return [4 /*yield*/, (0, utils_1.folderExists)(fullAssetPath)];
+                                    case 1:
+                                        assetPathExists = _b.sent();
+                                        if (!assetPathExists) {
+                                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.warn("Assets path '".concat(fullAssetPath, "' present in 'streamConfig' doesn't exist."));
+                                            return [2 /*return*/];
+                                        }
+                                        return [4 /*yield*/, createAssetsServicesNested(target, streamWebFolder, fullAssetPath, destinationPath)];
+                                    case 2:
+                                        assetPathMapNested = _b.sent();
+                                        assetPathMap.push.apply(assetPathMap, __spreadArray([], __read(assetPathMapNested), false));
                                         return [2 /*return*/];
-                                    }
-                                    return [4 /*yield*/, createAssetsServicesNested(target, streamWebFolder, fullAssetPath, destinationPath)];
-                                case 2:
-                                    assetPathMapNested = _b.sent();
-                                    assetPathMap.push.apply(assetPathMap, __spreadArray([], __read(assetPathMapNested), false));
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); })];
-            case 1:
-                _a.sent();
-                return [2 /*return*/, (0, lodash_uniqby_1.default)(assetPathMap, 'source')];
-        }
+                                }
+                            });
+                        }); })];
+                case 1:
+                    _b.sent();
+                    return [2 /*return*/, (0, lodash_uniqby_1.default)(assetPathMap, 'source')];
+            }
+        });
     });
-}); };
+};
 exports.createAssetServices = createAssetServices;
+/**
+ * Creates all the asset services for web streaming for a specific folder.
+ * Also prepares an asset-path Map based on server type.
+ * @param {Target} target the target to create asset service.
+ * @param {string} streamWebFolder the location of web streaming files.
+ * @param {string} fullAssetPath path of the specific folder used to create all services for.
+ * @param {string} destinationPath path of the destination folder for services.
+ * @returns {AssetPathMap[]} list of all the sources specified along server based paths.
+ */
 var createAssetsServicesNested = function (target, streamWebFolder, fullAssetPath, destinationPath) { return __awaiter(void 0, void 0, void 0, function () {
     var assetPathMap, filePaths, folderNames;
     return __generator(this, function (_a) {
@@ -119,37 +139,42 @@ var createAssetsServicesNested = function (target, streamWebFolder, fullAssetPat
             case 1:
                 filePaths = _a.sent();
                 return [4 /*yield*/, (0, utils_1.asyncForEach)(filePaths, function (filePath) { return __awaiter(void 0, void 0, void 0, function () {
-                        var fullFileName, fileName, fileExtension, sourcePath, assetServiceUrl, fileName_1, assetServiceUrl;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
+                        var fullFileName, fileName, fileExtension, sourcePath, assetServiceUrl, _a, fileName_1;
+                        return __generator(this, function (_b) {
+                            switch (_b.label) {
                                 case 0:
                                     fullFileName = path_1.default.basename(filePath);
                                     fileName = fullFileName.substring(0, fullFileName.lastIndexOf('.'));
                                     fileExtension = path_1.default
                                         .basename(filePath)
                                         .substring(fullFileName.lastIndexOf('.') + 1, fullFileName.length);
-                                    if (!(fileName && fileExtension)) return [3 /*break*/, 4];
+                                    if (!(fileName && fileExtension)) return [3 /*break*/, 7];
                                     sourcePath = path_1.default.join(fullAssetPath, filePath);
-                                    if (!(target.serverType === utils_1.ServerType.SasViya)) return [3 /*break*/, 2];
-                                    return [4 /*yield*/, (0, utils_1.copy)(sourcePath, path_1.default.join(destinationPath, fullFileName))];
-                                case 1:
-                                    _a.sent();
-                                    assetServiceUrl = getAssetPath(target.appLoc, target.serverType, streamWebFolder, fullFileName);
-                                    assetPathMap.push({
-                                        source: fullFileName,
-                                        target: assetServiceUrl
-                                    });
-                                    return [3 /*break*/, 4];
-                                case 2: return [4 /*yield*/, generateAssetService(sourcePath, filePath, destinationPath, target.serverType)];
-                                case 3:
-                                    fileName_1 = _a.sent();
-                                    assetServiceUrl = getAssetPath(target.appLoc, target.serverType, streamWebFolder, fileName_1.replace('.sas', ''));
+                                    assetServiceUrl = void 0;
+                                    _a = target.serverType;
+                                    switch (_a) {
+                                        case utils_1.ServerType.SasViya: return [3 /*break*/, 1];
+                                        case utils_1.ServerType.Sas9: return [3 /*break*/, 3];
+                                    }
+                                    return [3 /*break*/, 5];
+                                case 1: return [4 /*yield*/, (0, utils_1.copy)(sourcePath, path_1.default.join(destinationPath, fullFileName))];
+                                case 2:
+                                    _b.sent();
+                                    assetServiceUrl = (0, getAssetPath_1.getAssetPath)(target.appLoc, target.serverType, streamWebFolder, fullFileName);
+                                    return [3 /*break*/, 6];
+                                case 3: return [4 /*yield*/, (0, sas9_1.generateAssetService)(sourcePath, destinationPath)];
+                                case 4:
+                                    fileName_1 = _b.sent();
+                                    assetServiceUrl = (0, getAssetPath_1.getAssetPath)(target.appLoc, target.serverType, streamWebFolder, fileName_1.replace('.sas', ''));
+                                    return [3 /*break*/, 6];
+                                case 5: throw new Error("Server Type: ".concat(target.serverType, " is not supported for processing streaming file."));
+                                case 6:
                                     assetPathMap.push({
                                         source: fullFileName,
                                         target: assetServiceUrl
                                     });
-                                    _a.label = 4;
-                                case 4: return [2 /*return*/];
+                                    _b.label = 7;
+                                case 7: return [2 /*return*/];
                             }
                         });
                     }); })];
@@ -187,37 +212,3 @@ var createAssetsServicesNested = function (target, streamWebFolder, fullAssetPat
         }
     });
 }); };
-var generateAssetService = function (sourcePath, filePath, destinationPath, serverType) { return __awaiter(void 0, void 0, void 0, function () {
-    var fileExtension, fileType, fileName, base64string, serviceContent;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                fileExtension = path_1.default.extname(filePath);
-                fileType = fileExtension.replace('.', '').toUpperCase();
-                fileName = path_1.default
-                    .basename(filePath)
-                    .replace(new RegExp(fileExtension + '$'), fileExtension.replace('.', '-'));
-                return [4 /*yield*/, (0, utils_1.base64EncodeFile)(sourcePath)];
-            case 1:
-                base64string = _a.sent();
-                return [4 /*yield*/, (0, getWebServiceContent_1.getWebServiceContent)(base64string, fileType, serverType)];
-            case 2:
-                serviceContent = _a.sent();
-                return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(destinationPath, "".concat(fileName, ".sas")), serviceContent)];
-            case 3:
-                _a.sent();
-                return [2 /*return*/, "".concat(fileName, ".sas")];
-        }
-    });
-}); };
-var getAssetPath = function (appLoc, serverType, streamWebFolder, fileName) {
-    var storedProcessPath = 
-    // the appLoc is inserted dynamically by SAS
-    // using three forward slashes as a marker
-    // for SAS 9 fileName is a program, with replacement in sasjsout.ts
-    // for Viya, fileName is a FILE, with replacement in build.sas only
-    serverType === utils_1.ServerType.SasViya
-        ? "/SASJobExecution?_FILE=".concat(appLoc, "/services/").concat(streamWebFolder)
-        : "/SASStoredProcess/?_PROGRAM=///".concat(streamWebFolder);
-    return "".concat(storedProcessPath, "/").concat(fileName);
-};

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

@@ -0,0 +1,2 @@
+import { ServerType } from '@sasjs/utils';
+export declare const getAssetPath: (appLoc: string, serverType: ServerType, streamWebFolder: string, fileName: string) => string;

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

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAssetPath = void 0;
+var utils_1 = require("@sasjs/utils");
+var getAssetPath = function (appLoc, serverType, streamWebFolder, fileName) {
+    var sas9GUID = process.sasjsConstants.sas9GUID;
+    var storedProcessPath = 
+    // the appLoc is inserted dynamically
+    // for SAS 9 files are Base 64 encoded into STPs, with
+    //   dynamic runtime replacement of appLoc (see sasjsout.ts)
+    // for Viya, fileName is a FILE, with replacement harcoded in build.sas
+    serverType === utils_1.ServerType.SasViya
+        ? "/SASJobExecution?_FILE=".concat(appLoc, "/services")
+        : "/SASStoredProcess/?_PROGRAM=".concat(sas9GUID);
+    return "".concat(storedProcessPath, "/").concat(streamWebFolder, "/").concat(fileName);
+};
+exports.getAssetPath = getAssetPath;

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

@@ -0,0 +1,2 @@
+import { AssetPathMap } from './createAssetServices';
+export declare const modifyLinksInContent: (_content: string, assetPathMap: AssetPathMap[]) => string;

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

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.modifyLinksInContent = void 0;
+var modifyLinksInContent = function (_content, assetPathMap) {
+    var content = _content;
+    assetPathMap.forEach(function (pathEntry) {
+        content = content.replace(new RegExp(pathEntry.source, 'g'), pathEntry.target);
+    });
+    return content;
+};
+exports.modifyLinksInContent = modifyLinksInContent;

package/build/commands/web/internal/sas9/createClickMeService.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Creates index service file for SAS9 server only.
+ * @param {string} indexHtmlContent contents of index source file.
+ * @param {string} fileName name of index service file.
+ */
+export declare const createClickMeService: (indexHtmlContent: string, fileName: string) => Promise<void>;

package/build/commands/web/internal/sas9/createClickMeService.js

@@ -0,0 +1,91 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createClickMeService = void 0;
+var path_1 = __importDefault(require("path"));
+var utils_1 = require("@sasjs/utils");
+var sasjsout_1 = require("../sasjsout");
+/**
+ * Creates index service file for SAS9 server only.
+ * @param {string} indexHtmlContent contents of index source file.
+ * @param {string} fileName name of index service file.
+ */
+var createClickMeService = function (indexHtmlContent, fileName) { return __awaiter(void 0, void 0, void 0, function () {
+    var lines, clickMeServiceContent, buildDestinationServicesFolder;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                lines = indexHtmlContent.replace(/\r\n/g, '\n').split('\n');
+                clickMeServiceContent = "".concat((0, sasjsout_1.sasjsout)(), "\nfilename sasjs temp lrecl=99999999;\ndata _null_;\nfile sasjs;\n");
+                lines.forEach(function (line) {
+                    var chunkedLines = (0, utils_1.chunk)(line);
+                    if (chunkedLines.length === 1) {
+                        if (chunkedLines[0].length == 0)
+                            chunkedLines[0] = ' ';
+                        clickMeServiceContent += "put '".concat(chunkedLines[0]
+                            .split("'")
+                            .join("''"), "';\n");
+                    }
+                    else {
+                        var combinedLines_1 = '';
+                        chunkedLines.forEach(function (chunkedLine, index) {
+                            var text = "put '".concat(chunkedLine.split("'").join("''"), "'");
+                            if (index !== chunkedLines.length - 1) {
+                                text += '@;\n';
+                            }
+                            else {
+                                text += ';\n';
+                            }
+                            combinedLines_1 += text;
+                        });
+                        clickMeServiceContent += combinedLines_1;
+                    }
+                });
+                clickMeServiceContent += 'run;\n%sasjsout(HTML)';
+                buildDestinationServicesFolder = process.sasjsConstants.buildDestinationServicesFolder;
+                return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(buildDestinationServicesFolder, "".concat(fileName, ".sas")), clickMeServiceContent)];
+            case 1:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    });
+}); };
+exports.createClickMeService = createClickMeService;

package/build/commands/web/internal/sas9/generateAssetService.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Creates service file for SAS9 server only.
+ * @param {string} sourcePath path of source file.
+ * @param {string} destinationPath path of destination service file.
+ * @returns {string} name of created service file.
+ */
+export declare const generateAssetService: (sourcePath: string, destinationPath: string) => Promise<string>;