@sasjs/cli 3.20.5 → 3.21.1

package/build/commands/compile/internal/compileFile.d.ts

@@ -1,5 +1,5 @@
 import { CompileTree } from '@sasjs/utils';
-import { Target, ServerType, SASJsFileType } from '@sasjs/utils/types';
+import { Target, SASJsFileType } from '@sasjs/utils/types';
 /**
  * Compiles file dependencies.
  * @param {Target} target - SAS server configuration.
@@ -12,4 +12,3 @@ import { Target, ServerType, SASJsFileType } from '@sasjs/utils/types';
  * @param {string} sourceFolder - folder path of the source folder.
  */
 export declare function compileFile(target: Target, filePath: string, macroFolders: string[], programFolders: string[], programVar: string | undefined, compileTree: CompileTree, fileType: SASJsFileType, sourceFolder: string): Promise<void>;
-export declare function getPreCodeForServicePack(serverType: ServerType): Promise<string>;

package/build/commands/compile/internal/compileFile.js

@@ -39,12 +39,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPreCodeForServicePack = exports.compileFile = void 0;
+exports.compileFile = void 0;
 var utils_1 = require("@sasjs/utils");
 var types_1 = require("@sasjs/utils/types");
-var error_1 = require("@sasjs/utils/error");
 var loadDependencies_1 = require("./loadDependencies");
-var getServerType_1 = require("./getServerType");
 var path_1 = __importDefault(require("path"));
 /**
  * Compiles file dependencies.
@@ -60,7 +58,7 @@ var path_1 = __importDefault(require("path"));
 function compileFile(target, filePath, macroFolders, programFolders, programVar, compileTree, fileType, sourceFolder) {
     if (programVar === void 0) { programVar = ''; }
     return __awaiter(this, void 0, void 0, function () {
-        var dependencies, serverType, preCode;
+        var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, sourceFolder
@@ -68,20 +66,14 @@ function compileFile(target, filePath, macroFolders, programFolders, programVar,
                         : filePath, macroFolders, programFolders, (0, utils_1.isTestFile)(filePath) ? types_1.SASJsFileType.test : fileType, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    if (!(fileType === types_1.SASJsFileType.service)) return [3 /*break*/, 4];
-                    return [4 /*yield*/, (0, getServerType_1.getServerType)(target)];
+                    if (fileType === types_1.SASJsFileType.service) {
+                        dependencies = "".concat(programVar, "\n").concat(dependencies);
+                    }
+                    else {
+                        dependencies = "".concat(programVar ? programVar + '\n' : '').concat(dependencies);
+                    }
+                    return [4 /*yield*/, (0, utils_1.createFile)(filePath, dependencies)];
                 case 2:
-                    serverType = _a.sent();
-                    return [4 /*yield*/, getPreCodeForServicePack(serverType)];
-                case 3:
-                    preCode = _a.sent();
-                    dependencies = "".concat(programVar, "\n").concat(preCode, "\n").concat(dependencies);
-                    return [3 /*break*/, 5];
-                case 4:
-                    dependencies = "".concat(programVar ? programVar + '\n' : '').concat(dependencies);
-                    _a.label = 5;
-                case 5: return [4 /*yield*/, (0, utils_1.createFile)(filePath, dependencies)];
-                case 6:
                     _a.sent();
                     return [2 /*return*/];
             }
@@ -89,103 +81,3 @@ function compileFile(target, filePath, macroFolders, programFolders, programVar,
     });
 }
 exports.compileFile = compileFile;
-function getPreCodeForServicePack(serverType) {
-    return __awaiter(this, void 0, void 0, function () {
-        var content, macroCorePath, _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        return __generator(this, function (_l) {
-            switch (_l.label) {
-                case 0:
-                    content = '';
-                    macroCorePath = process.sasjsConstants.macroCorePath;
-                    _a = serverType;
-                    switch (_a) {
-                        case types_1.ServerType.SasViya: return [3 /*break*/, 1];
-                        case types_1.ServerType.Sas9: return [3 /*break*/, 5];
-                        case types_1.ServerType.Sasjs: return [3 /*break*/, 9];
-                    }
-                    return [3 /*break*/, 13];
-                case 1:
-                    _b = content;
-                    return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/base/mf_getuser.sas"))];
-                case 2:
-                    content = _b + _l.sent();
-                    _c = content;
-                    return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/base/mp_jsonout.sas"))];
-                case 3:
-                    content = _c + _l.sent();
-                    _d = content;
-                    return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/viya/mv_webout.sas"))];
-                case 4:
-                    content = _d + _l.sent();
-                    content +=
-                        '/* if calling viya service with _job param, _program will conflict */\n' +
-                            '/* so we provide instead as __program */\n' +
-                            '%global __program _program;\n' +
-                            '%let _program=%sysfunc(coalescec(&__program,&_program));\n' +
-                            '%macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO,maxobs=MAX);\n' +
-                            '  %mv_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt\n' +
-                            '    ,missing=&missing\n' +
-                            '    ,showmeta=&showmeta\n' +
-                            '    ,maxobs=&maxobs\n' +
-                            '  )' +
-                            '%mend;\n';
-                    return [3 /*break*/, 14];
-                case 5:
-                    _e = content;
-                    return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/base/mf_getuser.sas"))];
-                case 6:
-                    content = _e + _l.sent();
-                    _f = content;
-                    return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/base/mp_jsonout.sas"))];
-                case 7:
-                    content = _f + _l.sent();
-                    _g = content;
-                    return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/meta/mm_webout.sas"))];
-                case 8:
-                    content = _g + _l.sent();
-                    content +=
-                        '  %macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO,maxobs=MAX);\n' +
-                            '    %mm_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt\n' +
-                            '      ,missing=&missing\n' +
-                            '      ,showmeta=&showmeta\n' +
-                            '      ,maxobs=&maxobs\n' +
-                            '    )' +
-                            '  %mend;\n';
-                    return [3 /*break*/, 14];
-                case 9:
-                    _h = content;
-                    return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/base/mf_getuser.sas"))];
-                case 10:
-                    content = _h + _l.sent();
-                    _j = content;
-                    return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/base/mp_jsonout.sas"))];
-                case 11:
-                    content = _j + _l.sent();
-                    _k = content;
-                    return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/server/ms_webout.sas"))];
-                case 12:
-                    content = _k + _l.sent();
-                    content +=
-                        '  %macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO,maxobs=MAX);\n' +
-                            '    %ms_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt\n' +
-                            '      ,missing=&missing\n' +
-                            '      ,showmeta=&showmeta\n' +
-                            '      ,maxobs=&maxobs\n' +
-                            '    )' +
-                            '  %mend;\n';
-                    return [3 /*break*/, 14];
-                case 13: throw new error_1.ServerTypeError();
-                case 14:
-                    content +=
-                        '/* 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';
-                    return [2 /*return*/, content];
-            }
-        });
-    });
-}
-exports.getPreCodeForServicePack = getPreCodeForServicePack;

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

@@ -72,7 +72,6 @@ var loadDependencies_1 = require("./loadDependencies");
 var file_1 = require("../../../utils/file");
 var chalk_1 = __importDefault(require("chalk"));
 var config_1 = require("../../../utils/config");
-var compileFile_1 = require("./compileFile");
 var testsBuildFolder = function () {
     return path_1.default.join(process.projectDir, 'sasjsbuild', 'tests');
 };
@@ -82,7 +81,7 @@ function compileTestFile(target, filePath, testVar, saveToRoot, removeOriginalFi
     if (saveToRoot === void 0) { saveToRoot = true; }
     if (removeOriginalFile === void 0) { removeOriginalFile = true; }
     return __awaiter(this, void 0, void 0, function () {
-        var dependencies, _a, _b, preCode, destinationPath;
+        var dependencies, _a, _b, destinationPath;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -97,10 +96,7 @@ function compileTestFile(target, filePath, testVar, saveToRoot, removeOriginalFi
                         compileTree]))];
                 case 3:
                     dependencies = _c.sent();
-                    return [4 /*yield*/, (0, compileFile_1.getPreCodeForServicePack)(target.serverType)];
-                case 4:
-                    preCode = _c.sent();
-                    dependencies = "".concat(testVar ? testVar + '\n' : '', "\n").concat(preCode, "\n").concat(dependencies);
+                    dependencies = "".concat(testVar ? testVar + '\n' : '', "\n").concat(dependencies);
                     destinationPath = path_1.default.join(testsBuildFolder(), saveToRoot
                         ? filePath.split(path_1.default.sep).pop() || ''
                         : filePath
@@ -112,14 +108,14 @@ function compileTestFile(target, filePath, testVar, saveToRoot, removeOriginalFi
                         }, [])
                             .join(path_1.default.sep));
                     return [4 /*yield*/, (0, utils_1.createFile)(destinationPath, dependencies)];
-                case 5:
+                case 4:
                     _c.sent();
-                    if (!removeOriginalFile) return [3 /*break*/, 7];
+                    if (!removeOriginalFile) return [3 /*break*/, 6];
                     return [4 /*yield*/, (0, utils_1.deleteFile)(filePath)];
-                case 6:
+                case 5:
                     _c.sent();
-                    _c.label = 7;
-                case 7: return [2 /*return*/];
+                    _c.label = 6;
+                case 6: return [2 /*return*/];
             }
         });
     });

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

@@ -76,6 +76,7 @@ var getInitTerm_1 = require("@sasjs/utils/sasjsCli/getInitTerm");
 var test_1 = require("../../../utils/test");
 var utils_2 = require("../../../utils");
 var loadDependencies_1 = require("../internal/loadDependencies");
+var getAllFolders_1 = require("../internal/getAllFolders");
 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  ".concat(utils_1.DependencyHeader.Macro, "\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!!;");
 var fakeTerm = "/**\n  @file serviceterm.sas\n  @brief this file is called at the end of every service\n  @details  This file is included at the *end* of every service.\n\n  ".concat(utils_1.DependencyHeader.Macro, "\n  @li mf_abort.sas\n  @li mf_existds.sas\n\n**/\n\n%put service is finishing.  Thanks, SASjs!;");
 var fakeInit2 = "/**\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  ".concat(utils_1.DependencyHeader.Macro, "\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!!;");
@@ -123,7 +124,7 @@ var serviceConfig = function (root) {
             }
     });
 };
-var compiledVars = function (type) { return "* ".concat(type, " Variables start;\n\n%let macrovar1=macro ").concat(type.toLowerCase(), " value configuration 1;\n%let macrovar2=macro ").concat(type.toLowerCase(), " value target 2;\n%let macrovar3=macro ").concat(type.toLowerCase(), " value target 3;\n\n* ").concat(type, " Variables end;"); };
+var compiledVars = function (type) { return "* ".concat((0, utils_1.capitalizeFirstChar)(type), " Variables start;\n\n%let macrovar1=macro ").concat(type.toLowerCase(), " value configuration 1;\n%let macrovar2=macro ").concat(type.toLowerCase(), " value target 2;\n%let macrovar3=macro ").concat(type.toLowerCase(), " value target 3;\n\n* ").concat((0, utils_1.capitalizeFirstChar)(type), " Variables end;"); };
 describe('loadDependencies', function () {
     var appName = "cli-tests-load-dependencies-".concat((0, utils_1.generateTimestamp)());
     var temp = (0, test_1.generateTestTarget)(appName, '/Public/app', {
@@ -173,7 +174,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toStartWith(compiledVars('Service'));
+                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Service));
                     expect(/\* ServiceInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceTerm start;/.test(dependencies)).toEqual(true);
@@ -193,7 +194,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toStartWith(compiledVars('Job'));
+                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Job));
                     expect(/\* JobInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* JobInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* JobTerm start;/.test(dependencies)).toEqual(true);
@@ -213,7 +214,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toStartWith(compiledVars('Service'));
+                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Service));
                     expect(/\* ServiceInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceTerm start;/.test(dependencies)).toEqual(true);
@@ -233,7 +234,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toStartWith(compiledVars('Job'));
+                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Job));
                     expect(/\* JobInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* JobInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* JobTerm start;/.test(dependencies)).toEqual(true);
@@ -253,7 +254,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, 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, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toStartWith(compiledVars('Service'));
+                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Service));
                     expect(/\* ServiceInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceTerm start;/.test(dependencies)).toEqual(true);
@@ -273,7 +274,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, 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, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toStartWith(compiledVars('Job'));
+                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Job));
                     expect(/\* JobInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* JobInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* JobTerm start;/.test(dependencies)).toEqual(true);
@@ -293,7 +294,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, 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, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toStartWith(compiledVars('Service'));
+                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Service));
                     expect(/\* ServiceInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceTerm start;/.test(dependencies)).toEqual(true);
@@ -313,7 +314,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, 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, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toStartWith(compiledVars('Job'));
+                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Job));
                     expect(/\* JobInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* JobInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* JobTerm start;/.test(dependencies)).toEqual(true);
@@ -333,7 +334,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, 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, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toStartWith(compiledVars('Job'));
+                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Job));
                     expect(/\* JobInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* JobInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* JobTerm start;/.test(dependencies)).toEqual(true);
@@ -356,7 +357,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, 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, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toStartWith(compiledVars('Job'));
+                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Job));
                     expect(/\* JobInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* JobInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* JobTerm start;/.test(dependencies)).toEqual(true);
@@ -378,7 +379,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, 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, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toStartWith(compiledVars('Service'));
+                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Service));
                     expect(/\* ServiceInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceTerm start;/.test(dependencies)).toEqual(true);
@@ -401,7 +402,7 @@ describe('loadDependencies', function () {
                     return [4 /*yield*/, (0, 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, compileTree)];
                 case 1:
                     dependencies = _a.sent();
-                    expect(dependencies).toStartWith(compiledVars('Service'));
+                    expect(dependencies).toContain(compiledVars(getAllFolders_1.SasFileType.Service));
                     expect(/\* ServiceInit start;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceInit end;/.test(dependencies)).toEqual(true);
                     expect(/\* ServiceTerm start;/.test(dependencies)).toEqual(true);

package/build/commands/deploy/deploy.d.ts

@@ -1,10 +1,8 @@
-import SASjs from '@sasjs/adapter/node';
 import { Target } from '@sasjs/utils';
 /**
  * Deploys app to serverUrl/appLoc mentioned in specified target.
- * @param {Target} target- the target having deploy configuration.
- * @param {boolean} isLocal- flag indicating if specified target is
+ * @param {Target} target - the target having deploy configuration.
+ * @param {boolean} isLocal - flag indicating if specified target is
  * from local sasjsconfig or global sasjsconfig file.
- * @param {object} sasjs - optional configuration object of SAS adapter.
  */
-export declare function deploy(target: Target, isLocal: boolean, sasjs?: SASjs): Promise<void>;
+export declare function deploy(target: Target, isLocal: boolean): Promise<void>;