Merge pull request #3047 from hey-api/fix/sdk-flat-map

mrlubos · web-flow · commit 2b11229add51 · 2025-12-08T07:37:57.000+08:00
fix(@hey-api/sdk): correctly map flat parameters
diff --git a/.changeset/deep-lies-wish.md b/.changeset/deep-lies-wish.md
@@ -0,0 +1,5 @@
+---
+'@hey-api/openapi-ts': patch
+---
+
+**@hey-api/sdk**: correctly map flat parameters
diff --git a/dev/openapi-ts.config.ts b/dev/openapi-ts.config.ts
@@ -40,10 +40,10 @@ export default defineConfig(() => {
             // 'circular.yaml',
             // 'dutchie.json',
             // 'invalid',
-            'full.yaml',
+            // 'full.yaml',
             // 'object-property-names.yaml',
             // 'openai.yaml',
-            // 'opencode.yaml',
+            'opencode.yaml',
             // 'pagination-ref.yaml',
             // 'sdk-instance.yaml',
             // 'string-with-format.yaml',
@@ -96,15 +96,15 @@ export default defineConfig(() => {
           //   suffix: '.meh',
           // },
           // format: 'prettier',
-          // importFileExtension: '.ts',
+          importFileExtension: '.ts',
           // indexFile: false,
           // lint: 'eslint',
           path: path.resolve(__dirname, '.gen'),
-          tsConfigPath: path.resolve(
-            __dirname,
-            'tsconfig',
-            'tsconfig.nodenext.json',
-          ),
+          // tsConfigPath: path.resolve(
+          //   __dirname,
+          //   'tsconfig',
+          //   'tsconfig.nodenext.json',
+          // ),
         },
         // '.gen',
       ],
@@ -217,7 +217,7 @@ export default defineConfig(() => {
         {
           // baseUrl: false,
           // exportFromIndex: true,
-          name: '@hey-api/client-angular',
+          // name: '@hey-api/client-angular',
           // runtimeConfigPath: path.resolve(__dirname, 'hey-api.ts'),
           // runtimeConfigPath: './src/hey-api.ts',
           // strictBaseUrl: true,
@@ -264,14 +264,14 @@ export default defineConfig(() => {
           // instance: true,
           name: '@hey-api/sdk',
           // operationId: false,
-          // paramsStructure: 'flat',
-          responseStyle: 'data',
+          paramsStructure: 'flat',
+          // responseStyle: 'data',
           // signature: 'auto',
           // signature: 'client',
           // signature: 'object',
           // transformer: '@hey-api/transformers',
           // transformer: true,
-          validator: 'valibot',
+          // validator: 'valibot',
           // validator: {
           //   request: 'zod',
           //   response: 'zod',
@@ -293,13 +293,13 @@ export default defineConfig(() => {
         {
           // bigInt: true,
           dates: true,
-          name: '@hey-api/transformers',
+          // name: '@hey-api/transformers',
         },
         {
-          name: 'fastify',
+          // name: 'fastify',
         },
         {
-          name: 'swr',
+          // name: 'swr',
         },
         {
           // case: 'SCREAMING_SNAKE_CASE',
@@ -357,7 +357,7 @@ export default defineConfig(() => {
           },
         },
         {
-          name: 'arktype',
+          // name: 'arktype',
           types: {
             infer: true,
           },
@@ -368,7 +368,7 @@ export default defineConfig(() => {
           // definitions: 'z{{name}}Definition',
           exportFromIndex: true,
           // metadata: true,
-          name: 'valibot',
+          // name: 'valibot',
           // requests: {
           //   case: 'PascalCase',
           //   name: '{{name}}Data',
@@ -445,7 +445,7 @@ export default defineConfig(() => {
           },
           // exportFromIndex: true,
           metadata: true,
-          name: 'zod',
+          // name: 'zod',
           // requests: {
           //   // case: 'SCREAMING_SNAKE_CASE',
           //   // name: 'z{{name}}TestData',
@@ -522,7 +522,7 @@ export default defineConfig(() => {
           httpResources: {
             asClass: true,
           },
-          name: '@angular/common',
+          // name: '@angular/common',
         },
         {
           exportFromIndex: true,
diff --git a/dev/package.json b/dev/package.json
@@ -6,6 +6,9 @@
   "engines": {
     "node": ">=20.19.0"
   },
+  "scripts": {
+    "dev": "ts-node ./playground.ts"
+  },
   "devDependencies": {
     "@hey-api/codegen-core": "workspace:*",
     "@hey-api/openapi-ts": "workspace:*",
diff --git a/dev/playground.ts b/dev/playground.ts
@@ -1,14 +1,28 @@
 import type { DefinePlugin, IR } from '@hey-api/openapi-ts';
 
+import { authSet } from './.gen/index.ts';
+
 type MyPluginConfig = { readonly name: 'myplugin' };
 type MyPlugin = DefinePlugin<MyPluginConfig>;
 
 export function f(schema: IR.SchemaObject, plugin: MyPlugin['Instance']) {
-  plugin.context.resolveIrRef(schema.$ref);
+  plugin.context.resolveIrRef(schema.$ref!);
 }
 
 export const handler: MyPlugin['Handler'] = ({ plugin }) => {
   plugin.forEach('schema', 'operation', (event) => {
     console.log(event);
   });
 };
+
+console.log(
+  authSet({
+    auth: {
+      access: '',
+      expires: 1,
+      refresh: '',
+      type: 'oauth',
+    },
+    id: '123',
+  }),
+);
diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/sdk.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/sdk.gen.ts
diff --git a/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/operation.ts b/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/operation.ts

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@hey-api/openapi-ts': patch
 +---
++
 +**@hey-api/sdk**: correctly map flat parameters