@sasjs/cli 4.0.4 → 4.0.6

package/build/utils/setConstants.js

@@ -39,86 +39,64 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateSasjsConstants = exports.setConstants = exports.contextName = void 0;
+exports.setConstants = exports.contextName = void 0;
 var path_1 = __importDefault(require("path"));
-var config_1 = require("./config");
 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, buildDestinationResultsFolder, buildDestinationResultsLogsFolder, sas9CredentialsError, invalidSasError, sas9GUID;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0: return [4 /*yield*/, (0, config_1.getLocalOrGlobalConfig)().catch(function () { return ({
-                    configuration: null,
-                    isLocal: false
-                }); })];
-            case 1:
-                _a = _b.sent(), configuration = _a.configuration, isLocal = _a.isLocal;
-                buildOutputFolder = (configuration === null || configuration === void 0 ? void 0 : configuration.sasjsBuildFolder) ||
-                    (isLocal ? 'sasjsbuild' : '.sasjs/sasjsbuild');
-                buildResultsFolder = (configuration === null || configuration === void 0 ? void 0 : configuration.sasjsResultsFolder) ||
-                    (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_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');
-                return [4 /*yield*/, (0, utils_1.getNodeModulePath)('@sasjs/core')];
-            case 2:
-                macroCorePath = _b.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' +
-                    '\n* SAS_PASSWORD' +
-                    '\nPlease run "sasjs auth" for your specified target to apply the correct credentials.';
-                invalidSasError = 'Url specified does not contain a valid sas program. Please provide valid url.';
-                sas9GUID = 'pZKd6F95jECvRQlN0LCfdA==';
-                process.sasjsConstants = {
-                    buildSourceFolder: buildSourceFolder,
-                    buildSourceDbFolder: buildSourceDbFolder,
-                    buildDestinationFolder: buildDestinationFolder,
-                    buildDestinationServicesFolder: buildDestinationServicesFolder,
-                    buildDestinationJobsFolder: buildDestinationJobsFolder,
-                    buildDestinationDbFolder: buildDestinationDbFolder,
-                    buildDestinationDocsFolder: buildDestinationDocsFolder,
-                    buildDestinationResultsFolder: buildDestinationResultsFolder,
-                    buildDestinationResultsLogsFolder: buildDestinationResultsLogsFolder,
-                    buildDestinationTestFolder: buildDestinationTestFolder,
-                    macroCorePath: macroCorePath,
-                    contextName: exports.contextName,
-                    sas9CredentialsError: sas9CredentialsError,
-                    invalidSasError: invalidSasError,
-                    sas9GUID: sas9GUID
-                };
-                return [2 /*return*/];
-        }
+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) {
+                case 0:
+                    buildOutputFolder = (target === null || target === void 0 ? void 0 : target.sasjsBuildFolder) ||
+                        (configuration === null || configuration === void 0 ? void 0 : configuration.sasjsBuildFolder) ||
+                        (isLocal ? 'sasjsbuild' : '.sasjs/sasjsbuild');
+                    buildResultsFolder = (target === null || target === void 0 ? void 0 : target.sasjsResultsFolder) ||
+                        (configuration === null || configuration === void 0 ? void 0 : configuration.sasjsResultsFolder) ||
+                        (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_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');
+                    return [4 /*yield*/, (0, utils_1.getNodeModulePath)('@sasjs/core')];
+                case 1:
+                    macroCorePath = _a.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' +
+                        '\n* SAS_PASSWORD' +
+                        '\nPlease run "sasjs auth" for your specified target to apply the correct credentials.';
+                    invalidSasError = 'Url specified does not contain a valid sas program. Please provide valid url.';
+                    sas9GUID = 'pZKd6F95jECvRQlN0LCfdA==';
+                    process.sasjsConstants = {
+                        buildSourceFolder: buildSourceFolder,
+                        buildSourceDbFolder: buildSourceDbFolder,
+                        buildDestinationFolder: buildDestinationFolder,
+                        buildDestinationServicesFolder: buildDestinationServicesFolder,
+                        buildDestinationJobsFolder: buildDestinationJobsFolder,
+                        buildDestinationDbFolder: buildDestinationDbFolder,
+                        buildDestinationDocsFolder: buildDestinationDocsFolder,
+                        buildDestinationResultsFolder: buildDestinationResultsFolder,
+                        buildDestinationResultsLogsFolder: buildDestinationResultsLogsFolder,
+                        buildDestinationTestFolder: buildDestinationTestFolder,
+                        macroCorePath: macroCorePath,
+                        contextName: exports.contextName,
+                        sas9CredentialsError: sas9CredentialsError,
+                        invalidSasError: invalidSasError,
+                        sas9GUID: sas9GUID
+                    };
+                    return [2 /*return*/];
+            }
+        });
     });
-}); };
-exports.setConstants = setConstants;
-var updateSasjsConstants = function (target, isLocal) {
-    var homeDir = require('os').homedir();
-    if (target.sasjsBuildFolder) {
-        var buildOutputFolder = target.sasjsBuildFolder;
-        var buildDestinationFolder = (0, utils_2.getAbsolutePath)(buildOutputFolder, isLocal ? process.projectDir : homeDir);
-        process.sasjsConstants.buildDestinationFolder = buildDestinationFolder;
-        process.sasjsConstants.buildDestinationServicesFolder = path_1.default.join(buildDestinationFolder, 'services');
-        process.sasjsConstants.buildDestinationTestFolder = path_1.default.join(buildDestinationFolder, 'tests');
-        process.sasjsConstants.buildDestinationJobsFolder = path_1.default.join(buildDestinationFolder, 'jobs');
-        process.sasjsConstants.buildDestinationDbFolder = path_1.default.join(buildDestinationFolder, 'db');
-        process.sasjsConstants.buildDestinationDocsFolder = path_1.default.join(buildDestinationFolder, 'docs');
-    }
-    if (target.sasjsResultsFolder) {
-        var buildResultsFolder = target.sasjsResultsFolder;
-        var buildDestinationResultsFolder = (0, utils_2.getAbsolutePath)(buildResultsFolder, isLocal ? process.projectDir : homeDir);
-        process.sasjsConstants.buildDestinationResultsFolder =
-            buildDestinationResultsFolder;
-        process.sasjsConstants.buildDestinationResultsLogsFolder = path_1.default.join(buildDestinationResultsFolder, 'logs');
-    }
 };
-exports.updateSasjsConstants = updateSasjsConstants;
+exports.setConstants = setConstants;

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

@@ -157,7 +157,7 @@ describe('setConstants', function () {
                                 })];
                         });
                     }); });
-                    return [4 /*yield*/, (0, setConstants_1.setConstants)()];
+                    return [4 /*yield*/, (0, setConstants_1.setConstants)(false)];
                 case 1:
                     _a.sent();
                     verifySasjsConstants(undefined, false, false);

package/build/utils/test.js

@@ -66,57 +66,72 @@ var create_1 = require("../commands/create/create");
 var setConstants_1 = require("./setConstants");
 var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var createTestApp = function (parentFolder, appName) { return __awaiter(void 0, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 process.projectDir = parentFolder;
                 return [4 /*yield*/, (0, create_1.create)(appName, '')];
             case 1:
-                _a.sent();
+                _b.sent();
                 process.projectDir = path_1.default.join(parentFolder, appName);
                 process.currentDir = process.projectDir;
-                return [4 /*yield*/, (0, setConstants_1.setConstants)()];
+                _a = process;
+                return [4 /*yield*/, (0, config_1.getLocalConfig)()];
             case 2:
-                _a.sent();
+                _a.sasjsConfig = _b.sent();
+                return [4 /*yield*/, (0, setConstants_1.setConstants)()];
+            case 3:
+                _b.sent();
                 return [2 /*return*/];
         }
     });
 }); };
 exports.createTestApp = createTestApp;
 var createTestJobsApp = function (parentFolder, appName) { return __awaiter(void 0, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 process.projectDir = parentFolder;
                 return [4 /*yield*/, (0, create_1.create)(appName, 'jobs')];
             case 1:
-                _a.sent();
+                _b.sent();
                 process.projectDir = path_1.default.join(parentFolder, appName);
                 process.currentDir = process.projectDir;
-                return [4 /*yield*/, (0, setConstants_1.setConstants)()];
+                _a = process;
+                return [4 /*yield*/, (0, config_1.getLocalConfig)()];
             case 2:
-                _a.sent();
-                return [4 /*yield*/, (0, exports.updateTarget)({ serverUrl: 'https://example.com' }, 'viya')];
+                _a.sasjsConfig = _b.sent();
+                return [4 /*yield*/, (0, setConstants_1.setConstants)()];
             case 3:
-                _a.sent();
+                _b.sent();
+                return [4 /*yield*/, (0, exports.updateTarget)({ serverUrl: 'https://example.com' }, 'viya')];
+            case 4:
+                _b.sent();
                 return [2 /*return*/];
         }
     });
 }); };
 exports.createTestJobsApp = createTestJobsApp;
 var createTestMinimalApp = function (parentFolder, appName) { return __awaiter(void 0, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 process.projectDir = parentFolder;
                 return [4 /*yield*/, (0, create_1.create)(appName, 'minimal')];
             case 1:
-                _a.sent();
+                _b.sent();
                 process.projectDir = path_1.default.join(parentFolder, appName);
                 process.currentDir = process.projectDir;
-                return [4 /*yield*/, (0, setConstants_1.setConstants)()];
+                _a = process;
+                return [4 /*yield*/, (0, config_1.getLocalConfig)()];
             case 2:
-                _a.sent();
+                _a.sasjsConfig = _b.sent();
+                return [4 /*yield*/, (0, setConstants_1.setConstants)()];
+            case 3:
+                _b.sent();
                 return [2 /*return*/];
         }
     });

package/package.json

@@ -102,5 +102,5 @@
     "typescript": "4.9.5",
     "util": "0.12.4"
   },
-  "version": "4.0.4"
+  "version": "4.0.6"
 }