@orpc/valibot 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

@@ -26,7 +26,10 @@ declare class ValibotToJsonSchemaConverter implements JsonSchemaConverter {
     condition(schema: AnySchema | undefined, _direction: JsonSchemaConverterDirection): boolean;
     convert(schema: AnySchema | undefined, direction: JsonSchemaConverterDirection): [jsonSchema: JsonSchema, optional: boolean];
     private convertUncached;
-    private convertValibot;
+    private createConversionConfig;
+    private overrideSchema;
+    private convertNativeType;
+    private convertWithin;
 }
 
 export { ValibotToJsonSchemaConverter };

package/dist/index.d.ts

@@ -26,7 +26,10 @@ declare class ValibotToJsonSchemaConverter implements JsonSchemaConverter {
     condition(schema: AnySchema | undefined, _direction: JsonSchemaConverterDirection): boolean;
     convert(schema: AnySchema | undefined, direction: JsonSchemaConverterDirection): [jsonSchema: JsonSchema, optional: boolean];
     private convertUncached;
-    private convertValibot;
+    private createConversionConfig;
+    private overrideSchema;
+    private convertNativeType;
+    private convertWithin;
 }
 
 export { ValibotToJsonSchemaConverter };

package/dist/index.mjs

@@ -1,6 +1,8 @@
-import { JsonSchemaXNativeType, JsonSchemaFormat } from '@orpc/json-schema';
+import { isStandardSchemaOptional, JsonSchemaXNativeType, JsonSchemaFormat } from '@orpc/json-schema';
 import { toJsonSchema } from '@valibot/to-json-schema';
+import { any, tuple } from 'valibot';
 
+const NESTED_CONVERSION_SENTINEL = any();
 class ValibotToJsonSchemaConverter {
   conversionConfig;
   cache;
@@ -28,60 +30,68 @@ class ValibotToJsonSchemaConverter {
     return result;
   }
   convertUncached(valibotSchema, direction) {
-    const jsonSchema = this.convertValibot(valibotSchema, direction);
-    let optional = false;
-    try {
-      const result = valibotSchema["~standard"].validate(void 0);
-      if (!(result instanceof Promise) && !result.issues) {
-        optional = direction === "input" ? true : result.value === void 0;
-      }
-    } catch {
-    }
-    return [jsonSchema, optional];
+    const { $schema, ...jsonSchema } = toJsonSchema(valibotSchema, this.createConversionConfig(direction));
+    return [jsonSchema, isStandardSchemaOptional(valibotSchema, direction)];
   }
-  convertValibot(schema, direction) {
-    const jsonSchema = toJsonSchema(schema, {
+  createConversionConfig(direction) {
+    return {
       errorMode: "ignore",
       ...this.conversionConfig,
       target: "draft-2020-12",
       typeMode: direction,
+      overrideSchema: (context) => this.overrideSchema(context, direction)
+    };
+  }
+  overrideSchema(context, direction) {
+    const jsonSchema = this.convertNativeType(context, direction);
+    return jsonSchema ? this.conversionConfig.overrideSchema?.({ ...context, jsonSchema, errors: void 0 }) ?? jsonSchema : this.conversionConfig.overrideSchema?.(context);
+  }
+  convertNativeType(context, direction) {
+    switch (context.valibotSchema.type) {
+      case "bigint":
+        return { "type": "string", "pattern": "^-?[0-9]+$", "x-native-type": JsonSchemaXNativeType.BigInt };
+      case "date":
+        return { "type": "string", "format": JsonSchemaFormat.DateTime, "x-native-type": JsonSchemaXNativeType.Date };
+      case "set": {
+        const { value } = context.valibotSchema;
+        return { "type": "array", "uniqueItems": true, "items": this.convertWithin(context, [value], direction)[0], "x-native-type": JsonSchemaXNativeType.Set };
+      }
+      case "map": {
+        const { key, value } = context.valibotSchema;
+        return {
+          "type": "array",
+          "items": { type: "array", prefixItems: this.convertWithin(context, [key, value], direction), maxItems: 2, minItems: 2 },
+          "x-native-type": JsonSchemaXNativeType.Map
+        };
+      }
+    }
+  }
+  convertWithin(parent, schemas, direction) {
+    const wrapper = tuple([NESTED_CONVERSION_SENTINEL, ...schemas]);
+    let child;
+    const { prefixItems } = toJsonSchema(wrapper, {
+      ...this.createConversionConfig(direction),
+      definitions: {},
       overrideSchema: (context) => {
-        if (context.valibotSchema.type === "bigint") {
-          context.jsonSchema.type = "string";
-          context.jsonSchema.pattern = "^-?[0-9]+$";
-          context.jsonSchema["x-native-type"] = JsonSchemaXNativeType.BigInt;
-        } else if (context.valibotSchema.type === "date") {
-          context.jsonSchema.type = "string";
-          context.jsonSchema.format = JsonSchemaFormat.DateTime;
-          context.jsonSchema["x-native-type"] = JsonSchemaXNativeType.Date;
-        } else if (context.valibotSchema.type === "set") {
-          const setSchema = context.valibotSchema;
-          context.jsonSchema.type = "array";
-          context.jsonSchema.uniqueItems = true;
-          context.jsonSchema.items = this.convertValibot(setSchema.value, direction);
-          context.jsonSchema["x-native-type"] = JsonSchemaXNativeType.Set;
-        } else if (context.valibotSchema.type === "map") {
-          const mapSchema = context.valibotSchema;
-          context.jsonSchema.type = "array";
-          context.jsonSchema.items = {
-            type: "array",
-            prefixItems: [
-              this.convertValibot(mapSchema.key, direction),
-              this.convertValibot(mapSchema.value, direction)
-            ],
-            maxItems: 2,
-            minItems: 2
-          };
-          context.jsonSchema["x-native-type"] = JsonSchemaXNativeType.Map;
-        }
-        if (this.conversionConfig.overrideSchema) {
-          return this.conversionConfig.overrideSchema(context);
+        if (context.valibotSchema === NESTED_CONVERSION_SENTINEL) {
+          child = context;
+          mergeConversionContext(child, parent);
+        } else if (context.valibotSchema !== wrapper) {
+          return this.overrideSchema(context, direction);
         }
       }
     });
-    const { $schema, ...rest } = jsonSchema;
-    return rest;
+    mergeConversionContext(parent, child);
+    return prefixItems.slice(1);
+  }
+}
+function mergeConversionContext(target, source) {
+  if (!source.referenceMap.size) {
+    return;
   }
+  source.referenceMap.forEach((referenceId, schema) => target.referenceMap.set(schema, referenceId));
+  source.getterMap.forEach((schema, getter) => target.getterMap.set(getter, schema));
+  Object.assign(target.definitions, source.definitions);
 }
 
 export { ValibotToJsonSchemaConverter };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/valibot",
   "type": "module",
-  "version": "2.0.0-beta.40",
+  "version": "2.0.0-beta.41",
   "description": "Valibot integration for oRPC: convert Valibot schemas into JSON Schema for OpenAPI generation",
   "license": "MIT",
   "funding": [
@@ -39,7 +39,7 @@
     "valibot": ">=1.5.0"
   },
   "dependencies": {
-    "@orpc/json-schema": "2.0.0-beta.40",
+    "@orpc/json-schema": "2.0.0-beta.41",
     "@valibot/to-json-schema": "^1.8.0"
   },
   "devDependencies": {