@sasjs/cli 3.10.2 → 3.11.0

package/build/commands/deploy/deploy.js

@@ -330,11 +330,12 @@ function deployToSas9(deployScriptName, target, linesToExecute, logFolder, strea
  * Deploys app to `SASJS` server.
  * @param {Target} target- the target having deploy configuration.
  * @param {object} sasjs - optional configuration object of SAS adapter.
+ * @param {object} streamConfig - optional config for deploying streaming app.
  */
 function deployToSasjs(target, sasjs, streamConfig) {
     var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function () {
-        var buildDestinationFolder, finalFilePathJSON, jsonContent, payload, authConfig, e_2, result, appLoc, webAppStreamUrl;
+        var buildDestinationFolder, finalFilePathJSON, jsonContent, payload, authConfig, e_2, result, webAppStreamUrl;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
@@ -363,7 +364,7 @@ function deployToSasjs(target, sasjs, streamConfig) {
                     e_2 = _d.sent();
                     return [3 /*break*/, 5];
                 case 5: return [4 /*yield*/, sasjs
-                        .deployToSASjs(payload, undefined, authConfig)
+                        .deployToSASjs(payload, undefined, streamConfig, authConfig)
                         .catch(function (err) {
                         var _a;
                         (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error(err);
@@ -376,9 +377,8 @@ function deployToSasjs(target, sasjs, streamConfig) {
                             (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Payload example:\n".concat(JSON.stringify(result.example, null, 2)));
                         }
                     }
-                    if (streamConfig === null || streamConfig === void 0 ? void 0 : streamConfig.streamWeb) {
-                        appLoc = encodeURI(target.appLoc);
-                        webAppStreamUrl = "".concat(target.serverUrl, "/AppStream").concat(appLoc);
+                    if ((streamConfig === null || streamConfig === void 0 ? void 0 : streamConfig.streamWeb) && (result === null || result === void 0 ? void 0 : result.streamServiceName)) {
+                        webAppStreamUrl = "".concat(target.serverUrl, "/AppStream/").concat(result.streamServiceName);
                         (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info("Web app is available at ".concat(webAppStreamUrl));
                     }
                     return [2 /*return*/];

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

@@ -78,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, macroCorePath, mf_getuser, mp_jsonout, ms_webout, webout;
+        var sasjs, customTarget, macroCorePath, mf_getuser, mp_jsonout, ms_webout, webout, streamConfig;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -125,6 +125,13 @@ describe('sasjs cbd with server type SASJS', function () {
                         '      ,showmeta=&showmeta\n' +
                         '    )' +
                         '  %mend;\n';
+                    streamConfig = {
+                        assetPaths: [],
+                        streamServiceName: 'clickme',
+                        streamWeb: false,
+                        streamWebFolder: '',
+                        webSourcePath: ''
+                    };
                     expect(sasjs.deployToSASjs).toHaveBeenCalledWith({
                         members: [
                             {
@@ -152,7 +159,7 @@ describe('sasjs cbd with server type SASJS', function () {
                                 ]
                             }
                         ]
-                    }, undefined, undefined);
+                    }, undefined, streamConfig, undefined);
                     return [2 /*return*/];
             }
         });

package/package.json

@@ -47,10 +47,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "^3.7.14",
+    "@sasjs/adapter": "3.8.0",
     "@sasjs/core": "4.15.3",
     "@sasjs/lint": "1.11.2",
-    "@sasjs/utils": "2.39.0",
+    "@sasjs/utils": "2.40.0",
     "chalk": "4.1.2",
     "csv-stringify": "5.6.5",
     "dotenv": "10.0.0",
@@ -94,5 +94,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.10.2"
+  "version": "3.11.0"
 }