diff --git a/packages/contract/src/index.ts b/packages/contract/src/index.ts index ec469c058..f27a215a3 100644 --- a/packages/contract/src/index.ts +++ b/packages/contract/src/index.ts @@ -71,8 +71,11 @@ export type { } from '@orpc/client' export type { - AsyncIteratorClass, PromiseWithError, Registry, ThrowableError, } from '@orpc/shared' + +export { + AsyncIteratorClass, +} from '@orpc/shared' diff --git a/packages/openapi/src/types.ts b/packages/openapi/src/types.ts index 19b88a910..d5803d88b 100644 --- a/packages/openapi/src/types.ts +++ b/packages/openapi/src/types.ts @@ -1,13 +1,13 @@ +import type { AnyNestedClient, Client, ORPCError } from '@orpc/client' +import type { AsyncIteratorClass } from '@orpc/shared' // eslint-disable-next-line no-restricted-imports -import type * as OpenAPIV3_0 from '@openapi-spec/types/v3.0' +import * as OpenAPIV3_0 from '@openapi-spec/types/v3.0' // eslint-disable-next-line no-restricted-imports -import type * as OpenAPIV3_1 from '@openapi-spec/types/v3.1' +import * as OpenAPIV3_1 from '@openapi-spec/types/v3.1' // eslint-disable-next-line no-restricted-imports -import type * as OpenAPIV3_2 from '@openapi-spec/types/v3.2' -import type { AnyNestedClient, Client, ORPCError } from '@orpc/client' -import type { AsyncIteratorClass } from '@orpc/shared' +import * as OpenAPIV3_2 from '@openapi-spec/types/v3.2' -export type { OpenAPIV3_0, OpenAPIV3_1, OpenAPIV3_2 } +export { OpenAPIV3_0, OpenAPIV3_1, OpenAPIV3_2 } /** * An OpenAPI version `OpenAPIGenerator` can target: any `3.0.x`, `3.1.x`, or `3.2.x` value. diff --git a/packages/publisher/src/index.ts b/packages/publisher/src/index.ts index cbf944cc8..e49c07cfa 100644 --- a/packages/publisher/src/index.ts +++ b/packages/publisher/src/index.ts @@ -1,5 +1,5 @@ export * from './publisher' -export type { +export { AsyncIteratorClass, } from '@orpc/shared' diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index 5215f4ae2..867cbb51a 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -74,7 +74,6 @@ export type { ORPCErrorFactory, ORPCErrorFactoryOptions, ORPCErrorFromErrorMap, - ProcedureContract, ProcedureContractDefinition, RouterContract, Schema, @@ -85,6 +84,7 @@ export { defineMeta, error, eventIterator, + ProcedureContract, reconcileORPCError, type, ValidationError,