@sasjs/cli 3.20.4 → 3.20.5

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

@@ -137,7 +137,7 @@ describe('CompileCommand', function () {
                     targetInfo = _a.sent();
                     expect(command.name).toEqual('compile');
                     expect(command.subCommand).toEqual('');
-                    expect(targetInfo.target).toEqual(target);
+                    expect(JSON.stringify(targetInfo.target)).toEqual(JSON.stringify(target));
                     expect(targetInfo.isLocal).toBeTrue();
                     return [2 /*return*/];
             }
@@ -264,7 +264,7 @@ describe('CompileCommand', function () {
                     targetInfo = _a.sent();
                     expect(command.name).toEqual('compile');
                     expect(command.subCommand).toEqual('job');
-                    expect(targetInfo.target).toEqual(target);
+                    expect(JSON.stringify(targetInfo.target)).toEqual(JSON.stringify(target));
                     expect(targetInfo.isLocal).toBeTrue();
                     return [2 /*return*/];
             }
@@ -289,14 +289,14 @@ describe('CompileCommand', function () {
                     targetInfo = _a.sent();
                     expect(command.name).toEqual('compile');
                     expect(command.subCommand).toEqual('job');
-                    expect(targetInfo.target).toEqual(target);
+                    expect(JSON.stringify(targetInfo.target)).toEqual(JSON.stringify(target));
                     expect(targetInfo.isLocal).toBeTrue();
                     return [2 /*return*/];
             }
         });
     }); });
     it('should call the compileSingleFile handler when executed with the correct target', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var args, command;
+        var args, command, expectedTarget;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -312,7 +312,12 @@ describe('CompileCommand', function () {
                     return [4 /*yield*/, command.execute()];
                 case 1:
                     _a.sent();
-                    expect(compileSingleFileModule.compileSingleFile).toHaveBeenCalledWith(target, 'job', path_1.default.join(os_1.default.homedir(), 'test.sas'), expect.anything());
+                    expectedTarget = {};
+                    Object.keys(target).forEach(function (key) {
+                        expectedTarget[key] = target[key];
+                    });
+                    delete expectedTarget.getConfig;
+                    expect(compileSingleFileModule.compileSingleFile).toHaveBeenCalledWith(expect.objectContaining(expectedTarget), 'job', path_1.default.join(os_1.default.homedir(), 'test.sas'), expect.anything());
                     return [2 /*return*/];
             }
         });

package/build/utils/config.js

@@ -131,9 +131,8 @@ function findTargetInConfiguration(targetName, targetScope) {
                 case 0: return [4 /*yield*/, getProjectRoot()];
                 case 1:
                     rootDir = _g.sent();
-                    if (rootDir !== process.projectDir) {
+                    if (rootDir !== process.projectDir)
                         process.projectDir = rootDir;
-                    }
                     if (!(targetScope === targetScope_1.TargetScope.Local)) return [3 /*break*/, 6];
                     if (!targetName) return [3 /*break*/, 3];
                     _c = {};
@@ -258,7 +257,7 @@ function getLocalTarget(targetName) {
                 case 2:
                     _b.httpsAgentOptions =
                         _c.sent();
-                    return [2 /*return*/, new utils_1.Target(targetJson)];
+                    return [2 /*return*/, new utils_1.Target(targetJson, localConfig)];
                 case 3: throw new Error(ERROR_MESSAGE(targetName).NOT_FOUND_TARGET_NAME);
             }
         });
@@ -293,7 +292,7 @@ function getLocalFallbackTarget() {
                     return [4 /*yield*/, (0, utils_2.loadEnvVariables)(".env.".concat(fallBackTargetJson.name))];
                 case 3:
                     _d.sent();
-                    return [2 /*return*/, new utils_1.Target(fallBackTargetJson)];
+                    return [2 /*return*/, new utils_1.Target(fallBackTargetJson, localConfig)];
                 case 4: throw new Error(ERROR_MESSAGE().NOT_FOUND_FALLBACK);
             }
         });
@@ -322,7 +321,7 @@ function getGlobalTarget(targetName) {
                 case 2:
                     _b.httpsAgentOptions =
                         _c.sent();
-                    return [2 /*return*/, new utils_1.Target(targetJson)];
+                    return [2 /*return*/, new utils_1.Target(targetJson, globalConfig)];
                 case 3: throw new Error(ERROR_MESSAGE(targetName).NOT_FOUND_TARGET_NAME);
             }
         });
@@ -353,7 +352,7 @@ function getGlobalFallbackTarget() {
                 case 2:
                     _c.httpsAgentOptions =
                         _d.sent();
-                    return [2 /*return*/, new utils_1.Target(fallBackTargetJson)];
+                    return [2 /*return*/, new utils_1.Target(fallBackTargetJson, globalConfig)];
                 case 3: throw new Error(ERROR_MESSAGE().NOT_FOUND_FALLBACK);
             }
         });

package/package.json

@@ -53,7 +53,7 @@
     "@sasjs/adapter": "4.0.1",
     "@sasjs/core": "4.43.1",
     "@sasjs/lint": "1.13.0",
-    "@sasjs/utils": "2.49.3",
+    "@sasjs/utils": "2.50.0",
     "adm-zip": "0.5.9",
     "chalk": "4.1.2",
     "csv-stringify": "5.6.5",
@@ -99,5 +99,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.20.4"
+  "version": "3.20.5"
 }