Merge pull request #3370 from hey-api/refactor/plugin-ir-ref

refactor: allow path in top-level detect function

Author: mrlubos

.changeset/fluffy-words-dress.md

@@ -0,0 +1,5 @@
+---
+"@hey-api/shared": minor
+---
+
+**utils**: rename `isTopLevelComponentRef` to `isTopLevelComponent`

.changeset/smart-comics-talk.md

@@ -0,0 +1,5 @@
+---
+"@hey-api/openapi-ts": patch
+---
+
+**internal**: use shared schema processor

dev/openapi-python.config.ts

@@ -12,7 +12,7 @@ export default defineConfig(() => [
       path: './logs',
     },
     output: {
-      path: path.resolve(__dirname, '..', '.gen', 'python'),
+      path: path.resolve(__dirname, '.gen', 'python'),
     },
     plugins: getPreset(),
   },

dev/openapi-ts.config.ts

@@ -12,7 +12,7 @@ export default defineConfig(() => [
       path: './logs',
     },
     output: {
-      path: path.resolve(__dirname, '..', '.gen', 'typescript'),
+      path: path.resolve(__dirname, '.gen', 'typescript'),
     },
     plugins: getPreset(),
   },

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

@@ -1,5 +1,5 @@
 import type { Refs, Symbol, SymbolMeta } from '@hey-api/codegen-core';
-import type { IR } from '@hey-api/shared';
+import type { IR, SchemaExtractor } from '@hey-api/shared';
 
 import type { $ } from '../../../py-dsl';
 import type { PydanticPlugin } from '../types';
@@ -29,7 +29,11 @@ export type Ast = {
 };
 
 export type IrSchemaToAstOptions = {
+  /** The plugin instance. */
   plugin: PydanticPlugin['Instance'];
+  /** Optional schema extractor function. */
+  schemaExtractor?: SchemaExtractor;
+  /** The plugin state references. */
   state: Refs<PluginState>;
 };
 

packages/openapi-python/src/plugins/pydantic/v2/plugin.ts

@@ -13,11 +13,24 @@ export function irSchemaToAst({
   optional,
   plugin,
   schema,
+  schemaExtractor,
   state,
 }: IrSchemaToAstOptions & {
   optional?: boolean;
   schema: IR.SchemaObject;
 }): Ast {
+  if (schemaExtractor && !schema.$ref) {
+    const extracted = schemaExtractor({
+      meta: {
+        resource: 'definition',
+        resourceId: pathToJsonPointer(fromRef(state.path)),
+      },
+      path: fromRef(state.path),
+      schema,
+    });
+    if (extracted !== schema) schema = extracted;
+  }
+
   if (schema.$ref) {
     const query: SymbolMeta = {
       category: 'schema',

packages/openapi-ts/src/plugins/@hey-api/typescript/shared/types.ts

@@ -1,9 +1,14 @@
 import type { Refs, SymbolMeta } from '@hey-api/codegen-core';
+import type { SchemaExtractor } from '@hey-api/shared';
 
 import type { HeyApiTypeScriptPlugin } from '../types';
 
 export type IrSchemaToAstOptions = {
+  /** The plugin instance. */
   plugin: HeyApiTypeScriptPlugin['Instance'];
+  /** Optional schema extractor function. */
+  schemaExtractor?: SchemaExtractor;
+  /** The plugin state references. */
   state: Refs<PluginState>;
 };
 

packages/openapi-ts/src/plugins/@hey-api/typescript/v1/plugin.ts

@@ -1,9 +1,7 @@
 import type { Symbol } from '@hey-api/codegen-core';
-import { refs } from '@hey-api/codegen-core';
-import type { IR } from '@hey-api/shared';
-import type { SchemaWithType } from '@hey-api/shared';
-import { applyNaming } from '@hey-api/shared';
-import { deduplicateSchema } from '@hey-api/shared';
+import { fromRef, refs } from '@hey-api/codegen-core';
+import type { IR, SchemaWithType } from '@hey-api/shared';
+import { applyNaming, deduplicateSchema, pathToJsonPointer } from '@hey-api/shared';
 
 import type { MaybeTsDsl, TypeTsDsl } from '../../../../ts-dsl';
 import { $ } from '../../../../ts-dsl';
@@ -18,10 +16,23 @@ import { irSchemaWithTypeToAst } from './toAst';
 export function irSchemaToAst({
   plugin,
   schema,
+  schemaExtractor,
   state,
 }: IrSchemaToAstOptions & {
   schema: IR.SchemaObject;
 }): MaybeTsDsl<TypeTsDsl> {
+  if (schemaExtractor && !schema.$ref) {
+    const extracted = schemaExtractor({
+      meta: {
+        resource: 'definition',
+        resourceId: pathToJsonPointer(fromRef(state.path)),
+      },
+      path: fromRef(state.path),
+      schema,
+    });
+    if (extracted !== schema) schema = extracted;
+  }
+
   if (schema.symbolRef) {
     const baseType = $.type(schema.symbolRef);
     if (schema.omit && schema.omit.length > 0) {

packages/openapi-ts/src/plugins/arktype/shared/types.ts

@@ -1,5 +1,5 @@
 import type { Refs, SymbolMeta } from '@hey-api/codegen-core';
-import type { IR } from '@hey-api/shared';
+import type { IR, SchemaExtractor } from '@hey-api/shared';
 import type ts from 'typescript';
 
 import type { $ } from '../../../ts-dsl';
@@ -13,7 +13,11 @@ export type Ast = {
 };
 
 export type IrSchemaToAstOptions = {
+  /** The plugin instance. */
   plugin: ArktypePlugin['Instance'];
+  /** Optional schema extractor function. */
+  schemaExtractor?: SchemaExtractor;
+  /** The plugin state references. */
   state: Refs<PluginState>;
 };
 

packages/openapi-ts/src/plugins/arktype/v2/plugin.ts

@@ -13,6 +13,7 @@ export function irSchemaToAst({
   // optional,
   plugin,
   schema,
+  schemaExtractor,
   state,
 }: IrSchemaToAstOptions & {
   /**
@@ -23,6 +24,18 @@ export function irSchemaToAst({
   optional?: boolean;
   schema: IR.SchemaObject;
 }): Ast {
+  if (schemaExtractor && !schema.$ref) {
+    const extracted = schemaExtractor({
+      meta: {
+        resource: 'definition',
+        resourceId: pathToJsonPointer(fromRef(state.path)),
+      },
+      path: fromRef(state.path),
+      schema,
+    });
+    if (extracted !== schema) schema = extracted;
+  }
+
   let ast: Partial<Ast> = {};
 
   // const z = plugin.referenceSymbol({