chore: upgrade to latest zod v3 (#12938)
* chore: upgrade to latest zod v3 * chore: set explicit versions * chore: remove v3 scope --------- Co-authored-by: Oli Juhl <59018053+olivermrbl@users.noreply.github.com>
This commit is contained in:
@@ -25,7 +25,7 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@medusajs/admin-shared": "2.8.7",
|
"@medusajs/admin-shared": "2.8.7",
|
||||||
"zod": "3.22.4"
|
"zod": "3.25.76"
|
||||||
},
|
},
|
||||||
"packageManager": "yarn@3.2.1"
|
"packageManager": "yarn@3.2.1"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -73,7 +73,7 @@
|
|||||||
"react-i18next": "13.5.0",
|
"react-i18next": "13.5.0",
|
||||||
"react-jwt": "^1.2.0",
|
"react-jwt": "^1.2.0",
|
||||||
"react-router-dom": "6.20.1",
|
"react-router-dom": "6.20.1",
|
||||||
"zod": "3.22.4"
|
"zod": "3.25.76"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@medusajs/admin-shared": "2.8.7",
|
"@medusajs/admin-shared": "2.8.7",
|
||||||
|
|||||||
@@ -97,8 +97,8 @@
|
|||||||
"morgan": "^1.9.1",
|
"morgan": "^1.9.1",
|
||||||
"path-to-regexp": "^0.1.10",
|
"path-to-regexp": "^0.1.10",
|
||||||
"tsconfig-paths": "^4.2.0",
|
"tsconfig-paths": "^4.2.0",
|
||||||
"zod": "3.22.4",
|
"zod": "3.25.76",
|
||||||
"zod-validation-error": "^3.4.1"
|
"zod-validation-error": "3.5.1"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@aws-sdk/client-dynamodb": "^3.218.0",
|
"@aws-sdk/client-dynamodb": "^3.218.0",
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
import { raw } from "express"
|
import { raw } from "express"
|
||||||
import { MedusaRequest, MedusaResponse, MedusaNextFunction } from "../../types"
|
import { z } from "zod"
|
||||||
|
import { MedusaNextFunction, MedusaRequest, MedusaResponse } from "../../types"
|
||||||
|
import { defineMiddlewares } from "../../utils/define-middlewares"
|
||||||
import {
|
import {
|
||||||
customersCreateMiddlewareMock,
|
customersCreateMiddlewareMock,
|
||||||
customersGlobalMiddlewareMock,
|
|
||||||
customersCreateMiddlewareValidatorMock,
|
customersCreateMiddlewareValidatorMock,
|
||||||
|
customersGlobalMiddlewareMock,
|
||||||
storeGlobalMiddlewareMock,
|
storeGlobalMiddlewareMock,
|
||||||
} from "../mocks"
|
} from "../mocks"
|
||||||
import z from "zod"
|
|
||||||
import { defineMiddlewares } from "../../utils/define-middlewares"
|
|
||||||
|
|
||||||
const customersGlobalMiddleware = (
|
const customersGlobalMiddleware = (
|
||||||
req: MedusaRequest,
|
req: MedusaRequest,
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import zod from "zod"
|
|
||||||
import { MedusaError } from "@medusajs/utils"
|
import { MedusaError } from "@medusajs/utils"
|
||||||
import { validateAndTransformBody } from "../utils/validate-body"
|
import zod, { ZodNullable, ZodObject, ZodOptional } from "zod"
|
||||||
import { MedusaRequest, MedusaResponse } from "../types"
|
import { MedusaRequest, MedusaResponse } from "../types"
|
||||||
|
import { validateAndTransformBody } from "../utils/validate-body"
|
||||||
|
|
||||||
const createLinkBody = () => {
|
const createLinkBody = () => {
|
||||||
return zod.object({
|
return zod.object({
|
||||||
@@ -33,7 +33,7 @@ describe("validateAndTransformBody", () => {
|
|||||||
.nullish()
|
.nullish()
|
||||||
|
|
||||||
const validatorFactory = (
|
const validatorFactory = (
|
||||||
schema?: Zod.ZodOptional<Zod.ZodNullable<Zod.ZodObject<any, any>>>
|
schema?: ZodOptional<ZodNullable<ZodObject<any, any>>>
|
||||||
) => {
|
) => {
|
||||||
return schema
|
return schema
|
||||||
? createLinkBody().extend({
|
? createLinkBody().extend({
|
||||||
@@ -69,7 +69,7 @@ describe("validateAndTransformBody", () => {
|
|||||||
.nullish()
|
.nullish()
|
||||||
|
|
||||||
const validatorFactory = (
|
const validatorFactory = (
|
||||||
schema?: Zod.ZodOptional<Zod.ZodNullable<Zod.ZodObject<any, any>>>
|
schema?: ZodOptional<ZodNullable<ZodObject<any, any>>>
|
||||||
) => {
|
) => {
|
||||||
return schema
|
return schema
|
||||||
? createLinkBody().extend({
|
? createLinkBody().extend({
|
||||||
@@ -102,7 +102,7 @@ describe("validateAndTransformBody", () => {
|
|||||||
.nullish()
|
.nullish()
|
||||||
|
|
||||||
const validatorFactory = (
|
const validatorFactory = (
|
||||||
schema?: Zod.ZodOptional<Zod.ZodNullable<Zod.ZodObject<any, any>>>
|
schema?: ZodOptional<ZodNullable<ZodObject<any, any>>>
|
||||||
) => {
|
) => {
|
||||||
return schema
|
return schema
|
||||||
? createLinkBody().extend({
|
? createLinkBody().extend({
|
||||||
|
|||||||
@@ -57,7 +57,7 @@
|
|||||||
"pg-connection-string": "^2.7.0",
|
"pg-connection-string": "^2.7.0",
|
||||||
"pluralize": "^8.0.0",
|
"pluralize": "^8.0.0",
|
||||||
"ulid": "^2.3.0",
|
"ulid": "^2.3.0",
|
||||||
"zod": "3.22.4"
|
"zod": "3.25.76"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@mikro-orm/core": "6.4.3",
|
"@mikro-orm/core": "6.4.3",
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
"pg": "^8.13.0",
|
"pg": "^8.13.0",
|
||||||
"rimraf": "^5.0.1",
|
"rimraf": "^5.0.1",
|
||||||
"typescript": "^5.6.2",
|
"typescript": "^5.6.2",
|
||||||
"zod": "3.22.4"
|
"zod": "3.25.76"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@medusajs/modules-sdk": "2.8.7",
|
"@medusajs/modules-sdk": "2.8.7",
|
||||||
@@ -56,7 +56,7 @@
|
|||||||
"awilix": "^8.0.1",
|
"awilix": "^8.0.1",
|
||||||
"express": "^4.21.0",
|
"express": "^4.21.0",
|
||||||
"pg": "^8.13.0",
|
"pg": "^8.13.0",
|
||||||
"zod": "3.22.4"
|
"zod": "3.25.76"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "rimraf dist && tsc --build",
|
"build": "rimraf dist && tsc --build",
|
||||||
|
|||||||
@@ -126,7 +126,7 @@
|
|||||||
"request-ip": "^3.3.0",
|
"request-ip": "^3.3.0",
|
||||||
"slugify": "^1.6.6",
|
"slugify": "^1.6.6",
|
||||||
"uuid": "^9.0.0",
|
"uuid": "^9.0.0",
|
||||||
"zod": "3.22.4"
|
"zod": "3.25.76"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@medusajs/framework": "2.8.7",
|
"@medusajs/framework": "2.8.7",
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ export const AdminGetProductsParams = createFindParams({
|
|||||||
.merge(applyAndAndOrOperators(AdminGetProductsParamsDirectFields))
|
.merge(applyAndAndOrOperators(AdminGetProductsParamsDirectFields))
|
||||||
.merge(GetProductsParams)
|
.merge(GetProductsParams)
|
||||||
)
|
)
|
||||||
.transform(transformProductParams)
|
.transform(transformProductParams as any)
|
||||||
|
|
||||||
export const AdminGetProductOptionsParamsFields = z.object({
|
export const AdminGetProductOptionsParamsFields = z.object({
|
||||||
q: z.string().optional(),
|
q: z.string().optional(),
|
||||||
|
|||||||
@@ -81,4 +81,4 @@ export const StoreGetProductsParams = createFindParams({
|
|||||||
.merge(applyAndAndOrOperators(StoreGetProductParamsDirectFields))
|
.merge(applyAndAndOrOperators(StoreGetProductParamsDirectFields))
|
||||||
.strict()
|
.strict()
|
||||||
)
|
)
|
||||||
.transform(recursivelyNormalizeSchema(transformProductParams))
|
.transform(recursivelyNormalizeSchema(transformProductParams) as any)
|
||||||
|
|||||||
@@ -31,7 +31,9 @@ export const BigNumberInput = z.union([
|
|||||||
* @param {ZodObject<any>} schema
|
* @param {ZodObject<any>} schema
|
||||||
* @return {ZodObject<any>}
|
* @return {ZodObject<any>}
|
||||||
*/
|
*/
|
||||||
export const applyAndAndOrOperators = (schema: z.ZodObject<any>) => {
|
export const applyAndAndOrOperators = <T extends z.ZodObject<any>>(
|
||||||
|
schema: T
|
||||||
|
) => {
|
||||||
return schema.merge(
|
return schema.merge(
|
||||||
z.object({
|
z.object({
|
||||||
$and: z.lazy(() => schema.array()).optional(),
|
$and: z.lazy(() => schema.array()).optional(),
|
||||||
|
|||||||
34
yarn.lock
34
yarn.lock
@@ -5783,7 +5783,7 @@ __metadata:
|
|||||||
"@types/react": ^18.3.2
|
"@types/react": ^18.3.2
|
||||||
tsup: ^8.0.1
|
tsup: ^8.0.1
|
||||||
typescript: ^5.3.3
|
typescript: ^5.3.3
|
||||||
zod: 3.22.4
|
zod: 3.25.76
|
||||||
languageName: unknown
|
languageName: unknown
|
||||||
linkType: soft
|
linkType: soft
|
||||||
|
|
||||||
@@ -6204,7 +6204,7 @@ __metadata:
|
|||||||
vite: ^5.4.14
|
vite: ^5.4.14
|
||||||
vite-plugin-inspect: ^0.8.7
|
vite-plugin-inspect: ^0.8.7
|
||||||
vitest: ^3.0.5
|
vitest: ^3.0.5
|
||||||
zod: 3.22.4
|
zod: 3.25.76
|
||||||
languageName: unknown
|
languageName: unknown
|
||||||
linkType: soft
|
linkType: soft
|
||||||
|
|
||||||
@@ -6343,8 +6343,8 @@ __metadata:
|
|||||||
tsconfig-paths: ^4.2.0
|
tsconfig-paths: ^4.2.0
|
||||||
typescript: ^5.6.2
|
typescript: ^5.6.2
|
||||||
vite: ^5.4.14
|
vite: ^5.4.14
|
||||||
zod: 3.22.4
|
zod: 3.25.76
|
||||||
zod-validation-error: ^3.4.1
|
zod-validation-error: 3.5.1
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
"@aws-sdk/client-dynamodb": ^3.218.0
|
"@aws-sdk/client-dynamodb": ^3.218.0
|
||||||
"@medusajs/cli": 2.8.7
|
"@medusajs/cli": 2.8.7
|
||||||
@@ -6712,7 +6712,7 @@ __metadata:
|
|||||||
typescript: ^5.6.2
|
typescript: ^5.6.2
|
||||||
uuid: ^9.0.0
|
uuid: ^9.0.0
|
||||||
yalc: 1.0.0-pre.53
|
yalc: 1.0.0-pre.53
|
||||||
zod: 3.22.4
|
zod: 3.25.76
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
"@medusajs/framework": 2.8.7
|
"@medusajs/framework": 2.8.7
|
||||||
"@mikro-orm/core": 6.4.3
|
"@mikro-orm/core": 6.4.3
|
||||||
@@ -7377,7 +7377,7 @@ __metadata:
|
|||||||
rimraf: ^5.0.1
|
rimraf: ^5.0.1
|
||||||
typescript: ^5.6.2
|
typescript: ^5.6.2
|
||||||
ulid: ^2.3.0
|
ulid: ^2.3.0
|
||||||
zod: 3.22.4
|
zod: 3.25.76
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
"@mikro-orm/core": 6.4.3
|
"@mikro-orm/core": 6.4.3
|
||||||
"@mikro-orm/knex": 6.4.3
|
"@mikro-orm/knex": 6.4.3
|
||||||
@@ -7465,7 +7465,7 @@ __metadata:
|
|||||||
rimraf: ^5.0.1
|
rimraf: ^5.0.1
|
||||||
typescript: ^5.6.2
|
typescript: ^5.6.2
|
||||||
ulid: ^2.3.0
|
ulid: ^2.3.0
|
||||||
zod: 3.22.4
|
zod: 3.25.76
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
"@mikro-orm/core": 6.4.3
|
"@mikro-orm/core": 6.4.3
|
||||||
"@mikro-orm/knex": 6.4.3
|
"@mikro-orm/knex": 6.4.3
|
||||||
@@ -7474,7 +7474,7 @@ __metadata:
|
|||||||
awilix: ^8.0.1
|
awilix: ^8.0.1
|
||||||
express: ^4.21.0
|
express: ^4.21.0
|
||||||
pg: ^8.13.0
|
pg: ^8.13.0
|
||||||
zod: 3.22.4
|
zod: 3.25.76
|
||||||
languageName: unknown
|
languageName: unknown
|
||||||
linkType: soft
|
linkType: soft
|
||||||
|
|
||||||
@@ -35647,18 +35647,18 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"zod-validation-error@npm:^3.4.1":
|
"zod-validation-error@npm:3.5.1":
|
||||||
version: 3.4.1
|
version: 3.5.1
|
||||||
resolution: "zod-validation-error@npm:3.4.1"
|
resolution: "zod-validation-error@npm:3.5.1"
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
zod: ^3.24.4
|
zod: ^3.25.0
|
||||||
checksum: cf16f12fccb3e515d18c876c8a75ae4a87219b28e8e7f6334b8d423bebfa2c08b3382d7c53842ba05af8c5caabf66ee8df1ce2862b3b41c2e96eba26e70a995f
|
checksum: 37e83266755f798cf7f0437441ad72657882afae36e451177e9ae6ba555d211aa80b4f5d9dfbb08839ddb5538b94325499f0445aae923e09c0f7d9f472868c85
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"zod@npm:3.22.4":
|
"zod@npm:3.25.76":
|
||||||
version: 3.22.4
|
version: 3.25.76
|
||||||
resolution: "zod@npm:3.22.4"
|
resolution: "zod@npm:3.25.76"
|
||||||
checksum: 7578ab283dac0eee66a0ad0fc4a7f28c43e6745aadb3a529f59a4b851aa10872b3890398b3160f257f4b6817b4ce643debdda4fb21a2c040adda7862cab0a587
|
checksum: 5718ec35e3c40b600316c5b4c5e4976f7fee68151bc8f8d90ec18a469be9571f072e1bbaace10f1e85cf8892ea12d90821b200e980ab46916a6166a4260a983c
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|||||||
Reference in New Issue
Block a user