fix(@hey-api/sdk): correctly map flat parameters

.changeset/deep-lies-wish.md

···
+---
+'@hey-api/openapi-ts': patch
+---
+
+**@hey-api/sdk**: correctly map flat parameters

dev/openapi-ts.config.ts

···
             // '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',
···
           //   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',
       ],
···
         {
           // 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,
···
           // 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',
···
         {
           // bigInt: true,
           dates: true,
-          name: '@hey-api/transformers',
+          // name: '@hey-api/transformers',
         },
         {
-          name: 'fastify',
+          // name: 'fastify',
         },
         {
-          name: 'swr',
+          // name: 'swr',
         },
         {
           // case: 'SCREAMING_SNAKE_CASE',
···
           },
         },
         {
-          name: 'arktype',
+          // name: 'arktype',
           types: {
             infer: true,
           },
···
           // definitions: 'z{{name}}Definition',
           exportFromIndex: true,
           // metadata: true,
-          name: 'valibot',
+          // name: 'valibot',
           // requests: {
           //   case: 'PascalCase',
           //   name: '{{name}}Data',
···
           },
           // exportFromIndex: true,
           metadata: true,
-          name: 'zod',
+          // name: 'zod',
           // requests: {
           //   // case: 'SCREAMING_SNAKE_CASE',
           //   // name: 'z{{name}}TestData',
···
           httpResources: {
             asClass: true,
           },
-          name: '@angular/common',
+          // name: '@angular/common',
         },
         {
           exportFromIndex: true,

dev/package.json

···
   "engines": {
     "node": ">=20.19.0"
   },
+  "scripts": {
+    "dev": "ts-node ./playground.ts"
+  },
   "devDependencies": {
     "@hey-api/codegen-core": "workspace:*",
     "@hey-api/openapi-ts": "workspace:*",

dev/playground.ts

···
 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 }) => {
···
     console.log(event);
   });
 };
+
+console.log(
+  authSet({
+    auth: {
+      access: '',
+      expires: 1,
+      refresh: '',
+      type: 'oauth',
+    },
+    id: '123',
+  }),
+);

packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/sdk.gen.ts

···
     parentID?: string;
     title?: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [{ in: 'body', key: 'parentID' }, { in: 'body', key: 'title' }]);
+    const params = buildClientParams([parameters], [{ args: [{ in: 'body', key: 'parentID' }, { in: 'body', key: 'title' }] }]);
     return (options?.client ?? client).post<SessionCreateResponses, SessionCreateErrors, ThrowOnError>({
         url: '/session',
         ...options,
···
 export const sessionDelete = <ThrowOnError extends boolean = false>(parameters: {
     id: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [{ in: 'path', key: 'id' }]);
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]);
     return (options?.client ?? client).delete<SessionDeleteResponses, unknown, ThrowOnError>({
         url: '/session/{id}',
         ...options,
···
 export const sessionGet = <ThrowOnError extends boolean = false>(parameters: {
     id: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [{ in: 'path', key: 'id' }]);
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]);
     return (options?.client ?? client).get<SessionGetResponses, unknown, ThrowOnError>({
         url: '/session/{id}',
         ...options,
···
     id: string;
     title?: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [{ in: 'path', key: 'id' }, { in: 'body', key: 'title' }]);
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }, { in: 'body', key: 'title' }] }]);
     return (options?.client ?? client).patch<SessionUpdateResponses, unknown, ThrowOnError>({
         url: '/session/{id}',
         ...options,
···
 export const sessionChildren = <ThrowOnError extends boolean = false>(parameters: {
     id: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [{ in: 'path', key: 'id' }]);
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]);
     return (options?.client ?? client).get<SessionChildrenResponses, unknown, ThrowOnError>({
         url: '/session/{id}/children',
         ...options,
···
     providerID?: string;
     modelID?: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [
-        { in: 'path', key: 'id' },
-        { in: 'body', key: 'messageID' },
-        { in: 'body', key: 'providerID' },
-        { in: 'body', key: 'modelID' }
-    ]);
+    const params = buildClientParams([parameters], [{ args: [
+                { in: 'path', key: 'id' },
+                { in: 'body', key: 'messageID' },
+                { in: 'body', key: 'providerID' },
+                { in: 'body', key: 'modelID' }
+            ] }]);
     return (options?.client ?? client).post<SessionInitResponses, unknown, ThrowOnError>({
         url: '/session/{id}/init',
         ...options,
···
 export const sessionAbort = <ThrowOnError extends boolean = false>(parameters: {
     id: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [{ in: 'path', key: 'id' }]);
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]);
     return (options?.client ?? client).post<SessionAbortResponses, unknown, ThrowOnError>({
         url: '/session/{id}/abort',
         ...options,
···
 export const sessionUnshare = <ThrowOnError extends boolean = false>(parameters: {
     id: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [{ in: 'path', key: 'id' }]);
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]);
     return (options?.client ?? client).delete<SessionUnshareResponses, unknown, ThrowOnError>({
         url: '/session/{id}/share',
         ...options,
···
 export const sessionShare = <ThrowOnError extends boolean = false>(parameters: {
     id: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [{ in: 'path', key: 'id' }]);
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]);
     return (options?.client ?? client).post<SessionShareResponses, unknown, ThrowOnError>({
         url: '/session/{id}/share',
         ...options,
···
     providerID?: string;
     modelID?: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [
-        { in: 'path', key: 'id' },
-        { in: 'body', key: 'providerID' },
-        { in: 'body', key: 'modelID' }
-    ]);
+    const params = buildClientParams([parameters], [{ args: [
+                { in: 'path', key: 'id' },
+                { in: 'body', key: 'providerID' },
+                { in: 'body', key: 'modelID' }
+            ] }]);
     return (options?.client ?? client).post<SessionSummarizeResponses, unknown, ThrowOnError>({
         url: '/session/{id}/summarize',
         ...options,
···
 export const sessionMessages = <ThrowOnError extends boolean = false>(parameters: {
     id: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [{ in: 'path', key: 'id' }]);
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]);
     return (options?.client ?? client).get<SessionMessagesResponses, unknown, ThrowOnError>({
         url: '/session/{id}/message',
         ...options,
···
         type: 'agent';
     } & AgentPartInput)>;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [
-        { in: 'path', key: 'id' },
-        { in: 'body', key: 'messageID' },
-        { in: 'body', key: 'providerID' },
-        { in: 'body', key: 'modelID' },
-        { in: 'body', key: 'agent' },
-        { in: 'body', key: 'system' },
-        { in: 'body', key: 'tools' },
-        { in: 'body', key: 'parts' }
-    ]);
+    const params = buildClientParams([parameters], [{ args: [
+                { in: 'path', key: 'id' },
+                { in: 'body', key: 'messageID' },
+                { in: 'body', key: 'providerID' },
+                { in: 'body', key: 'modelID' },
+                { in: 'body', key: 'agent' },
+                { in: 'body', key: 'system' },
+                { in: 'body', key: 'tools' },
+                { in: 'body', key: 'parts' }
+            ] }]);
     return (options?.client ?? client).post<SessionChatResponses, unknown, ThrowOnError>({
         url: '/session/{id}/message',
         ...options,
···
     id: string;
     messageID: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [{ in: 'path', key: 'id' }, { in: 'path', key: 'messageID' }]);
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }, { in: 'path', key: 'messageID' }] }]);
     return (options?.client ?? client).get<SessionMessageResponses, unknown, ThrowOnError>({
         url: '/session/{id}/message/{messageID}',
         ...options,
···
     agent?: string;
     command?: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [
-        { in: 'path', key: 'id' },
-        { in: 'body', key: 'agent' },
-        { in: 'body', key: 'command' }
-    ]);
+    const params = buildClientParams([parameters], [{ args: [
+                { in: 'path', key: 'id' },
+                { in: 'body', key: 'agent' },
+                { in: 'body', key: 'command' }
+            ] }]);
     return (options?.client ?? client).post<SessionShellResponses, unknown, ThrowOnError>({
         url: '/session/{id}/shell',
         ...options,
···
     messageID?: string;
     partID?: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [
-        { in: 'path', key: 'id' },
-        { in: 'body', key: 'messageID' },
-        { in: 'body', key: 'partID' }
-    ]);
+    const params = buildClientParams([parameters], [{ args: [
+                { in: 'path', key: 'id' },
+                { in: 'body', key: 'messageID' },
+                { in: 'body', key: 'partID' }
+            ] }]);
     return (options?.client ?? client).post<SessionRevertResponses, unknown, ThrowOnError>({
         url: '/session/{id}/revert',
         ...options,
···
 export const sessionUnrevert = <ThrowOnError extends boolean = false>(parameters: {
     id: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [{ in: 'path', key: 'id' }]);
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]);
     return (options?.client ?? client).post<SessionUnrevertResponses, unknown, ThrowOnError>({
         url: '/session/{id}/unrevert',
         ...options,
···
     permissionID: string;
     response?: 'once' | 'always' | 'reject';
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [
-        { in: 'path', key: 'id' },
-        { in: 'path', key: 'permissionID' },
-        { in: 'body', key: 'response' }
-    ]);
+    const params = buildClientParams([parameters], [{ args: [
+                { in: 'path', key: 'id' },
+                { in: 'path', key: 'permissionID' },
+                { in: 'body', key: 'response' }
+            ] }]);
     return (options?.client ?? client).post<PostSessionByIdPermissionsByPermissionIdResponses, unknown, ThrowOnError>({
         url: '/session/{id}/permissions/{permissionID}',
         ...options,
···
 export const findText = <ThrowOnError extends boolean = false>(parameters: {
     pattern: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [{ in: 'query', key: 'pattern' }]);
+    const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'pattern' }] }]);
     return (options?.client ?? client).get<FindTextResponses, unknown, ThrowOnError>({
         url: '/find',
         ...options,
···
 export const findFiles = <ThrowOnError extends boolean = false>(parameters: {
     query: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [{ in: 'query', key: 'query' }]);
+    const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'query' }] }]);
     return (options?.client ?? client).get<FindFilesResponses, unknown, ThrowOnError>({
         url: '/find/file',
         ...options,
···
 export const findSymbols = <ThrowOnError extends boolean = false>(parameters: {
     query: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [{ in: 'query', key: 'query' }]);
+    const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'query' }] }]);
     return (options?.client ?? client).get<FindSymbolsResponses, unknown, ThrowOnError>({
         url: '/find/symbol',
         ...options,
···
 export const fileRead = <ThrowOnError extends boolean = false>(parameters: {
     path: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [{ in: 'query', key: 'path' }]);
+    const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'path' }] }]);
     return (options?.client ?? client).get<FileReadResponses, unknown, ThrowOnError>({
         url: '/file',
         ...options,
···
         [key: string]: unknown;
     };
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [
-        { in: 'body', key: 'service' },
-        { in: 'body', key: 'level' },
-        { in: 'body', key: 'message' },
-        { in: 'body', key: 'extra' }
-    ]);
+    const params = buildClientParams([parameters], [{ args: [
+                { in: 'body', key: 'service' },
+                { in: 'body', key: 'level' },
+                { in: 'body', key: 'message' },
+                { in: 'body', key: 'extra' }
+            ] }]);
     return (options?.client ?? client).post<AppLogResponses, unknown, ThrowOnError>({
         url: '/log',
         ...options,
···
 export const tuiAppendPrompt = <ThrowOnError extends boolean = false>(parameters?: {
     text?: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [{ in: 'body', key: 'text' }]);
+    const params = buildClientParams([parameters], [{ args: [{ in: 'body', key: 'text' }] }]);
     return (options?.client ?? client).post<TuiAppendPromptResponses, unknown, ThrowOnError>({
         url: '/tui/append-prompt',
         ...options,
···
 export const tuiExecuteCommand = <ThrowOnError extends boolean = false>(parameters?: {
     command?: string;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [{ in: 'body', key: 'command' }]);
+    const params = buildClientParams([parameters], [{ args: [{ in: 'body', key: 'command' }] }]);
     return (options?.client ?? client).post<TuiExecuteCommandResponses, unknown, ThrowOnError>({
         url: '/tui/execute-command',
         ...options,
···
     message?: string;
     variant?: 'info' | 'success' | 'warning' | 'error';
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [
-        { in: 'body', key: 'title' },
-        { in: 'body', key: 'message' },
-        { in: 'body', key: 'variant' }
-    ]);
+    const params = buildClientParams([parameters], [{ args: [
+                { in: 'body', key: 'title' },
+                { in: 'body', key: 'message' },
+                { in: 'body', key: 'variant' }
+            ] }]);
     return (options?.client ?? client).post<TuiShowToastResponses, unknown, ThrowOnError>({
         url: '/tui/show-toast',
         ...options,
···
     id: string;
     auth?: Auth;
 }, options?: Options<never, ThrowOnError>) => {
-    const params = buildClientParams([parameters], [{ in: 'path', key: 'id' }, {}]);
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }, { key: 'auth', map: 'body' }] }]);
     return (options?.client ?? client).put<AuthSetResponses, AuthSetErrors, ThrowOnError>({
         url: '/auth/{id}',
         ...options,

packages/openapi-ts/src/plugins/@hey-api/sdk/shared/operation.ts

···
       const shape = $.object();
       if ('in' in field) {
         shape.prop('in', $.literal(field.in));
+      }
+      if ('key' in field) {
         if (field.key) {
           shape.prop('key', $.literal(field.key));
         }
···
     });
     statements.push(
       $.const('params').assign(
-        $(symbol.placeholder).call($.array(...args), $.array(...config)),
+        $(symbol.placeholder).call(
+          $.array(...args),
+          $.array($.object().prop('args', $.array(...config))),
+        ),
       ),
     );
     reqOptions.spread('params');