cleanup

Author: SpaceFoon

CHANGELOG.md

@@ -112,8 +112,7 @@
       "node"
     ],
     "testMatch": [
-      "**/__tests__/**/*.test.ts",
-      "**/__tests__/**/*.test.js"
+      "**/__tests__/**/*.test.ts"
     ],
     "verbose": false,
     "forceExit": true,

package.json

@@ -1,5 +1,9 @@
 import { describe, it, expect, jest, beforeEach } from '@jest/globals';
 import { EventEmitter } from 'events';
+import {
+  createFindBinaryMock,
+  joinWithSeparator,
+} from './test-utils/pathResolutionMocks.js';
 
 type PathStyle = 'posix' | 'win32';
 
@@ -8,11 +12,6 @@ type SetupOptions = {
   isPackagedRuntime: boolean;
 };
 
-const makeJoin = (style: PathStyle) => {
-  const sep = style === 'win32' ? '\\' : '/';
-  return (...parts: string[]) => parts.join(sep);
-};
-
 async function setupAndImportConverterManager(options: SetupOptions) {
   jest.resetModules();
 
@@ -22,7 +21,8 @@ async function setupAndImportConverterManager(options: SetupOptions) {
   console.warn = jest.fn();
   console.error = jest.fn();
 
-  const join = makeJoin(options.pathStyle);
+  const sep = options.pathStyle === 'win32' ? '\\' : '/';
+  const join = joinWithSeparator(sep);
   const moduleDir = options.pathStyle === 'win32' ? 'C:\\MODDIR' : '/MODDIR';
   const cwdDir = options.pathStyle === 'win32' ? 'C:\\CWD' : '/CWD';
   const runtimeBaseDir =
@@ -78,18 +78,12 @@ async function setupAndImportConverterManager(options: SetupOptions) {
     getAnswer: jest.fn(async () => ''),
     runtimeBaseDir,
     isPackagedRuntime: options.isPackagedRuntime,
-    findBinary: (name: string, subdirs: string[] = []) => {
-      const roots = [runtimeBaseDir, cwdDir];
-      for (const root of roots) {
-        const direct = join(root, name);
-        if (existsSyncMock(direct)) return direct;
-        for (const sub of subdirs) {
-          const candidate = join(root, sub, name);
-          if (existsSyncMock(candidate)) return candidate;
-        }
-      }
-      return null;
-    },
+    findBinary: createFindBinaryMock({
+      sep,
+      runtimeBaseDir,
+      pathExists: (path: string) => existsSyncMock(path),
+      includeCwd: true,
+    }),
   }));
 
   const cwdSpy = jest.spyOn(process, 'cwd').mockReturnValue(cwdDir);

src/__tests__/converterManager.paths.test.ts

@@ -1,4 +1,5 @@
 import { jest, describe, it, expect, afterEach } from '@jest/globals';
+import { createFindBinaryMock } from './test-utils/pathResolutionMocks.js';
 
 type Config = {
   sep: '/' | '\\';
@@ -69,32 +70,12 @@ jest.unstable_mockModule('../utils.js', () => ({
   },
   getErrorMessage: (error: unknown) =>
     error instanceof Error ? error.message : String(error || 'Unknown error'),
-  findBinary: (name: string, subdirs: string[] = []) => {
-    const sep = config.sep;
-    const roots = [config.runtimeBaseDir];
-    // Also check process.cwd() if it were relevant, but tests control via config.exists
-    for (const root of roots) {
-      const direct = [root, name].join(sep);
-      if (config.exists.has(direct)) return direct;
-      for (const sub of subdirs) {
-        const candidate = [root, sub, name].join(sep);
-        if (config.exists.has(candidate)) return candidate;
-      }
-    }
-    // Check cwd-based paths too
-    try {
-      const cwd = process.cwd();
-      const direct = [cwd, name].join(sep);
-      if (config.exists.has(direct)) return direct;
-      for (const sub of subdirs) {
-        const candidate = [cwd, sub, name].join(sep);
-        if (config.exists.has(candidate)) return candidate;
-      }
-    } catch {
-      /* ignore */
-    }
-    return null;
-  },
+  findBinary: createFindBinaryMock({
+    sep: config.sep,
+    runtimeBaseDir: config.runtimeBaseDir,
+    pathExists: (path: string) => config.exists.has(path),
+    includeCwd: true,
+  }),
 }));
 
 jest.unstable_mockModule('../metadataService.js', () => ({