Merge branch 'main' into fix/pinia-colada-query-error-type

Author: mrlubos

.changeset/bitter-lines-hammer.md

@@ -0,0 +1,5 @@
+---
+"@hey-api/shared": patch
+---
+
+**output**: context file is optional

.changeset/busy-plums-cover.md

@@ -0,0 +1,5 @@
+---
+"@hey-api/openapi-ts": patch
+---
+
+**dsl(reserved)**: expand reserved keywords with more globals

.changeset/poor-beds-arrive.md

@@ -0,0 +1,5 @@
+---
+"@hey-api/openapi-ts": patch
+---
+
+**output(header)**: fix: support function signature in client and core files

dev/hey-api.ts

@@ -1,5 +1,5 @@
 // @ts-ignore
-import type { CreateClientConfig } from './client/client.gen';
+import type { CreateClientConfig } from './.gen/typescript/client.gen';
 
 // @ts-ignore
 export const createClientConfig: CreateClientConfig = (config) => ({

dev/playground.ts

@@ -1,7 +1,7 @@
 import type { DefinePlugin, IR } from '@hey-api/openapi-ts';
 
 // import { createOpencode } from '@opencode-ai/sdk';
-import { PetStore } from './.gen/sdk.gen.ts';
+import { PetStore } from './.gen/typescript/sdk.gen.ts';
 
 type MyPluginConfig = { readonly name: 'myplugin' };
 type MyPlugin = DefinePlugin<MyPluginConfig>;

dev/python/plugins.ts

@@ -1,6 +1,6 @@
 import type { UserConfig } from '@hey-api/openapi-python';
 
-type PluginConfig = NonNullable<NonNullable<UserConfig['plugins']>[number]>;
+export type PluginConfig = NonNullable<NonNullable<UserConfig['plugins']>[number]>;
 
 export function sdk(
   options?: Omit<Extract<PluginConfig, { name: '@hey-api/python-sdk' }>, 'name'>,

dev/python/presets.ts

@@ -1,3 +1,4 @@
+import type { PluginConfig } from './plugins';
 import { pydantic, sdk } from './plugins';
 
 export const presets = {
@@ -19,7 +20,7 @@ export const presets = {
     sdk(),
     pydantic(),
   ],
-} as const;
+} as const satisfies Record<string, () => ReadonlyArray<PluginConfig>>;
 
 export type PresetKey = keyof typeof presets;
 

dev/typescript/plugins.ts

@@ -1,6 +1,6 @@
 import type { UserConfig } from '@hey-api/openapi-ts';
 
-type PluginConfig = NonNullable<NonNullable<UserConfig['plugins']>[number]>;
+export type PluginConfig = NonNullable<NonNullable<UserConfig['plugins']>[number]>;
 
 export function typescript(
   options?: Omit<Extract<PluginConfig, { name: '@hey-api/typescript' }>, 'name'>,

dev/typescript/presets.ts

@@ -1,3 +1,4 @@
+import type { PluginConfig } from './plugins';
 import { sdk, tanstackReactQuery, transformers, typescript, valibot, zod } from './plugins';
 
 export const presets = {
@@ -36,7 +37,7 @@ export const presets = {
     valibot({ metadata: true }),
     zod({ metadata: true }),
   ],
-} as const;
+} as const satisfies Record<string, () => ReadonlyArray<PluginConfig>>;
 
 export type PresetKey = keyof typeof presets;
 

packages/openapi-python/src/generate/client.ts

@@ -4,7 +4,7 @@ import { fileURLToPath } from 'node:url';
 
 import type { IProject, ProjectRenderMeta } from '@hey-api/codegen-core';
 import type { DefinePlugin, OutputHeader } from '@hey-api/shared';
-import { ensureDirSync } from '@hey-api/shared';
+import { ensureDirSync, outputHeaderToPrefix } from '@hey-api/shared';
 
 import type { Config } from '../config/types';
 import type { Client } from '../plugins/@hey-api/client-core/types';
@@ -53,21 +53,6 @@ function getClientBundlePaths(pluginName: string): {
   };
 }
 
-/**
- * Converts an {@link OutputHeader} value to a string prefix for file content.
- * Returns an empty string when the header is null, undefined, or a function
- * (functions require a render context which is not available for bundled files).
- */
-function outputHeaderToPrefix(header: OutputHeader): string {
-  if (header == null || typeof header === 'function') return '';
-  const lines =
-    typeof header === 'string'
-      ? header.split(/\r?\n/)
-      : header.flatMap((line) => line.split(/\r?\n/));
-  const content = lines.join('\n');
-  return content ? `${content}\n\n` : '';
-}
-
 /**
  * Returns absolute path to the client folder. This is hard-coded for now.
  */
@@ -186,11 +171,11 @@ export function generateClientBundle({
   meta: ProjectRenderMeta;
   outputPath: string;
   plugin: DefinePlugin<Client.Config & { name: string }>['Config'];
-  project?: IProject;
+  project: IProject;
 }): Map<string, string> | undefined {
   const renamed = new Map<string, string>();
   const devMode = isDevMode();
-  const headerPrefix = outputHeaderToPrefix(header);
+  const headerPrefix = outputHeaderToPrefix(header, project);
 
   // copy Hey API clients to output
   const isHeyApiClientPlugin = plugin.name.startsWith('@hey-api/client-');