@sasjs/cli 3.5.1 → 3.6.0

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

@@ -42,7 +42,7 @@ var config_1 = require("../../../utils/config");
 function loadDependencies(target, filePath, macroFolders, programFolders, type) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var fileContent, configuration, _b, buildSourceFolder, macroCorePath;
+        var fileContent, configuration, _b, buildSourceFolder, macroCorePath, binaryFolders;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -54,6 +54,9 @@ function loadDependencies(target, filePath, macroFolders, programFolders, type)
                 case 2:
                     configuration = (_c.sent()).configuration;
                     _b = process.sasjsConstants, buildSourceFolder = _b.buildSourceFolder, macroCorePath = _b.macroCorePath;
+                    return [4 /*yield*/, config_1.getBinaryFolders(target)];
+                case 3:
+                    binaryFolders = _c.sent();
                     headerSyntaxNotices(fileContent);
                     return [4 /*yield*/, utils_1.loadDependenciesFile({
                             fileContent: fileContent,
@@ -64,9 +67,10 @@ function loadDependencies(target, filePath, macroFolders, programFolders, type)
                             macroFolders: macroFolders,
                             programFolders: programFolders,
                             buildSourceFolder: buildSourceFolder,
-                            macroCorePath: macroCorePath
+                            macroCorePath: macroCorePath,
+                            binaryFolders: binaryFolders
                         })];
-                case 3: return [2 /*return*/, _c.sent()];
+                case 4: return [2 /*return*/, _c.sent()];
             }
         });
     });

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

@@ -128,10 +128,10 @@ describe('compileTestFile', function () {
                                         return [4 /*yield*/, utils_1.readFile(compiledTestFilePath)];
                                     case 2:
                                         testFileContent = _a.apply(void 0, [_b.sent()]);
-                                        testVar = replaceLineBreaks("* Test Variables start;\n\n%let " + Object.keys(target.testConfig.macroVars)[0] + "=" + Object.values(target.testConfig.macroVars)[0] + ";\n\n*Test Variables end;");
+                                        testVar = replaceLineBreaks("* Test Variables start;\n\n%let " + Object.keys(target.testConfig.macroVars)[0] + "=" + Object.values(target.testConfig.macroVars)[0] + ";\n\n* Test Variables end;");
                                         testInit = replaceLineBreaks("* TestInit start;\n/**\n  @file\n  @brief setting up the test\n\n  <h4> SAS Macros </h4>\n**/\n\n%put testing, init;\n* TestInit end;");
                                         testTerm = replaceLineBreaks("* TestTerm start;\n/**\n  @file\n  @brief ending the test\n\n  <h4> SAS Macros </h4>\n**/\n\n%put testing, termed;\n* TestTerm end;");
-                                        mvWebout = "%macro mv_webout(action,ds,fref=_mvwtemp,dslabel=,fmt=Y,stream=Y);";
+                                        mvWebout = "%macro mv_webout(action,ds,fref=_mvwtemp,dslabel=,fmt=Y,stream=Y,missing=NULL<br>  ,showmeta=NO<br>);";
                                         expect(testFileContent.indexOf(testVar)).toBeGreaterThan(-1);
                                         expect(testFileContent.indexOf(testInit)).toBeGreaterThan(-1);
                                         expect(testFileContent.indexOf(testTerm)).toBeGreaterThan(-1);

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

@@ -121,7 +121,7 @@ var serviceConfig = function (root) {
             }
     });
 };
-var compiledVars = function (type) { return "* " + type + " Variables start;\n\n%let macrovar1=macro " + type.toLowerCase() + " value configuration 1;\n%let macrovar2=macro " + type.toLowerCase() + " value target 2;\n%let macrovar3=macro " + type.toLowerCase() + " value target 3;\n\n*" + type + " Variables end;"; };
+var compiledVars = function (type) { return "* " + type + " Variables start;\n\n%let macrovar1=macro " + type.toLowerCase() + " value configuration 1;\n%let macrovar2=macro " + type.toLowerCase() + " value target 2;\n%let macrovar3=macro " + type.toLowerCase() + " value target 3;\n\n* " + type + " Variables end;"; };
 describe('loadDependencies', function () {
     var appName = "cli-tests-load-dependencies-" + utils_1.generateTimestamp();
     var temp = test_1.generateTestTarget(appName, '/Public/app', {

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

@@ -139,13 +139,13 @@ describe('sasjs cbd with server type SASJS', function () {
                                                 name: 'appinit',
                                                 type: 'service',
                                                 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;')
+                                                    '/* 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: 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;')
+                                                    '/* 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;')
                                             }
                                         ]
                                     }

package/build/config.json

@@ -235,6 +235,7 @@
     },
     "macroFolders": ["sasjs/macros"],
     "programFolders": ["sasjs/programs"],
+    "binaryFolders": ["sasjs/binaries"],
     "serverType": "SASVIYA",
     "targets": [
       {

package/build/utils/config.d.ts

@@ -39,6 +39,7 @@ export declare function getFolders(): Promise<any>;
  * @param {Target} target- the target to check program folders for.
  */
 export declare function getProgramFolders(target: Target): Promise<string[]>;
+export declare function getBinaryFolders(target: Target): Promise<string[]>;
 /**
  * Returns SAS macro folders from configuration.
  * This list includes both common and target-specific folders.

package/build/utils/config.js

@@ -71,7 +71,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTestTearDown = exports.getTestSetUp = exports.overrideEnvVariables = exports.getAccessToken = exports.getAuthConfig = exports.getProjectRoot = exports.sanitizeAppLoc = exports.getMacroCorePath = exports.getStreamConfig = exports.getMacroFolders = exports.getProgramFolders = exports.getFolders = exports.saveToLocalConfig = exports.saveLocalConfigFile = exports.getLocalOrGlobalConfig = exports.getLocalConfig = exports.removeFromLocalConfig = exports.removeFromGlobalConfig = exports.saveToGlobalConfig = exports.saveGlobalRcFile = exports.getLocalRcFile = exports.getGlobalRcFile = exports.findTargetInConfiguration = exports.getConfiguration = void 0;
+exports.getTestTearDown = exports.getTestSetUp = exports.overrideEnvVariables = exports.getAccessToken = exports.getAuthConfig = exports.getProjectRoot = exports.sanitizeAppLoc = exports.getMacroCorePath = exports.getStreamConfig = exports.getMacroFolders = exports.getBinaryFolders = exports.getProgramFolders = exports.getFolders = exports.saveToLocalConfig = exports.saveLocalConfigFile = exports.getLocalOrGlobalConfig = exports.getLocalConfig = exports.removeFromLocalConfig = exports.removeFromGlobalConfig = exports.saveToGlobalConfig = exports.saveGlobalRcFile = exports.getLocalRcFile = exports.getGlobalRcFile = exports.findTargetInConfiguration = exports.getConfiguration = void 0;
 var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var utils_1 = require("@sasjs/utils");
 var auth_1 = require("./auth");
@@ -641,6 +641,32 @@ function getProgramFolders(target) {
     });
 }
 exports.getProgramFolders = getProgramFolders;
+function getBinaryFolders(target) {
+    return __awaiter(this, void 0, void 0, function () {
+        var binaryFolders, localConfig, buildSourceFolder;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    binaryFolders = [];
+                    return [4 /*yield*/, getLocalConfig().catch(function () { return null; })];
+                case 1:
+                    localConfig = _a.sent();
+                    if (localConfig === null || localConfig === void 0 ? void 0 : localConfig.binaryFolders) {
+                        binaryFolders = binaryFolders.concat(localConfig.binaryFolders);
+                    }
+                    if (target === null || target === void 0 ? void 0 : target.binaryFolders) {
+                        binaryFolders = binaryFolders.concat(target.binaryFolders);
+                    }
+                    buildSourceFolder = process.sasjsConstants.buildSourceFolder;
+                    binaryFolders = binaryFolders.map(function (binaryFolder) {
+                        return utils_1.getAbsolutePath(binaryFolder, buildSourceFolder);
+                    });
+                    return [2 /*return*/, __spreadArray([], __read(new Set(binaryFolders)))];
+            }
+        });
+    });
+}
+exports.getBinaryFolders = getBinaryFolders;
 /**
  * Returns SAS macro folders from configuration.
  * This list includes both common and target-specific folders.

package/build/utils/test.js

@@ -350,7 +350,9 @@ var verifyPackageJsonContent = function (parentFolderName) {
                 case 2:
                     packageJsonContent = _a.sent();
                     packageJson = JSON.parse(packageJsonContent);
-                    expect(packageJson.dependencies).toEqual(expect.objectContaining({ '@sasjs/core': expect.anything() }));
+                    expect(parentFolderName.includes('minimal')
+                        ? packageJson.devDependencies
+                        : packageJson.dependencies).toEqual(expect.objectContaining({ '@sasjs/core': expect.anything() }));
                     return [2 /*return*/];
             }
         });

package/package.json

@@ -49,10 +49,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "3.3.1",
-    "@sasjs/core": "^3.9.1",
+    "@sasjs/adapter": "3.4.1",
+    "@sasjs/core": "3.10.0",
     "@sasjs/lint": "1.11.2",
-    "@sasjs/utils": "2.34.1",
+    "@sasjs/utils": "2.35.0",
     "chalk": "4.1.2",
     "csv-stringify": "5.6.5",
     "dotenv": "10.0.0",
@@ -67,7 +67,7 @@
     "node-graphviz": "0.1.0",
     "ora": "5.4.1",
     "rimraf": "3.0.2",
-    "shelljs": "0.8.4",
+    "shelljs": "0.8.5",
     "xml": "1.0.1",
     "yargs": "17.2.1"
   },
@@ -97,5 +97,5 @@
     "typescript": "4.3.5",
     "util": "0.12.4"
   },
-  "version": "3.5.1"
+  "version": "3.6.0"
 }