@orpc/json-schema 2.0.0-beta.17 → 2.0.0-beta.19

package/README.md

@@ -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>
@@ -46,11 +49,14 @@ You can read the documentation [here](https://orpc.dev).
 **Framework & ecosystem integrations**
 
 - [@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/experimental-effect](https://www.npmjs.com/package/@orpc/experimental-effect): Integrate with [Effect](https://effect.website/).
 - [@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**
 
@@ -102,11 +108,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/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>
@@ -166,6 +171,7 @@ 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>

package/dist/index.d.mts

@@ -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",
@@ -95,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];
 }
 
 /**

package/dist/index.d.ts

@@ -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",
@@ -95,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];
 }
 
 /**

package/dist/index.mjs

@@ -844,13 +844,14 @@ class DelegatingJsonSchemaConverter {
   constructor(converters = []) {
     this.converters = converters;
   }
-  async convert(schema, direction) {
+  convert(schema, direction) {
     for (const converter of this.converters) {
-      if (await converter.condition(schema, direction)) {
+      if (converter.condition(schema, direction)) {
         return converter.convert(schema, direction);
       }
     }
-    const optional = !(await schema?.["~standard"].validate(void 0))?.issues?.length;
+    const result = schema?.["~standard"].validate(void 0);
+    const optional = result instanceof Promise ? false : !result?.issues?.length;
     if (schema && "jsonSchema" in schema["~standard"] && schema["~standard"].jsonSchema) {
       try {
         return [
@@ -907,23 +908,23 @@ class SmartCoercionHandlerPlugin {
     return {
       ...options,
       clientInterceptors: [
-        async ({ next, input, ...interceptorOptions }) => {
+        ({ next, input, ...interceptorOptions }) => {
           const inputSchemas = interceptorOptions.procedure["~orpc"].inputSchemas;
           if (!inputSchemas) {
             return next();
           }
-          const coercedInput = await this.coerceValue(inputSchemas, input);
+          const coercedInput = this.coerceValue(inputSchemas, input);
           return next({ ...interceptorOptions, input: coercedInput });
         },
         ...toArray(options.clientInterceptors)
       ]
     };
   }
-  async coerceValue(schemas, value) {
+  coerceValue(schemas, value) {
     for (const schema of schemas) {
       let converted = this.cache.get(schema);
       if (!converted) {
-        converted = await this.converter.convert(schema, "input");
+        converted = this.converter.convert(schema, "input");
         this.cache.set(schema, converted);
       }
       value = this.coercer.coerce(converted, value);
@@ -962,7 +963,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) {
@@ -974,18 +975,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);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/json-schema",
   "type": "module",
-  "version": "2.0.0-beta.17",
+  "version": "2.0.0-beta.19",
   "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.17",
-    "@orpc/server": "2.0.0-beta.17",
-    "@orpc/shared": "2.0.0-beta.17",
-    "@orpc/contract": "2.0.0-beta.17"
+    "@orpc/contract": "2.0.0-beta.19",
+    "@orpc/client": "2.0.0-beta.19",
+    "@orpc/server": "2.0.0-beta.19",
+    "@orpc/shared": "2.0.0-beta.19"
   },
   "devDependencies": {
     "zod": "^4.4.3"