chore: handle all relative paths the same way

Author: mrlubos

packages/openapi-ts/src/plugins/@hey-api/client-core/__tests__/client.test.ts

@@ -0,0 +1,65 @@
+import path from 'node:path';
+
+import { resolveRuntimeConfigPath } from '../../client-core/client';
+
+describe('resolveRuntimeConfigPath', () => {
+  it('preserves path mapping and module specifiers', () => {
+    const outputPath = path.join(process.cwd(), 'src/client');
+
+    expect(
+      resolveRuntimeConfigPath({
+        outputPath,
+        runtimeConfigPath: '~/foo.ts',
+      }),
+    ).toBe('~/foo.ts');
+
+    expect(
+      resolveRuntimeConfigPath({
+        outputPath,
+        runtimeConfigPath: '@/foo.ts',
+      }),
+    ).toBe('@/foo.ts');
+
+    expect(
+      resolveRuntimeConfigPath({
+        outputPath,
+        runtimeConfigPath: '@scope/runtime-config',
+      }),
+    ).toBe('@scope/runtime-config');
+  });
+
+  it('resolves relative filesystem paths from cwd to output-relative import', () => {
+    const outputPath = path.join(process.cwd(), 'src/client');
+
+    expect(
+      resolveRuntimeConfigPath({
+        outputPath,
+        runtimeConfigPath: './src/hey-api.ts',
+      }),
+    ).toBe('../hey-api.ts');
+  });
+
+  it('resolves absolute filesystem paths to output-relative import', () => {
+    const cwd = process.cwd();
+    const outputPath = path.join(cwd, 'src/client');
+
+    expect(
+      resolveRuntimeConfigPath({
+        outputPath,
+        runtimeConfigPath: path.join(cwd, 'src/runtime/hey-api.ts'),
+      }),
+    ).toBe('../runtime/hey-api.ts');
+  });
+
+  it('adds ./ prefix for same-directory files', () => {
+    const cwd = process.cwd();
+    const outputPath = path.join(cwd, 'src/client');
+
+    expect(
+      resolveRuntimeConfigPath({
+        outputPath,
+        runtimeConfigPath: path.join(cwd, 'src/client/hey-api.ts'),
+      }),
+    ).toBe('./hey-api.ts');
+  });
+});

packages/openapi-ts/src/plugins/@hey-api/client-core/client.ts

@@ -8,16 +8,22 @@ import { $ } from '../../../ts-dsl';
 import type { PluginHandler } from './types';
 import { getClientBaseUrlKey } from './utils';
 
-function resolveRuntimeConfigPath({
+export function resolveRuntimeConfigPath({
   outputPath,
   runtimeConfigPath,
 }: {
   outputPath: string;
   runtimeConfigPath: string;
 }): string {
-  // if (!path.isAbsolute(runtimeConfigPath) && !runtimeConfigPath.startsWith('./')) {
-  //   return runtimeConfigPath;
-  // }
+  const isFileSystemPath =
+    path.isAbsolute(runtimeConfigPath) ||
+    runtimeConfigPath.startsWith('./') ||
+    runtimeConfigPath.startsWith('../');
+
+  if (!isFileSystemPath) {
+    return runtimeConfigPath;
+  }
+
   const absoluteInputPath = path.isAbsolute(runtimeConfigPath)
     ? runtimeConfigPath
     : path.resolve(process.cwd(), runtimeConfigPath);