Merge branch 'main' into fix-body-param

Author: mrlubos

.changeset/cuddly-jokes-walk.md

@@ -0,0 +1,5 @@
+---
+"@hey-api/openapi-ts": patch
+---
+
+**parser**: inline deep path `$ref` references

dev/openapi-ts.config.ts

@@ -48,8 +48,8 @@ export default defineConfig(() => {
           path: path.resolve(
             getSpecsPath(),
             // '2.0.x',
-            // '3.0.x',
-            '3.1.x',
+            '3.0.x',
+            // '3.1.x',
             // 'circular.yaml',
             // 'dutchie.json',
             // 'enum-names-values.yaml',
@@ -60,12 +60,13 @@ export default defineConfig(() => {
             // 'openai.yaml',
             // 'opencode.yaml',
             // 'pagination-ref.yaml',
+            'ref-deep.yaml',
             // 'schema-const.yaml',
             // 'sdk-instance.yaml',
             // 'sdk-method-class-conflict.yaml',
             // 'sdk-nested-classes.yaml',
             // 'sdk-nested-conflict.yaml',
-            'security-api-key.yaml',
+            // 'security-api-key.yaml',
             // 'string-with-format.yaml',
             // 'transformers.json',
             // 'transformers-recursive.json',
@@ -286,7 +287,7 @@ export default defineConfig(() => {
           //   name: '你們_errors_{{name}}',
           // },
           // exportFromIndex: false,
-          // name: '@hey-api/typescript',
+          name: '@hey-api/typescript',
           // requests: '我們_data_{{name}}',
           // responses: {
           //   name: '我_responses_{{name}}',
@@ -331,7 +332,7 @@ export default defineConfig(() => {
           //   fields.unwrap('path')
           // },
           // include...
-          name: '@hey-api/sdk',
+          // name: '@hey-api/sdk',
           operations: {
             // container: 'object',
             // containerName: {

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

@@ -292,6 +292,14 @@ describe(`OpenAPI ${version}`, () => {
       }),
       description: 'handles form data',
     },
+    {
+      config: createConfig({
+        input: 'ref-deep.yaml',
+        output: 'ref-deep',
+        plugins: ['@hey-api/typescript'],
+      }),
+      description: 'handles deep references',
+    },
     {
       config: createConfig({
         input: 'transforms-read-write.yaml',

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

@@ -546,6 +546,14 @@ describe(`OpenAPI ${version}`, () => {
       }),
       description: 'handles non-exploded array query parameters (Axios)',
     },
+    {
+      config: createConfig({
+        input: 'ref-deep.yaml',
+        output: 'ref-deep',
+        plugins: ['@hey-api/typescript'],
+      }),
+      description: 'handles deep references',
+    },
     {
       config: createConfig({
         input: 'transforms-read-write.yaml',

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

@@ -646,6 +646,14 @@ describe(`OpenAPI ${version}`, () => {
       }),
       description: 'handles tuple query parameters',
     },
+    {
+      config: createConfig({
+        input: 'ref-deep.yaml',
+        output: 'ref-deep',
+        plugins: ['@hey-api/typescript'],
+      }),
+      description: 'handles deep references',
+    },
     {
       config: createConfig({
         input: 'transforms-read-write.yaml',

packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/ref-deep/index.ts

@@ -0,0 +1,3 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type { Bar, ClientOptions, Foo, GetFooData, GetFooResponses, PostFooData, PostFooResponses } from './types.gen';

packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/ref-deep/types.gen.ts

@@ -0,0 +1,51 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type ClientOptions = {
+    baseUrl: string;
+};
+
+export type Foo = {
+    foo?: Array<{
+        baz?: string;
+    }>;
+    bar?: Array<{
+        baz?: string;
+    }>;
+};
+
+export type Bar = {
+    foo?: Array<{
+        baz?: string;
+    }>;
+    bar?: Array<{
+        baz?: string;
+    }>;
+};
+
+export type GetFooData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/foo';
+};
+
+export type GetFooResponses = {
+    /**
+     * OK
+     */
+    200: unknown;
+};
+
+export type PostFooData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/foo';
+};
+
+export type PostFooResponses = {
+    /**
+     * OK
+     */
+    200: unknown;
+};

packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/ref-deep/index.ts

@@ -0,0 +1,3 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type { Bar, ClientOptions, Foo, GetFooData, GetFooResponse, GetFooResponses, PostFooData, PostFooResponse, PostFooResponses } from './types.gen';

packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/ref-deep/types.gen.ts

@@ -0,0 +1,64 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type ClientOptions = {
+    baseUrl: `${string}://${string}` | (string & {});
+};
+
+export type Foo = {
+    foo?: Array<{
+        baz?: string;
+    }>;
+    bar?: Array<{
+        baz?: string;
+    }>;
+};
+
+export type Bar = {
+    foo?: Array<{
+        baz?: string;
+    }>;
+    bar?: Array<{
+        baz?: string;
+    }>;
+};
+
+export type GetFooData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/foo';
+};
+
+export type GetFooResponses = {
+    /**
+     * OK
+     */
+    200: Array<{
+        foo?: number;
+        bar?: string;
+    }>;
+};
+
+export type GetFooResponse = GetFooResponses[keyof GetFooResponses];
+
+export type PostFooData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/foo';
+};
+
+export type PostFooResponses = {
+    /**
+     * OK
+     */
+    200: {
+        foo?: {
+            foo?: number;
+            bar?: string;
+        };
+        bar?: string;
+    };
+};
+
+export type PostFooResponse = PostFooResponses[keyof PostFooResponses];

packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/ref-deep/index.ts

@@ -0,0 +1,3 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type { Bar, ClientOptions, Foo, GetFooData, GetFooResponse, GetFooResponses, PostFooData, PostFooResponse, PostFooResponses } from './types.gen';