Remove upward search from dw.json loading, complete test isolation

- Change loadDwJson() default to look only at ./dw.json (no parent search)
- Update DwJsonSource to use same logic, remove findDwJson import
- Keep findDwJson() exported for users who need explicit upward search
- Set SFCC_CONFIG=/dev/null and MRT_CREDENTIALS_FILE=/dev/null in isolateConfig()
- Update test to verify new behavior (no upward search)

Author: clavery

packages/b2c-tooling-sdk/src/config/dw-json.ts

@@ -149,26 +149,32 @@ function selectConfig(json: DwJsonMultiConfig, instanceName?: string): DwJsonCon
 /**
  * Loads configuration from a dw.json file.
  *
- * Searches upward from the current directory (or specified startDir) for a dw.json file.
- * Supports both single-config and multi-config formats.
+ * If an explicit path is provided, uses that file. Otherwise, looks for dw.json
+ * in the startDir (or cwd). Does NOT search parent directories.
+ *
+ * Use `findDwJson()` if you need to search upward through parent directories.
  *
  * @param options - Loading options
  * @returns The parsed config, or undefined if no dw.json found
  *
  * @example
- * // Auto-find dw.json
+ * // Load from ./dw.json (current directory)
  * const config = loadDwJson();
  *
+ * // Load from specific directory
+ * const config = loadDwJson({ startDir: '/path/to/project' });
+ *
  * // Use named instance
  * const config = loadDwJson({ instance: 'staging' });
  *
  * // Explicit path
  * const config = loadDwJson({ path: './config/dw.json' });
  */
 export function loadDwJson(options: LoadDwJsonOptions = {}): DwJsonConfig | undefined {
-  const dwJsonPath = options.path || findDwJson(options.startDir);
+  // If explicit path provided, use it. Otherwise default to ./dw.json (no upward search)
+  const dwJsonPath = options.path ?? path.join(options.startDir || process.cwd(), 'dw.json');
 
-  if (!dwJsonPath || !fs.existsSync(dwJsonPath)) {
+  if (!fs.existsSync(dwJsonPath)) {
     return undefined;
   }
 

packages/b2c-tooling-sdk/src/config/sources/dw-json-source.ts

@@ -8,7 +8,8 @@
  *
  * @internal This module is internal to the SDK. Use ConfigResolver instead.
  */
-import {loadDwJson, findDwJson} from '../dw-json.js';
+import * as path from 'node:path';
+import {loadDwJson} from '../dw-json.js';
 import {mapDwJsonToNormalizedConfig} from '../mapping.js';
 import type {ConfigSource, NormalizedConfig, ResolveConfigOptions} from '../types.js';
 
@@ -33,8 +34,8 @@ export class DwJsonSource implements ConfigSource {
       return undefined;
     }
 
-    // Track the path for diagnostics
-    this.lastPath = options.configPath || findDwJson(options.startDir);
+    // Track the path for diagnostics - use explicit path or default location
+    this.lastPath = options.configPath ?? path.join(options.startDir || process.cwd(), 'dw.json');
 
     return mapDwJsonToNormalizedConfig(dwConfig);
   }

packages/b2c-tooling-sdk/test/config/sources.test.ts

@@ -46,7 +46,7 @@ describe('config/sources', () => {
       expect(config.codeVersion).to.equal('v1');
     });
 
-    it('loads config from dw.json in parent directory', () => {
+    it('does NOT load config from dw.json in parent directory (no upward search)', () => {
       const subDir = path.join(tempDir, 'subdir');
       fs.mkdirSync(subDir);
       const dwJsonPath = path.join(tempDir, 'dw.json');
@@ -57,11 +57,13 @@ describe('config/sources', () => {
         }),
       );
 
+      // Change to subdirectory - should NOT find parent's dw.json
       process.chdir(subDir);
       const resolver = new ConfigResolver();
       const {config} = resolver.resolve();
 
-      expect(config.hostname).to.equal('parent.demandware.net');
+      // Parent dw.json should NOT be found (no upward search)
+      expect(config.hostname).to.be.undefined;
     });
 
     it('handles OAuth credentials from dw.json', () => {

packages/b2c-tooling-sdk/test/helpers/config-isolation.ts

@@ -64,6 +64,11 @@ export function isolateConfig(): void {
     delete process.env[key];
   }
 
+  // SET isolation env vars - oclif will pick these up during flag parsing
+  // /dev/null exists but is empty (JSON.parse fails), so config sources find nothing
+  process.env.SFCC_CONFIG = '/dev/null';
+  process.env.MRT_CREDENTIALS_FILE = '/dev/null';
+
   state = {savedEnvVars};
 }
 
@@ -76,7 +81,11 @@ export function isolateConfig(): void {
 export function restoreConfig(): void {
   if (!state) return;
 
-  // Restore env vars
+  // Remove isolation env vars we set
+  delete process.env.SFCC_CONFIG;
+  delete process.env.MRT_CREDENTIALS_FILE;
+
+  // Restore original env vars
   for (const [key, value] of Object.entries(state.savedEnvVars)) {
     if (value === undefined) {
       delete process.env[key];