npm - @orpc/json-schema - Versions diffs - 2.0.0-beta.2 → 2.0.0-beta.21 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/README.md CHANGED Viewed

@@ -7,6 +7,9 @@
   <a href="https://www.npmjs.com/package/@orpc/json-schema">
     <img alt="weekly downloads" src="https://img.shields.io/npm/dw/%40orpc%2Fjson-schema?logo=npm" />
   </a>
+  <a href="https://app.codspeed.io/middleapi/orpc?utm_source=badge">
+    <img alt="CodSpeed" src="https://img.shields.io/endpoint?url=https://codspeed.io/badge.json" />
+  </a>
   <a href="https://github.com/middleapi/orpc/blob/main/LICENSE">
     <img alt="MIT License" src="https://img.shields.io/github/license/middleapi/orpc?logo=open-source-initiative" />
   </a>
@@ -26,10 +29,10 @@ You can read the documentation [here](https://orpc.dev).
 **Core**
-- [@orpc/contract](https://www.npmjs.com/package/@orpc/contract): Define type-safe contracts for your API.
-- [@orpc/server](https://www.npmjs.com/package/@orpc/server): Implement your API or contract on the server.
-- [@orpc/client](https://www.npmjs.com/package/@orpc/client): Consume your API from the client with full type safety.
-- [@orpc/openapi](https://www.npmjs.com/package/@orpc/openapi): Bring OpenAPI compatibility to your APIs.
+- [@orpc/contract](https://www.npmjs.com/package/@orpc/contract): Define API contract as the single source of truth.
+- [@orpc/server](https://www.npmjs.com/package/@orpc/server): Build APIs or implement contracts.
+- [@orpc/client](https://www.npmjs.com/package/@orpc/client): Consume APIs with end-to-end type safety.
+- [@orpc/openapi](https://www.npmjs.com/package/@orpc/openapi): Add OpenAPI compatibility to APIs.
 **Schema validation**
@@ -37,23 +40,30 @@ You can read the documentation [here](https://orpc.dev).
 - [@orpc/valibot](https://www.npmjs.com/package/@orpc/valibot): Integrate with [Valibot](https://valibot.dev/).
 - [@orpc/arktype](https://www.npmjs.com/package/@orpc/arktype): Integrate with [ArkType](https://arktype.io/).
+**Built-in features**
+- [@orpc/publisher](https://www.npmjs.com/package/@orpc/publisher): Pub/Sub with memory, Redis, and Upstash adapters.
+- [@orpc/ratelimit](https://www.npmjs.com/package/@orpc/ratelimit): Rate limiting with memory, Redis, and Upstash adapters.
+- [@orpc/json-schema](https://www.npmjs.com/package/@orpc/json-schema): Smart coercion for OpenAPI requests.
 **Framework & ecosystem integrations**
-- [@orpc/next](https://www.npmjs.com/package/@orpc/react): Use oRPC with [Next.js Server Functions](https://nextjs.org/docs/app/getting-started/mutating-data).
+- [@orpc/next](https://www.npmjs.com/package/@orpc/next): Integrate with [Next.js Server Functions](https://nextjs.org/docs/app/getting-started/mutating-data).
+- [@orpc/ai-sdk](https://www.npmjs.com/package/@orpc/ai-sdk): Turn contracts and procedures into [AI SDK](https://ai-sdk.dev/) tools.
 - [@orpc/tanstack-query](https://www.npmjs.com/package/@orpc/tanstack-query): Integrate with [TanStack Query](https://tanstack.com/query/latest).
+- [@orpc/pinia-colada](https://www.npmjs.com/package/@orpc/pinia-colada): Integrate with [Pinia Colada](https://pinia-colada.esm.dev/).
+- [@orpc/swr](https://www.npmjs.com/package/@orpc/swr): Integrate with [SWR](https://swr.vercel.app/).
 - [@orpc/experimental-effect](https://www.npmjs.com/package/@orpc/experimental-effect): Integrate with [Effect](https://effect.website/).
-**Built-in features**
-- [@orpc/publisher](https://www.npmjs.com/package/@orpc/publisher): Pub/Sub.
-- [@orpc/ratelimit](https://www.npmjs.com/package/@orpc/ratelimit): Rate limiting.
-- [@orpc/json-schema](https://www.npmjs.com/package/@orpc/json-schema): Smart coercion for OpenAPI requests.
+- [@orpc/nest](https://www.npmjs.com/package/@orpc/nest): Implement your contract with [NestJS](https://nestjs.com/).
+- [@orpc/bun](https://www.npmjs.com/package/@orpc/bun): Adapters for [Bun's Redis](https://bun.sh/).
+- [@orpc/cloudflare](https://www.npmjs.com/package/@orpc/cloudflare): Adapters for [Cloudflare's RateLimit and Durable Objects](https://developers.cloudflare.com/workers/).
+- [@orpc/trpc](https://www.npmjs.com/package/@orpc/trpc): Reuse existing [tRPC](https://trpc.io/) routers within oRPC.
 **Observability**
-- [@orpc/opentelemetry](https://www.npmjs.com/package/@orpc/opentelemetry): Instrument your API with [OpenTelemetry](https://opentelemetry.io/).
-- [@orpc/pino](https://www.npmjs.com/package/@orpc/pino): Log with [Pino](https://getpino.io/).
-- [@orpc/evlog](https://www.npmjs.com/package/@orpc/evlog): Log with [Evlog](https://evlog.dev/).
+- [@orpc/opentelemetry](https://www.npmjs.com/package/@orpc/opentelemetry): Integrate with [OpenTelemetry](https://opentelemetry.io/) for distributed tracing.
+- [@orpc/pino](https://www.npmjs.com/package/@orpc/pino): Integrate with [Pino](https://getpino.io/) for logging.
+- [@orpc/evlog](https://www.npmjs.com/package/@orpc/evlog): Integrate with [Evlog](https://evlog.dev/) for logging.
 ## Sponsors
@@ -99,12 +109,10 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
    <td align="center"><a href="https://github.com/valerii15298?ref=orpc" target="_blank" rel="noopener" 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://github.com/letstri?ref=orpc" target="_blank" rel="noopener" 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://github.com/K-Mistele?ref=orpc" target="_blank" rel="noopener" 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/andrewpeters9?ref=orpc" target="_blank" rel="noopener" title="Andrew Peters"><img src="https://avatars.githubusercontent.com/u/36251325?v=4" width="139" alt="Andrew Peters"/><br />Andrew Peters</a></td>
    <td align="center"><a href="https://github.com/R44VC0RP?ref=orpc" target="_blank" rel="noopener" title="Ryan Vogel"><img src="https://avatars.githubusercontent.com/u/89211796?u=1857347b9787d8d8a7ea5bfc333f96be92d5a683&amp;v=4" width="139" alt="Ryan Vogel"/><br />Ryan Vogel</a></td>
+   <td align="center"><a href="https://github.com/christ12938?ref=orpc" target="_blank" rel="noopener" title="christ12938"><img src="https://avatars.githubusercontent.com/u/25758598?v=4" width="139" alt="christ12938"/><br />christ12938</a></td>
   </tr>
   <tr>
-   <td align="center"><a href="https://github.com/christ12938?ref=orpc" target="_blank" rel="noopener" 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/peter-adam-dy?ref=orpc" target="_blank" rel="noopener" title="Peter Adam"><img src="https://avatars.githubusercontent.com/u/132129459?u=4f3dbbb3b443990b56acb7d6a5d11ed2c555f6db&amp;v=4" width="139" alt="Peter Adam"/><br />Peter Adam</a></td>
    <td align="center"><a href="https://github.com/Ryanjso?ref=orpc" target="_blank" rel="noopener" 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=orpc" target="_blank" rel="noopener" title="shota"><img src="https://avatars.githubusercontent.com/u/11831107?u=c976a6dc7e055eb026304c46c99100ed22b0c8e0&amp;v=4" width="139" alt="shota"/><br />shota</a></td>
   </tr>
@@ -115,25 +123,25 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
 <table>
   <tr>
    <td align="center"><a href="https://github.com/rhinodavid?ref=orpc" target="_blank" rel="noopener" title="David Walsh"><img src="https://avatars.githubusercontent.com/u/5778036?u=b5521f07d2f88c3db2a0dae62b5f2f8357214af0&amp;v=4" width="119" alt="David Walsh"/><br />David Walsh</a></td>
+   <td align="center"><a href="https://github.com/Nic13Gamer?ref=orpc" target="_blank" rel="noopener" title="Nicholas"><img src="https://avatars.githubusercontent.com/u/54724556?u=56a7ab430ce7a80d648ab6eba051d454a818ed0b&amp;v=4" width="119" alt="Nicholas"/><br />Nicholas</a></td>
    <td align="center"><a href="https://github.com/Robbe95?ref=orpc" target="_blank" rel="noopener" title="Robbe Vaes"><img src="https://avatars.githubusercontent.com/u/44748019?u=e0232402c045ad4eac7cbd217f1f47e083103b89&amp;v=4" width="119" alt="Robbe Vaes"/><br />Robbe Vaes</a></td>
    <td align="center"><a href="https://github.com/aidansunbury?ref=orpc" target="_blank" rel="noopener" title="Aidan Sunbury"><img src="https://avatars.githubusercontent.com/u/64103161?v=4" width="119" alt="Aidan Sunbury"/><br />Aidan Sunbury</a></td>
    <td align="center"><a href="https://github.com/soonoo?ref=orpc" target="_blank" rel="noopener" title="soonoo"><img src="https://avatars.githubusercontent.com/u/5436405?u=5d0b4aa955c87e30e6bda7f0cccae5402da99528&amp;v=4" width="119" alt="soonoo"/><br />soonoo</a></td>
    <td align="center"><a href="https://github.com/kporten?ref=orpc" target="_blank" rel="noopener" title="Kevin Porten"><img src="https://avatars.githubusercontent.com/u/1839345?u=dc2263d5cfe0d927ce1a0be04a1d55dd6b55405c&amp;v=4" width="119" alt="Kevin Porten"/><br />Kevin Porten</a></td>
    <td align="center"><a href="https://github.com/pumpkinlink?ref=orpc" target="_blank" rel="noopener" title="Denis"><img src="https://avatars.githubusercontent.com/u/11864620?u=5f47bbe6c65d0f6f5cf011021490238e4b0593d0&amp;v=4" width="119" alt="Denis"/><br />Denis</a></td>
-   <td align="center"><a href="https://github.com/christopher-kapic?ref=orpc" target="_blank" rel="noopener" title="Christopher Kapic"><img src="https://avatars.githubusercontent.com/u/59740769?u=e7ad4b72b5bf6c9eb1644c26dbf3332a8f987377&amp;v=4" width="119" alt="Christopher Kapic"/><br />Christopher Kapic</a></td>
   </tr>
   <tr>
+   <td align="center"><a href="https://github.com/christopher-kapic?ref=orpc" target="_blank" rel="noopener" title="Christopher Kapic"><img src="https://avatars.githubusercontent.com/u/59740769?u=e7ad4b72b5bf6c9eb1644c26dbf3332a8f987377&amp;v=4" width="119" alt="Christopher Kapic"/><br />Christopher Kapic</a></td>
    <td align="center"><a href="https://github.com/thomasballinger?ref=orpc" target="_blank" rel="noopener" title="Tom Ballinger"><img src="https://avatars.githubusercontent.com/u/458879?u=4b045ac75d721b6ac2b42a74d7d37f61f0414031&amp;v=4" width="119" alt="Tom Ballinger"/><br />Tom Ballinger</a></td>
    <td align="center"><a href="https://github.com/SSam0419?ref=orpc" target="_blank" rel="noopener" title="Sam"><img src="https://avatars.githubusercontent.com/u/102863520?u=3c89611f549d5070be232eb4532f690c8f2e7a65&amp;v=4" width="119" alt="Sam"/><br />Sam</a></td>
    <td align="center"><a href="https://github.com/Titoine?ref=orpc" target="_blank" rel="noopener" title="Titoine"><img src="https://avatars.githubusercontent.com/u/3514286?u=1bb1e86b0c99c8a1121372e56d51a177eea12191&amp;v=4" width="119" alt="Titoine"/><br />Titoine</a></td>
    <td align="center"><a href="https://github.com/Mnigos?ref=orpc" target="_blank" rel="noopener" title="Igor Makowski"><img src="https://avatars.githubusercontent.com/u/56691628?u=ee8c879478f7c151b9156aef6c74243fa3e247a8&amp;v=4" width="119" alt="Igor Makowski"/><br />Igor Makowski</a></td>
    <td align="center"><a href="https://github.com/hanayashiki?ref=orpc" target="_blank" rel="noopener" title="hanayashiki"><img src="https://avatars.githubusercontent.com/u/26056783?u=06c3b9205a16fd41a871e82da1cc2a09306d53f5&amp;v=4" width="119" alt="hanayashiki"/><br />hanayashiki</a></td>
    <td align="center"><a href="https://github.com/ldub?ref=orpc" target="_blank" rel="noopener" title="Lev Dubinets"><img src="https://avatars.githubusercontent.com/u/3114081?u=f547f5d5012cab54851f1b1ad72d10e537f78fc2&amp;v=4" width="119" alt="Lev Dubinets"/><br />Lev Dubinets</a></td>
-   <td align="center"><a href="https://github.com/mr-kelly?ref=orpc" target="_blank" rel="noopener" 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>
   </tr>
   <tr>
+   <td align="center"><a href="https://github.com/mr-kelly?ref=orpc" target="_blank" rel="noopener" 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://github.com/piscis?ref=orpc" target="_blank" rel="noopener" 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://github.com/nattstack?ref=orpc" target="_blank" rel="noopener" title="nattstack"><img src="https://avatars.githubusercontent.com/u/31426677?u=fa9dbb8b3e66eb0ea3c88db5dc07f31c8c5418fe&amp;v=4" width="119" alt="nattstack"/><br />nattstack</a></td>
    <td align="center"><a href="https://github.com/finom?ref=orpc" target="_blank" rel="noopener" title="Andrey Gubanov"><img src="https://avatars.githubusercontent.com/u/1082083?u=29e91400dbd4a9c217048a8f59562c4f740498e6&amp;v=4" width="119" alt="Andrey Gubanov"/><br />Andrey Gubanov</a></td>
   </tr>
 </table>
@@ -150,7 +158,7 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
   <a href="https://github.com/theoludwig?ref=orpc" target="_blank" rel="noopener" title="Théo LUDWIG"><img src="https://avatars.githubusercontent.com/u/25207499?u=a6a9653725a2f574c07893748806668e0598cdbe&amp;v=4" width="32" height="32" alt="Théo LUDWIG" /></a>
   <a href="https://github.com/abhay-ramesh?ref=orpc" target="_blank" rel="noopener" title="Abhay Ramesh"><img src="https://avatars.githubusercontent.com/u/66196314?u=c5c2b0327b26606c2efcfaf17046ab18c3d25c57&amp;v=4" width="32" height="32" alt="Abhay Ramesh" /></a>
   <a href="https://github.com/shr-ink?ref=orpc" target="_blank" rel="noopener" title="shr.ink oü"><img src="https://avatars.githubusercontent.com/u/139700438?v=4" width="32" height="32" alt="shr.ink oü" /></a>
-  <a href="https://github.com/johngerome?ref=orpc" target="_blank" rel="noopener" title="0x4e32"><img src="https://avatars.githubusercontent.com/u/2002000?u=24e8dd943cfc862aa284d858a023532c75071ade&amp;v=4" width="32" height="32" alt="0x4e32" /></a>
+  <a href="https://github.com/johngerome?ref=orpc" target="_blank" rel="noopener" title="0x4e32"><img src="https://avatars.githubusercontent.com/u/2002000?u=505e54608466ab53754f702973687b04c6424c1f&amp;v=4" width="32" height="32" alt="0x4e32" /></a>
   <a href="https://github.com/yzuyr?ref=orpc" target="_blank" rel="noopener" title="Ryuz"><img src="https://avatars.githubusercontent.com/u/196539378?u=d38374588d219b6748b16406982f6559411466d4&amp;v=4" width="32" height="32" alt="Ryuz" /></a>
   <a href="https://github.com/happyboy2022?ref=orpc" target="_blank" rel="noopener" title="happyboy"><img src="https://avatars.githubusercontent.com/u/103669586?u=65b49c4b893ed3703909fbb3a7a22313f3f9c121&amp;v=4" width="32" height="32" alt="happyboy" /></a>
   <a href="https://github.com/YiCChi?ref=orpc" target="_blank" rel="noopener" title="yicchi"><img src="https://avatars.githubusercontent.com/u/86967274?u=6c2756f09fe15dd94d572f560e979cd157982852&amp;v=4" width="32" height="32" alt="yicchi" /></a>
@@ -164,7 +172,9 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
   <a href="https://github.com/nelsonlaidev?ref=orpc" target="_blank" rel="noopener" title="Nelson Lai"><img src="https://avatars.githubusercontent.com/u/75498339?u=2fc0e0b95dd184c5ffb744df977cb15a18b60672&amp;v=4" width="32" height="32" alt="Nelson Lai" /></a>
   <a href="https://github.com/nguyenlc1993?ref=orpc" target="_blank" rel="noopener" title="Lê Cao Nguyên"><img src="https://avatars.githubusercontent.com/u/13871971?u=83c8b69d9e35b589c4e1f066cc113b1d9461386f&amp;v=4" width="32" height="32" alt="Lê Cao Nguyên" /></a>
   <a href="https://github.com/wobsoriano?ref=orpc" target="_blank" rel="noopener" title="Robert Soriano"><img src="https://avatars.githubusercontent.com/u/13049130?u=6d72104182e7c9ed25934815313fb69107332111&amp;v=4" width="32" height="32" alt="Robert Soriano" /></a>
+  <a href="https://github.com/andrewpeters9?ref=orpc" target="_blank" rel="noopener" title="Andrew Peters"><img src="https://avatars.githubusercontent.com/u/36251325?v=4" width="32" height="32" alt="Andrew Peters" /></a>
   <a href="https://github.com/SKostyukovich?ref=orpc" target="_blank" rel="noopener" title="SKostyukovich"><img src="https://avatars.githubusercontent.com/u/10700067?v=4" width="32" height="32" alt="SKostyukovich" /></a>
+  <a href="https://github.com/peter-adam-dy?ref=orpc" target="_blank" rel="noopener" title="Peter Adam"><img src="https://avatars.githubusercontent.com/u/132129459?u=4f3dbbb3b443990b56acb7d6a5d11ed2c555f6db&amp;v=4" width="32" height="32" alt="Peter Adam" /></a>
   <a href="https://github.com/FabworksHQ?ref=orpc" target="_blank" rel="noopener" title="Fabworks"><img src="https://avatars.githubusercontent.com/u/160179500?v=4" width="32" height="32" alt="Fabworks" /></a>
   <a href="https://github.com/NovakAnton?ref=orpc" target="_blank" rel="noopener" title="Novak Antonijevic"><img src="https://avatars.githubusercontent.com/u/157126729?u=ae49fa22292d55c0434ff0ca008206155b18663b&amp;v=4" width="32" height="32" alt="Novak Antonijevic" /></a>
   <a href="https://github.com/laduniestu?ref=orpc" target="_blank" rel="noopener" title="Laduni Estu Syalwa"><img src="https://avatars.githubusercontent.com/u/44757637?u=a2fc1ea8f7d827a96721176f79d30592d1c48059&amp;v=4" width="32" height="32" alt="Laduni Estu Syalwa" /></a>
@@ -172,6 +182,7 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
   <a href="https://github.com/illarionvk?ref=orpc" target="_blank" rel="noopener" title="Illarion Koperski"><img src="https://avatars.githubusercontent.com/u/5012724?u=7cfa13652f7ac5fb3c56d880e3eb3fbe40c3ea34&amp;v=4" width="32" height="32" alt="Illarion Koperski" /></a>
   <a href="https://github.com/steelbrain?ref=orpc" target="_blank" rel="noopener" title="Anees Iqbal"><img src="https://avatars.githubusercontent.com/u/4278113?u=22b80b5399eed68ac76cd58b02961b0481f1db11&amp;v=4" width="32" height="32" alt="Anees Iqbal" /></a>
   <a href="https://github.com/Scrumplex?ref=orpc" target="_blank" rel="noopener" title="Sefa Eyeoglu"><img src="https://avatars.githubusercontent.com/u/11587657?u=ab503582165c0bbff0cca47ce31c9450bb1553c9&amp;v=4" width="32" height="32" alt="Sefa Eyeoglu" /></a>
+  <a href="https://github.com/nattstack?ref=orpc" target="_blank" rel="noopener" title="natt"><img src="https://avatars.githubusercontent.com/u/31426677?u=fa9dbb8b3e66eb0ea3c88db5dc07f31c8c5418fe&amp;v=4" width="32" height="32" alt="natt" /></a>
   <a href="https://github.com/ChromeGG?ref=orpc" target="_blank" rel="noopener" title="Adam Tkaczyk"><img src="https://avatars.githubusercontent.com/u/39050595?u=a58ca6042a6950e94e6e92442db76ef584279bc0&amp;v=4" width="32" height="32" alt="Adam Tkaczyk" /></a>
   <a href="https://github.com/plancraft?ref=orpc" target="_blank" rel="noopener" title="plancraft"><img src="https://avatars.githubusercontent.com/u/46482287?v=4" width="32" height="32" alt="plancraft" /></a>
 </p>

package/dist/index.d.mts CHANGED Viewed

@@ -2,14 +2,13 @@ import * as Draft2020 from 'json-schema-typed/draft-2020-12';
 export { Format as JsonSchemaFormat, TypeName as JsonSchemaType } from 'json-schema-typed/draft-2020-12';
 import { AnySchema, RouterContract } from '@orpc/contract';
 export { AnySchema, Schema } from '@orpc/contract';
-import { Promisable } from '@orpc/shared';
 import { Context } from '@orpc/server';
 import { StandardHandlerPlugin, StandardHandlerOptions } from '@orpc/server/standard';
 import { ClientContext } from '@orpc/client';
 import { StandardLinkPlugin, StandardLinkOptions } from '@orpc/client/standard';
 import { StandardJSONSchemaV1 } from '@standard-schema/spec';
-type JsonSchema = Draft2020.JSONSchema;
+type JsonSchema<Value = any> = Draft2020.JSONSchema<Value>;
 type JsonSchemaKeywords = typeof Draft2020.keywords[number];
 declare enum JsonSchemaXNativeType {
     BigInt = "bigint",
@@ -30,6 +29,7 @@ declare class JsonSchemaCoercer {
  * and exclusively use absolute JSON pointers for `$ref` values.
  */
+declare function isJsonPrimitiveSchema(schema: JsonSchema): schema is JsonSchema & object;
 type JsonFileSchema = JsonSchema & object & {
     type: 'string';
     contentMediaType?: string;
@@ -70,10 +70,6 @@ declare function ensureJsonSchemaObject(schema: JsonSchema): Exclude<JsonSchema,
  * Combines multiple schemas under the requested composition keyword, promoting branch `$defs` to the root.
  */
 declare function combineJsonSchemasWithComposition(keyword: 'allOf' | 'anyOf' | 'oneOf', schemas: JsonSchema[]): JsonSchema;
-/**
- * Returns true when every branch in the schema describes a primitive value.
- */
-declare function isJsonPrimitiveSchema(schema: JsonSchema): boolean;
 type JsonObjectSchemaEntry = [name: string, schema: JsonSchema, optional: boolean];
 /**
  * Combines object property entries back into a single object schema.
@@ -98,16 +94,16 @@ interface JsonSchemaConverter {
     /**
      * Determines whether this converter can handle the given schema.
      */
-    condition(schema: AnySchema | undefined, direction: JsonSchemaConverterDirection): Promisable<boolean>;
+    condition(schema: AnySchema | undefined, direction: JsonSchemaConverterDirection): boolean;
     /**
      * Converts an ORPC schema to a JSON Schema representation.
      */
-    convert(schema: AnySchema | undefined, direction: JsonSchemaConverterDirection): Promisable<[jsonSchema: JsonSchema, optional: boolean]>;
+    convert(schema: AnySchema | undefined, direction: JsonSchemaConverterDirection): [jsonSchema: JsonSchema, optional: boolean];
 }
 declare class DelegatingJsonSchemaConverter implements Pick<JsonSchemaConverter, 'convert'> {
     private readonly converters;
     constructor(converters?: JsonSchemaConverter[]);
-    convert(schema: AnySchema | undefined, direction: JsonSchemaConverterDirection): Promise<[jsonSchema: JsonSchema, optional: boolean]>;
+    convert(schema: AnySchema | undefined, direction: JsonSchemaConverterDirection): [jsonSchema: JsonSchema, optional: boolean];
 }
 /**
@@ -127,6 +123,11 @@ declare function encodeJsonPointerSegment(segment: string): string;
  * https://datatracker.ietf.org/doc/html/rfc6901
  */
 declare function decodeJsonPointerSegment(segment: string): string;
+/**
+ * Visits every `$ref` in a schema, traversing the same keywords as {@link mapJsonSchemaRefs}.
+ * Shared or cyclic object instances are visited once.
+ */
+declare function visitJsonSchemaRefs(value: JsonSchema, visit: (ref: string) => void, schemaLevel?: boolean, seen?: Set<object>): void;
 declare function mapJsonSchemaRefs(value: JsonSchema, map: (ref: string, path: Array<string | number>) => string, schemaLevel?: boolean, path?: Array<string | number>): JsonSchema;
 /**
  * Rewrites recursive root `#` refs by moving the schema body into `$defs`.
@@ -186,5 +187,5 @@ declare class StandardJsonSchemaConverter implements JsonSchemaConverter {
     convertInternal(schema: StandardJSONSchemaV1 & AnySchema, direction: JsonSchemaConverterDirection): [jsonSchema: JsonSchema, optional: boolean];
 }
-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, JsonSchemaXNativeType, SmartCoercionHandlerPlugin, SmartCoercionLinkPlugin, StandardJsonSchemaConverter, combineJsonObjectSchemaEntries, combineJsonSchemasWithComposition, decodeJsonPointerSegment, deduplicateJsonSchemas, encodeJsonPointerSegment, ensureJsonSchemaObject, extractJsonObjectSchemaEntries, flattenJsonUnionSchema, hoistRecursiveRefToDef, isJsonArraySchema, isJsonFileSchema, isJsonObjectSchema, isJsonPrimitiveSchema, isUnconstrainedSchema, mapJsonSchemaRefs, matchArrayableJsonSchema, resolveJsonSchemaRootLocalRef, visitJsonSchemaRefs };
 export type { JsonArraySchema, JsonFileSchema, JsonObjectSchema, JsonObjectSchemaEntry, JsonSchema, JsonSchemaConverter, JsonSchemaConverterDirection, JsonSchemaKeywords, SmartCoercionHandlerPluginOptions, SmartCoercionLinkPluginOptions };

package/dist/index.d.ts CHANGED Viewed

@@ -2,14 +2,13 @@ import * as Draft2020 from 'json-schema-typed/draft-2020-12';
 export { Format as JsonSchemaFormat, TypeName as JsonSchemaType } from 'json-schema-typed/draft-2020-12';
 import { AnySchema, RouterContract } from '@orpc/contract';
 export { AnySchema, Schema } from '@orpc/contract';
-import { Promisable } from '@orpc/shared';
 import { Context } from '@orpc/server';
 import { StandardHandlerPlugin, StandardHandlerOptions } from '@orpc/server/standard';
 import { ClientContext } from '@orpc/client';
 import { StandardLinkPlugin, StandardLinkOptions } from '@orpc/client/standard';
 import { StandardJSONSchemaV1 } from '@standard-schema/spec';
-type JsonSchema = Draft2020.JSONSchema;
+type JsonSchema<Value = any> = Draft2020.JSONSchema<Value>;
 type JsonSchemaKeywords = typeof Draft2020.keywords[number];
 declare enum JsonSchemaXNativeType {
     BigInt = "bigint",
@@ -30,6 +29,7 @@ declare class JsonSchemaCoercer {
  * and exclusively use absolute JSON pointers for `$ref` values.
  */
+declare function isJsonPrimitiveSchema(schema: JsonSchema): schema is JsonSchema & object;
 type JsonFileSchema = JsonSchema & object & {
     type: 'string';
     contentMediaType?: string;
@@ -70,10 +70,6 @@ declare function ensureJsonSchemaObject(schema: JsonSchema): Exclude<JsonSchema,
  * Combines multiple schemas under the requested composition keyword, promoting branch `$defs` to the root.
  */
 declare function combineJsonSchemasWithComposition(keyword: 'allOf' | 'anyOf' | 'oneOf', schemas: JsonSchema[]): JsonSchema;
-/**
- * Returns true when every branch in the schema describes a primitive value.
- */
-declare function isJsonPrimitiveSchema(schema: JsonSchema): boolean;
 type JsonObjectSchemaEntry = [name: string, schema: JsonSchema, optional: boolean];
 /**
  * Combines object property entries back into a single object schema.
@@ -98,16 +94,16 @@ interface JsonSchemaConverter {
     /**
      * Determines whether this converter can handle the given schema.
      */
-    condition(schema: AnySchema | undefined, direction: JsonSchemaConverterDirection): Promisable<boolean>;
+    condition(schema: AnySchema | undefined, direction: JsonSchemaConverterDirection): boolean;
     /**
      * Converts an ORPC schema to a JSON Schema representation.
      */
-    convert(schema: AnySchema | undefined, direction: JsonSchemaConverterDirection): Promisable<[jsonSchema: JsonSchema, optional: boolean]>;
+    convert(schema: AnySchema | undefined, direction: JsonSchemaConverterDirection): [jsonSchema: JsonSchema, optional: boolean];
 }
 declare class DelegatingJsonSchemaConverter implements Pick<JsonSchemaConverter, 'convert'> {
     private readonly converters;
     constructor(converters?: JsonSchemaConverter[]);
-    convert(schema: AnySchema | undefined, direction: JsonSchemaConverterDirection): Promise<[jsonSchema: JsonSchema, optional: boolean]>;
+    convert(schema: AnySchema | undefined, direction: JsonSchemaConverterDirection): [jsonSchema: JsonSchema, optional: boolean];
 }
 /**
@@ -127,6 +123,11 @@ declare function encodeJsonPointerSegment(segment: string): string;
  * https://datatracker.ietf.org/doc/html/rfc6901
  */
 declare function decodeJsonPointerSegment(segment: string): string;
+/**
+ * Visits every `$ref` in a schema, traversing the same keywords as {@link mapJsonSchemaRefs}.
+ * Shared or cyclic object instances are visited once.
+ */
+declare function visitJsonSchemaRefs(value: JsonSchema, visit: (ref: string) => void, schemaLevel?: boolean, seen?: Set<object>): void;
 declare function mapJsonSchemaRefs(value: JsonSchema, map: (ref: string, path: Array<string | number>) => string, schemaLevel?: boolean, path?: Array<string | number>): JsonSchema;
 /**
  * Rewrites recursive root `#` refs by moving the schema body into `$defs`.
@@ -186,5 +187,5 @@ declare class StandardJsonSchemaConverter implements JsonSchemaConverter {
     convertInternal(schema: StandardJSONSchemaV1 & AnySchema, direction: JsonSchemaConverterDirection): [jsonSchema: JsonSchema, optional: boolean];
 }
-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, JsonSchemaXNativeType, SmartCoercionHandlerPlugin, SmartCoercionLinkPlugin, StandardJsonSchemaConverter, combineJsonObjectSchemaEntries, combineJsonSchemasWithComposition, decodeJsonPointerSegment, deduplicateJsonSchemas, encodeJsonPointerSegment, ensureJsonSchemaObject, extractJsonObjectSchemaEntries, flattenJsonUnionSchema, hoistRecursiveRefToDef, isJsonArraySchema, isJsonFileSchema, isJsonObjectSchema, isJsonPrimitiveSchema, isUnconstrainedSchema, mapJsonSchemaRefs, matchArrayableJsonSchema, resolveJsonSchemaRootLocalRef, visitJsonSchemaRefs };
 export type { JsonArraySchema, JsonFileSchema, JsonObjectSchema, JsonObjectSchemaEntry, JsonSchema, JsonSchemaConverter, JsonSchemaConverterDirection, JsonSchemaKeywords, SmartCoercionHandlerPluginOptions, SmartCoercionLinkPluginOptions };

package/dist/index.mjs CHANGED Viewed

@@ -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';
@@ -59,6 +59,27 @@ 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, val] of Object.entries(value)) {
+    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;
@@ -148,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) {
@@ -157,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;
@@ -189,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;
         }
@@ -215,7 +245,7 @@ class JsonSchemaCoercer {
             coerced = stringToNumber(coerced);
           }
           if (typeof coerced !== "number") {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -224,7 +254,7 @@ class JsonSchemaCoercer {
             coerced = stringToInteger(coerced);
           }
           if (typeof coerced !== "number" || !Number.isInteger(coerced)) {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -233,7 +263,7 @@ class JsonSchemaCoercer {
             coerced = stringToBoolean(coerced);
           }
           if (typeof coerced !== "boolean") {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -245,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;
         }
@@ -274,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;
         }
@@ -315,7 +344,7 @@ class JsonSchemaCoercer {
             coerced = stringToDate(coerced);
           }
           if (!(coerced instanceof Date)) {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -329,7 +358,7 @@ class JsonSchemaCoercer {
               break;
           }
           if (typeof coerced !== "bigint") {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -338,7 +367,7 @@ class JsonSchemaCoercer {
             coerced = stringToRegExp(coerced);
           }
           if (!(coerced instanceof RegExp)) {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -347,7 +376,7 @@ class JsonSchemaCoercer {
             coerced = stringToURL(coerced);
           }
           if (!(coerced instanceof URL)) {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -356,7 +385,7 @@ class JsonSchemaCoercer {
             coerced = arrayToSet(coerced);
           }
           if (!(coerced instanceof Set)) {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -365,7 +394,7 @@ class JsonSchemaCoercer {
             coerced = arrayToMap(coerced);
           }
           if (!(coerced instanceof Map)) {
-            satisfied = false;
+            satisfied = UNSATISFIED;
           }
           break;
         }
@@ -373,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") {
@@ -431,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;
@@ -473,6 +525,21 @@ function arrayToMap(value) {
   return result;
 }
+function isJsonPrimitiveSchema(schema) {
+  if (typeof schema === "boolean") {
+    return false;
+  }
+  if (typeof schema.type === "string" && JSON_SCHEMA_PRIMITIVE_TYPES.has(schema.type)) {
+    return true;
+  }
+  if (schema.const !== void 0) {
+    return true;
+  }
+  if (schema.enum !== void 0) {
+    return true;
+  }
+  return false;
+}
 function isJsonFileSchema(schema) {
   return typeof schema !== "boolean" && schema.type === "string" && (typeof schema.contentMediaType === "string" || schema.format === "binary" || schema.contentEncoding === "binary");
 }
@@ -568,23 +635,6 @@ function combineJsonSchemasWithComposition(keyword, schemas) {
   }
   return result;
 }
-function isJsonPrimitiveSchema(schema) {
-  return flattenJsonUnionSchema(schema).every((s) => {
-    if (typeof s === "boolean") {
-      return false;
-    }
-    if (typeof s.type === "string" && JSON_SCHEMA_PRIMITIVE_TYPES.has(s.type)) {
-      return true;
-    }
-    if (s.const !== void 0) {
-      return true;
-    }
-    if (s.enum !== void 0) {
-      return true;
-    }
-    return false;
-  });
-}
 function combineJsonObjectSchemaEntries(entries) {
   const properties = {};
   const required = [];
@@ -846,13 +896,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 [
@@ -909,23 +960,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);
@@ -964,7 +1015,7 @@ 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) {
@@ -976,18 +1027,18 @@ class SmartCoercionLinkPlugin {
               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);
@@ -996,4 +1047,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, JsonSchemaXNativeType, SmartCoercionHandlerPlugin, SmartCoercionLinkPlugin, StandardJsonSchemaConverter, combineJsonObjectSchemaEntries, combineJsonSchemasWithComposition, decodeJsonPointerSegment, deduplicateJsonSchemas, encodeJsonPointerSegment, ensureJsonSchemaObject, extractJsonObjectSchemaEntries, flattenJsonUnionSchema, hoistRecursiveRefToDef, isJsonArraySchema, isJsonFileSchema, isJsonObjectSchema, isJsonPrimitiveSchema, isUnconstrainedSchema, mapJsonSchemaRefs, matchArrayableJsonSchema, resolveJsonSchemaRootLocalRef, visitJsonSchemaRefs };

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/json-schema",
   "type": "module",
-  "version": "2.0.0-beta.2",
+  "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/server": "2.0.0-beta.2",
-    "@orpc/contract": "2.0.0-beta.2",
-    "@orpc/client": "2.0.0-beta.2",
-    "@orpc/shared": "2.0.0-beta.2"
+    "@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"