Merge branch 'main' into fix/discriminator-non-string-type-support

Author: mrlubos

.changeset/brown-ideas-matter.md

@@ -0,0 +1,5 @@
+---
+"@hey-api/shared": patch
+---
+
+**internal**: export schema walker interfaces

.changeset/clean-singers-stand.md

@@ -0,0 +1,9 @@
+---
+"@hey-api/openapi-ts": minor
+---
+
+**plugin(valibot)**: remove `enum.nodes.nullable` resolver node
+
+### Removed resolver node
+
+Valibot plugin no longer exposes the `enum.nodes.nullable` node. It was refactored so that nullable values are handled outside of resolvers.

.changeset/ninety-towns-act.md

@@ -0,0 +1,9 @@
+---
+"@hey-api/openapi-ts": minor
+---
+
+**plugin(zod)**: remove `enum.nodes.nullable` resolver node
+
+### Removed resolver node
+
+Zod plugin no longer exposes the `enum.nodes.nullable` node. It was refactored so that nullable values are handled outside of resolvers.

.changeset/proud-trains-lay.md

@@ -0,0 +1,5 @@
+---
+"@hey-api/openapi-ts": patch
+---
+
+**plugin(zod)**: use `.nullable()` and `.nullish()` methods

.changeset/stale-falcons-raise.md

@@ -0,0 +1,5 @@
+---
+"@hey-api/openapi-ts": patch
+---
+
+**plugin(valibot)**: use `.nullable()` and `.nullish()` methods

dev/inputs.ts

@@ -3,7 +3,7 @@ import path from 'node:path';
 import { getSpecsPath } from '../packages/openapi-ts-tests/utils';
 
 export const inputs = {
-  circular: path.resolve(getSpecsPath(), '3.1.x', 'circular.yaml'),
+  circular: path.resolve(getSpecsPath(), '3.0.x', 'circular.yaml'),
   full: path.resolve(getSpecsPath(), '3.1.x', 'full.yaml'),
   local: 'http://localhost:8000/openapi.json',
   opencode: path.resolve(getSpecsPath(), '3.1.x', 'opencode.yaml'),

dev/python/plugins.ts

@@ -3,17 +3,17 @@ import type { UserConfig } from '@hey-api/openapi-python';
 type PluginConfig = NonNullable<NonNullable<UserConfig['plugins']>[number]>;
 
 export function sdk(
-  options?: Partial<Omit<Extract<PluginConfig, { name: '@hey-api/python-sdk' }>, 'name'>>,
-) {
+  options?: Omit<Extract<PluginConfig, { name: '@hey-api/python-sdk' }>, 'name'>,
+): Extract<PluginConfig, { name: '@hey-api/python-sdk' }> {
   return {
     name: '@hey-api/python-sdk' as const,
     ...options,
   };
 }
 
 export function pydantic(
-  options?: Partial<Omit<Extract<PluginConfig, { name: 'pydantic' }>, 'name'>>,
-) {
+  options?: Omit<Extract<PluginConfig, { name: 'pydantic' }>, 'name'>,
+): Extract<PluginConfig, { name: 'pydantic' }> {
   return {
     name: 'pydantic' as const,
     ...options,

dev/typescript/plugins.ts

@@ -3,51 +3,53 @@ import type { UserConfig } from '@hey-api/openapi-ts';
 type PluginConfig = NonNullable<NonNullable<UserConfig['plugins']>[number]>;
 
 export function typescript(
-  options?: Partial<Omit<Extract<PluginConfig, { name: '@hey-api/typescript' }>, 'name'>>,
-) {
+  options?: Omit<Extract<PluginConfig, { name: '@hey-api/typescript' }>, 'name'>,
+): Extract<PluginConfig, { name: '@hey-api/typescript' }> {
   return {
     name: '@hey-api/typescript' as const,
     ...options,
   };
 }
 
 export function sdk(
-  options?: Partial<Omit<Extract<PluginConfig, { name: '@hey-api/sdk' }>, 'name'>>,
-) {
+  options?: Omit<Extract<PluginConfig, { name: '@hey-api/sdk' }>, 'name'>,
+): Extract<PluginConfig, { name: '@hey-api/sdk' }> {
   return {
     name: '@hey-api/sdk' as const,
     ...options,
   };
 }
 
-export function zod(options?: Partial<Omit<Extract<PluginConfig, { name: 'zod' }>, 'name'>>) {
+export function zod(
+  options?: Omit<Extract<PluginConfig, { name: 'zod' }>, 'name'>,
+): Extract<PluginConfig, { name: 'zod' }> {
   return {
     name: 'zod' as const,
     ...options,
   };
 }
 
 export function valibot(
-  options?: Partial<Omit<Extract<PluginConfig, { name: 'valibot' }>, 'name'>>,
-) {
+  options?: Omit<Extract<PluginConfig, { name: 'valibot' }>, 'name'>,
+): Extract<PluginConfig, { name: 'valibot' }> {
   return {
     name: 'valibot' as const,
     ...options,
   };
 }
 
 export function tanstackReactQuery(
-  options?: Partial<Omit<Extract<PluginConfig, { name: '@tanstack/react-query' }>, 'name'>>,
-) {
+  options?: Omit<Extract<PluginConfig, { name: '@tanstack/react-query' }>, 'name'>,
+): Extract<PluginConfig, { name: '@tanstack/react-query' }> {
   return {
     name: '@tanstack/react-query' as const,
     ...options,
   };
 }
 
 export function transformers(
-  options?: Partial<Omit<Extract<PluginConfig, { name: '@hey-api/transformers' }>, 'name'>>,
-) {
+  options?: Omit<Extract<PluginConfig, { name: '@hey-api/transformers' }>, 'name'>,
+): Extract<PluginConfig, { name: '@hey-api/transformers' }> {
   return {
     name: '@hey-api/transformers' as const,
     ...options,

docs/openapi-ts/migrating.md

@@ -7,6 +7,12 @@ description: Migrating to @hey-api/openapi-ts.
 
 While we try to avoid breaking changes, sometimes it's unavoidable in order to offer you the latest features. This page lists changes that require updates to your code. If you run into a problem with migration, please [open an issue](https://github.com/hey-api/openapi-ts/issues).
 
+## v0.93.0
+
+### Removed resolver node
+
+Valibot and Zod plugins no longer expose the `enum.nodes.nullable` node. Both plugins were refactored so that nullable values are handled outside of resolvers.
+
 ## v0.92.0
 
 ### Updated Symbol interface

packages/openapi-python/src/plugins/pydantic/shared/export.ts

@@ -1,25 +1,36 @@
-import type { Symbol } from '@hey-api/codegen-core';
-import type { IR } from '@hey-api/shared';
+import { applyNaming, pathToName } from '@hey-api/shared';
 
 // import { createSchemaComment } from '../../../plugins/shared/utils/schema';
 import { $ } from '../../../py-dsl';
+import type { ProcessorContext } from './processor';
 // import { identifiers } from '../v2/constants';
 // import { pipesToNode } from './pipes';
 import type { Ast, IrSchemaToAstOptions } from './types';
 
 export function exportAst({
-  // ast,
+  meta,
+  naming,
+  namingAnchor,
+  path,
   plugin,
-  // schema,
-  // state,
-  symbol,
-}: IrSchemaToAstOptions & {
-  ast: Ast;
-  schema: IR.SchemaObject;
-  symbol: Symbol;
-}): void {
-  // const v = plugin.external('valibot.v');
-  const classDef = $.class(symbol);
+  tags,
+}: Pick<IrSchemaToAstOptions, 'state'> &
+  ProcessorContext & {
+    ast: Ast;
+  }): void {
+  const name = pathToName(path, { anchor: namingAnchor });
+  const symbol = plugin.symbol(applyNaming(name, naming), {
+    meta: {
+      category: 'schema',
+      path,
+      tags,
+      tool: 'pydantic',
+      ...meta,
+    },
+  });
+
+  const baseModel = plugin.external('pydantic.BaseModel');
+  const classDef = $.class(symbol).extends(baseModel);
   // .export()
   // .$if(plugin.config.comments && createSchemaComment(schema), (c, v) => c.doc(v))
   // .$if(state.hasLazyExpression['~ref'], (c) =>