@sasjs/cli 6.4.7 → 6.4.8

package/build/commands/db/dbCommand.d.ts

@@ -1,6 +1,6 @@
 import { ReturnCode } from '../../types/command';
-import { CommandBase } from '../../types';
-export declare class DbCommand extends CommandBase {
+import { TargetCommand } from '../../types/command/targetCommand';
+export declare class DbCommand extends TargetCommand {
     constructor(args: string[]);
     execute(): Promise<ReturnCode>;
 }

package/build/commands/db/dbCommand.js

@@ -54,7 +54,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DbCommand = void 0;
 var db_1 = require("./db");
 var command_1 = require("../../types/command");
-var types_1 = require("../../types");
+var targetCommand_1 = require("../../types/command/targetCommand");
 var syntax = 'db';
 var aliases = ['build-DB', 'build-db'];
 var usage = 'sasjs db';
@@ -80,22 +80,30 @@ var DbCommand = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, db_1.buildDB)()
-                            .then(function () {
-                            var _a;
-                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success('DB build completed!');
-                            return command_1.ReturnCode.Success;
-                        })
-                            .catch(function (err) {
-                            var _a;
-                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error building DB: ', err);
-                            return command_1.ReturnCode.InternalError;
-                        })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: 
+                    // Resolving the target is what sets process.sasjsConstants - buildDB reads
+                    // the source and destination db folders from there.
+                    return [4 /*yield*/, this.getTargetInfo()];
+                    case 1:
+                        // Resolving the target is what sets process.sasjsConstants - buildDB reads
+                        // the source and destination db folders from there.
+                        _a.sent();
+                        return [4 /*yield*/, (0, db_1.buildDB)()
+                                .then(function () {
+                                var _a;
+                                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success('DB build completed!');
+                                return command_1.ReturnCode.Success;
+                            })
+                                .catch(function (err) {
+                                var _a;
+                                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error building DB: ', err);
+                                return command_1.ReturnCode.InternalError;
+                            })];
+                    case 2: return [2 /*return*/, _a.sent()];
                 }
             });
         });
     };
     return DbCommand;
-}(types_1.CommandBase));
+}(targetCommand_1.TargetCommand));
 exports.DbCommand = DbCommand;

package/build/commands/db/spec/dbCommand.spec.js

@@ -94,10 +94,18 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var logger_1 = require("@sasjs/utils/logger");
+var utils_1 = require("@sasjs/utils");
 var command_1 = require("../../../types/command");
 var dbModule = __importStar(require("../db"));
 var dbCommand_1 = require("../dbCommand");
+var configUtils = __importStar(require("../../../utils/config"));
+var setConstantsUtils = __importStar(require("../../../utils/setConstants"));
+var target = new utils_1.Target({
+    name: 'test-target',
+    serverUrl: 'https://sas.example.com',
+    serverType: utils_1.ServerType.SasViya,
+    appLoc: '/Public/app'
+});
 describe('DbCommand', function () {
     var defaultArgs = ['node', 'sasjs'];
     beforeEach(function () {
@@ -125,6 +133,32 @@ describe('DbCommand', function () {
             }
         });
     }); });
+    it('should resolve the target - and so set the constants - before building', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var calls;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    calls = [];
+                    setConstantsUtils.setConstants.mockImplementation(function () { return __awaiter(void 0, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            calls.push('setConstants');
+                            return [2 /*return*/];
+                        });
+                    }); });
+                    jest.spyOn(dbModule, 'buildDB').mockImplementation(function () { return __awaiter(void 0, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            calls.push('buildDB');
+                            return [2 /*return*/];
+                        });
+                    }); });
+                    return [4 /*yield*/, new dbCommand_1.DbCommand(__spreadArray(__spreadArray([], __read(defaultArgs), false), ['db'], false)).execute()];
+                case 1:
+                    _a.sent();
+                    expect(calls).toEqual(['setConstants', 'buildDB']);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('should return an error code when the execution errors out', function () { return __awaiter(void 0, void 0, void 0, function () {
         var args, command, returnCode;
         return __generator(this, function (_a) {
@@ -149,7 +183,16 @@ var setupMocks = function () {
     jest.resetAllMocks();
     jest.mock('../db');
     jest.spyOn(dbModule, 'buildDB').mockImplementation(function () { return Promise.resolve(); });
-    process.logger = new logger_1.Logger(logger_1.LogLevel.Off);
+    jest
+        .spyOn(configUtils, 'findTargetInConfiguration')
+        .mockImplementation(function () { return Promise.resolve({ target: target, isLocal: true }); });
+    jest
+        .spyOn(configUtils, 'getLocalConfig')
+        .mockImplementation(function () { return Promise.resolve({}); });
+    jest
+        .spyOn(setConstantsUtils, 'setConstants')
+        .mockImplementation(function () { return Promise.resolve(); });
+    process.logger = new utils_1.Logger(utils_1.LogLevel.Off);
     jest.spyOn(process.logger, 'success');
     jest.spyOn(process.logger, 'error');
 };

package/package.json

@@ -123,5 +123,5 @@
     "ws": "8.21.0",
     "nanoid": "3.3.18"
   },
-  "version": "6.4.7"
+  "version": "6.4.8"
 }