@orpc/openapi 0.0.0-next.2f8ca7f → 0.0.0-next.4555a17

package/dist/{chunk-KZIT2WCV.js → chunk-7HD5IZWG.js}

@@ -42,8 +42,12 @@ function eachContractProcedureLeaf(options, callback, result = [], isCurrentRout
   }
   return result;
 }
+function standardizeHTTPPath(path) {
+  return `/${path.replace(/\/{2,}/g, "/").replace(/^\/|\/$/g, "")}`;
+}
 
 export {
-  eachContractProcedureLeaf
+  eachContractProcedureLeaf,
+  standardizeHTTPPath
 };
-//# sourceMappingURL=chunk-KZIT2WCV.js.map
+//# sourceMappingURL=chunk-7HD5IZWG.js.map

package/dist/fetch.js

@@ -1,16 +1,16 @@
 import {
-  eachContractProcedureLeaf
-} from "./chunk-KZIT2WCV.js";
+  eachContractProcedureLeaf,
+  standardizeHTTPPath
+} from "./chunk-7HD5IZWG.js";
 
 // src/fetch/base-handler.ts
-import { ORPC_HEADER, standardizeHTTPPath } from "@orpc/contract";
 import { createProcedureCaller, isLazy, isProcedure, LAZY_LOADER_SYMBOL, LAZY_ROUTER_PREFIX_SYMBOL, ORPCError } from "@orpc/server";
-import { executeWithHooks, isPlainObject, mapValues, trim, value } from "@orpc/shared";
+import { executeWithHooks, isPlainObject, mapValues, ORPC_PROTOCOL_HEADER, ORPC_PROTOCOL_VALUE, trim, value } from "@orpc/shared";
 import { OpenAPIDeserializer, OpenAPISerializer, zodCoerce } from "@orpc/transformer";
 function createOpenAPIHandler(createHonoRouter) {
   const resolveRouter = createResolveRouter(createHonoRouter);
   return async (options) => {
-    if (options.request.headers.get(ORPC_HEADER) !== null) {
+    if (options.request.headers.get(ORPC_PROTOCOL_HEADER)?.includes(ORPC_PROTOCOL_VALUE)) {
       return void 0;
     }
     const context = await value(options.context);
@@ -33,8 +33,8 @@ function createOpenAPIHandler(createHonoRouter) {
           message: "Not found"
         });
       }
-      const params = procedure.zz$p.contract.zz$cp.InputSchema ? zodCoerce(
-        procedure.zz$p.contract.zz$cp.InputSchema,
+      const params = procedure.zz$p.contract["~orpc"].InputSchema ? zodCoerce(
+        procedure.zz$p.contract["~orpc"].InputSchema,
         match.params,
         { bracketNotation: true }
       ) : match.params;
@@ -88,8 +88,8 @@ var pendingCache = /* @__PURE__ */ new Map();
 function createResolveRouter(createHonoRouter) {
   const addRoutes = (routing, pending, options) => {
     const lazies = eachContractProcedureLeaf(options, ({ path, contract }) => {
-      const method = contract.zz$cp.method ?? "POST";
-      const httpPath = contract.zz$cp.path ? openAPIPathToRouterPath(contract.zz$cp.path) : `/${path.map(encodeURIComponent).join("/")}`;
+      const method = contract["~orpc"].route?.method ?? "POST";
+      const httpPath = contract["~orpc"].route?.path ? openAPIPathToRouterPath(contract["~orpc"].route?.path) : `/${path.map(encodeURIComponent).join("/")}`;
       routing.add(method, httpPath, path);
     });
     pending.ref.push(...lazies);
@@ -164,7 +164,7 @@ function mergeParamsAndInput(coercedParams, input) {
 }
 async function deserializeInput(request, procedure) {
   const deserializer = new OpenAPIDeserializer({
-    schema: procedure.zz$p.contract.zz$cp.InputSchema
+    schema: procedure.zz$p.contract["~orpc"].InputSchema
   });
   try {
     return await deserializer.deserialize(request);
@@ -702,7 +702,6 @@ export {
   createOpenAPIHandler,
   createOpenAPIServerHandler,
   createOpenAPIServerlessHandler,
-  createResolveRouter,
-  openAPIPathToRouterPath
+  createResolveRouter
 };
 //# sourceMappingURL=fetch.js.map

package/dist/index.js

@@ -1,6 +1,7 @@
 import {
-  eachContractProcedureLeaf
-} from "./chunk-KZIT2WCV.js";
+  eachContractProcedureLeaf,
+  standardizeHTTPPath
+} from "./chunk-7HD5IZWG.js";
 
 // src/generator.ts
 import { isContractProcedure } from "@orpc/contract";
@@ -3943,10 +3944,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 +3963,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 +3986,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) {
@@ -4051,6 +4057,12 @@ function zodToJsonSchema(schema, options) {
           case "ip":
             json.format = Format.IPv4;
             break;
+          case "jwt":
+            json.pattern = "^[A-Za-z0-9-_]+\\.[A-Za-z0-9-_]+\\.[A-Za-z0-9-_]*$";
+            break;
+          case "base64url":
+            json.pattern = "^([0-9a-zA-Z-_]{4})*(([0-9a-zA-Z-_]{2}(==)?)|([0-9a-zA-Z-_]{3}(=)?))?$";
+            break;
           default: {
             const _expect = check.kind;
           }
@@ -4059,7 +4071,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) {
@@ -4104,23 +4116,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) {
@@ -4136,7 +4148,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) {
@@ -4154,7 +4166,7 @@ function zodToJsonSchema(schema, options) {
       return json;
     }
     case ZodFirstPartyTypeKind.ZodObject: {
-      const schema_ = schema;
+      const schema_ = schema__;
       const json = { type: "object" };
       const properties = {};
       const required = [];
@@ -4190,7 +4202,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,
@@ -4199,14 +4211,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: {
@@ -4222,7 +4234,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));
@@ -4230,7 +4242,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));
@@ -4238,7 +4250,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) {
@@ -4255,44 +4267,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]
@@ -4361,12 +4373,12 @@ async function generateOpenAPI(opts, options) {
       if (!isContractProcedure(contract)) {
         return;
       }
-      const internal = contract.zz$cp;
-      if (ignoreUndefinedPathProcedures && internal.path === void 0) {
+      const internal = contract["~orpc"];
+      if (ignoreUndefinedPathProcedures && internal.route?.path === void 0) {
         return;
       }
-      const httpPath = internal.path ?? `/${path.map(encodeURIComponent).join("/")}`;
-      const method = internal.method ?? "POST";
+      const httpPath = internal.route?.path ? standardizeHTTPPath(internal.route?.path) : `/${path.map(encodeURIComponent).join("/")}`;
+      const method = internal.route?.method ?? "POST";
       let inputSchema = internal.InputSchema ? zodToJsonSchema(internal.InputSchema, { mode: "input" }) : {};
       const outputSchema = internal.OutputSchema ? zodToJsonSchema(internal.OutputSchema, { mode: "output" }) : {};
       const params = (() => {
@@ -4501,7 +4513,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
         };
       })();
@@ -4526,8 +4540,8 @@ async function generateOpenAPI(opts, options) {
           content
         };
       })();
-      if (throwOnMissingTagDefinition && internal.tags) {
-        const missingTag = internal.tags.find((tag) => !rootTags.includes(tag));
+      if (throwOnMissingTagDefinition && internal.route?.tags) {
+        const missingTag = internal.route?.tags.find((tag) => !rootTags.includes(tag));
         if (missingTag !== void 0) {
           throw new Error(
             `Tag "${missingTag}" is missing definition. Please define it in OpenAPI root tags object. [${path.join(".")}]`
@@ -4535,10 +4549,10 @@ async function generateOpenAPI(opts, options) {
         }
       }
       const operation = {
-        summary: internal.summary,
-        description: internal.description,
-        deprecated: internal.deprecated,
-        tags: internal.tags,
+        summary: internal.route?.summary,
+        description: internal.route?.description,
+        deprecated: internal.route?.deprecated,
+        tags: internal.route?.tags,
         operationId: path.join("."),
         parameters: parameters.length ? parameters : void 0,
         requestBody,

package/dist/src/fetch/base-handler.d.ts

@@ -1,4 +1,3 @@
-import type { HTTPPath } from '@orpc/contract';
 import type { ANY_LAZY_PROCEDURE, ANY_PROCEDURE, Router } from '@orpc/server';
 import type { FetchHandler } from '@orpc/server/fetch';
 import type { Router as HonoRouter } from 'hono/router';
@@ -10,6 +9,5 @@ export type ResolveRouter = (router: Router<any>, method: string, pathname: stri
 type Routing = HonoRouter<string[]>;
 export declare function createOpenAPIHandler(createHonoRouter: () => Routing): FetchHandler;
 export declare function createResolveRouter(createHonoRouter: () => Routing): ResolveRouter;
-export declare function openAPIPathToRouterPath(path: HTTPPath): string;
 export {};
 //# sourceMappingURL=base-handler.d.ts.map

package/dist/src/utils.d.ts

@@ -1,7 +1,7 @@
-import type { ContractProcedure, ContractRouter, WELL_CONTRACT_PROCEDURE } from '@orpc/contract';
+import type { ANY_CONTRACT_PROCEDURE, ContractRouter, HTTPPath, WELL_CONTRACT_PROCEDURE } from '@orpc/contract';
 import type { ANY_LAZY_PROCEDURE, ANY_PROCEDURE, Lazy, Router } from '@orpc/server';
 export interface EachLeafOptions {
-    router: ANY_PROCEDURE | Router<any> | ContractRouter | ContractProcedure<any, any>;
+    router: ANY_PROCEDURE | Router<any> | ContractRouter | ANY_CONTRACT_PROCEDURE;
     path: string[];
 }
 export interface EachLeafCallbackOptions {
@@ -13,4 +13,5 @@ export interface EachContractLeafResultItem {
     path: string[];
 }
 export declare function eachContractProcedureLeaf(options: EachLeafOptions, callback: (options: EachLeafCallbackOptions) => void, result?: EachContractLeafResultItem[], isCurrentRouterContract?: boolean): EachContractLeafResultItem[];
+export declare function standardizeHTTPPath(path: HTTPPath): HTTPPath;
 //# sourceMappingURL=utils.d.ts.map

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.0.0-next.2f8ca7f",
+  "version": "0.0.0-next.4555a17",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -34,19 +34,20 @@
     "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/contract": "0.0.0-next.2f8ca7f",
-    "@orpc/shared": "0.0.0-next.2f8ca7f",
-    "@orpc/server": "0.0.0-next.2f8ca7f",
-    "@orpc/transformer": "0.0.0-next.2f8ca7f",
-    "@orpc/zod": "0.0.0-next.2f8ca7f"
+    "@orpc/contract": "0.0.0-next.4555a17",
+    "@orpc/server": "0.0.0-next.4555a17",
+    "@orpc/shared": "0.0.0-next.4555a17",
+    "@orpc/transformer": "0.0.0-next.4555a17",
+    "@orpc/zod": "0.0.0-next.4555a17"
   },
   "devDependencies": {
     "@readme/openapi-parser": "^2.6.0",
     "hono": "^4.6.12",
-    "zod": "^3.23.8"
+    "zod": "^3.24.1"
   },
   "scripts": {
     "build": "tsup --clean --sourcemap --entry.index=src/index.ts --entry.fetch=src/fetch/index.ts --format=esm --onSuccess='tsc -b --noCheck'",