@orpc/zod 0.0.0-next.b6b0cc3 → 0.0.0-next.b6b8746

package/dist/zod4/index.mjs

@@ -1,4 +1,5 @@
-import { isObject, guard, intercept } from '@orpc/shared';
+import { isObject, guard, intercept, toArray } from '@orpc/shared';
+import { JsonSchemaXNativeType } from '@orpc/json-schema';
 import { JSONSchemaFormat, JSONSchemaContentEncoding } from '@orpc/openapi';
 import { registry, globalRegistry } from 'zod/v4/core';
 
@@ -7,7 +8,7 @@ class experimental_ZodSmartCoercionPlugin {
     options.clientInterceptors ??= [];
     options.clientInterceptors.unshift((options2) => {
       const inputSchema = options2.procedure["~orpc"].inputSchema;
-      if (!inputSchema || inputSchema["~standard"].vendor !== "zod") {
+      if (!inputSchema || inputSchema["~standard"].vendor !== "zod" || !("_zod" in inputSchema)) {
         return options2.next();
       }
       const coercedInput = this.#coerce(inputSchema, options2.input);
@@ -100,8 +101,7 @@ class experimental_ZodSmartCoercionPlugin {
         }
         return value;
       }
-      case "object":
-      case "interface": {
+      case "object": {
         const object = schema;
         if (value === void 0) {
           return {};
@@ -165,9 +165,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,64 +267,53 @@ 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();
-const experimental_JSON_SCHEMA_INPUT_REGISTRY = registry();
-const experimental_JSON_SCHEMA_OUTPUT_REGISTRY = registry();
+const JSON_SCHEMA_REGISTRY = registry();
+const JSON_SCHEMA_INPUT_REGISTRY = registry();
+const JSON_SCHEMA_OUTPUT_REGISTRY = registry();
 
-class experimental_ZodToJsonSchemaConverter {
+class ZodToJsonSchemaConverter {
   maxLazyDepth;
+  maxStructureDepth;
   anyJsonSchema;
   unsupportedJsonSchema;
   undefinedJsonSchema;
   interceptors;
   constructor(options = {}) {
     this.maxLazyDepth = options.maxLazyDepth ?? 2;
+    this.maxStructureDepth = options.maxStructureDepth ?? 10;
     this.anyJsonSchema = options.anyJsonSchema ?? {};
     this.unsupportedJsonSchema = options.unsupportedJsonSchema ?? { not: {} };
     this.undefinedJsonSchema = options.undefinedJsonSchema ?? { not: {} };
     this.interceptors = options.interceptors ?? [];
   }
   condition(schema) {
-    return schema !== void 0 && schema["~standard"].vendor === "zod";
+    return schema !== void 0 && schema["~standard"].vendor === "zod" && "_zod" in schema;
   }
   convert(schema, options) {
-    return this.#convert(schema, options, 0);
+    return this.#convert(schema, options, 0, 0);
   }
-  #convert(schema, options, lazyDepth, isHandledCustomJSONSchema = false) {
+  #convert(schema, options, lazyDepth, structureDepth, isHandledCustomJSONSchema = false) {
     return intercept(
       this.interceptors,
       { schema, options, lazyDepth, isHandledCustomJSONSchema },
       ({ schema: schema2, options: options2, lazyDepth: lazyDepth2, isHandledCustomJSONSchema: isHandledCustomJSONSchema2 }) => {
+        if (structureDepth > this.maxStructureDepth) {
+          return [false, this.anyJsonSchema];
+        }
+        if (!options2.minStructureDepthForRef || options2.minStructureDepthForRef <= structureDepth) {
+          const components = toArray(options2.components);
+          for (const component of components) {
+            if (component.schema === schema2 && component.allowedStrategies.includes(options2.strategy)) {
+              return [component.required, { $ref: component.ref }];
+            }
+          }
+        }
         if (!isHandledCustomJSONSchema2) {
           const customJSONSchema = this.#getCustomJsonSchema(schema2, options2);
           if (customJSONSchema) {
-            const [required, json] = this.#convert(schema2, options2, lazyDepth2, true);
+            const [required, json] = this.#convert(schema2, options2, lazyDepth2, structureDepth, true);
             return [required, { ...json, ...customJSONSchema }];
           }
         }
@@ -320,7 +321,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 +334,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;
@@ -369,10 +377,18 @@ class experimental_ZodToJsonSchemaConverter {
             return [true, { type: "boolean" }];
           }
           case "bigint": {
-            return [true, { type: "string", pattern: "^-?[0-9]+$" }];
+            return [true, {
+              "type": "string",
+              "pattern": "^-?[0-9]+$",
+              "x-native-type": JsonSchemaXNativeType.BigInt
+            }];
           }
           case "date": {
-            return [true, { type: "string", format: JSONSchemaFormat.DateTime }];
+            return [true, {
+              "type": "string",
+              "format": JSONSchemaFormat.DateTime,
+              "x-native-type": JsonSchemaXNativeType.Date
+            }];
           }
           case "null": {
             return [true, { type: "null" }];
@@ -400,14 +416,14 @@ class experimental_ZodToJsonSchemaConverter {
             if (typeof maximum === "number") {
               json.maxItems = maximum;
             }
-            json.items = this.#handleArrayItemJsonSchema(this.#convert(array._zod.def.element, options2, lazyDepth2), options2);
+            json.items = this.#handleArrayItemJsonSchema(this.#convert(array._zod.def.element, options2, lazyDepth2, structureDepth + 1), options2);
             return [true, json];
           }
           case "object": {
             const object = schema2;
             const json = { type: "object" };
             for (const [key, value] of Object.entries(object._zod.def.shape)) {
-              const [itemRequired, itemJson] = this.#convert(value, options2, lazyDepth2);
+              const [itemRequired, itemJson] = this.#convert(value, options2, lazyDepth2, structureDepth + 1);
               json.properties ??= {};
               json.properties[key] = itemJson;
               if (itemRequired) {
@@ -419,7 +435,7 @@ class experimental_ZodToJsonSchemaConverter {
               if (object._zod.def.catchall._zod.def.type === "never") {
                 json.additionalProperties = false;
               } else {
-                const [_, addJson] = this.#convert(object._zod.def.catchall, options2, lazyDepth2);
+                const [_, addJson] = this.#convert(object._zod.def.catchall, options2, lazyDepth2, structureDepth + 1);
                 json.additionalProperties = addJson;
               }
             }
@@ -430,7 +446,7 @@ class experimental_ZodToJsonSchemaConverter {
             const anyOf = [];
             let required = true;
             for (const item of union._zod.def.options) {
-              const [itemRequired, itemJson] = this.#convert(item, options2, lazyDepth2);
+              const [itemRequired, itemJson] = this.#convert(item, options2, lazyDepth2, structureDepth + 1);
               if (!itemRequired) {
                 required = false;
               }
@@ -444,14 +460,14 @@ class experimental_ZodToJsonSchemaConverter {
                 }
               }
             }
-            return [required, anyOf.length === 1 ? anyOf[0] : { anyOf }];
+            return [required, { anyOf }];
           }
           case "intersection": {
             const intersection = schema2;
             const json = { allOf: [] };
             let required = false;
             for (const item of [intersection._zod.def.left, intersection._zod.def.right]) {
-              const [itemRequired, itemJson] = this.#convert(item, options2, lazyDepth2);
+              const [itemRequired, itemJson] = this.#convert(item, options2, lazyDepth2, structureDepth + 1);
               json.allOf.push(itemJson);
               if (itemRequired) {
                 required = true;
@@ -463,10 +479,10 @@ class experimental_ZodToJsonSchemaConverter {
             const tuple = schema2;
             const json = { type: "array", prefixItems: [] };
             for (const item of tuple._zod.def.items) {
-              json.prefixItems.push(this.#handleArrayItemJsonSchema(this.#convert(item, options2, lazyDepth2), options2));
+              json.prefixItems.push(this.#handleArrayItemJsonSchema(this.#convert(item, options2, lazyDepth2, structureDepth + 1), options2));
             }
             if (tuple._zod.def.rest) {
-              json.items = this.#handleArrayItemJsonSchema(this.#convert(tuple._zod.def.rest, options2, lazyDepth2), options2);
+              json.items = this.#handleArrayItemJsonSchema(this.#convert(tuple._zod.def.rest, options2, lazyDepth2, structureDepth + 1), options2);
             }
             const { minimum, maximum } = tuple._zod.bag;
             if (typeof minimum === "number") {
@@ -480,36 +496,45 @@ class experimental_ZodToJsonSchemaConverter {
           case "record": {
             const record = schema2;
             const json = { type: "object" };
-            json.propertyNames = this.#convert(record._zod.def.keyType, options2, lazyDepth2)[1];
-            json.additionalProperties = this.#convert(record._zod.def.valueType, options2, lazyDepth2)[1];
+            json.propertyNames = this.#convert(record._zod.def.keyType, options2, lazyDepth2, structureDepth + 1)[1];
+            json.additionalProperties = this.#convert(record._zod.def.valueType, options2, lazyDepth2, structureDepth + 1)[1];
             return [true, json];
           }
           case "map": {
             const map = schema2;
             return [true, {
-              type: "array",
-              items: {
+              "type": "array",
+              "items": {
                 type: "array",
                 prefixItems: [
-                  this.#handleArrayItemJsonSchema(this.#convert(map._zod.def.keyType, options2, lazyDepth2), options2),
-                  this.#handleArrayItemJsonSchema(this.#convert(map._zod.def.valueType, options2, lazyDepth2), options2)
+                  this.#handleArrayItemJsonSchema(this.#convert(map._zod.def.keyType, options2, lazyDepth2, structureDepth + 1), options2),
+                  this.#handleArrayItemJsonSchema(this.#convert(map._zod.def.valueType, options2, lazyDepth2, structureDepth + 1), options2)
                 ],
                 maxItems: 2,
                 minItems: 2
-              }
+              },
+              "x-native-type": JsonSchemaXNativeType.Map
             }];
           }
           case "set": {
             const set = schema2;
             return [true, {
-              type: "array",
-              uniqueItems: true,
-              items: this.#handleArrayItemJsonSchema(this.#convert(set._zod.def.valueType, options2, lazyDepth2), options2)
+              "type": "array",
+              "uniqueItems": true,
+              "items": this.#handleArrayItemJsonSchema(this.#convert(set._zod.def.valueType, options2, lazyDepth2, structureDepth + 1), options2),
+              "x-native-type": JsonSchemaXNativeType.Set
             }];
           }
           case "enum": {
             const enum_ = schema2;
-            return [true, { enum: Object.values(enum_._zod.def.entries) }];
+            const values = getEnumValues(enum_._zod.def.entries);
+            const json = { enum: values };
+            if (values.every((v) => typeof v === "string")) {
+              json.type = "string";
+            } else if (values.every((v) => Number.isFinite(v))) {
+              json.type = "number";
+            }
+            return [true, json];
           }
           case "literal": {
             const literal = schema2;
@@ -544,12 +569,12 @@ class experimental_ZodToJsonSchemaConverter {
           }
           case "nullable": {
             const nullable = schema2;
-            const [required, json] = this.#convert(nullable._zod.def.innerType, options2, lazyDepth2);
+            const [required, json] = this.#convert(nullable._zod.def.innerType, options2, lazyDepth2, structureDepth);
             return [required, { anyOf: [json, { type: "null" }] }];
           }
           case "nonoptional": {
             const nonoptional = schema2;
-            const [, json] = this.#convert(nonoptional._zod.def.innerType, options2, lazyDepth2);
+            const [, json] = this.#convert(nonoptional._zod.def.innerType, options2, lazyDepth2, structureDepth);
             return [true, json];
           }
           case "success": {
@@ -558,7 +583,7 @@ class experimental_ZodToJsonSchemaConverter {
           case "default":
           case "prefault": {
             const default_ = schema2;
-            const [, json] = this.#convert(default_._zod.def.innerType, options2, lazyDepth2);
+            const [, json] = this.#convert(default_._zod.def.innerType, options2, lazyDepth2, structureDepth);
             return [false, {
               ...json,
               default: default_._zod.def.defaultValue
@@ -566,18 +591,24 @@ class experimental_ZodToJsonSchemaConverter {
           }
           case "catch": {
             const catch_ = schema2;
-            return this.#convert(catch_._zod.def.innerType, options2, lazyDepth2);
+            return this.#convert(catch_._zod.def.innerType, options2, lazyDepth2, structureDepth);
           }
           case "nan": {
             return [true, options2.strategy === "input" ? this.unsupportedJsonSchema : { type: "null" }];
           }
           case "pipe": {
             const pipe = schema2;
-            return this.#convert(options2.strategy === "input" ? pipe._zod.def.in : pipe._zod.def.out, options2, lazyDepth2);
+            return this.#convert(
+              // prefer out schema when in schema is preprocess/transform
+              options2.strategy === "input" && pipe._zod.def.in._zod.def.type !== "transform" ? pipe._zod.def.in : pipe._zod.def.out,
+              options2,
+              lazyDepth2,
+              structureDepth
+            );
           }
           case "readonly": {
             const readonly_ = schema2;
-            const [required, json] = this.#convert(readonly_._zod.def.innerType, options2, lazyDepth2);
+            const [required, json] = this.#convert(readonly_._zod.def.innerType, options2, lazyDepth2, structureDepth);
             return [required, { ...json, readOnly: true }];
           }
           case "template_literal": {
@@ -589,15 +620,16 @@ class experimental_ZodToJsonSchemaConverter {
           }
           case "optional": {
             const optional = schema2;
-            const [, json] = this.#convert(optional._zod.def.innerType, options2, lazyDepth2);
+            const [, json] = this.#convert(optional._zod.def.innerType, options2, lazyDepth2, structureDepth);
             return [false, json];
           }
           case "lazy": {
             const lazy = schema2;
-            if (lazyDepth2 >= this.maxLazyDepth) {
+            const currentLazyDepth = lazyDepth2 + 1;
+            if (currentLazyDepth > this.maxLazyDepth) {
               return [false, this.anyJsonSchema];
             }
-            return this.#convert(lazy._zod.def.getter(), options2, lazyDepth2 + 1);
+            return this.#convert(lazy._zod.def.getter(), options2, currentLazyDepth, structureDepth);
           }
           default: {
             schema2._zod.def.type;
@@ -608,20 +640,21 @@ class experimental_ZodToJsonSchemaConverter {
     );
   }
   #getCustomJsonSchema(schema, options) {
-    if (options.strategy === "input" && experimental_JSON_SCHEMA_INPUT_REGISTRY.has(schema)) {
-      return experimental_JSON_SCHEMA_INPUT_REGISTRY.get(schema);
+    if (options.strategy === "input" && JSON_SCHEMA_INPUT_REGISTRY.has(schema)) {
+      return JSON_SCHEMA_INPUT_REGISTRY.get(schema);
     }
-    if (options.strategy === "output" && experimental_JSON_SCHEMA_OUTPUT_REGISTRY.has(schema)) {
-      return experimental_JSON_SCHEMA_OUTPUT_REGISTRY.get(schema);
+    if (options.strategy === "output" && JSON_SCHEMA_OUTPUT_REGISTRY.has(schema)) {
+      return JSON_SCHEMA_OUTPUT_REGISTRY.get(schema);
     }
-    if (experimental_JSON_SCHEMA_REGISTRY.has(schema)) {
-      return experimental_JSON_SCHEMA_REGISTRY.get(schema);
+    if (JSON_SCHEMA_REGISTRY.has(schema)) {
+      return JSON_SCHEMA_REGISTRY.get(schema);
     }
     const global = globalRegistry.get(schema);
     if (global) {
       return {
+        title: global.title,
         description: global.description,
-        examples: global.examples
+        examples: Array.isArray(global.examples) ? global.examples : void 0
       };
     }
   }
@@ -656,5 +689,10 @@ class experimental_ZodToJsonSchemaConverter {
     return Object.values(JSONSchemaContentEncoding).includes(contentEncoding) ? contentEncoding : void 0;
   }
 }
+function getEnumValues(entries) {
+  const numericValues = Object.values(entries).filter((v) => typeof v === "number");
+  const values = Object.entries(entries).filter(([k, _]) => !numericValues.includes(+k)).map(([_, v]) => v);
+  return values;
+}
 
-export { experimental_JSON_SCHEMA_INPUT_REGISTRY, experimental_JSON_SCHEMA_OUTPUT_REGISTRY, experimental_JSON_SCHEMA_REGISTRY, experimental_ZodSmartCoercionPlugin, experimental_ZodToJsonSchemaConverter };
+export { JSON_SCHEMA_INPUT_REGISTRY, JSON_SCHEMA_OUTPUT_REGISTRY, JSON_SCHEMA_REGISTRY, ZodToJsonSchemaConverter, experimental_ZodSmartCoercionPlugin };

package/package.json

@@ -1,16 +1,15 @@
 {
   "name": "@orpc/zod",
   "type": "module",
-  "version": "0.0.0-next.b6b0cc3",
+  "version": "0.0.0-next.b6b8746",
   "license": "MIT",
-  "homepage": "https://orpc.unnoq.com",
+  "homepage": "https://orpc.dev",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/unnoq/orpc.git",
+    "url": "git+https://github.com/middleapi/orpc.git",
     "directory": "packages/zod"
   },
   "keywords": [
-    "unnoq",
     "orpc"
   ],
   "exports": {
@@ -29,19 +28,19 @@
     "dist"
   ],
   "peerDependencies": {
-    "zod": ">=3.24.2",
-    "@orpc/contract": "0.0.0-next.b6b0cc3",
-    "@orpc/server": "0.0.0-next.b6b0cc3"
+    "zod": ">=3.25.0",
+    "@orpc/contract": "0.0.0-next.b6b8746",
+    "@orpc/server": "0.0.0-next.b6b8746"
   },
   "dependencies": {
     "escape-string-regexp": "^5.0.0",
-    "wildcard-match": "^5.1.3",
-    "@orpc/openapi": "0.0.0-next.b6b0cc3",
-    "@orpc/shared": "0.0.0-next.b6b0cc3"
+    "wildcard-match": "^5.1.4",
+    "@orpc/openapi": "0.0.0-next.b6b8746",
+    "@orpc/shared": "0.0.0-next.b6b8746",
+    "@orpc/json-schema": "0.0.0-next.b6b8746"
   },
   "devDependencies": {
-    "zod": "^3.25.11",
-    "zod-to-json-schema": "^3.24.5"
+    "zod": "^4.3.6"
   },
   "scripts": {
     "build": "unbuild",