@sasjs/cli 4.12.15 → 4.12.16

package/build/commands/build/build.js

@@ -99,26 +99,36 @@ var internal_1 = require("../compile/internal");
 var config_2 = require("./internal/config");
 var getLaunchPageCode_1 = require("./internal/getLaunchPageCode");
 function build(target) {
+    var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var macroCorePath, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
-                    _a = process.sasjsConstants.buildDestinationFolder;
-                    if (!_a) return [3 /*break*/, 2];
+                    macroCorePath = process.sasjsConstants.macroCorePath;
+                    if (macroCorePath === '') {
+                        throw new Error("The @sasjs/core folder location is unknown.\n" +
+                            "Check that @sasjs/core is a dependency in the package.json, and \n" +
+                            "that the package has been installed.\n" +
+                            "Alternatively populate environment variable 'macroCorePath' with\n" +
+                            "the path to a local @sasjs/core package's root directory.");
+                    }
+                    (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("@sasjs/core found at ".concat(macroCorePath));
+                    _b = process.sasjsConstants.buildDestinationFolder;
+                    if (!_b) return [3 /*break*/, 2];
                     return [4 /*yield*/, (0, utils_1.folderExists)(process.sasjsConstants.buildDestinationFolder)];
                 case 1:
-                    _a = !(_b.sent());
-                    _b.label = 2;
+                    _b = !(_c.sent());
+                    _c.label = 2;
                 case 2:
-                    if (!_a) return [3 /*break*/, 4];
+                    if (!_b) return [3 /*break*/, 4];
                     return [4 /*yield*/, (0, compile_1.compile)(target)];
                 case 3:
-                    _b.sent();
-                    _b.label = 4;
+                    _c.sent();
+                    _c.label = 4;
                 case 4: return [4 /*yield*/, createFinalSasFiles(target)];
                 case 5:
-                    _b.sent();
+                    _c.sent();
                     return [2 /*return*/];
             }
         });
@@ -245,7 +255,7 @@ function getBuildInfo(target, streamWeb) {
                 case 8:
                     buildVars = _a.sent();
                     return [2 /*return*/, "\n/**\n  * The appLoc represents the metadata or SAS Drive location of the app you\n  * are about to deploy\n  *\n  * To set an alternative appLoc, simply populate the appLoc variable prior\n  * to running this program, eg:\n  *\n  * %let apploc=/my/apploc;\n  * %inc thisfile;\n  *\n  */\n\n%global appLoc;\n%let compiled_apploc=".concat(appLoc, ";\n%let appLoc=%sysfunc(coalescec(&appLoc,&compiled_apploc));\n\n\n").concat(serverType === utils_1.ServerType.Sas9
-                            ? "\n/**\n  * The serverName represents the SAS 9 logical server context\n  * There is no programmatic (SAS code) way to obtain this\n  * So it is taken from the sasjsconfig file OR supplied at runtime, eg:\n  * \n  * %let apploc=/my/apploc;\n  * %let serverName=SASAppDC;\n  * %inc thisfile;\n  * \n  */\n\n%global serverName;\n%let compiled_serverName=".concat(serverName, ";\n%let serverName=%sysfunc(coalescec(&serverName,&compiled_serverName));\n")
+                            ? "\n/**\n  * The serverName represents the SAS 9 logical server context\n  * There is no programmatic (SAS code) way to obtain this\n  * So it is taken from the sasjsconfig file OR supplied at runtime, eg:\n  *\n  * %let apploc=/my/apploc;\n  * %let serverName=SASAppDC;\n  * %inc thisfile;\n  *\n  */\n\n%global serverName;\n%let compiled_serverName=".concat(serverName, ";\n%let serverName=%sysfunc(coalescec(&serverName,&compiled_serverName));\n")
                             : '', "\n\n%let sasjs_clickmeservice=clickme;\n%let syscc=0;\noptions ps=max nonotes nosgen nomprint nomlogic nosource2 nosource noquotelenmax;\n/* user supplied build vars */\n").concat(buildVars, "\n/* user supplied build vars end */\n/* system macro dependencies for build process */\n").concat(dependenciesContent, "\n/* system macro dependencies for build process end*/\n/* system macros for build process */\n").concat((0, utils_1.removeHeader)(buildConfig), "\n/* system macros for build process end */\n")];
             }
         });

package/build/utils/setConstants.js

@@ -48,8 +48,9 @@ var setConstants = function (isLocal, target, configuration) {
     if (isLocal === void 0) { isLocal = true; }
     return __awaiter(void 0, void 0, void 0, function () {
         var buildOutputFolder, buildResultsFolder, homeDir, buildSourceFolder, buildSourceDbFolder, buildDestinationFolder, buildDestinationServicesFolder, buildDestinationTestFolder, buildDestinationJobsFolder, buildDestinationDbFolder, buildDestinationDocsFolder, macroCorePath, buildDestinationResultsFolder, buildDestinationResultsLogsFolder, sas9CredentialsError, invalidSasError, sas9GUID;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     buildOutputFolder = (target === null || target === void 0 ? void 0 : target.sasjsBuildFolder) ||
                         (configuration === null || configuration === void 0 ? void 0 : configuration.sasjsBuildFolder) ||
@@ -66,9 +67,15 @@ var setConstants = function (isLocal, target, configuration) {
                     buildDestinationJobsFolder = path_1.default.join(buildDestinationFolder, 'jobs');
                     buildDestinationDbFolder = path_1.default.join(buildDestinationFolder, 'db');
                     buildDestinationDocsFolder = path_1.default.join(buildDestinationFolder, 'docs');
+                    macroCorePath = (_a = process.env.macroCorePath) !== null && _a !== void 0 ? _a : '';
+                    if (!(macroCorePath === '')) return [3 /*break*/, 2];
                     return [4 /*yield*/, (0, utils_1.getNodeModulePath)('@sasjs/core')];
                 case 1:
-                    macroCorePath = _a.sent();
+                    // If no environment variable is set/populated then check for an installed
+                    // @sasjs/core in locations known to node.
+                    macroCorePath = _b.sent();
+                    _b.label = 2;
+                case 2:
                     buildDestinationResultsFolder = (0, utils_2.getAbsolutePath)(buildResultsFolder, isLocal ? process.projectDir : homeDir);
                     buildDestinationResultsLogsFolder = path_1.default.join(buildDestinationResultsFolder, 'logs');
                     sas9CredentialsError = 'The following attributes were not found:' +

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

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -66,8 +77,10 @@ var path_1 = __importDefault(require("path"));
 var configUtils = __importStar(require("../config"));
 var setConstants_1 = require("../setConstants");
 var fileModule = __importStar(require("@sasjs/utils/file"));
+var utils = __importStar(require("../utils"));
 describe('setConstants', function () {
     var config;
+    var origProcessEnv = process.env;
     beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
         var _a, _b;
         return __generator(this, function (_c) {
@@ -82,13 +95,15 @@ describe('setConstants', function () {
             }
         });
     }); });
+    afterEach(function () {
+        process.env = __assign({}, origProcessEnv);
+    });
     test('should set constants inside appFolder when @sasjs/core dependency is present', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var appFolder, hasSasjsCore;
+        var hasSasjsCore;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    appFolder = ['some', 'app', 'folder'].join(path_1.default.sep);
-                    process.projectDir = appFolder;
+                    process.projectDir = process.cwd();
                     jest
                         .spyOn(configUtils, 'getLocalOrGlobalConfig')
                         .mockImplementation(function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -99,11 +114,7 @@ describe('setConstants', function () {
                                 })];
                         });
                     }); });
-                    jest.spyOn(process, 'cwd').mockImplementation(function () { return appFolder; });
                     hasSasjsCore = true;
-                    jest
-                        .spyOn(fileModule, 'folderExists')
-                        .mockImplementation(function (path) { return Promise.resolve(hasSasjsCore); });
                     return [4 /*yield*/, (0, setConstants_1.setConstants)()];
                 case 1:
                     _a.sent();
@@ -119,6 +130,7 @@ describe('setConstants', function () {
                 case 0:
                     appFolder = ['some', 'app', 'folder'].join(path_1.default.sep);
                     process.projectDir = appFolder;
+                    process.env.macroCorePath = undefined;
                     jest
                         .spyOn(configUtils, 'getLocalOrGlobalConfig')
                         .mockImplementation(function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -130,11 +142,9 @@ describe('setConstants', function () {
                         });
                     }); });
                     jest.spyOn(process, 'cwd').mockImplementation(function () { return appFolder; });
-                    jest
-                        .spyOn(fileModule, 'folderExists')
-                        .mockImplementation(function (folderPath) {
-                        return Promise.resolve(folderPath !== path_1.default.join(appFolder, 'node_modules', '@sasjs', 'core'));
-                    });
+                    jest.spyOn(utils, 'getNodeModulePath').mockImplementation(function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+                        return [2 /*return*/, ''];
+                    }); }); });
                     return [4 /*yield*/, (0, setConstants_1.setConstants)()];
                 case 1:
                     _a.sent();
@@ -147,6 +157,7 @@ describe('setConstants', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
+                    process.env.macroCorePath = undefined;
                     jest
                         .spyOn(configUtils, 'getLocalOrGlobalConfig')
                         .mockImplementation(function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -157,6 +168,9 @@ describe('setConstants', function () {
                                 })];
                         });
                     }); });
+                    jest.spyOn(utils, 'getNodeModulePath').mockImplementation(function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+                        return [2 /*return*/, ''];
+                    }); }); });
                     return [4 /*yield*/, (0, setConstants_1.setConstants)(false)];
                 case 1:
                     _a.sent();
@@ -165,6 +179,63 @@ describe('setConstants', function () {
             }
         });
     }); });
+    test('should call getNodeModulePath once when environment variable macroCorePath is undefined', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var getNodeModulePathSpy;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    process.env.macroCorePath = undefined;
+                    getNodeModulePathSpy = jest
+                        .spyOn(utils, 'getNodeModulePath')
+                        .mockImplementation(function (packageName) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+                        return [2 /*return*/, Promise.resolve('')];
+                    }); }); });
+                    return [4 /*yield*/, (0, setConstants_1.setConstants)()];
+                case 1:
+                    _a.sent();
+                    expect(getNodeModulePathSpy).toHaveBeenCalledOnceWith('@sasjs/core');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    test('should call getNodeModulePath once when environment variable macroCorePath is blank', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var getNodeModulePathSpy;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    process.env.macroCorePath = '';
+                    getNodeModulePathSpy = jest
+                        .spyOn(utils, 'getNodeModulePath')
+                        .mockImplementation(function (packageName) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+                        return [2 /*return*/, Promise.resolve('')];
+                    }); }); });
+                    return [4 /*yield*/, (0, setConstants_1.setConstants)()];
+                case 1:
+                    _a.sent();
+                    expect(getNodeModulePathSpy).toHaveBeenCalledOnceWith('@sasjs/core');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    test('should not call getNodeModulePath when environment variable macroCorePath is populated', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var getNodeModulePathSpy;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    process.env.macroCorePath = '../core';
+                    getNodeModulePathSpy = jest
+                        .spyOn(utils, 'getNodeModulePath')
+                        .mockImplementation(function (packageName) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+                        return [2 /*return*/, Promise.resolve('')];
+                    }); }); });
+                    return [4 /*yield*/, (0, setConstants_1.setConstants)()];
+                case 1:
+                    _a.sent();
+                    expect(getNodeModulePathSpy).toBeCalledTimes(0);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
 });
 var verifySasjsConstants = function (appFolder, hasSasjsCore, isLocal) {
     if (hasSasjsCore === void 0) { hasSasjsCore = false; }
@@ -181,13 +252,16 @@ var verifySasjsConstants = function (appFolder, hasSasjsCore, isLocal) {
     expect(sasjsConstants.buildDestinationResultsFolder).toEqual(path_1.default.join(prefixAppFolder, isLocal ? '' : '.sasjs', 'sasjsresults'));
     expect(sasjsConstants.buildDestinationResultsLogsFolder).toEqual(path_1.default.join(prefixAppFolder, isLocal ? '' : '.sasjs', 'sasjsresults', 'logs'));
     expect(sasjsConstants.buildDestinationTestFolder).toEqual(path_1.default.join(prefixAppFolder, isLocal ? '' : '.sasjs', 'sasjsbuild', 'tests'));
-    var corePath = hasSasjsCore
-        ? 'core'
-        : path_1.default.join('cli', 'node_modules', '@sasjs', 'core');
-    if (appFolder) {
-        expect(sasjsConstants.macroCorePath).toEqual(path_1.default.join(prefixAppFolder, 'node_modules', '@sasjs', corePath));
+    var corePath = hasSasjsCore ? 'core' : '';
+    if (hasSasjsCore) {
+        if (appFolder) {
+            expect(sasjsConstants.macroCorePath).toEqual(path_1.default.join(prefixAppFolder, 'node_modules', '@sasjs', corePath));
+        }
+        else {
+            expect(sasjsConstants.macroCorePath).toEqual(expect.toEndWith(corePath));
+        }
     }
     else {
-        expect(sasjsConstants.macroCorePath).toEqual(expect.toEndWith(corePath));
+        expect(sasjsConstants.macroCorePath).toEqual(corePath);
     }
 };

package/build/utils/utils.js

@@ -684,35 +684,20 @@ var isSASjsProject = function () { return __awaiter(void 0, void 0, void 0, func
 }); };
 exports.isSASjsProject = isSASjsProject;
 var getNodeModulePath = function (module) { return __awaiter(void 0, void 0, void 0, function () {
-    var projectPath, cliDepsPath, cliLocalPath, cliGlobalPath;
+    var nodePackagePath;
     return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                projectPath = path_1.default.join(process.cwd(), 'node_modules', module);
-                return [4 /*yield*/, (0, utils_1.folderExists)(projectPath)];
-            case 1:
-                if (_a.sent())
-                    return [2 /*return*/, projectPath
-                        // Check if module is present in @sasjs/cli located in project's dependencies
-                    ];
-                cliDepsPath = path_1.default.join('@sasjs', 'cli', 'node_modules');
-                cliLocalPath = path_1.default.join(process.cwd(), 'node_modules', cliDepsPath, module);
-                return [4 /*yield*/, (0, utils_1.folderExists)(cliLocalPath)];
-            case 2:
-                if (_a.sent())
-                    return [2 /*return*/, cliLocalPath
-                        // Check if module is present in global @sasjs/cli
-                    ];
-                cliGlobalPath = 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)(cliGlobalPath)];
-            case 3:
-                if (_a.sent())
-                    return [2 /*return*/, cliGlobalPath
-                        // Return default value
-                    ];
-                // Return default value
-                return [2 /*return*/, ''];
+        // Look for ${module}/package.json, then return only the path
+        try {
+            nodePackagePath = path_1.default.dirname(require.resolve(path_1.default.join(module, 'package.json')));
+            if (nodePackagePath)
+                return [2 /*return*/, nodePackagePath];
+        }
+        catch (e) {
+            if (e.code !== 'MODULE_NOT_FOUND')
+                throw e;
         }
+        // Return default value
+        return [2 /*return*/, ''];
     });
 }); };
 exports.getNodeModulePath = getNodeModulePath;

package/package.json

@@ -19,7 +19,6 @@
     "test:mocked": "jest --silent --runInBand --config=jest.config.js --coverage",
     "lint:fix": "npx prettier --write \"{src,test}/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"",
     "lint": "npx prettier --check \"{src,test}/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"",
-    "preinstall": "npm run nodeVersionMessage",
     "prepare": "git rev-parse --git-dir && git config core.hooksPath ./.git-hooks || true",
     "doc": "npx compodoc -p tsconfig.doc.json --coverageTest 16 --coverageTestThresholdFail"
   },
@@ -51,7 +50,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "^4.16.0",
+    "@sasjs/adapter": "^4.16.1",
     "@sasjs/core": "4.59.9",
     "@sasjs/lint": "2.4.3",
     "@sasjs/utils": "3.5.2",
@@ -101,5 +100,5 @@
     "typescript": "4.9.5",
     "util": "0.12.4"
   },
-  "version": "4.12.15"
+  "version": "4.12.16"
 }