@sasjs/cli 3.15.2 → 3.16.2

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/add/addCredential.js

@@ -75,7 +75,8 @@ var logger_1 = require("@sasjs/utils/logger");
 var types_1 = require("@sasjs/utils/types");
 var node_1 = __importStar(require("@sasjs/adapter/node"));
 var auth_1 = require("../../utils/auth");
-var utils_1 = require("@sasjs/utils");
+var utils_1 = require("../../utils");
+var utils_2 = require("@sasjs/utils");
 var input_1 = require("./internal/input");
 var targetScope_1 = require("../../types/targetScope");
 var saveConfig_1 = require("./internal/saveConfig");
@@ -114,7 +115,7 @@ var addCredential = function (target, insecure, targetScope) { return __awaiter(
                     case types_1.ServerType.Sas9: return [3 /*break*/, 10];
                     case types_1.ServerType.Sasjs: return [3 /*break*/, 15];
                 }
-                return [3 /*break*/, 21];
+                return [3 /*break*/, 22];
             case 4: return [4 /*yield*/, (0, input_1.getCredentialsInputForViya)(target.name)];
             case 5:
                 _b = _j.sent(), client = _b.client, secret = _b.secret;
@@ -129,7 +130,7 @@ var addCredential = function (target, insecure, targetScope) { return __awaiter(
             case 8:
                 target = new types_1.Target(__assign(__assign({}, target.toJson(false)), { authConfig: { client: client, secret: secret, access_token: access_token, refresh_token: refresh_token } }));
                 _j.label = 9;
-            case 9: return [3 /*break*/, 22];
+            case 9: return [3 /*break*/, 23];
             case 10: return [4 /*yield*/, (0, input_1.getCredentialsInputSas9)(target, targetScope)];
             case 11:
                 _d = _j.sent(), userName = _d.userName, password = _d.password;
@@ -141,25 +142,31 @@ var addCredential = function (target, insecure, targetScope) { return __awaiter(
             case 13:
                 target = new types_1.Target(__assign(__assign({}, target.toJson(false)), { authConfigSas9: { userName: userName, password: password } }));
                 _j.label = 14;
-            case 14: return [3 /*break*/, 22];
-            case 15: return [4 /*yield*/, (0, input_1.getCredentialsInputSasjs)(target)];
+            case 14: return [3 /*break*/, 23];
+            case 15: return [4 /*yield*/, (0, utils_1.isSasJsServerInServerMode)(target)];
             case 16:
+                if (!(_j.sent())) {
+                    process.logger.info('No need to authenticate against the sasjs server running in desktop mode.');
+                    return [2 /*return*/, target];
+                }
+                return [4 /*yield*/, (0, input_1.getCredentialsInputSasjs)(target)];
+            case 17:
                 client = (_j.sent()).client;
                 return [4 /*yield*/, (0, exports.getTokens)(target, client, '', httpsAgentOptions)];
-            case 17:
+            case 18:
                 _e = _j.sent(), access_token = _e.access_token, refresh_token = _e.refresh_token;
-                if (!(targetScope === targetScope_1.TargetScope.Local)) return [3 /*break*/, 19];
+                if (!(targetScope === targetScope_1.TargetScope.Local)) return [3 /*break*/, 20];
                 return [4 /*yield*/, (0, exports.createEnvFileForSasjs)(target.name, client, access_token, refresh_token)];
-            case 18:
-                _j.sent();
-                return [3 /*break*/, 20];
             case 19:
+                _j.sent();
+                return [3 /*break*/, 21];
+            case 20:
                 target = new types_1.Target(__assign(__assign({}, target.toJson(false)), { authConfig: { client: client, secret: '', access_token: access_token, refresh_token: refresh_token } }));
-                _j.label = 20;
-            case 20: return [3 /*break*/, 22];
-            case 21: throw new Error('Target contains invalid serverType. Possible types could be SASVIYA, SAS9 and SASJS');
-            case 22: return [4 /*yield*/, (0, saveConfig_1.saveConfig)(targetScope, target, false, false)];
-            case 23:
+                _j.label = 21;
+            case 21: return [3 /*break*/, 23];
+            case 22: throw new Error('Target contains invalid serverType. Possible types could be SASVIYA, SAS9 and SASJS');
+            case 23: return [4 /*yield*/, (0, saveConfig_1.saveConfig)(targetScope, target, false, false)];
+            case 24:
                 filePath = _j.sent();
                 (_h = process.logger) === null || _h === void 0 ? void 0 : _h.info("Target configuration has been saved to ".concat(filePath, " ."));
                 return [2 /*return*/, target];
@@ -216,7 +223,7 @@ var createEnvFileForViya = function (targetName, client, secret, accessToken, re
             case 0:
                 envFileContent = "CLIENT=".concat(client, "\nSECRET=").concat(secret, "\nACCESS_TOKEN=").concat(accessToken, "\nREFRESH_TOKEN=").concat(refreshToken, "\n");
                 envFilePath = path_1.default.join(process.projectDir, ".env.".concat(targetName));
-                return [4 /*yield*/, (0, utils_1.createFile)(envFilePath, envFileContent)];
+                return [4 /*yield*/, (0, utils_2.createFile)(envFilePath, envFileContent)];
             case 1:
                 _b.sent();
                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Environment file saved at ".concat(envFilePath));
@@ -233,7 +240,7 @@ var createEnvFileForSas9 = function (targetName, userName, password) { return __
             case 0:
                 envFileContent = "SAS_USERNAME=".concat(userName, "\nSAS_PASSWORD=").concat(password, "\n");
                 envFilePath = path_1.default.join(process.projectDir, ".env.".concat(targetName));
-                return [4 /*yield*/, (0, utils_1.createFile)(envFilePath, envFileContent)];
+                return [4 /*yield*/, (0, utils_2.createFile)(envFilePath, envFileContent)];
             case 1:
                 _b.sent();
                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Environment file saved at ".concat(envFilePath));
@@ -250,7 +257,7 @@ var createEnvFileForSasjs = function (targetName, client, accessToken, refreshTo
             case 0:
                 envFileContent = "CLIENT=".concat(client, "\nACCESS_TOKEN=").concat(accessToken, "\nREFRESH_TOKEN=").concat(refreshToken, "\n");
                 envFilePath = path_1.default.join(process.projectDir, ".env.".concat(targetName));
-                return [4 /*yield*/, (0, utils_1.createFile)(envFilePath, envFileContent)];
+                return [4 /*yield*/, (0, utils_2.createFile)(envFilePath, envFileContent)];
             case 1:
                 _b.sent();
                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Environment file saved at ".concat(envFilePath));

package/build/commands/add/addTarget.js

@@ -53,6 +53,7 @@ var targetScope_1 = require("../../types/targetScope");
 var input_1 = require("./internal/input");
 var saveConfig_1 = require("./internal/saveConfig");
 var addCredential_1 = require("./addCredential");
+var utils_1 = require("../../utils");
 /**
  * Creates new target/ updates current target(if found) for either local config or global config file.
  * @param {boolean} insecure- boolean to use insecure connection, default is false. lf true the server will not reject any connection which is not authorized with the list of supplied CAs
@@ -81,7 +82,7 @@ function addTarget(insecure) {
                         case types_1.ServerType.SasViya: return [3 /*break*/, 5];
                         case types_1.ServerType.Sasjs: return [3 /*break*/, 7];
                     }
-                    return [3 /*break*/, 9];
+                    return [3 /*break*/, 11];
                 case 3: return [4 /*yield*/, (0, input_1.getAndValidateSas9Fields)(target, scope)];
                 case 4:
                     _f = _h.sent(), serverName = _f.serverName, repositoryName = _f.repositoryName, userName = _f.userName, password = _f.password;
@@ -92,7 +93,7 @@ function addTarget(insecure) {
                     else {
                         targetJson = __assign(__assign({}, targetJson), { authConfigSas9: { userName: userName, password: password } });
                     }
-                    return [3 /*break*/, 10];
+                    return [3 /*break*/, 12];
                 case 5: return [4 /*yield*/, (0, input_1.getAndValidateSasViyaFields)(target, scope, serverUrl, insecure, addCredential_1.addCredential)];
                 case 6:
                     _g = _h.sent(), contextName = _g.contextName, updatedViyaTarget = _g.target;
@@ -100,18 +101,22 @@ function addTarget(insecure) {
                         contextName: contextName
                     };
                     targetJson = __assign(__assign({}, updatedViyaTarget.toJson(false)), targetJson);
-                    return [3 /*break*/, 10];
-                case 7: return [4 /*yield*/, (0, input_1.getAndValidateSasjsFields)(target, scope, insecure, addCredential_1.addCredential)];
+                    return [3 /*break*/, 12];
+                case 7: return [4 /*yield*/, (0, utils_1.isSasJsServerInServerMode)(target)];
                 case 8:
+                    if (!_h.sent()) return [3 /*break*/, 10];
+                    return [4 /*yield*/, (0, input_1.getAndValidateSasjsFields)(target, scope, insecure, addCredential_1.addCredential)];
+                case 9:
                     updatedSasjsTarget = (_h.sent()).target;
                     targetJson = updatedSasjsTarget.toJson(false);
-                    return [3 /*break*/, 10];
-                case 9: throw new Error('Target contains invalid serverType. Possible types could be SASVIYA, SAS9 and SASJS');
-                case 10: return [4 /*yield*/, (0, input_1.getIsDefault)()];
-                case 11:
+                    _h.label = 10;
+                case 10: return [3 /*break*/, 12];
+                case 11: throw new Error('Target contains invalid serverType. Possible types could be SASVIYA, SAS9 and SASJS');
+                case 12: return [4 /*yield*/, (0, input_1.getIsDefault)()];
+                case 13:
                     isDefault = _h.sent();
                     return [4 /*yield*/, (0, saveConfig_1.saveConfig)(scope, new types_1.Target(targetJson), isDefault, false)];
-                case 12:
+                case 14:
                     filePath = _h.sent();
                     (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info("Target configuration has been saved to ".concat(filePath));
                     return [2 /*return*/, true];

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

@@ -73,6 +73,7 @@ var utils_1 = require("@sasjs/utils");
 var dotenv_1 = __importDefault(require("dotenv"));
 var path_1 = __importDefault(require("path"));
 var inputModule = __importStar(require("../internal/input"));
+var utilsModule = __importStar(require("../../../utils/utils"));
 var addTarget_1 = require("../addTarget");
 var config_1 = require("../../../utils/config");
 var targetScope_1 = require("../../../types/targetScope");
@@ -192,6 +193,9 @@ describe('addTarget', function () {
                             target: new utils_1.Target(commonFields)
                         });
                     });
+                    jest
+                        .spyOn(utilsModule, 'isSasJsServerInServerMode')
+                        .mockImplementation(function () { return Promise.resolve(true); });
                     return [4 /*yield*/, expect((0, addTarget_1.addTarget)(false)).resolves.toEqual(true)];
                 case 1:
                     _a.sent();
@@ -392,6 +396,9 @@ describe('addTarget', function () {
                             target: new utils_1.Target(__assign(__assign({}, targetJson), commonFields))
                         });
                     });
+                    jest
+                        .spyOn(utilsModule, 'isSasJsServerInServerMode')
+                        .mockImplementation(function () { return Promise.resolve(true); });
                     return [4 /*yield*/, expect((0, addTarget_1.addTarget)(false)).resolves.toEqual(true)];
                 case 2:
                     _a.sent();

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[]>;