Merge branch 'main' into fix/oneof-discriminator-required

Author: mrlubos

.changeset/serious-bottles-buy.md

@@ -0,0 +1,19 @@
+---
+'@hey-api/openapi-ts': minor
+---
+
+feat: respect `moduleResolution` value in `tsconfig.json`
+
+### Respecting `moduleResolution` value in `tsconfig.json`
+
+This release introduces functionality related to your `tsconfig.json` file. The initial feature properly respects the value of your `moduleResolution` field. If you're using `nodenext`, the relative module paths in your output will be appended with `.js`. To preserve the previous behavior where we never appended `.js` to relative module paths, set `output.tsConfigPath` to `off`.
+
+```js
+export default {
+  input: 'https://get.heyapi.dev/hey-api/backend',
+  output: {
+    path: 'src/client',
+    tsConfigPath: 'off',
+  },
+};
+```

docs/openapi-ts/migrating.md

@@ -27,6 +27,22 @@ This config option is deprecated and will be removed in favor of [clients](./cli
 
 This config option is deprecated and will be removed.
 
+## v0.67.0
+
+### Respecting `moduleResolution` value in `tsconfig.json`
+
+This release introduces functionality related to your `tsconfig.json` file. The initial feature properly respects the value of your `moduleResolution` field. If you're using `nodenext`, the relative module paths in your output will be appended with `.js`. To preserve the previous behavior where we never appended `.js` to relative module paths, set `output.tsConfigPath` to `off`.
+
+```js
+export default {
+  input: 'https://get.heyapi.dev/hey-api/backend',
+  output: {
+    path: 'src/client',
+    tsConfigPath: 'off', // [!code ++]
+  },
+};
+```
+
 ## v0.66.0
 
 ### Read-only and write-only fields

packages/openapi-ts-tests/test/2.0.x.test.ts

@@ -340,7 +340,8 @@ describe(`OpenAPI ${version}`, () => {
   it.each(scenarios)('$description', async ({ config }) => {
     await createClient(config);
 
-    const outputPath = typeof config.output === 'string' ? config.output : '';
+    const outputPath =
+      typeof config.output === 'string' ? config.output : config.output.path;
     const filePaths = getFilePaths(outputPath);
 
     await Promise.all(

packages/openapi-ts-tests/test/3.0.x.test.ts

@@ -579,7 +579,8 @@ describe(`OpenAPI ${version}`, () => {
   it.each(scenarios)('$description', async ({ config }) => {
     await createClient(config);
 
-    const outputPath = typeof config.output === 'string' ? config.output : '';
+    const outputPath =
+      typeof config.output === 'string' ? config.output : config.output.path;
     const filePaths = getFilePaths(outputPath);
 
     await Promise.all(

packages/openapi-ts-tests/test/3.1.x.test.ts

@@ -709,7 +709,8 @@ describe(`OpenAPI ${version}`, () => {
   it.each(scenarios)('$description', async ({ config }) => {
     await createClient(config);
 
-    const outputPath = typeof config.output === 'string' ? config.output : '';
+    const outputPath =
+      typeof config.output === 'string' ? config.output : config.output.path;
     const filePaths = getFilePaths(outputPath);
 
     await Promise.all(

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client.gen.ts

@@ -0,0 +1,18 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { ClientOptions } from './types.gen.js';
+import { type Config, type ClientOptions as DefaultClientOptions, createClient, createConfig } from '@hey-api/client-axios';
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends DefaultClientOptions = ClientOptions> = (override?: Config<DefaultClientOptions & T>) => Config<Required<DefaultClientOptions> & T>;
+
+export const client = createClient(createConfig<ClientOptions>({
+    baseURL: 'http://localhost:3000/base'
+}));

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/index.ts

@@ -0,0 +1,3 @@
+// This file is auto-generated by @hey-api/openapi-ts
+export * from './types.gen.js';
+export * from './sdk.gen.js';