@sasjs/cli 3.12.4 → 3.12.5

package/build/commands/build/build.js

@@ -96,6 +96,7 @@ var config_1 = require("../../utils/config");
 var compile_1 = require("../compile/compile");
 var config_2 = require("./internal/config");
 var getLaunchPageCode_1 = require("./internal/getLaunchPageCode");
+var types_1 = require("@sasjs/utils/types");
 function build(target) {
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -115,7 +116,7 @@ exports.build = build;
 function createFinalSasFiles(target) {
     var _a, _b, _c, _d, _e, _f, _g;
     return __awaiter(this, void 0, void 0, function () {
-        var streamConfig, streamWeb, buildConfig, serverType, name, macroFolders, buildOutputFileName, buildDestinationFolder, finalSasFileContent, finalFilePath, finalFilePathJSON, buildInfo, buildInit, buildTerm, macroCorePath, dependencyFilePaths, dependenciesContent, _h, folderContent, folderContentJSON;
+        var streamConfig, streamWeb, buildConfig, serverType, name, macroFolders, buildOutputFileName, buildDestinationFolder, finalSasFileContent, finalFilePath, finalFilePathJSON, buildInfo, buildInit, buildTerm, macroCorePath, dependencyFilePaths, dependenciesContent, _h, folderContent, folderContentJSON, servicePackSASjs, servicePack;
         return __generator(this, function (_j) {
             switch (_j.label) {
                 case 0:
@@ -154,6 +155,10 @@ function createFinalSasFiles(target) {
                     return [4 /*yield*/, getFolderContent(serverType)];
                 case 8:
                     _h = _j.sent(), folderContent = _h.folderContent, folderContentJSON = _h.folderContentJSON;
+                    servicePackSASjs = {
+                        appLoc: target.appLoc,
+                        fileTree: folderContentJSON
+                    };
                     finalSasFileContent += "\n".concat(folderContent);
                     finalSasFileContent += "\n".concat(buildTerm);
                     if (streamWeb) {
@@ -161,6 +166,11 @@ function createFinalSasFiles(target) {
                             target.serverType === utils_1.ServerType.Sas9) {
                             finalSasFileContent += (0, getLaunchPageCode_1.getLaunchPageCode)(target.serverType, streamConfig.streamServiceName);
                         }
+                        else if (target.serverType === utils_1.ServerType.Sasjs) {
+                            servicePackSASjs.streamLogo = streamConfig.streamLogo;
+                            servicePackSASjs.streamServiceName = streamConfig.streamServiceName;
+                            servicePackSASjs.streamWebFolder = streamConfig.streamWebFolder;
+                        }
                     }
                     finalSasFileContent = (0, utils_2.removeComments)(finalSasFileContent);
                     (_d = process.logger) === null || _d === void 0 ? void 0 : _d.debug("Creating file ".concat(finalFilePath, " ."));
@@ -169,7 +179,10 @@ function createFinalSasFiles(target) {
                     _j.sent();
                     (_e = process.logger) === null || _e === void 0 ? void 0 : _e.success("File ".concat(finalFilePath, " has been created."));
                     (_f = process.logger) === null || _f === void 0 ? void 0 : _f.debug("Creating file ".concat(finalFilePathJSON, " ."));
-                    return [4 /*yield*/, (0, utils_1.createFile)(finalFilePathJSON, JSON.stringify(folderContentJSON, null, 1))];
+                    servicePack = target.serverType === utils_1.ServerType.Sasjs
+                        ? servicePackSASjs
+                        : folderContentJSON;
+                    return [4 /*yield*/, (0, utils_1.createFile)(finalFilePathJSON, JSON.stringify(servicePack, null, 1))];
                 case 10:
                     _j.sent();
                     (_g = process.logger) === null || _g === void 0 ? void 0 : _g.success("File ".concat(finalFilePathJSON, " has been created."));
@@ -384,7 +397,7 @@ function getContentFor(rootDirectory, folderPath, serverType) {
                         .join('/'), ";\n");
                     contentJSON = {
                         name: folderName,
-                        type: 'folder',
+                        type: types_1.MemberType.folder,
                         members: []
                     };
                     return [4 /*yield*/, (0, utils_1.listFilesInFolder)(folderPath)];
@@ -404,7 +417,7 @@ function getContentFor(rootDirectory, folderPath, serverType) {
                                         content += "\n".concat(transformedContent, "\n");
                                         contentJSON.members.push({
                                             name: file.replace(/.sas$/, ''),
-                                            type: 'service',
+                                            type: types_1.MemberType.service,
                                             code: (0, utils_2.removeComments)(fileContent)
                                         });
                                         return [3 /*break*/, 4];
@@ -415,7 +428,7 @@ function getContentFor(rootDirectory, folderPath, serverType) {
                                         content += "\n".concat(transformedContent, "\n");
                                         contentJSON.members.push({
                                             name: file.replace(/.sas$/, ''),
-                                            type: 'file',
+                                            type: types_1.MemberType.file,
                                             code: fileContentEncoded
                                         });
                                         _a.label = 4;

package/build/commands/deploy/deploy.js

@@ -57,12 +57,12 @@ var deployToSasViyaWithServicePack_1 = require("../shared/deployToSasViyaWithSer
  * @param {object} sasjs - optional configuration object of SAS adapter.
  */
 function deploy(target, isLocal, sasjs) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     return __awaiter(this, void 0, void 0, function () {
-        var appLoc, buildDestinationFolder_1, finalFilePathJSON, jsonObject, webIndexFileName, deployScripts, buildDestinationFolder, logFilePath, streamConfig;
+        var appLoc, buildDestinationFolder_1, finalFilePathJSON, jsonObject, servicesFolder, webIndexFileName, deployScripts, buildDestinationFolder, logFilePath, streamConfig;
         var _this = this;
-        return __generator(this, function (_k) {
-            switch (_k.label) {
+        return __generator(this, function (_j) {
+            switch (_j.label) {
                 case 0:
                     if (!(target.serverType === utils_2.ServerType.SasViya &&
                         ((_a = target.deployConfig) === null || _a === void 0 ? void 0 : _a.deployServicePack))) return [3 /*break*/, 2];
@@ -72,30 +72,31 @@ function deploy(target, isLocal, sasjs) {
                     finalFilePathJSON = path_1.default.join(buildDestinationFolder_1, "".concat(target.name, ".json"));
                     return [4 /*yield*/, (0, deployToSasViyaWithServicePack_1.deployToSasViyaWithServicePack)(finalFilePathJSON, target, isLocal, true)];
                 case 1:
-                    jsonObject = _k.sent();
-                    webIndexFileName = (_f = (_e = (_d = (_c = jsonObject === null || jsonObject === void 0 ? void 0 : jsonObject.members.find(function (member) {
-                        return (member === null || member === void 0 ? void 0 : member.name) === 'services' && (member === null || member === void 0 ? void 0 : member.type) === 'folder';
-                    })) === null || _c === void 0 ? void 0 : _c.members) === null || _d === void 0 ? void 0 : _d.find(function (member) { return (member === null || member === void 0 ? void 0 : member.type) === 'file'; })) === null || _e === void 0 ? void 0 : _e.name) !== null && _f !== void 0 ? _f : '';
-                    (_g = process.logger) === null || _g === void 0 ? void 0 : _g.success('Build pack has been successfully deployed.');
-                    (_h = process.logger) === null || _h === void 0 ? void 0 : _h.success(target.serverType === utils_2.ServerType.SasViya && webIndexFileName
+                    jsonObject = _j.sent();
+                    servicesFolder = jsonObject === null || jsonObject === void 0 ? void 0 : jsonObject.members.find(function (member) {
+                        return (member === null || member === void 0 ? void 0 : member.name) === 'services' && (member === null || member === void 0 ? void 0 : member.type) === utils_2.MemberType.folder;
+                    });
+                    webIndexFileName = (_e = (_d = (_c = servicesFolder === null || servicesFolder === void 0 ? void 0 : servicesFolder.members) === null || _c === void 0 ? void 0 : _c.find(function (member) { return (member === null || member === void 0 ? void 0 : member.type) === utils_2.MemberType.file; })) === null || _d === void 0 ? void 0 : _d.name) !== null && _e !== void 0 ? _e : '';
+                    (_f = process.logger) === null || _f === void 0 ? void 0 : _f.success('Build pack has been successfully deployed.');
+                    (_g = process.logger) === null || _g === void 0 ? void 0 : _g.success(target.serverType === utils_2.ServerType.SasViya && webIndexFileName
                         ? "".concat(target.serverUrl, "/SASJobExecution?_file=").concat(appLoc, "/services/").concat(webIndexFileName, "&_debug=2")
                         : "".concat(target.serverUrl, "/SASJobExecution?_folder=").concat(appLoc));
-                    _k.label = 2;
+                    _j.label = 2;
                 case 2: return [4 /*yield*/, (0, getDeployScripts_1.getDeployScripts)(target)];
                 case 3:
-                    deployScripts = _k.sent();
-                    if (deployScripts.length === 0 && !((_j = target.deployConfig) === null || _j === void 0 ? void 0 : _j.deployServicePack)) {
+                    deployScripts = _j.sent();
+                    if (deployScripts.length === 0 && !((_h = target.deployConfig) === null || _h === void 0 ? void 0 : _h.deployServicePack)) {
                         throw new Error("Deployment failed.\nPlease either enable the 'deployServicePack' option or add deployment script paths to 'deployScripts' in your target's 'deployConfig'.");
                     }
                     buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
                     logFilePath = buildDestinationFolder;
                     return [4 /*yield*/, (0, config_1.getStreamConfig)(target)];
                 case 4:
-                    streamConfig = _k.sent();
+                    streamConfig = _j.sent();
                     if (!(target.serverType === utils_2.ServerType.Sasjs)) return [3 /*break*/, 6];
                     return [4 /*yield*/, deployToSasjs(target, sasjs, streamConfig)];
                 case 5:
-                    _k.sent();
+                    _j.sent();
                     return [3 /*break*/, 8];
                 case 6: return [4 /*yield*/, (0, utils_2.asyncForEach)(deployScripts, function (deployScript) { return __awaiter(_this, void 0, void 0, function () {
                         var deployScriptPath, deployScriptContent, linesToExecute, deployScriptName, logPath;
@@ -139,8 +140,8 @@ function deploy(target, isLocal, sasjs) {
                         });
                     }); })];
                 case 7:
-                    _k.sent();
-                    _k.label = 8;
+                    _j.sent();
+                    _j.label = 8;
                 case 8: return [2 /*return*/];
             }
         });
@@ -364,7 +365,7 @@ function deployToSasjs(target, sasjs, streamConfig) {
                     e_2 = _d.sent();
                     return [3 /*break*/, 5];
                 case 5: return [4 /*yield*/, sasjs
-                        .deployToSASjs(payload, undefined, streamConfig, authConfig)
+                        .deployToSASjs(payload, undefined, authConfig)
                         .catch(function (err) {
                         var _a;
                         (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error(err);

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

@@ -133,33 +133,36 @@ describe('sasjs cbd with server type SASJS', function () {
                         webSourcePath: ''
                     };
                     expect(sasjs.deployToSASjs).toHaveBeenCalledWith({
-                        members: [
-                            {
-                                name: 'services',
-                                type: 'folder',
-                                members: [
-                                    {
-                                        name: 'common',
-                                        type: 'folder',
-                                        members: [
-                                            {
-                                                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;')
-                                            },
-                                            {
-                                                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;')
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        ]
-                    }, undefined, streamConfig, undefined);
+                        appLoc: target.appLoc,
+                        fileTree: {
+                            members: [
+                                {
+                                    name: 'services',
+                                    type: 'folder',
+                                    members: [
+                                        {
+                                            name: 'common',
+                                            type: 'folder',
+                                            members: [
+                                                {
+                                                    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;')
+                                                },
+                                                {
+                                                    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;')
+                                                }
+                                            ]
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                    }, undefined, undefined);
                     return [2 /*return*/];
             }
         });

package/build/commands/shared/deployToSasViyaWithServicePack.d.ts

@@ -1,3 +1,2 @@
-import { Target } from '@sasjs/utils';
-import { ServicePack } from '../../types';
-export declare function deployToSasViyaWithServicePack(jsonFilePath: string, target: Target, isLocal: boolean, isForced?: boolean): Promise<ServicePack>;
+import { FileTree, Target } from '@sasjs/utils';
+export declare function deployToSasViyaWithServicePack(jsonFilePath: string, target: Target, isLocal: boolean, isForced?: boolean): Promise<FileTree>;

package/build/commands/shared/deployToSasViyaWithServicePack.js

@@ -85,9 +85,9 @@ exports.deployToSasViyaWithServicePack = deployToSasViyaWithServicePack;
 var populateCodeInServicePack = function (json) {
     var _a;
     return (_a = json === null || json === void 0 ? void 0 : json.members) === null || _a === void 0 ? void 0 : _a.forEach(function (member) {
-        if (member.type === 'file')
+        if (member.type === utils_1.MemberType.file)
             member.code = (0, js_base64_1.decode)(member.code);
-        if (member.type === 'folder')
+        if (member.type === utils_1.MemberType.folder)
             populateCodeInServicePack(member);
     });
 };

package/build/types/index.d.ts

@@ -4,4 +4,3 @@ export { Folder } from './folder';
 export { TargetScope } from './targetScope';
 export { TestFlow, Coverage, CoverageType, CoverageState, TestResults, TestResultStatus, TestDescription, TestResult, TestResultDescription, TestResultCsv } from './testing';
 export { Flow, FlowWave, FlowWaveJob } from './flow';
-export { ServicePack, ServicePackMember } from './servicePack';

package/package.json

@@ -47,10 +47,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "3.8.1",
+    "@sasjs/adapter": "3.8.2",
     "@sasjs/core": "4.15.3",
     "@sasjs/lint": "1.11.2",
-    "@sasjs/utils": "2.41.0",
+    "@sasjs/utils": "2.42.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.12.4"
+  "version": "3.12.5"
 }

package/build/types/servicePack.d.ts

@@ -1,9 +0,0 @@
-export interface ServicePack {
-    members: ServicePackMember[];
-}
-export interface ServicePackMember {
-    name: string;
-    type: 'folder' | 'service' | 'file';
-    code?: string;
-    members?: ServicePackMember[];
-}

package/build/types/servicePack.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });