diff --git a/packages/openapi-ts/src/plugins/@faker-js/faker/api.ts b/packages/openapi-ts/src/plugins/@faker-js/faker/api.ts index 2efdfa9fd..12dfaf6e8 100644 --- a/packages/openapi-ts/src/plugins/@faker-js/faker/api.ts +++ b/packages/openapi-ts/src/plugins/@faker-js/faker/api.ts @@ -7,25 +7,38 @@ export type IApi = { /** * Generate a Faker expression for a schema. * - * Returns an expression that, when executed, produces a valid instance. + * Returns an expression that produces a valid instance when executed. + * Use when you need one-off generation without referencing shared artifacts. + * + * @example + * ```ts + * { + * name: faker.person.fullName(), + * email: faker.internet.email() + * } + * ``` */ - generateValue(schema: IR.SchemaObject): Expression; + toNode(schema: IR.SchemaObject): Expression; /** - * Get a reference to an exported generator function. + * Get a reference to a generated Faker expression for a schema. + * + * Returns a call expression referencing the shared artifact. + * If the artifact doesn't exist, it will be created. * - * Returns an identifier that can be called, e.g., `fakeUser()` + * @example + * // Returns: fakeUser() */ - getGeneratorRef(schema: IR.SchemaObject): Expression; + toNodeRef(schema: IR.SchemaObject): Expression; }; export class Api implements IApi { // eslint-disable-next-line @typescript-eslint/no-unused-vars - generateValue(_schema: IR.SchemaObject): Expression { + toNode(_schema: IR.SchemaObject): Expression { return undefined as any; } // eslint-disable-next-line @typescript-eslint/no-unused-vars - getGeneratorRef(_schema: IR.SchemaObject): Expression { + toNodeRef(_schema: IR.SchemaObject): Expression { return undefined as any; } } diff --git a/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/class.ts b/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/class.ts index 3906b8904..1dd6c211e 100644 --- a/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/class.ts +++ b/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/class.ts @@ -74,10 +74,7 @@ export const createClientClass = ({ }): ReturnType => { const symClient = plugin.getSymbol({ category: 'client' }); const optionalClient = Boolean(plugin.config.client && symClient); - const symbolClient = plugin.referenceSymbol({ - category: 'external', - resource: 'client.Client', - }); + const symbolClient = plugin.external('client.Client'); return $.class(symbol) .field('client', (f) => f.protected().type(symbolClient)) .newline() 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 index b43f5a41a..26da27b8c 100644 --- a/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/operation.ts +++ b/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/operation.ts @@ -254,10 +254,7 @@ export const operationStatements = ({ if (operation.body) { switch (operation.body.type) { case 'form-data': { - const symbol = plugin.referenceSymbol({ - category: 'external', - resource: 'client.formDataBodySerializer', - }); + const symbol = plugin.external('client.formDataBodySerializer'); reqOptions.spread(symbol); break; } @@ -270,10 +267,7 @@ export const operationStatements = ({ reqOptions.prop('bodySerializer', $.literal(null)); break; case 'url-search-params': { - const symbol = plugin.referenceSymbol({ - category: 'external', - resource: 'client.urlSearchParamsBodySerializer', - }); + const symbol = plugin.external('client.urlSearchParamsBodySerializer'); reqOptions.spread(symbol); break; } @@ -423,10 +417,7 @@ export const operationStatements = ({ } config.push(shape); } - const symbol = plugin.referenceSymbol({ - category: 'external', - resource: 'client.buildClientParams', - }); + const symbol = plugin.external('client.buildClientParams'); statements.push( $.const('params').assign( $(symbol).call( diff --git a/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/typeOptions.ts b/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/typeOptions.ts index 034ed45bb..fa55023c7 100644 --- a/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/typeOptions.ts +++ b/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/typeOptions.ts @@ -49,12 +49,7 @@ export const createTypeOptions = ({ t .generic('TComposable', (g) => g - .extends( - plugin.referenceSymbol({ - category: 'external', - resource: 'client.Composable', - }), - ) + .extends(plugin.external('client.Composable')) .default($.type.literal('$fetch')), ) .generic('TData', (g) => diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts b/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts index 1699ce288..869b8f3a4 100644 --- a/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts +++ b/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts @@ -16,10 +16,9 @@ export const createMutationOptions = ({ operation: IR.OperationObject; plugin: PiniaColadaPlugin['Instance']; }): void => { - const symbolMutationOptionsType = plugin.referenceSymbol({ - category: 'external', - resource: `${plugin.name}.UseMutationOptions`, - }); + const symbolMutationOptionsType = plugin.external( + `${plugin.name}.UseMutationOptions`, + ); const client = getClientPlugin(plugin.context.config); const isNuxtClient = client.name === '@hey-api/client-nuxt'; diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/queryKey.ts b/packages/openapi-ts/src/plugins/@pinia/colada/queryKey.ts index e53e83d8b..2d2d809b8 100644 --- a/packages/openapi-ts/src/plugins/@pinia/colada/queryKey.ts +++ b/packages/openapi-ts/src/plugins/@pinia/colada/queryKey.ts @@ -37,10 +37,7 @@ export const createQueryKeyFunction = ({ resource: 'QueryKey', tool: plugin.name, }); - const symbolJsonValue = plugin.referenceSymbol({ - category: 'external', - resource: `${plugin.name}._JSONValue`, - }); + const symbolJsonValue = plugin.external(`${plugin.name}._JSONValue`); const returnType = $.type(symbolQueryKeyType).generic(TOptionsType).idx(0); @@ -157,10 +154,7 @@ export const createQueryKeyType = ({ }: { plugin: PiniaColadaPlugin['Instance']; }) => { - const symbolJsonValue = plugin.referenceSymbol({ - category: 'external', - resource: `${plugin.name}._JSONValue`, - }); + const symbolJsonValue = plugin.external(`${plugin.name}._JSONValue`); const symbolOptions = plugin.referenceSymbol({ category: 'type', diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts b/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts index 1158576b2..3108635ae 100644 --- a/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts +++ b/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts @@ -137,10 +137,9 @@ export const createQueryOptions = ({ }, }, ); - const symbolDefineQueryOptions = plugin.referenceSymbol({ - category: 'external', - resource: `${plugin.name}.defineQueryOptions`, - }); + const symbolDefineQueryOptions = plugin.external( + `${plugin.name}.defineQueryOptions`, + ); const statement = $.const(symbolQueryOptionsFn) .export() .$if(plugin.config.comments && createOperationComment(operation), (c, v) => diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/useType.ts b/packages/openapi-ts/src/plugins/@pinia/colada/useType.ts index 274580b5c..3b18d9742 100644 --- a/packages/openapi-ts/src/plugins/@pinia/colada/useType.ts +++ b/packages/openapi-ts/src/plugins/@pinia/colada/useType.ts @@ -32,10 +32,7 @@ export const useTypeError = ({ }); const symbolError = symbolErrorType || 'Error'; if (client.name === '@hey-api/client-axios') { - const symbol = plugin.referenceSymbol({ - category: 'external', - resource: 'axios.AxiosError', - }); + const symbol = plugin.external('axios.AxiosError'); return $.type(symbol).generic(symbolError); } return $.type(symbolError); diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/shared/useType.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/shared/useType.ts index b135e983b..dc8e2be37 100644 --- a/packages/openapi-ts/src/plugins/@tanstack/query-core/shared/useType.ts +++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/shared/useType.ts @@ -31,16 +31,9 @@ export const useTypeError = ({ role: 'error', }); const symbolError = - symbolErrorType || - plugin.referenceSymbol({ - category: 'external', - resource: `${plugin.name}.DefaultError`, - }); + symbolErrorType || plugin.external(`${plugin.name}.DefaultError`); if (client.name === '@hey-api/client-axios') { - const symbol = plugin.referenceSymbol({ - category: 'external', - resource: 'axios.AxiosError', - }); + const symbol = plugin.external('axios.AxiosError'); return $.type(symbol).generic(symbolError); } return $.type(symbolError); diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/infiniteQueryOptions.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/infiniteQueryOptions.ts index dcca19314..649e8a03d 100644 --- a/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/infiniteQueryOptions.ts +++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/infiniteQueryOptions.ts @@ -144,14 +144,10 @@ export const createInfiniteQueryOptions = ({ createInfiniteParamsFunction({ plugin }); } - const symbolInfiniteQueryOptions = plugin.referenceSymbol({ - category: 'external', - resource: `${plugin.name}.infiniteQueryOptions`, - }); - const symbolInfiniteDataType = plugin.referenceSymbol({ - category: 'external', - resource: `${plugin.name}.InfiniteData`, - }); + const symbolInfiniteQueryOptions = plugin.external( + `${plugin.name}.infiniteQueryOptions`, + ); + const symbolInfiniteDataType = plugin.external(`${plugin.name}.InfiniteData`); const typeData = useTypeData({ operation, plugin }); const typeResponse = useTypeResponse({ operation, plugin }); diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/mutationOptions.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/mutationOptions.ts index 1a42526ee..9861f479d 100644 --- a/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/mutationOptions.ts +++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/mutationOptions.ts @@ -15,10 +15,9 @@ export const createMutationOptions = ({ operation: IR.OperationObject; plugin: PluginInstance; }): void => { - const symbolMutationOptionsType = plugin.referenceSymbol({ - category: 'external', - resource: `${plugin.name}.MutationOptions`, - }); + const symbolMutationOptionsType = plugin.external( + `${plugin.name}.MutationOptions`, + ); const typeData = useTypeData({ operation, plugin }); const mutationType = $.type(symbolMutationOptionsType) diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/queryOptions.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/queryOptions.ts index 61dc8a667..41fb876ac 100644 --- a/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/queryOptions.ts +++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/queryOptions.ts @@ -46,10 +46,7 @@ export const createQueryOptions = ({ createQueryKeyFunction({ plugin }); } - const symbolQueryOptions = plugin.referenceSymbol({ - category: 'external', - resource: `${plugin.name}.queryOptions`, - }); + const symbolQueryOptions = plugin.external(`${plugin.name}.queryOptions`); const symbolQueryKey = plugin.symbol( applyNaming(operation.id, plugin.config.queryKeys), diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/useQuery.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/useQuery.ts index fa08ff11b..5d9963723 100644 --- a/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/useQuery.ts +++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/v5/useQuery.ts @@ -31,10 +31,7 @@ export const createUseQuery = ({ applyNaming(operation.id, plugin.config.useQuery), ); - const symbolUseQuery = plugin.referenceSymbol({ - category: 'external', - resource: `${plugin.name}.useQuery`, - }); + const symbolUseQuery = plugin.external(`${plugin.name}.useQuery`); const isRequiredOptions = isOperationOptionsRequired({ context: plugin.context, diff --git a/packages/openapi-ts/src/plugins/arktype/shared/export.ts b/packages/openapi-ts/src/plugins/arktype/shared/export.ts index d94322e5f..928e8279e 100644 --- a/packages/openapi-ts/src/plugins/arktype/shared/export.ts +++ b/packages/openapi-ts/src/plugins/arktype/shared/export.ts @@ -21,10 +21,7 @@ export const exportAst = ({ symbol: Symbol; typeInferSymbol: Symbol | undefined; }): void => { - const type = plugin.referenceSymbol({ - category: 'external', - resource: 'arktype.type', - }); + const type = plugin.external('arktype.type'); const statement = $.const(symbol) .export() diff --git a/packages/openapi-ts/src/plugins/arktype/v2/toAst/index.ts b/packages/openapi-ts/src/plugins/arktype/v2/toAst/index.ts index 326c2e316..272498627 100644 --- a/packages/openapi-ts/src/plugins/arktype/v2/toAst/index.ts +++ b/packages/openapi-ts/src/plugins/arktype/v2/toAst/index.ts @@ -85,10 +85,7 @@ export const irSchemaWithTypeToAst = ({ // }); } - const type = args.plugin.referenceSymbol({ - category: 'external', - resource: 'arktype.type', - }); + const type = args.plugin.external('arktype.type'); const expression = $(type).call( $.object() diff --git a/packages/openapi-ts/src/plugins/swr/v2/useSwr.ts b/packages/openapi-ts/src/plugins/swr/v2/useSwr.ts index ff0de7994..aa56677cb 100644 --- a/packages/openapi-ts/src/plugins/swr/v2/useSwr.ts +++ b/packages/openapi-ts/src/plugins/swr/v2/useSwr.ts @@ -20,10 +20,7 @@ export const createUseSwr = ({ return; } - const symbolUseSwr = plugin.referenceSymbol({ - category: 'external', - resource: 'swr', - }); + const symbolUseSwr = plugin.external('swr'); const symbolUseQueryFn = plugin.symbol( applyNaming(operation.id, plugin.config.useSwr), ); diff --git a/packages/openapi-ts/src/plugins/valibot/shared/export.ts b/packages/openapi-ts/src/plugins/valibot/shared/export.ts index f09ede243..e35d197e7 100644 --- a/packages/openapi-ts/src/plugins/valibot/shared/export.ts +++ b/packages/openapi-ts/src/plugins/valibot/shared/export.ts @@ -19,11 +19,7 @@ export const exportAst = ({ schema: IR.SchemaObject; symbol: Symbol; }): void => { - const v = plugin.referenceSymbol({ - category: 'external', - resource: 'valibot.v', - }); - + const v = plugin.external('valibot.v'); const statement = $.const(symbol) .export() .$if(plugin.config.comments && createSchemaComment(schema), (c, v) => diff --git a/packages/openapi-ts/src/plugins/valibot/v1/plugin.ts b/packages/openapi-ts/src/plugins/valibot/v1/plugin.ts index e6f401c55..af9056c29 100644 --- a/packages/openapi-ts/src/plugins/valibot/v1/plugin.ts +++ b/packages/openapi-ts/src/plugins/valibot/v1/plugin.ts @@ -36,10 +36,7 @@ export const irSchemaToAst = ({ pipes: [], }; - const v = plugin.referenceSymbol({ - category: 'external', - resource: 'valibot.v', - }); + const v = plugin.external('valibot.v'); if (schema.$ref) { const query: SymbolMeta = { diff --git a/packages/openapi-ts/src/plugins/valibot/v1/toAst/array.ts b/packages/openapi-ts/src/plugins/valibot/v1/toAst/array.ts index 85a9b5711..250641a8b 100644 --- a/packages/openapi-ts/src/plugins/valibot/v1/toAst/array.ts +++ b/packages/openapi-ts/src/plugins/valibot/v1/toAst/array.ts @@ -21,10 +21,7 @@ export const arrayToAst = ({ pipes: [], }; - const v = plugin.referenceSymbol({ - category: 'external', - resource: 'valibot.v', - }); + const v = plugin.external('valibot.v'); const functionName = $(v).attr(identifiers.schemas.array); if (!schema.items) { diff --git a/packages/openapi-ts/src/plugins/valibot/v1/toAst/boolean.ts b/packages/openapi-ts/src/plugins/valibot/v1/toAst/boolean.ts index 2d8d738fc..caaf34982 100644 --- a/packages/openapi-ts/src/plugins/valibot/v1/toAst/boolean.ts +++ b/packages/openapi-ts/src/plugins/valibot/v1/toAst/boolean.ts @@ -13,10 +13,7 @@ export const booleanToAst = ({ }): ReturnType => { const pipes: Array> = []; - const v = plugin.referenceSymbol({ - category: 'external', - resource: 'valibot.v', - }); + const v = plugin.external('valibot.v'); if (typeof schema.const === 'boolean') { pipes.push( diff --git a/packages/openapi-ts/src/plugins/valibot/v1/toAst/enum.ts b/packages/openapi-ts/src/plugins/valibot/v1/toAst/enum.ts index 864937b39..85f2aaadb 100644 --- a/packages/openapi-ts/src/plugins/valibot/v1/toAst/enum.ts +++ b/packages/openapi-ts/src/plugins/valibot/v1/toAst/enum.ts @@ -35,10 +35,7 @@ export const enumToAst = ({ }); } - const v = plugin.referenceSymbol({ - category: 'external', - resource: 'valibot.v', - }); + const v = plugin.external('valibot.v'); let resultExpression = $(v) .attr(identifiers.schemas.picklist) diff --git a/packages/openapi-ts/src/plugins/valibot/v1/toAst/never.ts b/packages/openapi-ts/src/plugins/valibot/v1/toAst/never.ts index 937e92814..5913bc52a 100644 --- a/packages/openapi-ts/src/plugins/valibot/v1/toAst/never.ts +++ b/packages/openapi-ts/src/plugins/valibot/v1/toAst/never.ts @@ -9,10 +9,7 @@ export const neverToAst = ({ }: IrSchemaToAstOptions & { schema: SchemaWithType<'never'>; }) => { - const v = plugin.referenceSymbol({ - category: 'external', - resource: 'valibot.v', - }); + const v = plugin.external('valibot.v'); const expression = $(v).attr(identifiers.schemas.never).call(); return expression; }; diff --git a/packages/openapi-ts/src/plugins/valibot/v1/toAst/null.ts b/packages/openapi-ts/src/plugins/valibot/v1/toAst/null.ts index db4e25f7c..d42ff0f96 100644 --- a/packages/openapi-ts/src/plugins/valibot/v1/toAst/null.ts +++ b/packages/openapi-ts/src/plugins/valibot/v1/toAst/null.ts @@ -9,10 +9,7 @@ export const nullToAst = ({ }: IrSchemaToAstOptions & { schema: SchemaWithType<'null'>; }) => { - const v = plugin.referenceSymbol({ - category: 'external', - resource: 'valibot.v', - }); + const v = plugin.external('valibot.v'); const expression = $(v).attr(identifiers.schemas.null).call(); return expression; }; diff --git a/packages/openapi-ts/src/plugins/valibot/v1/toAst/tuple.ts b/packages/openapi-ts/src/plugins/valibot/v1/toAst/tuple.ts index a6480e7f5..36d84975a 100644 --- a/packages/openapi-ts/src/plugins/valibot/v1/toAst/tuple.ts +++ b/packages/openapi-ts/src/plugins/valibot/v1/toAst/tuple.ts @@ -18,10 +18,7 @@ export const tupleToAst = ({ }): Omit => { const result: Partial> = {}; - const v = plugin.referenceSymbol({ - category: 'external', - resource: 'valibot.v', - }); + const v = plugin.external('valibot.v'); if (schema.const && Array.isArray(schema.const)) { const tupleElements = schema.const.map((value) => diff --git a/packages/openapi-ts/src/plugins/valibot/v1/toAst/undefined.ts b/packages/openapi-ts/src/plugins/valibot/v1/toAst/undefined.ts index 9d7a9f41d..e3fc0747b 100644 --- a/packages/openapi-ts/src/plugins/valibot/v1/toAst/undefined.ts +++ b/packages/openapi-ts/src/plugins/valibot/v1/toAst/undefined.ts @@ -9,11 +9,7 @@ export const undefinedToAst = ({ }: IrSchemaToAstOptions & { schema: SchemaWithType<'undefined'>; }) => { - const v = plugin.referenceSymbol({ - category: 'external', - resource: 'valibot.v', - }); - + const v = plugin.external('valibot.v'); const expression = $(v).attr(identifiers.schemas.undefined).call(); return expression; }; diff --git a/packages/openapi-ts/src/plugins/valibot/v1/toAst/unknown.ts b/packages/openapi-ts/src/plugins/valibot/v1/toAst/unknown.ts index c8765bcf2..ff00e277c 100644 --- a/packages/openapi-ts/src/plugins/valibot/v1/toAst/unknown.ts +++ b/packages/openapi-ts/src/plugins/valibot/v1/toAst/unknown.ts @@ -9,11 +9,7 @@ export const unknownToAst = ({ }: IrSchemaToAstOptions & { schema: SchemaWithType<'unknown'>; }) => { - const v = plugin.referenceSymbol({ - category: 'external', - resource: 'valibot.v', - }); - + const v = plugin.external('valibot.v'); const expression = $(v).attr(identifiers.schemas.unknown).call(); return expression; }; diff --git a/packages/openapi-ts/src/plugins/valibot/v1/toAst/void.ts b/packages/openapi-ts/src/plugins/valibot/v1/toAst/void.ts index 375a020a4..0e0e5b692 100644 --- a/packages/openapi-ts/src/plugins/valibot/v1/toAst/void.ts +++ b/packages/openapi-ts/src/plugins/valibot/v1/toAst/void.ts @@ -9,11 +9,7 @@ export const voidToAst = ({ }: IrSchemaToAstOptions & { schema: SchemaWithType<'void'>; }) => { - const v = plugin.referenceSymbol({ - category: 'external', - resource: 'valibot.v', - }); - + const v = plugin.external('valibot.v'); const expression = $(v).attr(identifiers.schemas.void).call(); return expression; }; diff --git a/packages/openapi-ts/src/plugins/zod/mini/plugin.ts b/packages/openapi-ts/src/plugins/zod/mini/plugin.ts index 80c43a60c..bd6dc371f 100644 --- a/packages/openapi-ts/src/plugins/zod/mini/plugin.ts +++ b/packages/openapi-ts/src/plugins/zod/mini/plugin.ts @@ -34,10 +34,7 @@ export const irSchemaToAst = ({ }): Ast => { let ast: Partial = {}; - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); if (schema.$ref) { const query: SymbolMeta = { diff --git a/packages/openapi-ts/src/plugins/zod/mini/toAst/array.ts b/packages/openapi-ts/src/plugins/zod/mini/toAst/array.ts index 2f62be7e8..1488ebfb6 100644 --- a/packages/openapi-ts/src/plugins/zod/mini/toAst/array.ts +++ b/packages/openapi-ts/src/plugins/zod/mini/toAst/array.ts @@ -16,10 +16,7 @@ export const arrayToAst = ({ }: IrSchemaToAstOptions & { schema: SchemaWithType<'array'>; }): Omit => { - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); const result: Partial> = {}; diff --git a/packages/openapi-ts/src/plugins/zod/mini/toAst/boolean.ts b/packages/openapi-ts/src/plugins/zod/mini/toAst/boolean.ts index 065f6f7bd..db72e81b2 100644 --- a/packages/openapi-ts/src/plugins/zod/mini/toAst/boolean.ts +++ b/packages/openapi-ts/src/plugins/zod/mini/toAst/boolean.ts @@ -13,10 +13,7 @@ export const booleanToAst = ({ const result: Partial> = {}; let chain: ReturnType; - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); if (typeof schema.const === 'boolean') { chain = $(z).attr(identifiers.literal).call($.literal(schema.const)); diff --git a/packages/openapi-ts/src/plugins/zod/mini/toAst/enum.ts b/packages/openapi-ts/src/plugins/zod/mini/toAst/enum.ts index aabcd77af..11a247b3d 100644 --- a/packages/openapi-ts/src/plugins/zod/mini/toAst/enum.ts +++ b/packages/openapi-ts/src/plugins/zod/mini/toAst/enum.ts @@ -12,10 +12,7 @@ export const enumToAst = ({ }: IrSchemaToAstOptions & { schema: SchemaWithType<'enum'>; }): Omit => { - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); const result: Partial> = {}; diff --git a/packages/openapi-ts/src/plugins/zod/mini/toAst/never.ts b/packages/openapi-ts/src/plugins/zod/mini/toAst/never.ts index 05bda512f..a72ba74a8 100644 --- a/packages/openapi-ts/src/plugins/zod/mini/toAst/never.ts +++ b/packages/openapi-ts/src/plugins/zod/mini/toAst/never.ts @@ -9,10 +9,7 @@ export const neverToAst = ({ }: IrSchemaToAstOptions & { schema: SchemaWithType<'never'>; }): Omit => { - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); const result: Partial> = {}; result.expression = $(z).attr(identifiers.never).call(); return result as Omit; diff --git a/packages/openapi-ts/src/plugins/zod/mini/toAst/null.ts b/packages/openapi-ts/src/plugins/zod/mini/toAst/null.ts index 52d1a877d..92425ccaa 100644 --- a/packages/openapi-ts/src/plugins/zod/mini/toAst/null.ts +++ b/packages/openapi-ts/src/plugins/zod/mini/toAst/null.ts @@ -9,10 +9,7 @@ export const nullToAst = ({ }: IrSchemaToAstOptions & { schema: SchemaWithType<'null'>; }): Omit => { - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); const result: Partial> = {}; result.expression = $(z).attr(identifiers.null).call(); return result as Omit; diff --git a/packages/openapi-ts/src/plugins/zod/mini/toAst/tuple.ts b/packages/openapi-ts/src/plugins/zod/mini/toAst/tuple.ts index 9950206c9..3cd383d71 100644 --- a/packages/openapi-ts/src/plugins/zod/mini/toAst/tuple.ts +++ b/packages/openapi-ts/src/plugins/zod/mini/toAst/tuple.ts @@ -14,10 +14,7 @@ export const tupleToAst = ({ }: IrSchemaToAstOptions & { schema: SchemaWithType<'tuple'>; }): Omit => { - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); const result: Partial> = {}; diff --git a/packages/openapi-ts/src/plugins/zod/mini/toAst/undefined.ts b/packages/openapi-ts/src/plugins/zod/mini/toAst/undefined.ts index f3b2726be..b05fdea3a 100644 --- a/packages/openapi-ts/src/plugins/zod/mini/toAst/undefined.ts +++ b/packages/openapi-ts/src/plugins/zod/mini/toAst/undefined.ts @@ -9,10 +9,7 @@ export const undefinedToAst = ({ }: IrSchemaToAstOptions & { schema: SchemaWithType<'undefined'>; }): Omit => { - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); const result: Partial> = {}; result.expression = $(z).attr(identifiers.undefined).call(); return result as Omit; diff --git a/packages/openapi-ts/src/plugins/zod/mini/toAst/unknown.ts b/packages/openapi-ts/src/plugins/zod/mini/toAst/unknown.ts index a09101768..59f54db09 100644 --- a/packages/openapi-ts/src/plugins/zod/mini/toAst/unknown.ts +++ b/packages/openapi-ts/src/plugins/zod/mini/toAst/unknown.ts @@ -9,10 +9,7 @@ export const unknownToAst = ({ }: IrSchemaToAstOptions & { schema: SchemaWithType<'unknown'>; }): Omit => { - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); const result: Partial> = {}; result.expression = $(z).attr(identifiers.unknown).call(); return result as Omit; diff --git a/packages/openapi-ts/src/plugins/zod/mini/toAst/void.ts b/packages/openapi-ts/src/plugins/zod/mini/toAst/void.ts index cd0ac49ae..ee15683c1 100644 --- a/packages/openapi-ts/src/plugins/zod/mini/toAst/void.ts +++ b/packages/openapi-ts/src/plugins/zod/mini/toAst/void.ts @@ -9,10 +9,7 @@ export const voidToAst = ({ }: IrSchemaToAstOptions & { schema: SchemaWithType<'void'>; }): Omit => { - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); const result: Partial> = {}; result.expression = $(z).attr(identifiers.void).call(); return result as Omit; diff --git a/packages/openapi-ts/src/plugins/zod/shared/export.ts b/packages/openapi-ts/src/plugins/zod/shared/export.ts index ae30e02f6..32f2c172f 100644 --- a/packages/openapi-ts/src/plugins/zod/shared/export.ts +++ b/packages/openapi-ts/src/plugins/zod/shared/export.ts @@ -21,10 +21,7 @@ export const exportAst = ({ symbol: Symbol; typeInferSymbol: Symbol | undefined; }): void => { - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); const statement = $.const(symbol) .export() diff --git a/packages/openapi-ts/src/plugins/zod/v3/plugin.ts b/packages/openapi-ts/src/plugins/zod/v3/plugin.ts index fcbb7b588..b36a6fb4a 100644 --- a/packages/openapi-ts/src/plugins/zod/v3/plugin.ts +++ b/packages/openapi-ts/src/plugins/zod/v3/plugin.ts @@ -34,10 +34,7 @@ export const irSchemaToAst = ({ }): Ast => { let ast: Partial = {}; - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); if (schema.$ref) { const query: SymbolMeta = { diff --git a/packages/openapi-ts/src/plugins/zod/v3/toAst/array.ts b/packages/openapi-ts/src/plugins/zod/v3/toAst/array.ts index e87db2572..437d0d9c9 100644 --- a/packages/openapi-ts/src/plugins/zod/v3/toAst/array.ts +++ b/packages/openapi-ts/src/plugins/zod/v3/toAst/array.ts @@ -18,10 +18,7 @@ export const arrayToAst = ({ }): Omit & { anyType?: string; } => { - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); const functionName = $(z).attr(identifiers.array); diff --git a/packages/openapi-ts/src/plugins/zod/v3/toAst/boolean.ts b/packages/openapi-ts/src/plugins/zod/v3/toAst/boolean.ts index 10a649541..1afbc9bc1 100644 --- a/packages/openapi-ts/src/plugins/zod/v3/toAst/boolean.ts +++ b/packages/openapi-ts/src/plugins/zod/v3/toAst/boolean.ts @@ -12,10 +12,7 @@ export const booleanToAst = ({ }): ReturnType => { let chain: ReturnType; - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); if (typeof schema.const === 'boolean') { chain = $(z).attr(identifiers.literal).call($.literal(schema.const)); diff --git a/packages/openapi-ts/src/plugins/zod/v3/toAst/enum.ts b/packages/openapi-ts/src/plugins/zod/v3/toAst/enum.ts index 76d4dafb9..39f003c29 100644 --- a/packages/openapi-ts/src/plugins/zod/v3/toAst/enum.ts +++ b/packages/openapi-ts/src/plugins/zod/v3/toAst/enum.ts @@ -12,10 +12,7 @@ export const enumToAst = ({ }: IrSchemaToAstOptions & { schema: SchemaWithType<'enum'>; }): ReturnType => { - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); const enumMembers: Array> = []; const literalMembers: Array> = []; diff --git a/packages/openapi-ts/src/plugins/zod/v3/toAst/never.ts b/packages/openapi-ts/src/plugins/zod/v3/toAst/never.ts index 0e71d32f6..11f87881f 100644 --- a/packages/openapi-ts/src/plugins/zod/v3/toAst/never.ts +++ b/packages/openapi-ts/src/plugins/zod/v3/toAst/never.ts @@ -9,10 +9,7 @@ export const neverToAst = ({ }: IrSchemaToAstOptions & { schema: SchemaWithType<'never'>; }) => { - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); const expression = $(z).attr(identifiers.never).call(); return expression; }; diff --git a/packages/openapi-ts/src/plugins/zod/v3/toAst/null.ts b/packages/openapi-ts/src/plugins/zod/v3/toAst/null.ts index 91969aebf..43b98e9f9 100644 --- a/packages/openapi-ts/src/plugins/zod/v3/toAst/null.ts +++ b/packages/openapi-ts/src/plugins/zod/v3/toAst/null.ts @@ -9,10 +9,7 @@ export const nullToAst = ({ }: IrSchemaToAstOptions & { schema: SchemaWithType<'null'>; }) => { - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); const expression = $(z).attr(identifiers.null).call(); return expression; }; diff --git a/packages/openapi-ts/src/plugins/zod/v3/toAst/tuple.ts b/packages/openapi-ts/src/plugins/zod/v3/toAst/tuple.ts index c08e02522..083d8a0d7 100644 --- a/packages/openapi-ts/src/plugins/zod/v3/toAst/tuple.ts +++ b/packages/openapi-ts/src/plugins/zod/v3/toAst/tuple.ts @@ -16,10 +16,7 @@ export const tupleToAst = ({ }): Omit & { anyType?: string; } => { - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); let hasLazyExpression = false; diff --git a/packages/openapi-ts/src/plugins/zod/v3/toAst/undefined.ts b/packages/openapi-ts/src/plugins/zod/v3/toAst/undefined.ts index 207ec6d3c..ba776b832 100644 --- a/packages/openapi-ts/src/plugins/zod/v3/toAst/undefined.ts +++ b/packages/openapi-ts/src/plugins/zod/v3/toAst/undefined.ts @@ -9,10 +9,7 @@ export const undefinedToAst = ({ }: IrSchemaToAstOptions & { schema: SchemaWithType<'undefined'>; }) => { - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); const expression = $(z).attr(identifiers.undefined).call(); return expression; }; diff --git a/packages/openapi-ts/src/plugins/zod/v3/toAst/unknown.ts b/packages/openapi-ts/src/plugins/zod/v3/toAst/unknown.ts index 8327f2df1..f85cb1554 100644 --- a/packages/openapi-ts/src/plugins/zod/v3/toAst/unknown.ts +++ b/packages/openapi-ts/src/plugins/zod/v3/toAst/unknown.ts @@ -9,10 +9,7 @@ export const unknownToAst = ({ }: IrSchemaToAstOptions & { schema: SchemaWithType<'unknown'>; }) => { - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); const expression = $(z).attr(identifiers.unknown).call(); return expression; }; diff --git a/packages/openapi-ts/src/plugins/zod/v3/toAst/void.ts b/packages/openapi-ts/src/plugins/zod/v3/toAst/void.ts index 9f6d53c80..dd691ca39 100644 --- a/packages/openapi-ts/src/plugins/zod/v3/toAst/void.ts +++ b/packages/openapi-ts/src/plugins/zod/v3/toAst/void.ts @@ -9,10 +9,7 @@ export const voidToAst = ({ }: IrSchemaToAstOptions & { schema: SchemaWithType<'void'>; }) => { - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); const expression = $(z).attr(identifiers.void).call(); return expression; }; diff --git a/packages/openapi-ts/src/plugins/zod/v4/plugin.ts b/packages/openapi-ts/src/plugins/zod/v4/plugin.ts index 169e99122..bf35a8e4c 100644 --- a/packages/openapi-ts/src/plugins/zod/v4/plugin.ts +++ b/packages/openapi-ts/src/plugins/zod/v4/plugin.ts @@ -34,10 +34,7 @@ export const irSchemaToAst = ({ }): Ast => { let ast: Partial = {}; - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); if (schema.$ref) { const query: SymbolMeta = { diff --git a/packages/openapi-ts/src/plugins/zod/v4/toAst/array.ts b/packages/openapi-ts/src/plugins/zod/v4/toAst/array.ts index 02de0b062..9c03921ec 100644 --- a/packages/openapi-ts/src/plugins/zod/v4/toAst/array.ts +++ b/packages/openapi-ts/src/plugins/zod/v4/toAst/array.ts @@ -18,10 +18,7 @@ export const arrayToAst = ({ }): Omit => { const result: Partial> = {}; - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); const functionName = $(z).attr(identifiers.array); diff --git a/packages/openapi-ts/src/plugins/zod/v4/toAst/boolean.ts b/packages/openapi-ts/src/plugins/zod/v4/toAst/boolean.ts index 065f6f7bd..db72e81b2 100644 --- a/packages/openapi-ts/src/plugins/zod/v4/toAst/boolean.ts +++ b/packages/openapi-ts/src/plugins/zod/v4/toAst/boolean.ts @@ -13,10 +13,7 @@ export const booleanToAst = ({ const result: Partial> = {}; let chain: ReturnType; - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); if (typeof schema.const === 'boolean') { chain = $(z).attr(identifiers.literal).call($.literal(schema.const)); diff --git a/packages/openapi-ts/src/plugins/zod/v4/toAst/enum.ts b/packages/openapi-ts/src/plugins/zod/v4/toAst/enum.ts index 4abee084a..f97165889 100644 --- a/packages/openapi-ts/src/plugins/zod/v4/toAst/enum.ts +++ b/packages/openapi-ts/src/plugins/zod/v4/toAst/enum.ts @@ -14,10 +14,7 @@ export const enumToAst = ({ }): Omit => { const result: Partial> = {}; - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); const enumMembers: Array> = []; const literalMembers: Array> = []; diff --git a/packages/openapi-ts/src/plugins/zod/v4/toAst/never.ts b/packages/openapi-ts/src/plugins/zod/v4/toAst/never.ts index 3c684d464..9ab7ae986 100644 --- a/packages/openapi-ts/src/plugins/zod/v4/toAst/never.ts +++ b/packages/openapi-ts/src/plugins/zod/v4/toAst/never.ts @@ -10,10 +10,7 @@ export const neverToAst = ({ schema: SchemaWithType<'never'>; }): Omit => { const result: Partial> = {}; - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); result.expression = $(z).attr(identifiers.never).call(); return result as Omit; }; diff --git a/packages/openapi-ts/src/plugins/zod/v4/toAst/null.ts b/packages/openapi-ts/src/plugins/zod/v4/toAst/null.ts index 79785a5b4..72dc1f3ed 100644 --- a/packages/openapi-ts/src/plugins/zod/v4/toAst/null.ts +++ b/packages/openapi-ts/src/plugins/zod/v4/toAst/null.ts @@ -10,10 +10,7 @@ export const nullToAst = ({ schema: SchemaWithType<'null'>; }): Omit => { const result: Partial> = {}; - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); result.expression = $(z).attr(identifiers.null).call(); return result as Omit; }; diff --git a/packages/openapi-ts/src/plugins/zod/v4/toAst/tuple.ts b/packages/openapi-ts/src/plugins/zod/v4/toAst/tuple.ts index f9d194db2..1be5f8dc7 100644 --- a/packages/openapi-ts/src/plugins/zod/v4/toAst/tuple.ts +++ b/packages/openapi-ts/src/plugins/zod/v4/toAst/tuple.ts @@ -16,10 +16,7 @@ export const tupleToAst = ({ }): Omit => { const result: Partial> = {}; - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); if (schema.const && Array.isArray(schema.const)) { const tupleElements = schema.const.map((value) => diff --git a/packages/openapi-ts/src/plugins/zod/v4/toAst/undefined.ts b/packages/openapi-ts/src/plugins/zod/v4/toAst/undefined.ts index aa5e63b40..a0be0fa6a 100644 --- a/packages/openapi-ts/src/plugins/zod/v4/toAst/undefined.ts +++ b/packages/openapi-ts/src/plugins/zod/v4/toAst/undefined.ts @@ -10,10 +10,7 @@ export const undefinedToAst = ({ schema: SchemaWithType<'undefined'>; }): Omit => { const result: Partial> = {}; - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); result.expression = $(z).attr(identifiers.undefined).call(); return result as Omit; }; diff --git a/packages/openapi-ts/src/plugins/zod/v4/toAst/unknown.ts b/packages/openapi-ts/src/plugins/zod/v4/toAst/unknown.ts index a0294359c..40218d065 100644 --- a/packages/openapi-ts/src/plugins/zod/v4/toAst/unknown.ts +++ b/packages/openapi-ts/src/plugins/zod/v4/toAst/unknown.ts @@ -10,10 +10,7 @@ export const unknownToAst = ({ schema: SchemaWithType<'unknown'>; }): Omit => { const result: Partial> = {}; - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); result.expression = $(z).attr(identifiers.unknown).call(); return result as Omit; }; diff --git a/packages/openapi-ts/src/plugins/zod/v4/toAst/void.ts b/packages/openapi-ts/src/plugins/zod/v4/toAst/void.ts index 5ee35e976..525c59d0f 100644 --- a/packages/openapi-ts/src/plugins/zod/v4/toAst/void.ts +++ b/packages/openapi-ts/src/plugins/zod/v4/toAst/void.ts @@ -10,10 +10,7 @@ export const voidToAst = ({ schema: SchemaWithType<'void'>; }): Omit => { const result: Partial> = {}; - const z = plugin.referenceSymbol({ - category: 'external', - resource: 'zod.z', - }); + const z = plugin.external('zod.z'); result.expression = $(z).attr(identifiers.void).call(); return result as Omit; };