@sasjs/cli 3.28.0 → 4.0.0

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

@@ -441,7 +441,6 @@ describe('sasjs compile single file', function () {
     });
 });
 var defaultBuildConfig = {
-    buildOutputFolder: '.sasjs/sasjsbuild',
     buildOutputFileName: 'test.sas',
     initProgram: '',
     termProgram: '',
@@ -655,7 +654,8 @@ describe('sasjs compile outside project', function () {
                         destinationPath = path_1.default.join(buildOutputFolder, 'services', 'services', 'example1.sas');
                         parentOutputFolder = path_1.default.join(__dirname, 'random-folder');
                         return [4 /*yield*/, (0, test_1.updateConfig)({
-                                buildConfig: __assign(__assign({}, defaultBuildConfig), { buildOutputFolder: buildOutputFolder })
+                                sasjsBuildFolder: buildOutputFolder,
+                                buildConfig: defaultBuildConfig
                             }, false)];
                     case 1:
                         _a.sent();
@@ -705,7 +705,8 @@ describe('sasjs compile outside project', function () {
                         destinationPath = path_1.default.join(buildOutputFolder, 'services', 'services', 'example1.sas');
                         parentOutputFolder = path_1.default.join(homedir, appName);
                         return [4 /*yield*/, (0, test_1.updateConfig)({
-                                buildConfig: __assign(__assign({}, defaultBuildConfig), { buildOutputFolder: appName + '/random-folder' })
+                                sasjsBuildFolder: appName + '/random-folder',
+                                buildConfig: defaultBuildConfig
                             }, false)];
                     case 1:
                         _a.sent();

package/build/commands/fs/fsCommand.js

@@ -261,13 +261,18 @@ var FSCommand = /** @class */ (function (_super) {
             var folderPath, outputPath, programContent;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
+                    case 0: 
+                    // NOTE: call getTargetInfo() method once, so that process.sasjsConstants could be updated based on target config
+                    return [4 /*yield*/, this.getTargetInfo()];
+                    case 1:
+                        // NOTE: call getTargetInfo() method once, so that process.sasjsConstants could be updated based on target config
+                        _a.sent();
                         folderPath = this.localFolder;
                         return [4 /*yield*/, this.getOutputPath()];
-                    case 1:
+                    case 2:
                         outputPath = _a.sent();
                         return [4 /*yield*/, (0, utils_2.generateCompileProgram)(folderPath)];
-                    case 2:
+                    case 3:
                         programContent = _a.sent();
                         return [4 /*yield*/, (0, utils_2.createFile)(outputPath, programContent)
                                 .then(function () {
@@ -279,7 +284,7 @@ var FSCommand = /** @class */ (function (_super) {
                                 (0, utils_1.displayError)(err, 'An error has occurred when creating program file.');
                                 return command_1.ReturnCode.InternalError;
                             })];
-                    case 3: return [2 /*return*/, _a.sent()];
+                    case 4: return [2 /*return*/, _a.sent()];
                 }
             });
         });

package/build/types/command/targetCommand.js

@@ -99,6 +99,7 @@ var TargetCommand = /** @class */ (function (_super) {
                         return [4 /*yield*/, (0, utils_1.findTargetInConfiguration)(targetName)
                                 .then(function (res) {
                                 _this._targetInfo = res;
+                                (0, utils_1.updateSasjsConstants)(res.target, res.isLocal);
                                 return res;
                             })
                                 .catch(function (err) {

package/build/utils/setConstants.d.ts

@@ -1,2 +1,4 @@
+import { Target } from '@sasjs/utils';
 export declare const contextName = "sasjs cli compute context";
 export declare const setConstants: () => Promise<void>;
+export declare const updateSasjsConstants: (target: Target, isLocal: boolean) => void;

package/build/utils/setConstants.js

@@ -39,7 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setConstants = exports.contextName = void 0;
+exports.updateSasjsConstants = exports.setConstants = exports.contextName = void 0;
 var path_1 = __importDefault(require("path"));
 var config_1 = require("./config");
 var utils_1 = require("./utils");
@@ -47,18 +47,17 @@ 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;
-    var _b, _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    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 = _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) ||
+                _a = _b.sent(), configuration = _a.configuration, isLocal = _a.isLocal;
+                buildOutputFolder = (configuration === null || configuration === void 0 ? void 0 : configuration.sasjsBuildFolder) ||
                     (isLocal ? 'sasjsbuild' : '.sasjs/sasjsbuild');
-                buildResultsFolder = ((_c = configuration === null || configuration === void 0 ? void 0 : configuration.buildConfig) === null || _c === void 0 ? void 0 : _c.buildResultsFolder) ||
+                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);
@@ -71,7 +70,7 @@ var setConstants = function () { return __awaiter(void 0, void 0, void 0, functi
                 buildDestinationDocsFolder = path_1.default.join(buildDestinationFolder, 'docs');
                 return [4 /*yield*/, (0, utils_1.getNodeModulePath)('@sasjs/core')];
             case 2:
-                macroCorePath = _d.sent();
+                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:' +
@@ -102,3 +101,24 @@ var setConstants = function () { return __awaiter(void 0, void 0, void 0, functi
     });
 }); };
 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;

package/package.json

@@ -53,7 +53,7 @@
     "@sasjs/adapter": "4.1.3",
     "@sasjs/core": "4.45.4",
     "@sasjs/lint": "2.2.2",
-    "@sasjs/utils": "3.0.1",
+    "@sasjs/utils": "3.1.0",
     "adm-zip": "0.5.9",
     "chalk": "4.1.2",
     "dotenv": "10.0.0",
@@ -100,5 +100,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.28.0"
+  "version": "4.0.0"
 }