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

package/README.md

@@ -85,7 +85,7 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
 
 <table>
   <tr>
-   <td width="2000"><a href="https://screenshotone.com/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener" title="The screenshot API for developers"><img src="https://avatars.githubusercontent.com/u/97035603?v=4" width="64" align="left" hspace="12" alt="ScreenshotOne.com"/><b>ScreenshotOne.com</b></a><br /><sub>The screenshot API for developers</sub></td>
+   <td width="2000"><a href="https://screenshotone.com/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="The screenshot API for developers"><img src="https://avatars.githubusercontent.com/u/97035603?v=4" width="64" align="left" hspace="12" alt="ScreenshotOne.com"/><b>ScreenshotOne.com</b></a><br /><sub>The screenshot API for developers</sub></td>
   </tr>
   <tr>
    <td width="2000"><a href="https://yuzu.health/careers?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="We&#39;re hiring NYC based engineers"><img src="https://avatars.githubusercontent.com/u/102488956?v=4" width="64" align="left" hspace="12" alt="Yuzu"/><b>Yuzu</b></a><br /><sub>We&#39;re hiring NYC based engineers</sub></td>
@@ -127,19 +127,18 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
    <td align="center"><a href="https://soymilk.party/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="あわわわとーにゅ"><img src="https://avatars.githubusercontent.com/u/17376330?u=de3353804be889f009f7e0a1582daf04d0ab292d&amp;v=4" width="139" alt="あわわわとーにゅ"/><br />あわわわとーにゅ</a></td>
    <td align="center"><a href="https://github.com/nicognaW?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="nk"><img src="https://avatars.githubusercontent.com/u/66731869?u=4699bda3a9092d3ec34fbd959450767bcc8b8b6d&amp;v=4" width="139" alt="nk"/><br />nk</a></td>
    <td align="center"><a href="https://supastarter.dev/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="supastarter"><img src="https://avatars.githubusercontent.com/u/110960143?v=4" width="139" alt="supastarter"/><br />supastarter</a></td>
-   <td align="center"><a href="https://github.com/divmgl?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Dexter Miguel"><img src="https://avatars.githubusercontent.com/u/5452298?u=645993204be8696c085ecf0d228c3062efe2ed65&amp;v=4" width="139" alt="Dexter Miguel"/><br />Dexter Miguel</a></td>
    <td align="center"><a href="https://github.com/herrfugbaum?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="herrfugbaum"><img src="https://avatars.githubusercontent.com/u/12859776?u=644dc1666d0220bc0468eb0de3c56b919f635b16&amp;v=4" width="139" alt="herrfugbaum"/><br />herrfugbaum</a></td>
+   <td align="center"><a href="https://laststance.io/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Ryota Murakami"><img src="https://avatars.githubusercontent.com/u/5501268?u=599389e03340734325726ca3f8f423c021d47d7f&amp;v=4" width="139" alt="Ryota Murakami"/><br />Ryota Murakami</a></td>
   </tr>
   <tr>
-   <td align="center"><a href="https://laststance.io/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Ryota Murakami"><img src="https://avatars.githubusercontent.com/u/5501268?u=599389e03340734325726ca3f8f423c021d47d7f&amp;v=4" width="139" alt="Ryota Murakami"/><br />Ryota Murakami</a></td>
    <td align="center"><a href="https://cra.mr/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="David Cramer"><img src="https://avatars.githubusercontent.com/u/23610?v=4" width="139" alt="David Cramer"/><br />David Cramer</a></td>
    <td align="center"><a href="https://valerii15298.github.io/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Valerii Petryniak"><img src="https://avatars.githubusercontent.com/u/44531564?u=88ac74d9bacd20401518441907acad21063cd397&amp;v=4" width="139" alt="Valerii Petryniak"/><br />Valerii Petryniak</a></td>
    <td align="center"><a href="https://letstri.dev/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Valerii Strilets"><img src="https://avatars.githubusercontent.com/u/13253748?u=c7b10399ccc8f8081e24db94ec32cd9858e86ac3&amp;v=4" width="139" alt="Valerii Strilets"/><br />Valerii Strilets</a></td>
    <td align="center"><a href="https://blacklight.sh/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Kyle Mistele"><img src="https://avatars.githubusercontent.com/u/18430555?u=3afebeb81de666e35aaac3ed46f14159d7603ffb&amp;v=4" width="139" alt="Kyle Mistele"/><br />Kyle Mistele</a></td>
    <td align="center"><a href="https://github.com/christ12938?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="christ12938"><img src="https://avatars.githubusercontent.com/u/25758598?v=4" width="139" alt="christ12938"/><br />christ12938</a></td>
+   <td align="center"><a href="https://github.com/Ryanjso?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Ryan Soderberg"><img src="https://avatars.githubusercontent.com/u/39172778?u=5ed913c31d57e7221b75784abcad48c7ebddde27&amp;v=4" width="139" alt="Ryan Soderberg"/><br />Ryan Soderberg</a></td>
   </tr>
   <tr>
-   <td align="center"><a href="https://github.com/Ryanjso?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Ryan Soderberg"><img src="https://avatars.githubusercontent.com/u/39172778?u=5ed913c31d57e7221b75784abcad48c7ebddde27&amp;v=4" width="139" alt="Ryan Soderberg"/><br />Ryan Soderberg</a></td>
    <td align="center"><a href="https://github.com/itigoore01?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="shota"><img src="https://avatars.githubusercontent.com/u/11831107?u=c976a6dc7e055eb026304c46c99100ed22b0c8e0&amp;v=4" width="139" alt="shota"/><br />shota</a></td>
    <td align="center"><a href="https://github.com/ellis-driscoll?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Ellis Driscoll"><img src="https://avatars.githubusercontent.com/u/70685966?u=c5f95bc33b5991d9744abe00052542e4a2ed3cb9&amp;v=4" width="139" alt="Ellis Driscoll"/><br />Ellis Driscoll</a></td>
    <td align="center"><a href="https://github.com/hoangbn?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Hoang Nguyen"><img src="https://avatars.githubusercontent.com/u/38968280?u=c90084c6de65c56facabab7ba13a72a49ddbc3e4&amp;v=4" width="139" alt="Hoang Nguyen"/><br />Hoang Nguyen</a></td>
@@ -173,12 +172,13 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
    <td align="center"><a href="https://kellychan.im/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Kelly Peilin Chan"><img src="https://avatars.githubusercontent.com/u/520852?u=6b0f7105f694e7b5cacf410a3f04c7044b469dc8&amp;v=4" width="119" alt="Kelly Peilin Chan"/><br />Kelly Peilin Chan</a></td>
    <td align="center"><a href="https://guyariely.com/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Guy Ariely"><img src="https://avatars.githubusercontent.com/u/42813496?u=edb6b7f563bf28e160a290832e7da57c0506f8ca&amp;v=4" width="119" alt="Guy Ariely"/><br />Guy Ariely</a></td>
    <td align="center"><a href="https://paulsenon.com/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="PaulSenon"><img src="https://avatars.githubusercontent.com/u/19531087?u=6385741eb91d200b8c513ec6045482e301767ca6&amp;v=4" width="119" alt="PaulSenon"/><br />PaulSenon</a></td>
+   <td align="center"><a href="https://nakasyou.how/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Shotaro Nakamura"><img src="https://avatars.githubusercontent.com/u/79000684?u=f644df3f29f0e8677a90967115774564f1d9d6ab&amp;v=4" width="119" alt="Shotaro Nakamura"/><br />Shotaro Nakamura</a></td>
    <td align="center"><a href="https://piscis.dev/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Alex"><img src="https://avatars.githubusercontent.com/u/326163?u=b245f368bd940cf51d08c0b6bf55f8257f359437&amp;v=4" width="119" alt="Alex"/><br />Alex</a></td>
    <td align="center"><a href="https://opensource.gubanov.eu/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Andrey Gubanov"><img src="https://avatars.githubusercontent.com/u/1082083?u=c5f2daf7ebece498e85c83367bb37b4e10e2649d&amp;v=4" width="119" alt="Andrey Gubanov"/><br />Andrey Gubanov</a></td>
   </tr>
 </table>
 
-With thanks to [36 past sponsors](https://htmlpreview.github.io/?https://github.com/middleapi/static/blob/main/sponsors.svg) who helped get oRPC here.
+With thanks to [38 past sponsors](https://orpc.dev/sponsors#past-sponsors) who helped get oRPC here.
 
 ## References
 

package/dist/index.d.mts

@@ -193,7 +193,8 @@ declare function hoistRecursiveRefToDef(schema: JsonSchema): JsonSchema;
  * intentionally left untouched.
  *
  * If the ref cannot be resolved (missing `$defs`, unknown key, etc.) the
- * schema is returned as-is.
+ * schema is returned as-is. Chained refs are followed until one repeats,
+ * which is kept.
  *
  * @param schema - The schema whose root-level `$ref` should be resolved.
  * @param $defs - Definition map to resolve against. If omitted, falls back to
@@ -245,11 +246,18 @@ declare class SmartCoercionLinkPlugin<T extends ClientContext> implements Standa
     private coerceValue;
 }
 
+/**
+ * Returns true when the schema accepts `undefined` in the given direction,
+ * found by validating `undefined` against it. For `output`, the validated value must also be `undefined`.
+ *
+ * Returns false when validation throws or is async. An async result is never left as an unhandled rejection.
+ */
+declare function isStandardSchemaOptional(schema: AnySchema, direction: JsonSchemaConverterDirection): boolean;
 declare class StandardJsonSchemaConverter implements JsonSchemaConverter {
     condition(schema: AnySchema | undefined, _direction: JsonSchemaConverterDirection): boolean;
     convert(schema: AnySchema | undefined, direction: JsonSchemaConverterDirection): [jsonSchema: JsonSchema, optional: boolean];
     convertInternal(schema: StandardJSONSchemaV1 & AnySchema, direction: JsonSchemaConverterDirection): [jsonSchema: JsonSchema, optional: boolean];
 }
 
-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 };
+export { DelegatingJsonSchemaConverter, JsonSchemaCoercer, JsonSchemaFormat, JsonSchemaType, JsonSchemaXNativeType, SmartCoercionHandlerPlugin, SmartCoercionLinkPlugin, StandardJsonSchemaConverter, combineJsonObjectSchemaEntries, combineJsonSchemasWithComposition, decodeJsonPointerSegment, deduplicateJsonSchemas, encodeJsonPointerSegment, ensureJsonSchemaObject, extractJsonObjectSchemaEntries, flattenJsonUnionSchema, hoistRecursiveRefToDef, isJsonArraySchema, isJsonFileSchema, isJsonObjectSchema, isJsonPrimitiveSchema, isStandardSchemaOptional, isUnconstrainedSchema, mapJsonSchemaRefs, matchArrayableJsonSchema, resolveJsonSchemaRootLocalRef, visitJsonSchemaRefs };
 export type { JsonArraySchema, JsonFileSchema, JsonObjectSchema, JsonObjectSchemaEntry, JsonSchema, JsonSchemaConverter, JsonSchemaConverterDirection, JsonSchemaKeywords, SmartCoercionHandlerPluginOptions, SmartCoercionLinkPluginOptions };

package/dist/index.d.ts

@@ -193,7 +193,8 @@ declare function hoistRecursiveRefToDef(schema: JsonSchema): JsonSchema;
  * intentionally left untouched.
  *
  * If the ref cannot be resolved (missing `$defs`, unknown key, etc.) the
- * schema is returned as-is.
+ * schema is returned as-is. Chained refs are followed until one repeats,
+ * which is kept.
  *
  * @param schema - The schema whose root-level `$ref` should be resolved.
  * @param $defs - Definition map to resolve against. If omitted, falls back to
@@ -245,11 +246,18 @@ declare class SmartCoercionLinkPlugin<T extends ClientContext> implements Standa
     private coerceValue;
 }
 
+/**
+ * Returns true when the schema accepts `undefined` in the given direction,
+ * found by validating `undefined` against it. For `output`, the validated value must also be `undefined`.
+ *
+ * Returns false when validation throws or is async. An async result is never left as an unhandled rejection.
+ */
+declare function isStandardSchemaOptional(schema: AnySchema, direction: JsonSchemaConverterDirection): boolean;
 declare class StandardJsonSchemaConverter implements JsonSchemaConverter {
     condition(schema: AnySchema | undefined, _direction: JsonSchemaConverterDirection): boolean;
     convert(schema: AnySchema | undefined, direction: JsonSchemaConverterDirection): [jsonSchema: JsonSchema, optional: boolean];
     convertInternal(schema: StandardJSONSchemaV1 & AnySchema, direction: JsonSchemaConverterDirection): [jsonSchema: JsonSchema, optional: boolean];
 }
 
-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 };
+export { DelegatingJsonSchemaConverter, JsonSchemaCoercer, JsonSchemaFormat, JsonSchemaType, JsonSchemaXNativeType, SmartCoercionHandlerPlugin, SmartCoercionLinkPlugin, StandardJsonSchemaConverter, combineJsonObjectSchemaEntries, combineJsonSchemasWithComposition, decodeJsonPointerSegment, deduplicateJsonSchemas, encodeJsonPointerSegment, ensureJsonSchemaObject, extractJsonObjectSchemaEntries, flattenJsonUnionSchema, hoistRecursiveRefToDef, isJsonArraySchema, isJsonFileSchema, isJsonObjectSchema, isJsonPrimitiveSchema, isStandardSchemaOptional, isUnconstrainedSchema, mapJsonSchemaRefs, matchArrayableJsonSchema, resolveJsonSchemaRootLocalRef, visitJsonSchemaRefs };
 export type { JsonArraySchema, JsonFileSchema, JsonObjectSchema, JsonObjectSchemaEntry, JsonSchema, JsonSchemaConverter, JsonSchemaConverterDirection, JsonSchemaKeywords, SmartCoercionHandlerPluginOptions, SmartCoercionLinkPluginOptions };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { get, isPlainObject, tryOrUndefined, getOwn, toArray, isDeepEqual, omit, isTypescriptObject } from '@orpc/shared';
+import { setOwn, get, isPlainObject, tryOrUndefined, getOwn, toArray, isDeepEqual, omit, isTypescriptObject } from '@orpc/shared';
 import { ORPCError, cloneORPCError } from '@orpc/client';
 import { getProcedureContractOrThrow } from '@orpc/contract';
 
@@ -91,13 +91,13 @@ function mapJsonSchemaRefs(value, map, schemaLevel = true, path = []) {
   for (const key of Object.keys(value)) {
     const val = value[key];
     if (key === "$ref" && typeof val === "string") {
-      result[key] = map(val, [...path, key]);
+      setOwn(result, key, map(val, [...path, key]));
     } else if (!schemaLevel) {
-      result[key] = mapJsonSchemaRefs(val, map, true, [...path, key]);
+      setOwn(result, key, mapJsonSchemaRefs(val, map, true, [...path, key]));
     } else if (JSON_SCHEMA_LOGIC_KEYWORDS.has(key) || JSON_SCHEMA_RECORD_KEYWORDS.has(key)) {
-      result[key] = mapJsonSchemaRefs(val, map, !JSON_SCHEMA_RECORD_KEYWORDS.has(key), [...path, key]);
+      setOwn(result, key, mapJsonSchemaRefs(val, map, !JSON_SCHEMA_RECORD_KEYWORDS.has(key), [...path, key]));
     } else {
-      result[key] = val;
+      setOwn(result, key, val);
     }
   }
   return result;
@@ -106,20 +106,19 @@ function hoistRecursiveRefToDef(schema) {
   if (typeof schema !== "object") {
     return schema;
   }
-  let defName;
-  const rewritten = mapJsonSchemaRefs(schema, (ref) => {
-    if (ref === "#" || ref.startsWith("#/") && !ref.startsWith("#/$defs/") && get(schema, ref.slice(2).split("/").map(decodeJsonPointerSegment)) !== void 0) {
-      defName ??= findRecursiveJsonSchemaDefName(schema.$defs);
-      return `#/$defs/${encodeJsonPointerSegment(defName)}${ref.slice(1)}`;
-    }
-    return ref;
+  const isRootRef = (ref) => ref === "#" || ref.startsWith("#/") && !ref.startsWith("#/$defs/") && get(schema, ref.slice(2).split("/").map(decodeJsonPointerSegment)) !== void 0;
+  let hasRootRef = false;
+  visitJsonSchemaRefs(schema, (ref) => {
+    hasRootRef ||= isRootRef(ref);
   });
-  if (defName === void 0) {
+  if (!hasRootRef) {
     return schema;
   }
-  const { $defs, ...rest } = rewritten;
+  const defName = findRecursiveJsonSchemaDefName(schema.$defs);
+  const defRef = `#/$defs/${encodeJsonPointerSegment(defName)}`;
+  const { $defs, ...rest } = mapJsonSchemaRefs(schema, (ref) => isRootRef(ref) ? `${defRef}${ref.slice(1)}` : ref);
   return {
-    $ref: `#/$defs/${encodeJsonPointerSegment(defName)}`,
+    $ref: defRef,
     $defs: {
       ...$defs,
       [defName]: rest
@@ -136,21 +135,24 @@ function resolveJsonSchemaRootLocalRef(schema, $defs) {
   if (!$defs) {
     return schema;
   }
-  if (typeof schema.$ref !== "string" || !schema.$ref.startsWith("#/$defs/")) {
-    return schema;
-  }
-  const resolved = get($defs, schema.$ref.slice("#/$defs/".length).split("/").map(decodeJsonPointerSegment));
-  if (resolved === void 0) {
-    return schema;
-  }
-  if (typeof resolved !== "object") {
-    return resolved;
+  const followedRefs = /* @__PURE__ */ new Set();
+  let current = schema;
+  while (typeof current.$ref === "string" && current.$ref.startsWith("#/$defs/") && !followedRefs.has(current.$ref)) {
+    followedRefs.add(current.$ref);
+    const resolved = get($defs, current.$ref.slice("#/$defs/".length).split("/").map(decodeJsonPointerSegment));
+    if (resolved === void 0) {
+      return current;
+    }
+    if (typeof resolved !== "object") {
+      return resolved;
+    }
+    const { $ref: _ref, ...rest } = current;
+    current = {
+      ...rest,
+      ...resolved
+    };
   }
-  const { $ref: _ref, ...rest } = schema;
-  return resolveJsonSchemaRootLocalRef({
-    ...rest,
-    ...resolved
-  });
+  return current;
 }
 function findRecursiveJsonSchemaDefName(defs) {
   let index = 0;
@@ -204,6 +206,35 @@ var JsonSchemaXNativeType = /* @__PURE__ */ ((JsonSchemaXNativeType2) => {
 const UNSATISFIED = 0;
 const LOOSELY_SATISFIED = 1;
 const SATISFIED = 2;
+const NATIVE_TYPES = /* @__PURE__ */ new Map([
+  [JsonSchemaXNativeType.Date, {
+    types: ["string"],
+    is: (value) => value instanceof Date,
+    coerce: (value) => typeof value === "string" ? stringToDate(value) : value
+  }],
+  [JsonSchemaXNativeType.BigInt, {
+    types: ["string", "integer", "number"],
+    is: (value) => typeof value === "bigint",
+    coerce: (value) => typeof value === "string" ? stringToBigInt(value) : typeof value === "number" ? numberToBigInt(value) : value
+  }],
+  [JsonSchemaXNativeType.Url, {
+    types: ["string"],
+    is: (value) => value instanceof URL,
+    coerce: (value) => typeof value === "string" ? stringToURL(value) : value
+  }],
+  [JsonSchemaXNativeType.Set, {
+    types: ["array"],
+    is: (value) => value instanceof Set,
+    coerce: (value) => Array.isArray(value) ? arrayToSet(value) : value,
+    afterTypeCheck: true
+  }],
+  [JsonSchemaXNativeType.Map, {
+    types: ["array"],
+    is: (value) => value instanceof Map,
+    coerce: (value) => Array.isArray(value) ? arrayToMap(value) : value,
+    afterTypeCheck: true
+  }]
+]);
 function minSatisfaction(a, b) {
   return a < b ? a : b;
 }
@@ -258,7 +289,12 @@ class JsonSchemaCoercer {
         satisfied = UNSATISFIED;
       }
     }
-    if (schema.type) {
+    const declaredNativeType = NATIVE_TYPES.get(schema["x-native-type"]);
+    const nativeType = schema.type === void 0 || declaredNativeType?.types.includes(schema.type) ? declaredNativeType : void 0;
+    if (nativeType && !nativeType.afterTypeCheck) {
+      coerced = nativeType.coerce(coerced);
+    }
+    if (schema.type && !nativeType?.is(coerced)) {
       switch (schema.type) {
         case "null": {
           if (coerced !== null) {
@@ -317,7 +353,7 @@ class JsonSchemaCoercer {
               }
               return subCoerced;
             });
-            if (coercedItems.length < prefixItemSchemas.length) {
+            if (typeof schema.minItems === "number" && coercedItems.length < schema.minItems) {
               satisfied = UNSATISFIED;
             }
             if (shouldUseCoercedItems) {
@@ -369,58 +405,12 @@ class JsonSchemaCoercer {
         }
       }
     }
-    if ("x-native-type" in schema && typeof schema["x-native-type"] === "string") {
-      switch (schema["x-native-type"]) {
-        case JsonSchemaXNativeType.Date: {
-          if (typeof coerced === "string") {
-            coerced = stringToDate(coerced);
-          }
-          if (!(coerced instanceof Date)) {
-            satisfied = UNSATISFIED;
-          }
-          break;
-        }
-        case JsonSchemaXNativeType.BigInt: {
-          switch (typeof coerced) {
-            case "string":
-              coerced = stringToBigInt(coerced);
-              break;
-            case "number":
-              coerced = numberToBigInt(coerced);
-              break;
-          }
-          if (typeof coerced !== "bigint") {
-            satisfied = UNSATISFIED;
-          }
-          break;
-        }
-        case JsonSchemaXNativeType.Url: {
-          if (typeof coerced === "string") {
-            coerced = stringToURL(coerced);
-          }
-          if (!(coerced instanceof URL)) {
-            satisfied = UNSATISFIED;
-          }
-          break;
-        }
-        case JsonSchemaXNativeType.Set: {
-          if (Array.isArray(coerced)) {
-            coerced = arrayToSet(coerced);
-          }
-          if (!(coerced instanceof Set)) {
-            satisfied = UNSATISFIED;
-          }
-          break;
-        }
-        case JsonSchemaXNativeType.Map: {
-          if (Array.isArray(coerced)) {
-            coerced = arrayToMap(coerced);
-          }
-          if (!(coerced instanceof Map)) {
-            satisfied = UNSATISFIED;
-          }
-          break;
-        }
+    if (nativeType) {
+      if (nativeType.afterTypeCheck) {
+        coerced = nativeType.coerce(coerced);
+      }
+      if (!nativeType.is(coerced)) {
+        satisfied = UNSATISFIED;
       }
     }
     if (schema.allOf) {
@@ -507,17 +497,30 @@ function stringToBoolean(value) {
   }
   return value;
 }
-const DATE_TIME_PATTERN = /^[+-]?\d{4,6}-\d{1,2}-\d{1,2}(?:[T ].*)?$/;
+const DATE_TIME_PATTERN = /^(?!-0{6})(?:[+-]\d{2})?\d{4}-\d{2}-\d{2}(?:[T ].*)?$/;
+const DAYS_IN_MONTH = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
 function stringToDate(value) {
   if (!DATE_TIME_PATTERN.test(value)) {
     return value;
   }
+  const yearEnd = value.indexOf("-", 1);
+  const month = readTwoDigits(value, yearEnd + 1);
+  const day = readTwoDigits(value, yearEnd + 4);
+  if (day < 1 || day > (DAYS_IN_MONTH[month - 1] ?? 0) || month === 2 && day === 29 && !isLeapYear(Number(value.slice(0, yearEnd)))) {
+    return value;
+  }
   const date = new Date(value);
   if (Number.isNaN(date.getTime())) {
     return value;
   }
   return date;
 }
+function readTwoDigits(value, index) {
+  return (value.charCodeAt(index) - 48) * 10 + value.charCodeAt(index + 1) - 48;
+}
+function isLeapYear(year) {
+  return year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0);
+}
 function stringToURL(value) {
   return tryOrUndefined(() => new URL(value)) ?? value;
 }
@@ -758,7 +761,7 @@ function extractJsonObjectSchemaEntriesInternal(schema, $defs, resolvingRefs) {
       return [
         name,
         schemas.length === 1 ? schemas[0] : { allOf: schemas },
-        [entries.direct, entries.allOf, entries.anyOf, entries.oneOf].every((entry) => entry === void 0 || entry[2])
+        !schema.required?.includes(name) && [entries.allOf, entries.anyOf, entries.oneOf].every((entry) => entry === void 0 || entry[2])
       ];
     }),
     objectLike
@@ -853,21 +856,23 @@ class DelegatingJsonSchemaConverter {
         return converter.convert(schema, direction);
       }
     }
-    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 [
-          schema["~standard"].jsonSchema[direction](),
-          optional
-        ];
-      } catch {
-      }
-    }
-    return [{}, optional];
+    return [{}, true];
   }
 }
 
+function isStandardSchemaOptional(schema, direction) {
+  try {
+    const result = schema["~standard"].validate(void 0);
+    if (result instanceof Promise) {
+      result.catch(() => {
+      });
+      return false;
+    }
+    return !result.issues && (direction === "input" || result.value === void 0);
+  } catch {
+    return false;
+  }
+}
 class StandardJsonSchemaConverter {
   condition(schema, _direction) {
     return Boolean(
@@ -880,15 +885,7 @@ class StandardJsonSchemaConverter {
   convertInternal(schema, direction) {
     try {
       const jsonSchema = direction === "input" ? schema["~standard"].jsonSchema.input({ target: "draft-2020-12" }) : schema["~standard"].jsonSchema.output({ target: "draft-2020-12" });
-      let optional = false;
-      try {
-        const result = schema["~standard"].validate(void 0);
-        if (!(result instanceof Promise) && !result.issues) {
-          optional = direction === "input" ? true : result.value === void 0;
-        }
-      } catch {
-      }
-      return [jsonSchema, optional];
+      return [jsonSchema, isStandardSchemaOptional(schema, direction)];
     } catch {
       return [{}, true];
     }
@@ -998,4 +995,4 @@ class SmartCoercionLinkPlugin {
   }
 }
 
-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 };
+export { DelegatingJsonSchemaConverter, JsonSchemaCoercer, JsonSchemaFormat, JsonSchemaType, JsonSchemaXNativeType, SmartCoercionHandlerPlugin, SmartCoercionLinkPlugin, StandardJsonSchemaConverter, combineJsonObjectSchemaEntries, combineJsonSchemasWithComposition, decodeJsonPointerSegment, deduplicateJsonSchemas, encodeJsonPointerSegment, ensureJsonSchemaObject, extractJsonObjectSchemaEntries, flattenJsonUnionSchema, hoistRecursiveRefToDef, isJsonArraySchema, isJsonFileSchema, isJsonObjectSchema, isJsonPrimitiveSchema, isStandardSchemaOptional, isUnconstrainedSchema, mapJsonSchemaRefs, matchArrayableJsonSchema, resolveJsonSchemaRootLocalRef, visitJsonSchemaRefs };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/json-schema",
   "type": "module",
-  "version": "2.0.0-beta.40",
+  "version": "2.0.0-beta.41",
   "description": "JSON Schema conversion and smart request coercion for oRPC and OpenAPI",
   "license": "MIT",
   "funding": [
@@ -36,10 +36,10 @@
   ],
   "dependencies": {
     "@openapi-spec/types": "~0.1.0",
-    "@orpc/client": "2.0.0-beta.40",
-    "@orpc/contract": "2.0.0-beta.40",
-    "@orpc/server": "2.0.0-beta.40",
-    "@orpc/shared": "2.0.0-beta.40",
+    "@orpc/client": "2.0.0-beta.41",
+    "@orpc/contract": "2.0.0-beta.41",
+    "@orpc/server": "2.0.0-beta.41",
+    "@orpc/shared": "2.0.0-beta.41",
     "@standard-schema/spec": "^1.1.0"
   },
   "devDependencies": {