diff --git a/packages/plugins/openapi/package.json b/packages/plugins/openapi/package.json index 831a015f9..84e8eb5c3 100644 --- a/packages/plugins/openapi/package.json +++ b/packages/plugins/openapi/package.json @@ -32,7 +32,7 @@ "semver": "^7.5.2", "ts-pattern": "^4.3.0", "yaml": "^2.2.2", - "zod-validation-error": "^1.5.0" + "zod-validation-error": "catalog:" }, "peerDependencies": { "zod": "catalog:" diff --git a/packages/plugins/openapi/src/generator-base.ts b/packages/plugins/openapi/src/generator-base.ts index 38cddf16c..9dc94a57c 100644 --- a/packages/plugins/openapi/src/generator-base.ts +++ b/packages/plugins/openapi/src/generator-base.ts @@ -3,7 +3,7 @@ import { Model } from '@zenstackhq/sdk/ast'; import type { DMMF } from '@zenstackhq/sdk/prisma'; import type { OpenAPIV3_1 as OAPI } from 'openapi-types'; import semver from 'semver'; -import { fromZodError } from 'zod-validation-error'; +import { fromZodError } from 'zod-validation-error/v3'; import { name } from '.'; import { SecuritySchemesSchema } from './schema'; diff --git a/packages/runtime/package.json b/packages/runtime/package.json index 6561496f0..a5be906ca 100644 --- a/packages/runtime/package.json +++ b/packages/runtime/package.json @@ -110,7 +110,7 @@ "ts-pattern": "^4.3.0", "tslib": "^2.4.1", "uuid": "^9.0.0", - "zod-validation-error": "^1.5.0" + "zod-validation-error": "catalog:" }, "peerDependencies": { "@prisma/client": "5.0.0 - 6.13.x", diff --git a/packages/runtime/src/enhancements/node/policy/handler.ts b/packages/runtime/src/enhancements/node/policy/handler.ts index f42dad01f..7aa22e8c4 100644 --- a/packages/runtime/src/enhancements/node/policy/handler.ts +++ b/packages/runtime/src/enhancements/node/policy/handler.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import deepmerge from 'deepmerge'; -import { fromZodError } from 'zod-validation-error'; +import { fromZodError } from 'zod-validation-error/v3'; import { CrudFailureReason } from '../../../constants'; import { ModelDataVisitor, @@ -15,7 +15,7 @@ import { type FieldInfo, type ModelMeta, } from '../../../cross'; -import { lowerCaseFirst, upperCaseFirst, invariant } from '../../../local-helpers'; +import { invariant, lowerCaseFirst, upperCaseFirst } from '../../../local-helpers'; import { EnhancementContext, PolicyOperationKind, type CrudContract, type DbClientContract } from '../../../types'; import type { InternalEnhancementOptions } from '../create-enhancement'; import { Logger } from '../logger'; diff --git a/packages/runtime/src/enhancements/node/policy/policy-utils.ts b/packages/runtime/src/enhancements/node/policy/policy-utils.ts index d1c75a32e..08804dee1 100644 --- a/packages/runtime/src/enhancements/node/policy/policy-utils.ts +++ b/packages/runtime/src/enhancements/node/policy/policy-utils.ts @@ -2,7 +2,7 @@ import deepmerge from 'deepmerge'; import { z, type ZodError, type ZodObject, type ZodSchema } from 'zod'; -import { fromZodError } from 'zod-validation-error'; +import { fromZodError } from 'zod-validation-error/v3'; import { CrudFailureReason, PrismaErrorCode } from '../../../constants'; import { clone, diff --git a/packages/runtime/src/validation.ts b/packages/runtime/src/validation.ts index 83a05cc48..a3c153c96 100644 --- a/packages/runtime/src/validation.ts +++ b/packages/runtime/src/validation.ts @@ -1,5 +1,5 @@ import { z } from 'zod'; -import { fromZodError } from 'zod-validation-error'; +import { fromZodError } from 'zod-validation-error/v3'; /** * Error indicating violations of field-level constraints diff --git a/packages/schema/package.json b/packages/schema/package.json index b35262a9d..d41f7b4ae 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -113,7 +113,7 @@ "vscode-languageserver": "^8.0.2", "vscode-languageserver-textdocument": "^1.0.7", "vscode-uri": "^3.0.6", - "zod-validation-error": "^1.5.0" + "zod-validation-error": "catalog:" }, "peerDependencies": { "prisma": "5.0.0 - 6.13.x", diff --git a/packages/schema/src/cli/config.ts b/packages/schema/src/cli/config.ts index 3a803f751..d1fc2d0fb 100644 --- a/packages/schema/src/cli/config.ts +++ b/packages/schema/src/cli/config.ts @@ -1,6 +1,6 @@ import fs from 'fs'; import z, { ZodError } from 'zod'; -import { fromZodError } from 'zod-validation-error'; +import { fromZodError } from 'zod-validation-error/v3'; import { CliError } from './cli-error'; // TODO: future use diff --git a/packages/server/package.json b/packages/server/package.json index 8b7bc40f4..aabc3f565 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -31,7 +31,7 @@ "superjson": "^1.13.0", "ts-japi": "^1.10.1", "url-pattern": "^1.0.3", - "zod-validation-error": "^1.5.0", + "zod-validation-error": "catalog:", "decimal.js": "^10.4.2" }, "peerDependencies": { diff --git a/packages/server/src/api/rest/index.ts b/packages/server/src/api/rest/index.ts index 0bf02762c..866fdbe37 100644 --- a/packages/server/src/api/rest/index.ts +++ b/packages/server/src/api/rest/index.ts @@ -16,7 +16,7 @@ import SuperJSON from 'superjson'; import { Linker, Paginator, Relator, Serializer, SerializerOptions } from 'ts-japi'; import UrlPattern from 'url-pattern'; import z, { ZodError } from 'zod'; -import { fromZodError } from 'zod-validation-error'; +import { fromZodError } from 'zod-validation-error/v3'; import { LoggerConfig, Response } from '../../types'; import { APIHandlerBase, RequestContext } from '../base'; import { logWarning, registerCustomSerializers } from '../utils'; diff --git a/packages/server/src/api/rpc/index.ts b/packages/server/src/api/rpc/index.ts index ef237b779..b3d368460 100644 --- a/packages/server/src/api/rpc/index.ts +++ b/packages/server/src/api/rpc/index.ts @@ -10,7 +10,7 @@ import { import { upperCaseFirst } from '@zenstackhq/runtime/local-helpers'; import SuperJSON from 'superjson'; import { ZodError } from 'zod'; -import { fromZodError } from 'zod-validation-error'; +import { fromZodError } from 'zod-validation-error/v3'; import { Response } from '../../types'; import { APIHandlerBase, RequestContext } from '../base'; import { logError, registerCustomSerializers } from '../utils'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c7804dae0..7b2add801 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,6 +15,9 @@ catalogs: zod: specifier: ^3.25.0 version: 3.25.76 + zod-validation-error: + specifier: ^4.0.0 + version: 4.0.1 importers: @@ -153,8 +156,8 @@ importers: specifier: 'catalog:' version: 3.25.76 zod-validation-error: - specifier: ^1.5.0 - version: 1.5.0(zod@3.25.76) + specifier: 'catalog:' + version: 4.0.1(zod@3.25.76) devDependencies: '@readme/openapi-parser': specifier: ^2.4.0 @@ -401,8 +404,8 @@ importers: specifier: 'catalog:' version: 3.25.76 zod-validation-error: - specifier: ^1.5.0 - version: 1.5.0(zod@3.25.76) + specifier: 'catalog:' + version: 4.0.1(zod@3.25.76) devDependencies: '@types/bcryptjs': specifier: ^2.4.2 @@ -499,8 +502,8 @@ importers: specifier: 'catalog:' version: 3.25.76 zod-validation-error: - specifier: ^1.5.0 - version: 1.5.0(zod@3.25.76) + specifier: 'catalog:' + version: 4.0.1(zod@3.25.76) devDependencies: '@prisma/client': specifier: 6.13.x @@ -605,8 +608,8 @@ importers: specifier: 'catalog:' version: 3.25.76 zod-validation-error: - specifier: ^1.5.0 - version: 1.5.0(zod@3.25.76) + specifier: 'catalog:' + version: 4.0.1(zod@3.25.76) devDependencies: '@nestjs/common': specifier: ^10.3.7 @@ -8743,11 +8746,11 @@ packages: resolution: {integrity: sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==} engines: {node: '>= 14'} - zod-validation-error@1.5.0: - resolution: {integrity: sha512-/7eFkAI4qV0tcxMBB/3+d2c1P6jzzZYdYSlBuAklzMuCrJu5bzJfHS0yVAS87dRHVlhftd6RFJDIvv03JgkSbw==} - engines: {node: '>=16.0.0'} + zod-validation-error@4.0.1: + resolution: {integrity: sha512-F3rdaCOHs5ViJ5YTz5zzRtfkQdMdIeKudJAoxy7yB/2ZMEHw73lmCAcQw11r7++20MyGl4WV59EVh7A9rNAyog==} + engines: {node: '>=18.0.0'} peerDependencies: - zod: ^3.18.0 + zod: ^3.25.0 || ^4.0.0 zod@3.25.76: resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==} @@ -17895,7 +17898,7 @@ snapshots: compress-commons: 6.0.2 readable-stream: 4.5.2 - zod-validation-error@1.5.0(zod@3.25.76): + zod-validation-error@4.0.1(zod@3.25.76): dependencies: zod: 3.25.76 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 5b2640a02..5b48b0193 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -7,4 +7,5 @@ packages: catalog: ts-morph: ^26.0.0 typescript: ~5.8.0 - zod: ^3.25.0 \ No newline at end of file + zod: ^3.25.0 + zod-validation-error: ^4.0.0 \ No newline at end of file