Merge branch 'v4' into i18n/zh-tw

Author: neighborhood999

.vscode/settings.json

@@ -15,9 +15,6 @@
     "**/dist": true,
     "**/lib": true
   },
-  "search.exclude": {
-    "./scratch": false
-  },
   "search.useIgnoreFiles": false,
   "editor.guides.indentation": false
 }

biome.jsonc

@@ -1,5 +1,6 @@
 {
   "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
+
   "formatter": {
     "enabled": true,
     "indentStyle": "space",

package.json

@@ -44,8 +44,14 @@
     "zod3": "npm:zod@^3.0.0"
   },
   "lint-staged": {
-    "packages/*/src/**/*.ts": ["biome format --write", "biome lint --write"],
-    "packages/*/**/*.json": ["biome format --write", "biome lint --write"],
+    "packages/*/src/**/*.ts": [
+      "biome format --no-errors-on-unmatched --write",
+      "biome lint --no-errors-on-unmatched --write"
+    ],
+    "packages/*/**/*.json": [
+      "biome format --no-errors-on-unmatched --write",
+      "biome lint --no-errors-on-unmatched --write"
+    ],
     "packages/*/**/*.md": ["prettier --ignore-unknown --write"]
   },
   "scripts": {

packages/bench/error-handling.ts

@@ -0,0 +1,25 @@
+import { makeData, makeSchema } from "./benchUtil.js";
+import { metabench } from "./metabench.js";
+
+import * as z4 from "zod4";
+import * as z from "zod";
+
+const a = z4.object({ a: z4.string() });
+const b = z.object({ a: z.string() });
+
+const DATA = makeData(10000, () => ({ b: `${Math.random()}` }));
+
+const bench = metabench("safeparse error", {
+  zod4() {
+    for (const _ of DATA) {
+      try{a.safeParse(_);} catch(e){e;}
+    }
+  },
+  zod4new() {
+    for (const _ of DATA) {
+      try{b.safeParse(_);} catch(e){e;}
+    }
+  }
+});
+
+await bench.run();

packages/bench/package.json

@@ -9,5 +9,8 @@
     "valibot": "^1.0.0",
     "zod": "workspace:*",
     "zod3": "npm:zod@^3.23.7"
+  },
+  "scripts": {
+    "bench": "tsx --conditions @zod/source index.ts"
   }
 }

packages/core/src/api.ts

@@ -1005,130 +1005,7 @@ export function _array<T extends schemas.$ZodType>(
   }) as schemas.$ZodArray<T>;
 }
 
-// ZodObjectLike
-export type $ZodObjectLikeParams = util.TypeParams<schemas.$ZodObjectLike, "shape" | "catchall">;
-
-export type $ZodInterfaceParams = util.TypeParams<schemas.$ZodInterface, "shape">;
-export function _interface<T extends schemas.$ZodLooseShape>(
-  Class: util.SchemaClass<schemas.$ZodInterface>,
-  shape: T,
-  params?: $ZodInterfaceParams
-): schemas.$ZodInterface<util.CleanInterfaceShape<T>, util.InitInterfaceParams<T, {}>> {
-  const cleaned = util.cached(() => util.cleanInterfaceShape(shape));
-  const def: schemas.$ZodInterfaceDef = {
-    type: "interface",
-    get shape() {
-      const _shape = cleaned.value.shape;
-      util.assignProp(this, "shape", _shape);
-      return _shape;
-      // return cleaned.value.shape;
-    },
-    get optional() {
-      return cleaned.value.optional;
-    },
-    ...util.normalizeParams(params),
-  };
-  return new Class(def) as any;
-}
-
-// strictInterface
-export function _strictInterface<T extends schemas.$ZodLooseShape>(
-  Class: util.SchemaClass<schemas.$ZodInterface>,
-  shape: T,
-  params?: $ZodInterfaceParams
-): schemas.$ZodInterface<util.CleanInterfaceShape<T>, util.InitInterfaceParams<T, {}>> {
-  const cleaned = util.cached(() => util.cleanInterfaceShape(shape));
-  const def: schemas.$ZodInterfaceDef = {
-    type: "interface",
-    get shape() {
-      const _shape = cleaned.value.shape;
-      util.assignProp(this, "shape", _shape);
-      return _shape;
-      // return cleaned.value.shape;
-    },
-    get optional() {
-      return cleaned.value.optional;
-    },
-    catchall: _never(schemas.$ZodNever),
-    ...util.normalizeParams(params),
-  };
-  return new Class(def) as any;
-}
-
-// looseInterface
-export function _looseInterface<T extends schemas.$ZodLooseShape>(
-  Class: util.SchemaClass<schemas.$ZodInterface>,
-  shape: T,
-  params?: $ZodInterfaceParams
-): schemas.$ZodInterface<util.CleanInterfaceShape<T>, util.InitInterfaceParams<T, Record<string, unknown>>> {
-  const cleaned = util.cached(() => util.cleanInterfaceShape(shape));
-  const def: schemas.$ZodInterfaceDef = {
-    type: "interface",
-    get optional() {
-      return cleaned.value.optional;
-    },
-    get shape() {
-      const _shape = cleaned.value.shape;
-      util.assignProp(this, "shape", _shape);
-      return _shape;
-      // return cleaned.value.shape;
-    },
-    catchall: _unknown(schemas.$ZodUnknown),
-    ...util.normalizeParams(params),
-  };
-  return new Class(def) as any;
-}
-
 export type $ZodObjectParams = util.TypeParams<schemas.$ZodObject, "shape" | "catchall">;
-export function _object<T extends schemas.$ZodShape = Record<never, schemas.$ZodObject>>(
-  Class: util.SchemaClass<schemas.$ZodObject>,
-  shape?: T,
-  params?: $ZodObjectLikeParams
-): schemas.$ZodObject<T, {}> {
-  const def: schemas.$ZodObjectDef = {
-    type: "object",
-    shape: shape ?? {},
-    get optional() {
-      return util.optionalObjectKeys(shape ?? {});
-    },
-    ...util.normalizeParams(params),
-  };
-  return new Class(def) as any;
-}
-
-// strictObject
-export function _strictObject<T extends schemas.$ZodShape>(
-  Class: util.SchemaClass<schemas.$ZodObject>,
-  shape: T,
-  params?: $ZodObjectParams
-): schemas.$ZodObject<T, {}> {
-  return new Class({
-    type: "object",
-    shape: shape as schemas.$ZodShape,
-    get optional() {
-      return util.optionalObjectKeys(shape);
-    },
-    catchall: _never(schemas.$ZodNever),
-    ...util.normalizeParams(params),
-  }) as any;
-}
-
-// looseObject
-export function _looseObject<T extends schemas.$ZodShape>(
-  Class: util.SchemaClass<schemas.$ZodObject>,
-  shape: T,
-  params?: $ZodObjectParams
-): schemas.$ZodObject<T, { [k: string]: unknown }> {
-  return new Class({
-    type: "object",
-    shape: shape as schemas.$ZodShape,
-    get optional() {
-      return util.optionalObjectKeys(shape);
-    },
-    catchall: _unknown(schemas.$ZodUnknown),
-    ...util.normalizeParams(params),
-  }) as any;
-}
 
 // ZodUnion
 export type $ZodUnionParams = util.TypeParams<schemas.$ZodUnion, "options">;
@@ -1609,6 +1486,7 @@ export function _stringbool(
           def: {
             check: "custom",
           },
+          onattach: [],
         },
       },
     ],