From 2f3a9abdd7cb2f426ae75dd654998c3dba0da1eb Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 19 May 2026 16:37:34 +0800 Subject: [PATCH 1/2] Progress --- .idea/workspace.xml | 88 ++++++++++++++++++++++++++++++++++ package.json | 2 +- src/adapters/node-http/core.ts | 2 +- src/generator/index.ts | 2 +- src/generator/schema.ts | 2 +- src/types.ts | 2 +- src/utils/procedure.ts | 2 +- src/utils/zod.ts | 2 +- 8 files changed, 95 insertions(+), 7 deletions(-) create mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000..6365bf9d --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + { + "lastFilter": { + "state": "OPEN", + "assignee": "Sam152" + } +} + { + "selectedUrlAndAccountId": { + "url": "git@github.com:mcampa/trpc-to-openapi.git", + "accountId": "4254b8b1-0587-4893-b61f-6458cf4bfeaf" + } +} + + + + + { + "associatedIndex": 2 +} + + + + { + "keyToString": { + "ModuleVcsDetector.initialDetectionPerformed": "true", + "RunOnceActivity.MCP Project settings loaded": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "RunOnceActivity.git.unshallow": "true", + "RunOnceActivity.typescript.service.memoryLimit.init": "true", + "com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1": "true", + "git-widget-placeholder": "gentler-migration-from-v3", + "javascript.preferred.runtime.type.id": "node", + "junie.onboarding.icon.badge.shown": "true", + "last_opened_file_path": "/Users/sam.becker/Sites/trpc-to-openapi", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "pnpm", + "to.speed.mode.migration.done": "true", + "ts.external.directory.path": "/Users/sam.becker/Sites/trpc-to-openapi/node_modules/typescript/lib", + "vue.rearranger.settings.migration": "true" + } +} + + + + 1779174617442 + + + + + + \ No newline at end of file diff --git a/package.json b/package.json index 94895ab7..922f28a9 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ }, "peerDependencies": { "@trpc/server": "^11.1.0", - "zod": "^4.0.0", + "zod": "^3.25.0 || ^4.0.0", "zod-openapi": "^5.0.1" }, "dependencies": { diff --git a/src/adapters/node-http/core.ts b/src/adapters/node-http/core.ts index a2774540..a2a18554 100644 --- a/src/adapters/node-http/core.ts +++ b/src/adapters/node-http/core.ts @@ -5,7 +5,7 @@ import { type NodeHTTPResponse, } from '@trpc/server/adapters/node-http'; import { getErrorShape, TRPCRequestInfo } from '@trpc/server/unstable-core-do-not-import'; -import { ZodArray, ZodError, ZodTypeAny } from 'zod'; +import { ZodArray, ZodError, ZodTypeAny } from 'zod/v4'; import { NodeHTTPRequest } from '../../types'; import { generateOpenApiDocument } from '../../generator'; import { diff --git a/src/generator/index.ts b/src/generator/index.ts index ba28fc09..86c09077 100644 --- a/src/generator/index.ts +++ b/src/generator/index.ts @@ -1,5 +1,5 @@ import { ZodOpenApiObject, ZodOpenApiPathsObject, createDocument } from 'zod-openapi'; -import { ZodSchema } from 'zod'; +import { ZodSchema } from 'zod/v4'; import { OpenApiMeta, diff --git a/src/generator/schema.ts b/src/generator/schema.ts index a278ccc2..db7c1b52 100644 --- a/src/generator/schema.ts +++ b/src/generator/schema.ts @@ -1,5 +1,5 @@ import { TRPCError } from '@trpc/server'; -import { ZodObject, ZodAny, z } from 'zod'; +import { ZodObject, ZodAny, z } from 'zod/v4'; import { ZodOpenApiContentObject, ZodOpenApiParameters, diff --git a/src/types.ts b/src/types.ts index bc8cf0b7..3ba293af 100644 --- a/src/types.ts +++ b/src/types.ts @@ -7,7 +7,7 @@ import type { RouterRecord, } from '@trpc/server/unstable-core-do-not-import'; import { IncomingMessage } from 'http'; -import type { ZodObject } from 'zod'; +import type { ZodObject } from 'zod/v4'; import type { $ZodIssue } from 'zod/v4/core'; export { type OpenAPIObject, type SecuritySchemeObject } from 'openapi3-ts/oas31'; diff --git a/src/utils/procedure.ts b/src/utils/procedure.ts index 0568640f..a132c690 100644 --- a/src/utils/procedure.ts +++ b/src/utils/procedure.ts @@ -1,5 +1,5 @@ import { TRPCProcedureType } from '@trpc/server'; -import { ZodObject, z } from 'zod'; +import { ZodObject, z } from 'zod/v4'; import { OpenApiMeta, OpenApiProcedure, OpenApiProcedureRecord } from '../types'; diff --git a/src/utils/zod.ts b/src/utils/zod.ts index ae58f180..f54daffb 100644 --- a/src/utils/zod.ts +++ b/src/utils/zod.ts @@ -1,4 +1,4 @@ -import { ZodObject, ZodRawShape, ZodType, z } from 'zod'; +import { ZodObject, ZodRawShape, ZodType, z } from 'zod/v4'; import type { $ZodType, $ZodTypes } from 'zod/v4/core'; import type { $ZodTypeDef } from 'zod/v4/core/schemas'; From b5cc59d1d29d3a13b32fa85661778b9ec5b4151d Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 19 May 2026 16:41:38 +0800 Subject: [PATCH 2/2] Progress --- .idea/workspace.xml | 88 --------------------------------------------- 1 file changed, 88 deletions(-) delete mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 6365bf9d..00000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - { - "lastFilter": { - "state": "OPEN", - "assignee": "Sam152" - } -} - { - "selectedUrlAndAccountId": { - "url": "git@github.com:mcampa/trpc-to-openapi.git", - "accountId": "4254b8b1-0587-4893-b61f-6458cf4bfeaf" - } -} - - - - - { - "associatedIndex": 2 -} - - - - { - "keyToString": { - "ModuleVcsDetector.initialDetectionPerformed": "true", - "RunOnceActivity.MCP Project settings loaded": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "RunOnceActivity.git.unshallow": "true", - "RunOnceActivity.typescript.service.memoryLimit.init": "true", - "com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1": "true", - "git-widget-placeholder": "gentler-migration-from-v3", - "javascript.preferred.runtime.type.id": "node", - "junie.onboarding.icon.badge.shown": "true", - "last_opened_file_path": "/Users/sam.becker/Sites/trpc-to-openapi", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "pnpm", - "to.speed.mode.migration.done": "true", - "ts.external.directory.path": "/Users/sam.becker/Sites/trpc-to-openapi/node_modules/typescript/lib", - "vue.rearranger.settings.migration": "true" - } -} - - - - 1779174617442 - - - - - - \ No newline at end of file