@orpc/openapi 0.15.0 → 0.16.0

package/dist/index.js

@@ -3943,10 +3943,15 @@ var NON_LOGIC_KEYWORDS = [
 var UNSUPPORTED_JSON_SCHEMA = { not: {} };
 var UNDEFINED_JSON_SCHEMA = { const: "undefined" };
 function zodToJsonSchema(schema, options) {
+  if (schema["~standard"].vendor !== "zod") {
+    console.warn(`Generate JSON schema not support ${schema["~standard"].vendor} yet`);
+    return {};
+  }
+  const schema__ = schema;
   if (!options?.isHandledCustomJSONSchema) {
-    const customJSONSchema = getCustomJSONSchema(schema._def, options);
+    const customJSONSchema = getCustomJSONSchema(schema__._def, options);
     if (customJSONSchema) {
-      const json = zodToJsonSchema(schema, {
+      const json = zodToJsonSchema(schema__, {
         ...options,
         isHandledCustomJSONSchema: true
       });
@@ -3957,13 +3962,13 @@ function zodToJsonSchema(schema, options) {
     }
   }
   const childOptions = { ...options, isHandledCustomJSONSchema: false };
-  const customType = getCustomZodType(schema._def);
+  const customType = getCustomZodType(schema__._def);
   switch (customType) {
     case "Blob": {
       return { type: "string", contentMediaType: "*/*" };
     }
     case "File": {
-      const mimeType = getCustomZodFileMimeType(schema._def) ?? "*/*";
+      const mimeType = getCustomZodFileMimeType(schema__._def) ?? "*/*";
       return { type: "string", contentMediaType: mimeType };
     }
     case "Invalid Date": {
@@ -3980,10 +3985,10 @@ function zodToJsonSchema(schema, options) {
     }
   }
   const _expectedCustomType = customType;
-  const typeName = schema._def.typeName;
+  const typeName = schema__._def.typeName;
   switch (typeName) {
     case ZodFirstPartyTypeKind.ZodString: {
-      const schema_ = schema;
+      const schema_ = schema__;
       const json = { type: "string" };
       for (const check of schema_._def.checks) {
         switch (check.kind) {
@@ -4065,7 +4070,7 @@ function zodToJsonSchema(schema, options) {
       return json;
     }
     case ZodFirstPartyTypeKind.ZodNumber: {
-      const schema_ = schema;
+      const schema_ = schema__;
       const json = { type: "number" };
       for (const check of schema_._def.checks) {
         switch (check.kind) {
@@ -4110,23 +4115,23 @@ function zodToJsonSchema(schema, options) {
       return UNDEFINED_JSON_SCHEMA;
     }
     case ZodFirstPartyTypeKind.ZodLiteral: {
-      const schema_ = schema;
+      const schema_ = schema__;
       return { const: schema_._def.value };
     }
     case ZodFirstPartyTypeKind.ZodEnum: {
-      const schema_ = schema;
+      const schema_ = schema__;
       return {
         enum: schema_._def.values
       };
     }
     case ZodFirstPartyTypeKind.ZodNativeEnum: {
-      const schema_ = schema;
+      const schema_ = schema__;
       return {
         enum: Object.values(schema_._def.values)
       };
     }
     case ZodFirstPartyTypeKind.ZodArray: {
-      const schema_ = schema;
+      const schema_ = schema__;
       const def = schema_._def;
       const json = { type: "array" };
       if (def.exactLength) {
@@ -4142,7 +4147,7 @@ function zodToJsonSchema(schema, options) {
       return json;
     }
     case ZodFirstPartyTypeKind.ZodTuple: {
-      const schema_ = schema;
+      const schema_ = schema__;
       const prefixItems = [];
       const json = { type: "array" };
       for (const item of schema_._def.items) {
@@ -4160,7 +4165,7 @@ function zodToJsonSchema(schema, options) {
       return json;
     }
     case ZodFirstPartyTypeKind.ZodObject: {
-      const schema_ = schema;
+      const schema_ = schema__;
       const json = { type: "object" };
       const properties = {};
       const required = [];
@@ -4196,7 +4201,7 @@ function zodToJsonSchema(schema, options) {
       return json;
     }
     case ZodFirstPartyTypeKind.ZodRecord: {
-      const schema_ = schema;
+      const schema_ = schema__;
       const json = { type: "object" };
       json.additionalProperties = zodToJsonSchema(
         schema_._def.valueType,
@@ -4205,14 +4210,14 @@ function zodToJsonSchema(schema, options) {
       return json;
     }
     case ZodFirstPartyTypeKind.ZodSet: {
-      const schema_ = schema;
+      const schema_ = schema__;
       return {
         type: "array",
         items: zodToJsonSchema(schema_._def.valueType, childOptions)
       };
     }
     case ZodFirstPartyTypeKind.ZodMap: {
-      const schema_ = schema;
+      const schema_ = schema__;
       return {
         type: "array",
         items: {
@@ -4228,7 +4233,7 @@ function zodToJsonSchema(schema, options) {
     }
     case ZodFirstPartyTypeKind.ZodUnion:
     case ZodFirstPartyTypeKind.ZodDiscriminatedUnion: {
-      const schema_ = schema;
+      const schema_ = schema__;
       const anyOf = [];
       for (const s of schema_._def.options) {
         anyOf.push(zodToJsonSchema(s, childOptions));
@@ -4236,7 +4241,7 @@ function zodToJsonSchema(schema, options) {
       return { anyOf };
     }
     case ZodFirstPartyTypeKind.ZodIntersection: {
-      const schema_ = schema;
+      const schema_ = schema__;
       const allOf = [];
       for (const s of [schema_._def.left, schema_._def.right]) {
         allOf.push(zodToJsonSchema(s, childOptions));
@@ -4244,7 +4249,7 @@ function zodToJsonSchema(schema, options) {
       return { allOf };
     }
     case ZodFirstPartyTypeKind.ZodLazy: {
-      const schema_ = schema;
+      const schema_ = schema__;
       const maxLazyDepth = childOptions?.maxLazyDepth ?? 5;
       const lazyDepth = childOptions?.lazyDepth ?? 0;
       if (lazyDepth > maxLazyDepth) {
@@ -4261,44 +4266,44 @@ function zodToJsonSchema(schema, options) {
       return {};
     }
     case ZodFirstPartyTypeKind.ZodOptional: {
-      const schema_ = schema;
+      const schema_ = schema__;
       const inner = zodToJsonSchema(schema_._def.innerType, childOptions);
       return {
         anyOf: [UNDEFINED_JSON_SCHEMA, inner]
       };
     }
     case ZodFirstPartyTypeKind.ZodReadonly: {
-      const schema_ = schema;
+      const schema_ = schema__;
       return zodToJsonSchema(schema_._def.innerType, childOptions);
     }
     case ZodFirstPartyTypeKind.ZodDefault: {
-      const schema_ = schema;
+      const schema_ = schema__;
       return zodToJsonSchema(schema_._def.innerType, childOptions);
     }
     case ZodFirstPartyTypeKind.ZodEffects: {
-      const schema_ = schema;
+      const schema_ = schema__;
       if (schema_._def.effect.type === "transform" && childOptions?.mode === "output") {
         return {};
       }
       return zodToJsonSchema(schema_._def.schema, childOptions);
     }
     case ZodFirstPartyTypeKind.ZodCatch: {
-      const schema_ = schema;
+      const schema_ = schema__;
       return zodToJsonSchema(schema_._def.innerType, childOptions);
     }
     case ZodFirstPartyTypeKind.ZodBranded: {
-      const schema_ = schema;
+      const schema_ = schema__;
       return zodToJsonSchema(schema_._def.type, childOptions);
     }
     case ZodFirstPartyTypeKind.ZodPipeline: {
-      const schema_ = schema;
+      const schema_ = schema__;
       return zodToJsonSchema(
         childOptions?.mode === "output" ? schema_._def.out : schema_._def.in,
         childOptions
       );
     }
     case ZodFirstPartyTypeKind.ZodNullable: {
-      const schema_ = schema;
+      const schema_ = schema__;
       const inner = zodToJsonSchema(schema_._def.innerType, childOptions);
       return {
         anyOf: [{ type: "null" }, inner]
@@ -4507,7 +4512,9 @@ async function generateOpenAPI(opts, options) {
           };
         }
         return {
-          required: Boolean(internal.InputSchema?.isOptional()),
+          required: Boolean(
+            internal.InputSchema && "isOptional" in internal.InputSchema && typeof internal.InputSchema.isOptional === "function" ? internal.InputSchema.isOptional() : false
+          ),
           content
         };
       })();

package/dist/src/zod-to-json-schema.d.ts

@@ -1,5 +1,5 @@
+import type { StandardSchemaV1 } from '@standard-schema/spec';
 import { type JSONSchema } from 'json-schema-typed/draft-2020-12';
-import { type ZodTypeAny } from 'zod';
 export declare const NON_LOGIC_KEYWORDS: ("$anchor" | "$comment" | "$defs" | "$dynamicAnchor" | "$dynamicRef" | "$id" | "$schema" | "$vocabulary" | "contentEncoding" | "contentMediaType" | "default" | "definitions" | "deprecated" | "description" | "examples" | "format" | "readOnly" | "title" | "writeOnly")[];
 export declare const UNSUPPORTED_JSON_SCHEMA: {
     not: {};
@@ -35,7 +35,7 @@ export interface ZodToJsonSchemaOptions {
      */
     isHandledCustomJSONSchema?: boolean;
 }
-export declare function zodToJsonSchema(schema: ZodTypeAny, options?: ZodToJsonSchemaOptions): Exclude<JSONSchema, boolean>;
+export declare function zodToJsonSchema(schema: StandardSchemaV1, options?: ZodToJsonSchemaOptions): Exclude<JSONSchema, boolean>;
 export declare function extractJSONSchema(schema: JSONSchema, check: (schema: JSONSchema) => boolean, matches?: JSONSchema[]): {
     schema: JSONSchema | undefined;
     matches: JSONSchema[];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/openapi",
   "type": "module",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -34,14 +34,15 @@
     "dist"
   ],
   "dependencies": {
+    "@standard-schema/spec": "1.0.0-beta.4",
     "escape-string-regexp": "^5.0.0",
     "json-schema-typed": "^8.0.1",
     "openapi3-ts": "^4.4.0",
-    "@orpc/server": "0.15.0",
-    "@orpc/contract": "0.15.0",
-    "@orpc/shared": "0.15.0",
-    "@orpc/transformer": "0.15.0",
-    "@orpc/zod": "0.15.0"
+    "@orpc/contract": "0.16.0",
+    "@orpc/transformer": "0.16.0",
+    "@orpc/server": "0.16.0",
+    "@orpc/shared": "0.16.0",
+    "@orpc/zod": "0.16.0"
   },
   "devDependencies": {
     "@readme/openapi-parser": "^2.6.0",