@sasjs/cli 3.12.6 → 3.13.0

package/build/cli.js

@@ -48,13 +48,13 @@ function cli(args) {
                 case 0: return [4 /*yield*/, (0, utils_1.setProjectDir)(args)];
                 case 1:
                     _a.sent();
-                    return [4 /*yield*/, (0, utils_1.setConstants)()];
+                    return [4 /*yield*/, instantiateLogger()];
                 case 2:
                     _a.sent();
-                    return [4 /*yield*/, (0, utils_1.loadProjectEnvVariables)()];
+                    return [4 /*yield*/, (0, utils_1.setConstants)()];
                 case 3:
                     _a.sent();
-                    return [4 /*yield*/, instantiateLogger()];
+                    return [4 /*yield*/, (0, utils_1.loadProjectEnvVariables)()];
                 case 4:
                     _a.sent();
                     command = (0, parse_1.parse)(args);

package/build/commands/build/build.js

@@ -144,7 +144,7 @@ function createFinalSasFiles(target) {
                     return [4 /*yield*/, (0, config_2.getBuildTerm)(target)];
                 case 5:
                     buildTerm = _j.sent();
-                    macroCorePath = (0, config_1.getMacroCorePath)();
+                    macroCorePath = process.sasjsConstants.macroCorePath;
                     return [4 /*yield*/, (0, utils_1.getDependencyPaths)("".concat(buildTerm, "\n").concat(buildInit), macroFolders, macroCorePath)];
                 case 6:
                     dependencyFilePaths = _j.sent();
@@ -205,7 +205,7 @@ function getBuildInfo(target, streamWeb) {
                     return [4 /*yield*/, getCreateWebServiceScript(serverType)];
                 case 2:
                     createWebServiceScript = _a.sent();
-                    macroCorePath = (0, config_1.getMacroCorePath)();
+                    macroCorePath = process.sasjsConstants.macroCorePath;
                     buildConfig += "".concat(createWebServiceScript, "\n");
                     return [4 /*yield*/, (0, utils_1.getDependencyPaths)(buildConfig, macroFolders, macroCorePath)];
                 case 3:
@@ -222,7 +222,7 @@ function getBuildInfo(target, streamWeb) {
                     ];
                 case 5:
                     dependencyFilePathsForCreateFile = _a.sent();
-                    return [4 /*yield*/, (0, utils_1.readFile)("".concat((0, config_1.getMacroCorePath)(), "/base/mp_replace.sas"))];
+                    return [4 /*yield*/, (0, utils_1.readFile)("".concat(process.sasjsConstants.macroCorePath, "/base/mp_replace.sas"))];
                 case 6:
                     gsubScript = _a.sent();
                     buildConfig += "".concat(gsubScript, "\n");
@@ -244,10 +244,11 @@ function getBuildInfo(target, streamWeb) {
 }
 function getCreateWebServiceScript(serverType) {
     return __awaiter(this, void 0, void 0, function () {
-        var _a;
+        var macroCorePath, _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
+                    macroCorePath = process.sasjsConstants.macroCorePath;
                     _a = serverType;
                     switch (_a) {
                         case utils_1.ServerType.SasViya: return [3 /*break*/, 1];
@@ -255,15 +256,15 @@ function getCreateWebServiceScript(serverType) {
                         case utils_1.ServerType.Sasjs: return [3 /*break*/, 5];
                     }
                     return [3 /*break*/, 7];
-                case 1: return [4 /*yield*/, (0, utils_1.readFile)("".concat((0, config_1.getMacroCorePath)(), "/viya/mv_createwebservice.sas"))];
+                case 1: return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/viya/mv_createwebservice.sas"))];
                 case 2: return [2 /*return*/, _b.sent()];
-                case 3: return [4 /*yield*/, (0, utils_1.readFile)("".concat((0, config_1.getMacroCorePath)(), "/meta/mm_createwebservice.sas"))
+                case 3: return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/meta/mm_createwebservice.sas"))
                     // FIXME: use sasjs/mv_createwebservice.sas ones created
                 ];
                 case 4: return [2 /*return*/, _b.sent()
                     // FIXME: use sasjs/mv_createwebservice.sas ones created
                 ];
-                case 5: return [4 /*yield*/, (0, utils_1.readFile)("".concat((0, config_1.getMacroCorePath)(), "/viya/mv_createwebservice.sas"))];
+                case 5: return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/viya/mv_createwebservice.sas"))];
                 case 6: return [2 /*return*/, _b.sent()];
                 case 7: throw new error_1.ServerTypeError();
             }
@@ -272,23 +273,24 @@ function getCreateWebServiceScript(serverType) {
 }
 function getCreateFileScript(serverType) {
     return __awaiter(this, void 0, void 0, function () {
-        var _a;
+        var macroCorePath, _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
+                    macroCorePath = process.sasjsConstants.macroCorePath;
                     _a = serverType;
                     switch (_a) {
                         case utils_1.ServerType.SasViya: return [3 /*break*/, 1];
                         case utils_1.ServerType.Sasjs: return [3 /*break*/, 3];
                     }
                     return [3 /*break*/, 5];
-                case 1: return [4 /*yield*/, (0, utils_1.readFile)("".concat((0, config_1.getMacroCorePath)(), "/viya/mv_createfile.sas"))
+                case 1: return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/viya/mv_createfile.sas"))
                     // FIXME: use sasjs/mv_createfile.sas ones created
                 ];
                 case 2: return [2 /*return*/, _b.sent()
                     // FIXME: use sasjs/mv_createfile.sas ones created
                 ];
-                case 3: return [4 /*yield*/, (0, utils_1.readFile)("".concat((0, config_1.getMacroCorePath)(), "/viya/mv_createfile.sas"))];
+                case 3: return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/viya/mv_createfile.sas"))];
                 case 4: return [2 /*return*/, _b.sent()];
                 case 5: throw new error_1.ServerTypeError([utils_1.ServerType.SasViya, utils_1.ServerType.Sasjs]);
             }

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

@@ -37,7 +37,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPreCodeForServicePack = exports.compileServiceFile = void 0;
-var config_1 = require("../../../utils/config");
 var utils_1 = require("@sasjs/utils");
 var types_1 = require("@sasjs/utils/types");
 var error_1 = require("@sasjs/utils/error");
@@ -75,7 +74,7 @@ function getPreCodeForServicePack(serverType) {
             switch (_l.label) {
                 case 0:
                     content = '';
-                    macroCorePath = (0, config_1.getMacroCorePath)();
+                    macroCorePath = process.sasjsConstants.macroCorePath;
                     _a = serverType;
                     switch (_a) {
                         case types_1.ServerType.SasViya: return [3 /*break*/, 1];

package/build/utils/config.d.ts

@@ -52,7 +52,6 @@ export declare function getMacroFolders(target?: Target): Promise<string[]>;
  * @param {Target} target- the target to check stream configuration for.
  */
 export declare function getStreamConfig(target?: Target): Promise<StreamConfig>;
-export declare const getMacroCorePath: () => string;
 /**
  * Sanitizes app location string.
  * @param {string} appLoc - app location

package/build/utils/config.js

@@ -75,7 +75,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.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;
+exports.getTestTearDown = exports.getTestSetUp = exports.overrideEnvVariables = exports.getAccessToken = exports.getAuthConfig = exports.getProjectRoot = exports.sanitizeAppLoc = 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");
@@ -727,8 +727,6 @@ function getStreamConfig(target) {
     });
 }
 exports.getStreamConfig = getStreamConfig;
-var getMacroCorePath = function () { return process.sasjsConstants.macroCorePath; };
-exports.getMacroCorePath = getMacroCorePath;
 /**
  * Sanitizes app location string.
  * @param {string} appLoc - app location

package/build/utils/setConstants.js

@@ -41,45 +41,38 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setConstants = exports.contextName = void 0;
 var path_1 = __importDefault(require("path"));
-var get_installed_path_1 = require("get-installed-path");
 var config_1 = require("./config");
-var utils_1 = require("@sasjs/utils");
+var utils_1 = require("./utils");
+var utils_2 = require("@sasjs/utils");
 exports.contextName = 'sasjs cli compute context';
 var setConstants = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, configuration, isLocal, buildOutputFolder, buildResultsFolder, homeDir, buildSourceFolder, buildSourceDbFolder, buildDestinationFolder, buildDestinationServicesFolder, buildDestinationTestFolder, buildDestinationJobsFolder, buildDestinationDbFolder, buildDestinationDocsFolder, macroCorePath, _b, buildDestinationResultsFolder, buildDestinationResultsLogsFolder, sas9CredentialsError, invalidSasError;
-    var _c, _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var _a, configuration, isLocal, buildOutputFolder, buildResultsFolder, homeDir, buildSourceFolder, buildSourceDbFolder, buildDestinationFolder, buildDestinationServicesFolder, buildDestinationTestFolder, buildDestinationJobsFolder, buildDestinationDbFolder, buildDestinationDocsFolder, macroCorePath, buildDestinationResultsFolder, buildDestinationResultsLogsFolder, sas9CredentialsError, invalidSasError;
+    var _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0: return [4 /*yield*/, (0, config_1.getLocalOrGlobalConfig)().catch(function () { return ({
                     configuration: null,
                     isLocal: false
                 }); })];
             case 1:
-                _a = _e.sent(), configuration = _a.configuration, isLocal = _a.isLocal;
-                buildOutputFolder = ((_c = configuration === null || configuration === void 0 ? void 0 : configuration.buildConfig) === null || _c === void 0 ? void 0 : _c.buildOutputFolder) ||
+                _a = _d.sent(), configuration = _a.configuration, isLocal = _a.isLocal;
+                buildOutputFolder = ((_b = configuration === null || configuration === void 0 ? void 0 : configuration.buildConfig) === null || _b === void 0 ? void 0 : _b.buildOutputFolder) ||
                     (isLocal ? 'sasjsbuild' : '.sasjs/sasjsbuild');
-                buildResultsFolder = ((_d = configuration === null || configuration === void 0 ? void 0 : configuration.buildConfig) === null || _d === void 0 ? void 0 : _d.buildResultsFolder) ||
+                buildResultsFolder = ((_c = configuration === null || configuration === void 0 ? void 0 : configuration.buildConfig) === null || _c === void 0 ? void 0 : _c.buildResultsFolder) ||
                     (isLocal ? 'sasjsresults' : '.sasjs/sasjsresults');
                 homeDir = require('os').homedir();
                 buildSourceFolder = path_1.default.join(isLocal ? process.projectDir : homeDir);
                 buildSourceDbFolder = path_1.default.join(isLocal ? process.projectDir : homeDir, 'sasjs', 'db');
-                buildDestinationFolder = (0, utils_1.getAbsolutePath)(buildOutputFolder, isLocal ? process.projectDir : homeDir);
+                buildDestinationFolder = (0, utils_2.getAbsolutePath)(buildOutputFolder, isLocal ? process.projectDir : homeDir);
                 buildDestinationServicesFolder = path_1.default.join(buildDestinationFolder, 'services');
                 buildDestinationTestFolder = path_1.default.join(buildDestinationFolder, 'tests');
                 buildDestinationJobsFolder = path_1.default.join(buildDestinationFolder, 'jobs');
                 buildDestinationDbFolder = path_1.default.join(buildDestinationFolder, 'db');
                 buildDestinationDocsFolder = path_1.default.join(buildDestinationFolder, 'docs');
-                if (!isLocal) return [3 /*break*/, 2];
-                _b = path_1.default.join(buildSourceFolder, 'node_modules', '@sasjs/core');
-                return [3 /*break*/, 4];
-            case 2: // use @sasjs/core from @sasjs/cli's dependencies
-            return [4 /*yield*/, (0, get_installed_path_1.getInstalledPath)('@sasjs/core', { local: true })];
-            case 3:
-                _b = _e.sent();
-                _e.label = 4;
-            case 4:
-                macroCorePath = _b;
-                buildDestinationResultsFolder = (0, utils_1.getAbsolutePath)(buildResultsFolder, isLocal ? process.projectDir : homeDir);
+                return [4 /*yield*/, (0, utils_1.getCliNodeModulePath)('@sasjs/core')];
+            case 2:
+                macroCorePath = _d.sent();
+                buildDestinationResultsFolder = (0, utils_2.getAbsolutePath)(buildResultsFolder, isLocal ? process.projectDir : homeDir);
                 buildDestinationResultsLogsFolder = path_1.default.join(buildDestinationResultsFolder, 'logs');
                 sas9CredentialsError = 'The following attributes were not found:' +
                     '\n* SAS_USERNAME' +

package/build/utils/spec/setConstants.spec.js

@@ -58,10 +58,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var utils_1 = require("@sasjs/utils");
 var path_1 = __importDefault(require("path"));
 var configUtils = __importStar(require("../config"));
 var setConstants_1 = require("../setConstants");
+var fileModule = __importStar(require("@sasjs/utils/file"));
 describe('setConstants', function () {
     var config;
     beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -71,17 +71,20 @@ describe('setConstants', function () {
                 case 0:
                     ;
                     _b = (_a = JSON).parse;
-                    return [4 /*yield*/, (0, utils_1.readFile)(path_1.default.join(__dirname, '..', '..', 'config.json'))];
+                    return [4 /*yield*/, fileModule.readFile(path_1.default.join(__dirname, '..', '..', 'config.json'))];
                 case 1:
                     (config = _b.apply(_a, [_c.sent()]).config);
                     return [2 /*return*/];
             }
         });
     }); });
-    test('should set contants inside appFolder', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test('should set constants inside appFolder', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var appFolder;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
+                    appFolder = ['some', 'app', 'folder'].join(path_1.default.sep);
+                    process.projectDir = appFolder;
                     jest
                         .spyOn(configUtils, 'getLocalOrGlobalConfig')
                         .mockImplementation(function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -92,7 +95,10 @@ describe('setConstants', function () {
                                 })];
                         });
                     }); });
-                    process.projectDir = ['some', 'app', 'folder'].join(path_1.default.sep);
+                    jest.spyOn(process, 'cwd').mockImplementation(function () { return appFolder; });
+                    jest
+                        .spyOn(fileModule, 'folderExists')
+                        .mockImplementation(function () { return Promise.resolve(true); });
                     return [4 /*yield*/, (0, setConstants_1.setConstants)()];
                 case 1:
                     _a.sent();
@@ -101,7 +107,7 @@ describe('setConstants', function () {
             }
         });
     }); });
-    test('should set contants outside appFolder', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test('should set constants outside appFolder', function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -137,8 +143,11 @@ var verifySasjsConstants = function (appFolder) {
     expect(sasjsConstants.buildDestinationResultsFolder).toEqual([prefixAppFolder, 'sasjsresults'].join(path_1.default.sep));
     expect(sasjsConstants.buildDestinationResultsLogsFolder).toEqual([prefixAppFolder, 'sasjsresults', 'logs'].join(path_1.default.sep));
     expect(sasjsConstants.buildDestinationTestFolder).toEqual([prefixAppFolder, 'sasjsbuild', 'tests'].join(path_1.default.sep));
-    if (appFolder)
-        expect(sasjsConstants.macroCorePath).toEqual([prefixAppFolder, 'node_modules', '@sasjs', 'core'].join(path_1.default.sep));
-    else
-        expect(sasjsConstants.macroCorePath).toEqual(expect.toEndWith(['cli', 'node_modules', '@sasjs', 'core'].join(path_1.default.sep)));
+    var corePath = path_1.default.join('cli', 'node_modules', '@sasjs', 'core');
+    if (appFolder) {
+        expect(sasjsConstants.macroCorePath).toEqual(path_1.default.join(prefixAppFolder, 'node_modules', '@sasjs', corePath));
+    }
+    else {
+        expect(sasjsConstants.macroCorePath).toEqual(expect.toEndWith(corePath));
+    }
 };

package/build/utils/utils.d.ts

@@ -43,3 +43,4 @@ export declare const terminateProcess: (status: number) => never;
  * @returns boolean
  */
 export declare const isSASjsProject: () => Promise<boolean>;
+export declare const getCliNodeModulePath: (module: string) => Promise<string>;

package/build/utils/utils.js

@@ -86,7 +86,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSASjsProject = exports.terminateProcess = exports.prefixAppLoc = exports.loadEnvVariables = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.parseLogLines = exports.executeShellScript = exports.getUniqServicesObj = exports.removeComments = exports.setupDoxygen = exports.setupGhooks = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
+exports.getCliNodeModulePath = exports.isSASjsProject = exports.terminateProcess = exports.prefixAppLoc = exports.loadEnvVariables = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.parseLogLines = exports.executeShellScript = exports.getUniqServicesObj = exports.removeComments = exports.setupDoxygen = exports.setupGhooks = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
 var shelljs_1 = __importDefault(require("shelljs"));
 var path_1 = __importDefault(require("path"));
 var ora_1 = __importDefault(require("ora"));
@@ -605,3 +605,24 @@ var isSASjsProject = function () { return __awaiter(void 0, void 0, void 0, func
     });
 }); };
 exports.isSASjsProject = isSASjsProject;
+var getCliNodeModulePath = function (module) { return __awaiter(void 0, void 0, void 0, function () {
+    var cliDepsPath, localPath, globalPath;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                cliDepsPath = path_1.default.join('@sasjs', 'cli', 'node_modules');
+                localPath = path_1.default.join(process.cwd(), 'node_modules', cliDepsPath, module);
+                return [4 /*yield*/, (0, utils_1.folderExists)(localPath)];
+            case 1:
+                if (_a.sent())
+                    return [2 /*return*/, localPath];
+                globalPath = path_1.default.join(shelljs_1.default.exec("npm root -g", { silent: true }).stdout.replace(/\n/, ''), cliDepsPath, module);
+                return [4 /*yield*/, (0, utils_1.folderExists)(globalPath)];
+            case 2:
+                if (_a.sent())
+                    return [2 /*return*/, globalPath];
+                return [2 /*return*/, ''];
+        }
+    });
+}); };
+exports.getCliNodeModulePath = getCliNodeModulePath;

package/package.json

@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "@sasjs/adapter": "3.8.5",
-    "@sasjs/core": "4.15.3",
+    "@sasjs/core": "4.18.11",
     "@sasjs/lint": "1.11.2",
     "@sasjs/utils": "2.42.0",
     "chalk": "4.1.2",
@@ -56,7 +56,6 @@
     "dotenv": "10.0.0",
     "esm": "3.2.25",
     "find": "0.3.0",
-    "get-installed-path": "4.0.8",
     "js-base64": "3.7.2",
     "jsdom": "19.0.0",
     "jwt-decode": "3.1.2",
@@ -74,7 +73,6 @@
     "@babel/preset-env": "7.15.6",
     "@babel/preset-typescript": "7.15.0",
     "@types/find": "0.2.1",
-    "@types/get-installed-path": "4.0.1",
     "@types/jest": "27.0.2",
     "@types/jsdom": "16.2.13",
     "@types/lodash.groupby": "4.6.6",
@@ -95,5 +93,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.12.6"
+  "version": "3.13.0"
 }