@sasjs/cli 3.0.0 → 3.0.4

package/build/commands/compile/spec/loadDependencies.spec.js

@@ -71,7 +71,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
-var internalModule = __importStar(require("../internal/config"));
+var internalModule = __importStar(require("@sasjs/utils/sasjsCli/getInitTerm"));
 var test_1 = require("../../../utils/test");
 var loadDependencies_1 = require("../internal/loadDependencies");
 var fakeInit = "/**\n  @file serviceinit.sas\n  @brief this file is called with every service\n  @details  This file is included in *every* service, *after* the macros and *before* the service code.\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n\n**/\n\noptions\n  DATASTMTCHK=ALLKEYWORDS /* some sites have this enabled */\n  PS=MAX /* reduce log size slightly */\n;\n%put service is starting!!;";
@@ -162,19 +162,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getServiceInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceInit start;\n" + fakeInit + "\n* ServiceInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getServiceTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceTerm start;\n" + fakeTerm + "\n* ServiceTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [], [], 'service')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.service)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));
@@ -193,19 +193,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getJobInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobInit start;\n" + fakeInit + "\n* JobInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getJobTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobTerm start;\n" + fakeTerm + "\n* JobTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [], [], 'job')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.job)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -224,19 +224,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getServiceInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceInit start;\n" + fakeInit2 + "\n* ServiceInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getServiceTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceTerm start;\n" + fakeTerm2 + "\n* ServiceTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [], [], 'service')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.service)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));
@@ -255,19 +255,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getJobInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobInit start;\n" + fakeInit2 + "\n* JobInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getJobTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobTerm start;\n" + fakeTerm2 + "\n* JobTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [], [], 'job')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.job)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -286,19 +286,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getServiceInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceInit start;\n" + fakeJobInit + "\n* ServiceInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getServiceTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceTerm start;\n" + fakeTerm + "\n* ServiceTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], 'service')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));
@@ -317,19 +317,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getJobInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobInit start;\n" + fakeJobInit + "\n* JobInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getJobTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobTerm start;\n" + fakeTerm + "\n* JobTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], 'job')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -348,19 +348,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getServiceInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceInit start;\n" + fakeJobInit2 + "\n* ServiceInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getServiceTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceTerm start;\n" + fakeTerm2 + "\n* ServiceTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], 'service')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));
@@ -379,19 +379,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getJobInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobInit start;\n" + fakeJobInit2 + "\n* JobInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getJobTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobTerm start;\n" + fakeTerm2 + "\n* JobTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], 'job')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -410,19 +410,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getJobInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobInit start;\n" + fakeJobInit + "\n* JobInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getJobTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobTerm start;\n" + fakeTerm2 + "\n* JobTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], 'job')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -444,19 +444,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getJobInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobInit start;\n" + fakeInit2 + "\n* JobInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getJobTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobTerm start;\n" + fakeJobInit + "\n* JobTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], 'job')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -477,19 +477,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getServiceInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceInit start;\n" + fakeJobInit + "\n* ServiceInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getServiceTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceTerm start;\n" + fakeTerm2 + "\n* ServiceTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], 'service')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));
@@ -511,19 +511,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getServiceInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceInit start;\n" + fakeInit2 + "\n* ServiceInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getServiceTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceTerm start;\n" + fakeJobInit + "\n* ServiceTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], 'service')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));

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

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

package/build/commands/deploy/deploy.js

@@ -93,7 +93,7 @@ function deploy(target, isLocal, sasjs) {
                         return __generator(this, function (_d) {
                             switch (_d.label) {
                                 case 0:
-                                    deployScriptPath = utils_1.getAbsolutePath(deployScript, process.projectDir);
+                                    deployScriptPath = utils_2.getAbsolutePath(deployScript, process.projectDir);
                                     if (!file_1.isSasFile(deployScript)) return [3 /*break*/, 7];
                                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Processing SAS file " + path_1.default.basename(deployScript) + " ...");
                                     return [4 /*yield*/, utils_2.readFile(deployScriptPath)

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

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

package/build/commands/docs/generateDocs.js

@@ -80,7 +80,6 @@ var utils_1 = require("@sasjs/utils");
 var getFoldersForDocs_1 = require("./internal/getFoldersForDocs");
 var createDotFiles_1 = require("./internal/createDotFiles");
 var getDocConfig_1 = require("./internal/getDocConfig");
-var logger_1 = require("@sasjs/utils/logger");
 var utils_2 = require("../../utils");
 /**
  * Generates documentation(Doxygen)
@@ -129,7 +128,7 @@ function generateDocs(target, config, outDirectory) {
                 case 4:
                     doxyContent = __assign({ favIcon: 'favicon.ico', footer: 'new_footer.html', header: 'new_header.html', layout: 'DoxygenLayout.xml', logo: 'logo.png', readMe: '../../README.md', stylesheet: 'new_stylesheet.css', path: path_1.default.join(process.projectDir, 'sasjs', 'doxy') }, doxyContentFromConfig);
                     if (doxyContentFromConfig === null || doxyContentFromConfig === void 0 ? void 0 : doxyContentFromConfig.path)
-                        doxyContent.path = utils_2.getAbsolutePath(doxyContentFromConfig.path, process.projectDir);
+                        doxyContent.path = utils_1.getAbsolutePath(doxyContentFromConfig.path, process.projectDir);
                     doxyParams = setVariableCmd({
                         DOXY_HTML_OUTPUT: newOutDirectory,
                         DOXY_INPUT: "\"" + path_1.default.join(doxyContent.path, doxyContent.readMe) + "\" " + combinedFolders,
@@ -147,7 +146,7 @@ function generateDocs(target, config, outDirectory) {
                     doxyConfigPath = _f.sent();
                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Using " + doxyConfigPath + " as Doxygen Configuration.");
                     spinner = ora_1.default(chalk_1.default.greenBright('Generating docs', chalk_1.default.cyanBright(newOutDirectory)));
-                    if (process.env.LOG_LEVEL !== logger_1.LogLevel.Debug)
+                    if (process.env.LOG_LEVEL !== utils_1.LogLevel.Debug)
                         spinner.start();
                     return [4 /*yield*/, utils_1.fileExists(newOutDirectory)];
                 case 6:
@@ -161,9 +160,9 @@ function generateDocs(target, config, outDirectory) {
                 case 9:
                     _f.sent();
                     _e = shelljs_1.default.exec(doxyParams + " doxygen \"" + doxyConfigPath + "\"", {
-                        silent: process.env.LOG_LEVEL !== logger_1.LogLevel.Debug
+                        silent: process.env.LOG_LEVEL !== utils_1.LogLevel.Debug
                     }), stderr = _e.stderr, code = _e.code;
-                    if (process.env.LOG_LEVEL !== logger_1.LogLevel.Debug)
+                    if (process.env.LOG_LEVEL !== utils_1.LogLevel.Debug)
                         spinner.stop();
                     if (code !== 0) {
                         if (stderr.startsWith('error: ')) {

package/build/commands/docs/internal/getFileInputs.d.ts

@@ -7,4 +7,4 @@
 export declare function getFileInputs(fileName: string, fileContent: string, paramNodes: Map<string, {
     edges: string[];
     label: string;
-}>): any[];
+}>): string[];

package/build/commands/docs/internal/getFileInputs.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFileInputs = void 0;
-var file_1 = require("../../../utils/file");
+var utils_1 = require("@sasjs/utils");
 /**
  * Returns list of Inputs and populates Map of Nodes
  * @param {string} fileName- Name of the file from which Inputs need to extract
@@ -9,7 +9,7 @@ var file_1 = require("../../../utils/file");
  * @param {Map} paramNodes- Map for params(Inputs/Outputs)
  */
 function getFileInputs(fileName, fileContent, paramNodes) {
-    var fileInputs = file_1.getList('<h4> Data Inputs </h4>', fileContent)
+    var fileInputs = utils_1.getList('<h4> Data Inputs </h4>', fileContent)
         .map(function (input) { return input.toUpperCase(); })
         .filter(function (input) { return !input.endsWith('.DLL'); });
     fileInputs.forEach(function (inputParam) {

package/build/commands/docs/internal/getFileOutputs.d.ts

@@ -6,4 +6,4 @@
 export declare function getFileOutputs(fileContent: string, paramNodes: Map<string, {
     edges: string[];
     label: string;
-}>): any[];
+}>): string[];

package/build/commands/docs/internal/getFileOutputs.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFileOutputs = void 0;
-var file_1 = require("../../../utils/file");
+var utils_1 = require("@sasjs/utils");
 /**
  * Returns list of Outputs and populates Map of Nodes
  * @param {string} fileContent- Contents of the file from which Outputs need to extract
  * @param {Map} paramNodes- Map for params(Inputs/Outputs)
  */
 function getFileOutputs(fileContent, paramNodes) {
-    var fileOutputs = file_1.getList('<h4> Data Outputs </h4>', fileContent)
+    var fileOutputs = utils_1.getList('<h4> Data Outputs </h4>', fileContent)
         .map(function (output) { return output.toUpperCase(); })
         .filter(function (output) { return !output.endsWith('.DLL'); });
     fileOutputs.forEach(function (outputParam) {

package/build/commands/docs/internal/getFoldersForDocs.d.ts

@@ -1,4 +1,4 @@
-import { Target, Configuration } from '@sasjs/utils/types';
+import { Target, Configuration } from '@sasjs/utils';
 /**
  * Returns list of folders for documentation( macroCore / macros / SAS programs/ services / jobs )
  * @param {Target} target- target for docs.

package/build/commands/docs/internal/getFoldersForDocs.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFoldersForDocs = void 0;
-var utils_1 = require("../../../utils/utils");
+var utils_1 = require("@sasjs/utils");
 /**
  * Returns list of folders for documentation( macroCore / macros / SAS programs/ services / jobs )
  * @param {Target} target- target for docs.

package/build/commands/request/request.js

@@ -59,7 +59,7 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                     if (dataFilePath.split('.').slice(-1)[0] !== 'json') {
                         throw new Error('Provided data file must be valid json.');
                     }
-                    return [4 /*yield*/, utils_1.readFile(utils_2.getAbsolutePath(dataFilePath, process.projectDir))];
+                    return [4 /*yield*/, utils_1.readFile(utils_1.getAbsolutePath(dataFilePath, process.projectDir))];
                 case 1:
                     dataFile = _a.sent();
                     try {
@@ -74,7 +74,7 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                     if (configFilePath.split('.').slice(-1)[0] !== 'json') {
                         throw new Error('Provided config file must be valid json.');
                     }
-                    return [4 /*yield*/, utils_1.readFile(utils_2.getAbsolutePath(configFilePath, process.projectDir))];
+                    return [4 /*yield*/, utils_1.readFile(utils_1.getAbsolutePath(configFilePath, process.projectDir))];
                 case 3:
                     configFile = _a.sent();
                     try {

package/build/commands/run/run.js

@@ -113,7 +113,7 @@ function runSasCode(target, filePath, compile) {
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("File Compiled and placed at: " + filePath + " .");
                     _b.label = 4;
                 case 4:
-                    sasFilePath = utils_2.getAbsolutePath(filePath, process.currentDir);
+                    sasFilePath = utils_1.getAbsolutePath(filePath, process.currentDir);
                     return [4 /*yield*/, utils_1.readFile(sasFilePath)];
                 case 5:
                     sasFileContent = _b.sent();

package/build/commands/servicepack/deploy.js

@@ -42,7 +42,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.servicePackDeploy = void 0;
 var path_1 = __importDefault(require("path"));
 var displayResult_1 = require("../../utils/displayResult");
-var utils_1 = require("../../utils/utils");
+var utils_1 = require("@sasjs/utils");
 var deployToSasViyaWithServicePack_1 = require("../shared/deployToSasViyaWithServicePack");
 function servicePackDeploy(target, isLocal, jsonFilePath, isForced) {
     var _a;

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

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

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

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

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

@@ -38,7 +38,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWebServiceContent = void 0;
 var utils_1 = require("@sasjs/utils");
-var utils_2 = require("../../../utils");
 var sasjsout_1 = require("./sasjsout");
 var getWebServiceContent = function (contentBase64, type, serverType) {
     if (type === void 0) { type = 'JS'; }
@@ -52,7 +51,7 @@ var getWebServiceContent = function (contentBase64, type, serverType) {
             };
             serviceContent = sasjsout_1.sasjsout + "\nfilename sasjs temp lrecl=99999999;\ndata _null_;\nfile sasjs;\n";
             lines.forEach(function (line) {
-                var chunkedLines = utils_2.chunk(line);
+                var chunkedLines = utils_1.chunk(line);
                 if (chunkedLines.length === 1) {
                     serviceContent += "put '" + chunkedLines[0].split("'").join("''") + "';\n";
                 }