@orpc/zod 1.3.0 → 1.4.1

package/dist/zod4/index.mjs

@@ -100,8 +100,7 @@ class experimental_ZodSmartCoercionPlugin {
         }
         return value;
       }
-      case "object":
-      case "interface": {
+      case "object": {
         const object = schema;
         if (value === void 0) {
           return {};
@@ -165,9 +164,21 @@ class experimental_ZodSmartCoercionPlugin {
           return this.#coerce(union._zod.def.options[0], value);
         }
         if (isObject(value)) {
+          const discriminator = "discriminator" in union._zod.def && typeof union._zod.def.discriminator === "string" ? union._zod.def.discriminator : void 0;
           for (const option of union._zod.def.options) {
-            if (option._zod.disc && this.#matchDiscriminators(value, option._zod.disc)) {
-              return this.#coerce(option, value);
+            if (!option._zod.propValues) {
+              continue;
+            }
+            if (discriminator !== void 0) {
+              if (option._zod.propValues[discriminator]?.has(value[discriminator])) {
+                return this.#coerce(option, value);
+              }
+            } else {
+              for (const key in option._zod.propValues) {
+                if (option._zod.propValues[key]?.has(value[key])) {
+                  return this.#coerce(option, value);
+                }
+              }
             }
           }
         }
@@ -255,30 +266,6 @@ class experimental_ZodSmartCoercionPlugin {
     }
     return value;
   }
-  /**
-   * This function is inspired from Zod, because it's not exported
-   * https://github.com/colinhacks/zod/blob/v4/packages/core/src/schemas.ts#L1903C1-L1921C2
-   */
-  #matchDiscriminators(input, discs) {
-    for (const [key, value] of discs) {
-      const data = input[key];
-      if (value.values.size && !value.values.has(data)) {
-        return false;
-      }
-      if (value.maps.length === 0) {
-        continue;
-      }
-      if (!isObject(data)) {
-        return false;
-      }
-      for (const m of value.maps) {
-        if (!this.#matchDiscriminators(data, m)) {
-          return false;
-        }
-      }
-    }
-    return true;
-  }
 }
 
 const experimental_JSON_SCHEMA_REGISTRY = registry();
@@ -320,7 +307,7 @@ class experimental_ZodToJsonSchemaConverter {
           case "string": {
             const string = schema2;
             const json = { type: "string" };
-            const { minimum, maximum, format, pattern, contentEncoding } = string._zod.bag;
+            const { minimum, maximum, format, patterns, contentEncoding } = string._zod.bag;
             if (typeof minimum === "number") {
               json.minLength = minimum;
             }
@@ -333,8 +320,15 @@ class experimental_ZodToJsonSchemaConverter {
             if (typeof format === "string" && format !== "regex" && json.contentEncoding === void 0) {
               json.format = this.#handleStringFormat(format);
             }
-            if (pattern instanceof RegExp && json.contentEncoding === void 0 && json.format === void 0) {
-              json.pattern = pattern.source;
+            if (patterns instanceof Set && json.contentEncoding === void 0 && json.format === void 0) {
+              for (const pattern of patterns) {
+                if (json.pattern === void 0) {
+                  json.pattern = pattern.source;
+                } else {
+                  json.allOf ??= [];
+                  json.allOf.push({ pattern: pattern.source });
+                }
+              }
             }
             if (format === "jwt" && json.contentEncoding === void 0 && json.format === void 0 && json.pattern === void 0) {
               json.pattern = /^[\w-]+\.[\w-]+\.[\w-]+$/.source;
@@ -621,7 +615,7 @@ class experimental_ZodToJsonSchemaConverter {
     if (global) {
       return {
         description: global.description,
-        examples: global.examples
+        examples: Array.isArray(global.examples) ? global.examples : void 0
       };
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/zod",
   "type": "module",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -30,17 +30,17 @@
   ],
   "peerDependencies": {
     "zod": ">=3.24.2",
-    "@orpc/contract": "1.3.0",
-    "@orpc/server": "1.3.0"
+    "@orpc/contract": "1.4.1",
+    "@orpc/server": "1.4.1"
   },
   "dependencies": {
     "escape-string-regexp": "^5.0.0",
     "wildcard-match": "^5.1.3",
-    "@orpc/openapi": "1.3.0",
-    "@orpc/shared": "1.3.0"
+    "@orpc/openapi": "1.4.1",
+    "@orpc/shared": "1.4.1"
   },
   "devDependencies": {
-    "zod": "^3.25.11",
+    "zod": "^3.25.49",
     "zod-to-json-schema": "^3.24.5"
   },
   "scripts": {