@orpc/json-schema 2.0.0-beta.20 → 2.0.0-beta.21

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { get, isPlainObject, toArray, tryOrUndefined, isDeepEqual, omit, isTypescriptObject } from '@orpc/shared';
+import { get, isPlainObject, tryOrUndefined, toArray, isDeepEqual, omit, isTypescriptObject } from '@orpc/shared';
 export { Format as JsonSchemaFormat, TypeName as JsonSchemaType } from 'json-schema-typed/draft-2020-12';
 import { ORPCError, cloneORPCError } from '@orpc/client';
 import { getProcedureContractOrThrow } from '@orpc/contract';
@@ -169,7 +169,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) {
@@ -178,25 +183,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;
@@ -210,24 +219,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;
         }
@@ -236,7 +245,7 @@ class JsonSchemaCoercer {
             coerced = stringToNumber(coerced);
           }
           if (typeof coerced !== "number") {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -245,7 +254,7 @@ class JsonSchemaCoercer {
             coerced = stringToInteger(coerced);
           }
           if (typeof coerced !== "number" || !Number.isInteger(coerced)) {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -254,7 +263,7 @@ class JsonSchemaCoercer {
             coerced = stringToBoolean(coerced);
           }
           if (typeof coerced !== "boolean") {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -266,26 +275,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;
         }
@@ -295,35 +302,36 @@ class JsonSchemaCoercer {
           }
           if (isPlainObject(coerced)) {
             let shouldUseCoercedItems = false;
-            const coercedItems = {};
-            const patternProperties = Object.entries(schema.patternProperties ?? {}).map(([key, value2]) => [new RegExp(key), value2]);
+            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 in 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 = (propertySchemas !== void 0 && Object.hasOwn(propertySchemas, key) ? propertySchemas[key] : void 0) ?? 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;
         }
@@ -336,7 +344,7 @@ class JsonSchemaCoercer {
             coerced = stringToDate(coerced);
           }
           if (!(coerced instanceof Date)) {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -350,7 +358,7 @@ class JsonSchemaCoercer {
               break;
           }
           if (typeof coerced !== "bigint") {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -359,7 +367,7 @@ class JsonSchemaCoercer {
             coerced = stringToRegExp(coerced);
           }
           if (!(coerced instanceof RegExp)) {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -368,7 +376,7 @@ class JsonSchemaCoercer {
             coerced = stringToURL(coerced);
           }
           if (!(coerced instanceof URL)) {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -377,7 +385,7 @@ class JsonSchemaCoercer {
             coerced = arrayToSet(coerced);
           }
           if (!(coerced instanceof Set)) {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -386,7 +394,7 @@ class JsonSchemaCoercer {
             coerced = arrayToMap(coerced);
           }
           if (!(coerced instanceof Map)) {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -394,54 +402,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") {
@@ -452,21 +484,20 @@ 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;
 }
+const REGEXP_PATTERN = /^\/([\s\S]*)\/([a-z]*)$/;
 function stringToRegExp(value) {
-  const match = value.match(/^\/(.*)\/([a-z]*)$/);
+  const match = value.match(REGEXP_PATTERN);
   if (match) {
     const [, pattern, flags] = match;
     return tryOrUndefined(() => new RegExp(pattern, flags)) ?? value;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/json-schema",
   "type": "module",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "license": "MIT",
   "homepage": "https://orpc.dev",
   "repository": {
@@ -27,10 +27,10 @@
   "dependencies": {
     "@standard-schema/spec": "^1.1.0",
     "json-schema-typed": "^8.0.2",
-    "@orpc/client": "2.0.0-beta.20",
-    "@orpc/contract": "2.0.0-beta.20",
-    "@orpc/shared": "2.0.0-beta.20",
-    "@orpc/server": "2.0.0-beta.20"
+    "@orpc/client": "2.0.0-beta.21",
+    "@orpc/contract": "2.0.0-beta.21",
+    "@orpc/server": "2.0.0-beta.21",
+    "@orpc/shared": "2.0.0-beta.21"
   },
   "devDependencies": {
     "zod": "^4.4.3"