@orpc/json-schema 2.0.0-beta.4 → 2.0.0-beta.40

package/dist/index.mjs

@@ -1,5 +1,4 @@
-import { get, isPlainObject, toArray, tryOrUndefined, isDeepEqual, omit, isTypescriptObject } from '@orpc/shared';
-export { Format as JsonSchemaFormat, TypeName as JsonSchemaType } from 'json-schema-typed/draft-2020-12';
+import { get, isPlainObject, tryOrUndefined, getOwn, toArray, isDeepEqual, omit, isTypescriptObject } from '@orpc/shared';
 import { ORPCError, cloneORPCError } from '@orpc/client';
 import { getProcedureContractOrThrow } from '@orpc/contract';
 
@@ -59,6 +58,28 @@ function encodeJsonPointerSegment(segment) {
 function decodeJsonPointerSegment(segment) {
   return segment.replaceAll("~1", "/").replaceAll("~0", "~");
 }
+function visitJsonSchemaRefs(value, visit, schemaLevel = true, seen = /* @__PURE__ */ new Set()) {
+  if (!value || typeof value !== "object" || seen.has(value)) {
+    return;
+  }
+  seen.add(value);
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      visitJsonSchemaRefs(item, visit, schemaLevel, seen);
+    }
+    return;
+  }
+  for (const key of Object.keys(value)) {
+    const val = value[key];
+    if (key === "$ref" && typeof val === "string") {
+      visit(val);
+    } else if (!schemaLevel) {
+      visitJsonSchemaRefs(val, visit, true, seen);
+    } else if (JSON_SCHEMA_LOGIC_KEYWORDS.has(key) || JSON_SCHEMA_RECORD_KEYWORDS.has(key)) {
+      visitJsonSchemaRefs(val, visit, !JSON_SCHEMA_RECORD_KEYWORDS.has(key), seen);
+    }
+  }
+}
 function mapJsonSchemaRefs(value, map, schemaLevel = true, path = []) {
   if (!value || typeof value !== "object") {
     return value;
@@ -67,7 +88,8 @@ function mapJsonSchemaRefs(value, map, schemaLevel = true, path = []) {
     return value.map((item, index) => mapJsonSchemaRefs(item, map, schemaLevel, [...path, index]));
   }
   const result = {};
-  for (const [key, val] of Object.entries(value)) {
+  for (const key of Object.keys(value)) {
+    const val = value[key];
     if (key === "$ref" && typeof val === "string") {
       result[key] = map(val, [...path, key]);
     } else if (!schemaLevel) {
@@ -138,9 +160,40 @@ function findRecursiveJsonSchemaDefName(defs) {
   return `__schema${index}`;
 }
 
+var JsonSchemaType = /* @__PURE__ */ ((JsonSchemaType2) => {
+  JsonSchemaType2["Array"] = "array";
+  JsonSchemaType2["Boolean"] = "boolean";
+  JsonSchemaType2["Integer"] = "integer";
+  JsonSchemaType2["Null"] = "null";
+  JsonSchemaType2["Number"] = "number";
+  JsonSchemaType2["Object"] = "object";
+  JsonSchemaType2["String"] = "string";
+  return JsonSchemaType2;
+})(JsonSchemaType || {});
+var JsonSchemaFormat = /* @__PURE__ */ ((JsonSchemaFormat2) => {
+  JsonSchemaFormat2["Date"] = "date";
+  JsonSchemaFormat2["DateTime"] = "date-time";
+  JsonSchemaFormat2["Duration"] = "duration";
+  JsonSchemaFormat2["Email"] = "email";
+  JsonSchemaFormat2["Hostname"] = "hostname";
+  JsonSchemaFormat2["IDNEmail"] = "idn-email";
+  JsonSchemaFormat2["IDNHostname"] = "idn-hostname";
+  JsonSchemaFormat2["IPv4"] = "ipv4";
+  JsonSchemaFormat2["IPv6"] = "ipv6";
+  JsonSchemaFormat2["IRI"] = "iri";
+  JsonSchemaFormat2["IRIReference"] = "iri-reference";
+  JsonSchemaFormat2["JSONPointer"] = "json-pointer";
+  JsonSchemaFormat2["RegEx"] = "regex";
+  JsonSchemaFormat2["RelativeJSONPointer"] = "relative-json-pointer";
+  JsonSchemaFormat2["Time"] = "time";
+  JsonSchemaFormat2["URI"] = "uri";
+  JsonSchemaFormat2["URIReference"] = "uri-reference";
+  JsonSchemaFormat2["URITemplate"] = "uri-template";
+  JsonSchemaFormat2["UUID"] = "uuid";
+  return JsonSchemaFormat2;
+})(JsonSchemaFormat || {});
 var JsonSchemaXNativeType = /* @__PURE__ */ ((JsonSchemaXNativeType2) => {
   JsonSchemaXNativeType2["BigInt"] = "bigint";
-  JsonSchemaXNativeType2["RegExp"] = "regexp";
   JsonSchemaXNativeType2["Date"] = "date";
   JsonSchemaXNativeType2["Url"] = "url";
   JsonSchemaXNativeType2["Set"] = "set";
@@ -148,7 +201,12 @@ var JsonSchemaXNativeType = /* @__PURE__ */ ((JsonSchemaXNativeType2) => {
   return JsonSchemaXNativeType2;
 })(JsonSchemaXNativeType || {});
 
-const FLEXIBLE_DATE_FORMAT_REGEX = /^[^-]+-[^-]+-[^-]+$/;
+const UNSATISFIED = 0;
+const LOOSELY_SATISFIED = 1;
+const SATISFIED = 2;
+function minSatisfaction(a, b) {
+  return a < b ? a : b;
+}
 class JsonSchemaCoercer {
   coerce([schema, optional], value) {
     if (optional && value === void 0) {
@@ -157,25 +215,29 @@ class JsonSchemaCoercer {
     const [, coerced] = this.coerceInternal(schema, schema, value);
     return coerced;
   }
-  coerceInternal(rootSchema, schema, value) {
+  coerceInternal(rootSchema, schema, value, appliedRefs) {
     if (typeof schema === "boolean") {
-      return [schema, value];
+      return [schema ? SATISFIED : UNSATISFIED, value];
     }
     if (Array.isArray(schema.type)) {
       return this.coerceInternal(
         rootSchema,
         { anyOf: schema.type.map((type) => ({ ...schema, type })) },
-        value
+        value,
+        appliedRefs
       );
     }
     let coerced = value;
-    let satisfied = true;
+    let satisfied = SATISFIED;
     if (typeof schema.$ref === "string") {
       const resolved = schema.$ref.startsWith("#/") ? get(rootSchema, schema.$ref.slice("#/".length).split("/").map(decodeJsonPointerSegment)) : schema.$ref === "#" ? rootSchema : void 0;
-      if (resolved !== void 0) {
-        const [subSatisfied, subCoerced] = this.coerceInternal(rootSchema, resolved, coerced);
+      if (resolved !== void 0 && !appliedRefs?.has(resolved)) {
+        appliedRefs ??= /* @__PURE__ */ new Set();
+        appliedRefs.add(resolved);
+        const [subSatisfied, subCoerced] = this.coerceInternal(rootSchema, resolved, coerced, appliedRefs);
+        appliedRefs.delete(resolved);
         coerced = subCoerced;
-        satisfied = subSatisfied;
+        satisfied = minSatisfaction(satisfied, subSatisfied);
       }
     }
     const enumValues = schema.const !== void 0 ? [schema.const] : schema.enum;
@@ -189,24 +251,24 @@ class JsonSchemaCoercer {
           if (enumValues.includes(booleanValue)) {
             coerced = booleanValue;
           } else {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
         }
       } else {
-        satisfied = false;
+        satisfied = UNSATISFIED;
       }
     }
     if (schema.type) {
       switch (schema.type) {
         case "null": {
           if (coerced !== null) {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
         case "string": {
           if (typeof coerced !== "string") {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -215,7 +277,7 @@ class JsonSchemaCoercer {
             coerced = stringToNumber(coerced);
           }
           if (typeof coerced !== "number") {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -224,7 +286,7 @@ class JsonSchemaCoercer {
             coerced = stringToInteger(coerced);
           }
           if (typeof coerced !== "number" || !Number.isInteger(coerced)) {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -233,7 +295,7 @@ class JsonSchemaCoercer {
             coerced = stringToBoolean(coerced);
           }
           if (typeof coerced !== "boolean") {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -245,26 +307,24 @@ class JsonSchemaCoercer {
             const coercedItems = coerced.map((item, i) => {
               const subSchema = prefixItemSchemas[i] ?? itemSchema;
               if (subSchema === void 0) {
-                satisfied = false;
+                satisfied = minSatisfaction(satisfied, LOOSELY_SATISFIED);
                 return item;
               }
               const [subSatisfied, subCoerced] = this.coerceInternal(rootSchema, subSchema, item);
-              if (!subSatisfied) {
-                satisfied = false;
-              }
+              satisfied = minSatisfaction(satisfied, subSatisfied);
               if (subCoerced !== item) {
                 shouldUseCoercedItems = true;
               }
               return subCoerced;
             });
             if (coercedItems.length < prefixItemSchemas.length) {
-              satisfied = false;
+              satisfied = UNSATISFIED;
             }
             if (shouldUseCoercedItems) {
               coerced = coercedItems;
             }
           } else {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -274,35 +334,36 @@ class JsonSchemaCoercer {
           }
           if (isPlainObject(coerced)) {
             let shouldUseCoercedItems = false;
-            const coercedItems = {};
-            const patternProperties = Object.entries(schema.patternProperties ?? {}).map(([key, value2]) => [new RegExp(key), value2]);
-            for (const key in coerced) {
+            const coercedItems = { ...coerced };
+            const patternProperties = Object.entries(schema.patternProperties ?? {}).flatMap(([key, value2]) => {
+              const pattern = tryOrUndefined(() => new RegExp(key));
+              return pattern ? [[pattern, value2]] : [];
+            });
+            const propertySchemas = schema.properties ?? {};
+            for (const key of Object.keys(coerced)) {
               const value2 = coerced[key];
-              const subSchema = schema.properties?.[key] ?? patternProperties.find(([pattern]) => pattern.test(key))?.[1] ?? schema.additionalProperties;
-              if (value2 === void 0 && !schema.required?.includes(key)) {
-                coercedItems[key] = value2;
-              } else if (subSchema === void 0) {
-                coercedItems[key] = value2;
-                satisfied = false;
-              } else {
-                const [subSatisfied, subCoerced] = this.coerceInternal(rootSchema, subSchema, value2);
-                coercedItems[key] = subCoerced;
-                if (!subSatisfied) {
-                  satisfied = false;
-                }
-                if (subCoerced !== value2) {
-                  shouldUseCoercedItems = true;
+              const subSchema = getOwn(propertySchemas, key) ?? patternProperties.find(([pattern]) => pattern.test(key))?.[1] ?? schema.additionalProperties;
+              if (value2 !== void 0 || schema.required?.includes(key)) {
+                if (subSchema === void 0) {
+                  satisfied = minSatisfaction(satisfied, LOOSELY_SATISFIED);
+                } else {
+                  const [subSatisfied, subCoerced] = this.coerceInternal(rootSchema, subSchema, value2);
+                  coercedItems[key] = subCoerced;
+                  satisfied = minSatisfaction(satisfied, subSatisfied);
+                  if (subCoerced !== value2) {
+                    shouldUseCoercedItems = true;
+                  }
                 }
               }
             }
             if (schema.required?.some((key) => !Object.hasOwn(coercedItems, key))) {
-              satisfied = false;
+              satisfied = UNSATISFIED;
             }
             if (shouldUseCoercedItems) {
               coerced = coercedItems;
             }
           } else {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -315,7 +376,7 @@ class JsonSchemaCoercer {
             coerced = stringToDate(coerced);
           }
           if (!(coerced instanceof Date)) {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -329,16 +390,7 @@ class JsonSchemaCoercer {
               break;
           }
           if (typeof coerced !== "bigint") {
-            satisfied = false;
-          }
-          break;
-        }
-        case JsonSchemaXNativeType.RegExp: {
-          if (typeof coerced === "string") {
-            coerced = stringToRegExp(coerced);
-          }
-          if (!(coerced instanceof RegExp)) {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -347,7 +399,7 @@ class JsonSchemaCoercer {
             coerced = stringToURL(coerced);
           }
           if (!(coerced instanceof URL)) {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -356,7 +408,7 @@ class JsonSchemaCoercer {
             coerced = arrayToSet(coerced);
           }
           if (!(coerced instanceof Set)) {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -365,7 +417,7 @@ class JsonSchemaCoercer {
             coerced = arrayToMap(coerced);
           }
           if (!(coerced instanceof Map)) {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -373,54 +425,78 @@ class JsonSchemaCoercer {
     }
     if (schema.allOf) {
       for (const subSchema of schema.allOf) {
-        const [subSatisfied, subCoerced] = this.coerceInternal(rootSchema, subSchema, coerced);
+        const [subSatisfied, subCoerced] = this.coerceInternal(rootSchema, subSchema, coerced, appliedRefs);
         coerced = subCoerced;
-        if (!subSatisfied) {
-          satisfied = false;
-        }
+        satisfied = minSatisfaction(satisfied, subSatisfied);
       }
     }
     for (const key of ["anyOf", "oneOf"]) {
       if (schema[key]) {
-        let bestOptions;
+        let best;
         for (const subSchema of schema[key]) {
-          const [subSatisfied, subCoerced] = this.coerceInternal(rootSchema, subSchema, coerced);
-          if (subSatisfied) {
-            if (!bestOptions || subCoerced === coerced) {
-              bestOptions = { coerced: subCoerced, satisfied: subSatisfied };
-            }
-            if (subCoerced === coerced) {
-              break;
-            }
+          const [subSatisfied, subCoerced] = this.coerceInternal(rootSchema, subSchema, coerced, appliedRefs);
+          if (subSatisfied === UNSATISFIED) {
+            continue;
+          }
+          if (subCoerced === coerced) {
+            best = { satisfied: subSatisfied, value: subCoerced };
+            break;
           }
+          if (!best || subSatisfied > best.satisfied) {
+            best = { satisfied: subSatisfied, value: subCoerced };
+          }
+        }
+        if (best) {
+          coerced = best.value;
+          satisfied = minSatisfaction(satisfied, best.satisfied);
+        } else {
+          satisfied = UNSATISFIED;
         }
-        coerced = bestOptions ? bestOptions.coerced : coerced;
-        satisfied = bestOptions ? bestOptions.satisfied : false;
       }
     }
     if (typeof schema.not !== "undefined") {
-      const [notSatisfied] = this.coerceInternal(rootSchema, schema.not, coerced);
-      if (notSatisfied) {
-        satisfied = false;
+      const [notSatisfied] = this.coerceInternal(rootSchema, schema.not, coerced, appliedRefs);
+      if (notSatisfied !== UNSATISFIED) {
+        satisfied = UNSATISFIED;
       }
     }
     return [satisfied, coerced];
   }
 }
+const NUMBER_PATTERN = /^-?(?:0|[1-9]\d*)(?:\.\d+)?$/;
 function stringToNumber(value) {
-  const num = Number.parseFloat(value);
-  if (Number.isNaN(num) || num !== Number(value)) {
+  if (!NUMBER_PATTERN.test(value)) {
+    return value;
+  }
+  const num = Number(value);
+  if (num < Number.MIN_SAFE_INTEGER || num > Number.MAX_SAFE_INTEGER) {
     return value;
   }
   return num;
 }
+const INTEGER_PATTERN = /^-?(?:0|[1-9]\d*)$/;
 function stringToInteger(value) {
-  const num = Number.parseInt(value);
-  if (Number.isNaN(num) || num !== Number(value)) {
+  if (!INTEGER_PATTERN.test(value)) {
+    return value;
+  }
+  const num = Number(value);
+  if (!Number.isSafeInteger(num)) {
     return value;
   }
   return num;
 }
+function stringToBigInt(value) {
+  if (!INTEGER_PATTERN.test(value)) {
+    return value;
+  }
+  return BigInt(value);
+}
+function numberToBigInt(value) {
+  if (!Number.isInteger(value)) {
+    return value;
+  }
+  return BigInt(value);
+}
 function stringToBoolean(value) {
   const lower = value.toLowerCase();
   if (lower === "false" || lower === "off") {
@@ -431,27 +507,17 @@ function stringToBoolean(value) {
   }
   return value;
 }
-function stringToBigInt(value) {
-  return tryOrUndefined(() => BigInt(value)) ?? value;
-}
-function numberToBigInt(value) {
-  return tryOrUndefined(() => BigInt(value)) ?? value;
-}
+const DATE_TIME_PATTERN = /^[+-]?\d{4,6}-\d{1,2}-\d{1,2}(?:[T ].*)?$/;
 function stringToDate(value) {
+  if (!DATE_TIME_PATTERN.test(value)) {
+    return value;
+  }
   const date = new Date(value);
-  if (Number.isNaN(date.getTime()) || !FLEXIBLE_DATE_FORMAT_REGEX.test(value)) {
+  if (Number.isNaN(date.getTime())) {
     return value;
   }
   return date;
 }
-function stringToRegExp(value) {
-  const match = value.match(/^\/(.*)\/([a-z]*)$/);
-  if (match) {
-    const [, pattern, flags] = match;
-    return tryOrUndefined(() => new RegExp(pattern, flags)) ?? value;
-  }
-  return value;
-}
 function stringToURL(value) {
   return tryOrUndefined(() => new URL(value)) ?? value;
 }
@@ -513,148 +579,85 @@ function ensureJsonSchemaObject(schema) {
   return schema;
 }
 
+function promoteJsonSchemaDefs(schema, mergedDefs, basePath) {
+  const { $defs, ...rootBody } = schema;
+  const renameMap = /* @__PURE__ */ new Map();
+  const mapRef = (ref) => {
+    if (ref === "#") {
+      return basePath;
+    }
+    if (ref.startsWith("#/$defs/")) {
+      const [encodedName, ...segments] = ref.slice("#/$defs/".length).split("/");
+      const newName = renameMap.get(decodeJsonPointerSegment(encodedName));
+      return newName === void 0 ? ref : ["#/$defs", encodeJsonPointerSegment(newName), ...segments].join("/");
+    }
+    if (ref.startsWith("#/") && get(rootBody, ref.slice(2).split("/").map(decodeJsonPointerSegment)) !== void 0) {
+      return `${basePath}/${ref.slice(2)}`;
+    }
+    return ref;
+  };
+  const defs = Object.entries($defs ?? {}).filter(([, def]) => def !== void 0);
+  if (defs.length > 0) {
+    const promoted = /* @__PURE__ */ new Map();
+    const reserved = /* @__PURE__ */ new Set([...mergedDefs.keys(), ...defs.map(([name]) => name)]);
+    for (let changed = true; changed; ) {
+      changed = false;
+      for (const [name, def] of defs) {
+        const body = mapJsonSchemaRefs(def, mapRef);
+        promoted.set(name, body);
+        if (renameMap.has(name) || !mergedDefs.has(name) || isDeepEqual(mergedDefs.get(name), body)) {
+          continue;
+        }
+        let counter = 2;
+        while (reserved.has(`${name}${counter}`)) {
+          counter++;
+        }
+        reserved.add(`${name}${counter}`);
+        renameMap.set(name, `${name}${counter}`);
+        changed = true;
+      }
+    }
+    for (const [name, body] of promoted) {
+      mergedDefs.set(renameMap.get(name) ?? name, body);
+    }
+  }
+  return mapJsonSchemaRefs(rootBody, mapRef);
+}
 function combineJsonSchemasWithComposition(keyword, schemas) {
   if (schemas.length <= 1) {
     return schemas[0] ?? true;
   }
-  const mergedDefs = {};
+  const mergedDefs = /* @__PURE__ */ new Map();
   const compositionBranches = [];
   for (let i = 0; i < schemas.length; i++) {
     const schema = schemas[i];
-    if (typeof schema === "boolean") {
-      compositionBranches.push(schema);
-      continue;
-    }
-    const { $defs, ...rest } = schema;
-    const renameMap = {};
-    const promotedNames = /* @__PURE__ */ new Set();
-    if ($defs) {
-      for (const [name, def] of Object.entries($defs)) {
-        if (def === void 0)
-          continue;
-        promotedNames.add(name);
-        if (name in mergedDefs) {
-          if (isDeepEqual(mergedDefs[name], def)) {
-            continue;
-          }
-          let counter = 2;
-          let newName = `${name}${counter}`;
-          while (newName in mergedDefs) {
-            counter++;
-            newName = `${name}${counter}`;
-          }
-          mergedDefs[newName] = def;
-          renameMap[name] = newName;
-        } else {
-          mergedDefs[name] = def;
-        }
-      }
-    }
-    compositionBranches.push(mapJsonSchemaRefs(
-      rest,
-      (ref) => {
-        if (ref === "#") {
-          return `#/${keyword}/${i}`;
-        }
-        if (ref.startsWith("#/$defs/")) {
-          const afterPrefix = ref.slice("#/$defs/".length);
-          const slashIdx = afterPrefix.indexOf("/");
-          const encodedSegment = slashIdx === -1 ? afterPrefix : afterPrefix.slice(0, slashIdx);
-          const rest2 = slashIdx === -1 ? "" : afterPrefix.slice(slashIdx);
-          const defName = decodeJsonPointerSegment(encodedSegment);
-          if (!promotedNames.has(defName)) {
-            return ref;
-          }
-          if (defName in renameMap) {
-            return `#/$defs/${encodeJsonPointerSegment(renameMap[defName])}${rest2}`;
-          }
-          return ref;
-        }
-        if (ref.startsWith("#/") && get(rest, ref.slice(2).split("/").map(decodeJsonPointerSegment)) !== void 0) {
-          return `#/${keyword}/${i}/${ref.slice(2)}`;
-        }
-        return ref;
-      }
-    ));
+    compositionBranches.push(typeof schema === "boolean" ? schema : promoteJsonSchemaDefs(schema, mergedDefs, `#/${keyword}/${i}`));
   }
   const result = { [keyword]: compositionBranches };
-  if (Object.keys(mergedDefs).length > 0) {
-    result.$defs = mergedDefs;
+  if (mergedDefs.size > 0) {
+    result.$defs = Object.fromEntries(mergedDefs);
   }
   return result;
 }
 function combineJsonObjectSchemaEntries(entries) {
-  const properties = {};
+  const properties = /* @__PURE__ */ new Map();
   const required = [];
-  const mergedDefs = {};
+  const mergedDefs = /* @__PURE__ */ new Map();
   for (const [name, propertySchema, optional] of entries) {
     if (!optional) {
       required.push(name);
     }
-    if (typeof propertySchema === "boolean") {
-      properties[name] = propertySchema;
-      continue;
-    }
-    const { $defs, ...rest } = propertySchema;
-    const renameMap = {};
-    const promotedNames = /* @__PURE__ */ new Set();
-    if ($defs) {
-      for (const [defName, def] of Object.entries($defs)) {
-        if (def === void 0) {
-          continue;
-        }
-        promotedNames.add(defName);
-        if (defName in mergedDefs) {
-          if (isDeepEqual(mergedDefs[defName], def)) {
-            continue;
-          }
-          let counter = 2;
-          let newName = `${defName}${counter}`;
-          while (newName in mergedDefs) {
-            counter++;
-            newName = `${defName}${counter}`;
-          }
-          mergedDefs[newName] = def;
-          renameMap[defName] = newName;
-        } else {
-          mergedDefs[defName] = def;
-        }
-      }
-    }
-    const propertyPathPrefix = `#/properties/${encodeJsonPointerSegment(name)}`;
-    properties[name] = mapJsonSchemaRefs(rest, (ref) => {
-      if (ref.startsWith("#/$defs/")) {
-        const afterPrefix = ref.slice("#/$defs/".length);
-        const slashIdx = afterPrefix.indexOf("/");
-        const encodedSegment = slashIdx === -1 ? afterPrefix : afterPrefix.slice(0, slashIdx);
-        const refRest = slashIdx === -1 ? "" : afterPrefix.slice(slashIdx);
-        const defName = decodeJsonPointerSegment(encodedSegment);
-        if (!promotedNames.has(defName)) {
-          return ref;
-        }
-        if (defName in renameMap) {
-          return `#/$defs/${encodeJsonPointerSegment(renameMap[defName])}${refRest}`;
-        }
-        return ref;
-      }
-      if (ref === "#") {
-        return propertyPathPrefix;
-      }
-      if (ref.startsWith("#/") && get(rest, ref.slice(2).split("/").map(decodeJsonPointerSegment)) !== void 0) {
-        return `${propertyPathPrefix}/${ref.slice(2)}`;
-      }
-      return ref;
-    });
+    properties.set(name, typeof propertySchema === "boolean" ? propertySchema : promoteJsonSchemaDefs(propertySchema, mergedDefs, `#/properties/${encodeJsonPointerSegment(name)}`));
   }
   const schema = {
     type: "object",
-    properties
+    properties: Object.fromEntries(properties)
   };
   if (required.length > 0) {
     schema.required = required;
   }
-  if (Object.keys(mergedDefs).length > 0) {
-    schema.$defs = mergedDefs;
+  if (mergedDefs.size > 0) {
+    schema.$defs = Object.fromEntries(mergedDefs);
   }
   return schema;
 }
@@ -774,7 +777,7 @@ function flattenJsonUnionSchemaInternal(schema, resolvingRefs) {
     }
     const resolved = resolveJsonSchemaRootLocalRef(schema);
     if (resolved !== schema) {
-      const result = flattenJsonUnionSchemaInternal(resolved, resolvingRefs.add(schema.$ref));
+      const result = flattenJsonUnionSchemaInternal(resolved, new Set(resolvingRefs).add(schema.$ref));
       if (result.length > 1) {
         return result;
       }
@@ -844,13 +847,14 @@ class DelegatingJsonSchemaConverter {
   constructor(converters = []) {
     this.converters = converters;
   }
-  async convert(schema, direction) {
+  convert(schema, direction) {
     for (const converter of this.converters) {
-      if (await converter.condition(schema, direction)) {
+      if (converter.condition(schema, direction)) {
         return converter.convert(schema, direction);
       }
     }
-    const optional = !(await schema?.["~standard"].validate(void 0))?.issues?.length;
+    const result = schema?.["~standard"].validate(void 0);
+    const optional = result instanceof Promise ? false : !result?.issues?.length;
     if (schema && "jsonSchema" in schema["~standard"] && schema["~standard"].jsonSchema) {
       try {
         return [
@@ -907,23 +911,23 @@ class SmartCoercionHandlerPlugin {
     return {
       ...options,
       clientInterceptors: [
-        async ({ next, input, ...interceptorOptions }) => {
+        ({ next, input, ...interceptorOptions }) => {
           const inputSchemas = interceptorOptions.procedure["~orpc"].inputSchemas;
           if (!inputSchemas) {
             return next();
           }
-          const coercedInput = await this.coerceValue(inputSchemas, input);
+          const coercedInput = this.coerceValue(inputSchemas, input);
           return next({ ...interceptorOptions, input: coercedInput });
         },
         ...toArray(options.clientInterceptors)
       ]
     };
   }
-  async coerceValue(schemas, value) {
+  coerceValue(schemas, value) {
     for (const schema of schemas) {
       let converted = this.cache.get(schema);
       if (!converted) {
-        converted = await this.converter.convert(schema, "input");
+        converted = this.converter.convert(schema, "input");
         this.cache.set(schema, converted);
       }
       value = this.coercer.coerce(converted, value);
@@ -962,30 +966,30 @@ class SmartCoercionLinkPlugin {
             if (!outputSchemas) {
               return output;
             }
-            const coercedOutput = await this.coerceValue(outputSchemas, output);
+            const coercedOutput = this.coerceValue(outputSchemas, output);
             return coercedOutput;
           } catch (error) {
             if (!(error instanceof ORPCError) || !error.defined) {
               throw error;
             }
             const errorMap = procedure["~orpc"].errorMap;
-            const dataSchema = errorMap[error.code]?.data;
+            const dataSchema = getOwn(errorMap, error.code)?.data;
             if (!dataSchema) {
               throw error;
             }
             const cloned = cloneORPCError(error);
-            cloned.data = await this.coerceValue([dataSchema], cloned.data);
+            cloned.data = this.coerceValue([dataSchema], cloned.data);
             throw cloned;
           }
         }
       ]
     };
   }
-  async coerceValue(schemas, value) {
+  coerceValue(schemas, value) {
     for (const schema of schemas) {
       let converted = this.cache.get(schema);
       if (!converted) {
-        converted = await this.converter.convert(schema, "output");
+        converted = this.converter.convert(schema, "output");
         this.cache.set(schema, converted);
       }
       value = this.coercer.coerce(converted, value);
@@ -994,4 +998,4 @@ class SmartCoercionLinkPlugin {
   }
 }
 
-export { DelegatingJsonSchemaConverter, JsonSchemaCoercer, JsonSchemaXNativeType, SmartCoercionHandlerPlugin, SmartCoercionLinkPlugin, StandardJsonSchemaConverter, combineJsonObjectSchemaEntries, combineJsonSchemasWithComposition, decodeJsonPointerSegment, deduplicateJsonSchemas, encodeJsonPointerSegment, ensureJsonSchemaObject, extractJsonObjectSchemaEntries, flattenJsonUnionSchema, hoistRecursiveRefToDef, isJsonArraySchema, isJsonFileSchema, isJsonObjectSchema, isJsonPrimitiveSchema, isUnconstrainedSchema, mapJsonSchemaRefs, matchArrayableJsonSchema, resolveJsonSchemaRootLocalRef };
+export { DelegatingJsonSchemaConverter, JsonSchemaCoercer, JsonSchemaFormat, JsonSchemaType, JsonSchemaXNativeType, SmartCoercionHandlerPlugin, SmartCoercionLinkPlugin, StandardJsonSchemaConverter, combineJsonObjectSchemaEntries, combineJsonSchemasWithComposition, decodeJsonPointerSegment, deduplicateJsonSchemas, encodeJsonPointerSegment, ensureJsonSchemaObject, extractJsonObjectSchemaEntries, flattenJsonUnionSchema, hoistRecursiveRefToDef, isJsonArraySchema, isJsonFileSchema, isJsonObjectSchema, isJsonPrimitiveSchema, isUnconstrainedSchema, mapJsonSchemaRefs, matchArrayableJsonSchema, resolveJsonSchemaRootLocalRef, visitJsonSchemaRefs };