@orpc/openapi 0.0.0-next.db1f26d → 0.0.0-next.ee0aeaf

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 { 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;
@@ -45,7 +45,7 @@ function createOpenAPIHandler(createHonoRouter) {
         procedure,
         path
       });
-      const output = await caller(mergedInput);
+      const output = await caller(mergedInput, { signal: options.signal });
       const { body, headers } = serializer.serialize(output);
       return new Response(body, {
         status: 200,
@@ -53,10 +53,15 @@ function createOpenAPIHandler(createHonoRouter) {
       });
     };
     try {
-      return await options.hooks?.(context, {
-        next: handler,
-        response: (response) => response
-      }) ?? await handler();
+      return await executeWithHooks({
+        context,
+        hooks: options,
+        execute: handler,
+        input: options.request,
+        meta: {
+          signal: options.signal
+        }
+      });
     } catch (e) {
       const error = toORPCError(e);
       try {
@@ -83,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);
@@ -159,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);
@@ -182,13 +187,13 @@ function openAPIPathToRouterPath(path) {
   return standardizeHTTPPath(path).replace(/\{([^}]+)\}/g, ":$1");
 }
 
-// ../../node_modules/.pnpm/hono@4.6.12/node_modules/hono/dist/router.js
+// ../../node_modules/.pnpm/hono@4.6.13/node_modules/hono/dist/router.js
 var METHOD_NAME_ALL = "ALL";
 var MESSAGE_MATCHER_IS_ALREADY_BUILT = "Can not add a route since the matcher is already built.";
 var UnsupportedPathError = class extends Error {
 };
 
-// ../../node_modules/.pnpm/hono@4.6.12/node_modules/hono/dist/utils/url.js
+// ../../node_modules/.pnpm/hono@4.6.13/node_modules/hono/dist/utils/url.js
 var checkOptionalParameter = (path) => {
   if (!path.match(/\:.+\?$/)) {
     return null;
@@ -217,7 +222,7 @@ var checkOptionalParameter = (path) => {
   return results.filter((v, i, a) => a.indexOf(v) === i);
 };
 
-// ../../node_modules/.pnpm/hono@4.6.12/node_modules/hono/dist/router/reg-exp-router/node.js
+// ../../node_modules/.pnpm/hono@4.6.13/node_modules/hono/dist/router/reg-exp-router/node.js
 var LABEL_REG_EXP_STR = "[^/]+";
 var ONLY_WILDCARD_REG_EXP_STR = ".*";
 var TAIL_WILDCARD_REG_EXP_STR = "(?:|/.*)";
@@ -322,7 +327,7 @@ var Node = class {
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.6.12/node_modules/hono/dist/router/reg-exp-router/trie.js
+// ../../node_modules/.pnpm/hono@4.6.13/node_modules/hono/dist/router/reg-exp-router/trie.js
 var Trie = class {
   #context = { varIndex: 0 };
   #root = new Node();
@@ -378,7 +383,7 @@ var Trie = class {
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.6.12/node_modules/hono/dist/router/reg-exp-router/router.js
+// ../../node_modules/.pnpm/hono@4.6.13/node_modules/hono/dist/router/reg-exp-router/router.js
 var emptyParam = [];
 var nullMatcher = [/^$/, [], /* @__PURE__ */ Object.create(null)];
 var wildcardRegExpCache = /* @__PURE__ */ Object.create(null);
@@ -579,7 +584,7 @@ function createOpenAPIServerHandler() {
   return createOpenAPIHandler(() => new RegExpRouter());
 }
 
-// ../../node_modules/.pnpm/hono@4.6.12/node_modules/hono/dist/router/linear-router/router.js
+// ../../node_modules/.pnpm/hono@4.6.13/node_modules/hono/dist/router/linear-router/router.js
 var emptyParams = /* @__PURE__ */ Object.create(null);
 var splitPathRe = /\/(:\w+(?:{(?:(?:{[\d,]+})|[^}])+})?)|\/[^\/\?]+|(\?)/g;
 var splitByStarRe = /\*/;
@@ -697,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";
@@ -22,7 +23,7 @@ import {
   Format
 } from "json-schema-typed/draft-2020-12";
 
-// ../../node_modules/.pnpm/zod@3.23.8/node_modules/zod/lib/index.mjs
+// ../../node_modules/.pnpm/zod@3.24.1/node_modules/zod/lib/index.mjs
 var util;
 (function(util2) {
   util2.assertEqual = (val) => val;
@@ -173,6 +174,9 @@ var ZodIssueCode = util.arrayToEnum([
   "not_finite"
 ]);
 var ZodError = class _ZodError extends Error {
+  get errors() {
+    return this.issues;
+  }
   constructor(issues) {
     super();
     this.issues = [];
@@ -191,9 +195,6 @@ var ZodError = class _ZodError extends Error {
     this.name = "ZodError";
     this.issues = issues;
   }
-  get errors() {
-    return this.issues;
-  }
   format(_mapper) {
     const mapper = _mapper || function(issue) {
       return issue.message;
@@ -400,8 +401,11 @@ function addIssueToContext(ctx, issueData) {
     path: ctx.path,
     errorMaps: [
       ctx.common.contextualErrorMap,
+      // contextual error map is first priority
       ctx.schemaErrorMap,
+      // then schema-bound map if available
       overrideMap,
+      // then global override map
       overrideMap === errorMap ? void 0 : errorMap
       // then global default map
     ].filter((x) => !!x)
@@ -552,34 +556,6 @@ function processCreateParams(params) {
   return { errorMap: customMap, description };
 }
 var ZodType = class {
-  constructor(def) {
-    this.spa = this.safeParseAsync;
-    this._def = def;
-    this.parse = this.parse.bind(this);
-    this.safeParse = this.safeParse.bind(this);
-    this.parseAsync = this.parseAsync.bind(this);
-    this.safeParseAsync = this.safeParseAsync.bind(this);
-    this.spa = this.spa.bind(this);
-    this.refine = this.refine.bind(this);
-    this.refinement = this.refinement.bind(this);
-    this.superRefine = this.superRefine.bind(this);
-    this.optional = this.optional.bind(this);
-    this.nullable = this.nullable.bind(this);
-    this.nullish = this.nullish.bind(this);
-    this.array = this.array.bind(this);
-    this.promise = this.promise.bind(this);
-    this.or = this.or.bind(this);
-    this.and = this.and.bind(this);
-    this.transform = this.transform.bind(this);
-    this.brand = this.brand.bind(this);
-    this.default = this.default.bind(this);
-    this.catch = this.catch.bind(this);
-    this.describe = this.describe.bind(this);
-    this.pipe = this.pipe.bind(this);
-    this.readonly = this.readonly.bind(this);
-    this.isNullable = this.isNullable.bind(this);
-    this.isOptional = this.isOptional.bind(this);
-  }
   get description() {
     return this._def.description;
   }
@@ -643,6 +619,43 @@ var ZodType = class {
     const result = this._parseSync({ data, path: ctx.path, parent: ctx });
     return handleResult(ctx, result);
   }
+  "~validate"(data) {
+    var _a, _b;
+    const ctx = {
+      common: {
+        issues: [],
+        async: !!this["~standard"].async
+      },
+      path: [],
+      schemaErrorMap: this._def.errorMap,
+      parent: null,
+      data,
+      parsedType: getParsedType(data)
+    };
+    if (!this["~standard"].async) {
+      try {
+        const result = this._parseSync({ data, path: [], parent: ctx });
+        return isValid(result) ? {
+          value: result.value
+        } : {
+          issues: ctx.common.issues
+        };
+      } catch (err) {
+        if ((_b = (_a = err === null || err === void 0 ? void 0 : err.message) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === null || _b === void 0 ? void 0 : _b.includes("encountered")) {
+          this["~standard"].async = true;
+        }
+        ctx.common = {
+          issues: [],
+          async: true
+        };
+      }
+    }
+    return this._parseAsync({ data, path: [], parent: ctx }).then((result) => isValid(result) ? {
+      value: result.value
+    } : {
+      issues: ctx.common.issues
+    });
+  }
   async parseAsync(data, params) {
     const result = await this.safeParseAsync(data, params);
     if (result.success)
@@ -720,6 +733,39 @@ var ZodType = class {
   superRefine(refinement) {
     return this._refinement(refinement);
   }
+  constructor(def) {
+    this.spa = this.safeParseAsync;
+    this._def = def;
+    this.parse = this.parse.bind(this);
+    this.safeParse = this.safeParse.bind(this);
+    this.parseAsync = this.parseAsync.bind(this);
+    this.safeParseAsync = this.safeParseAsync.bind(this);
+    this.spa = this.spa.bind(this);
+    this.refine = this.refine.bind(this);
+    this.refinement = this.refinement.bind(this);
+    this.superRefine = this.superRefine.bind(this);
+    this.optional = this.optional.bind(this);
+    this.nullable = this.nullable.bind(this);
+    this.nullish = this.nullish.bind(this);
+    this.array = this.array.bind(this);
+    this.promise = this.promise.bind(this);
+    this.or = this.or.bind(this);
+    this.and = this.and.bind(this);
+    this.transform = this.transform.bind(this);
+    this.brand = this.brand.bind(this);
+    this.default = this.default.bind(this);
+    this.catch = this.catch.bind(this);
+    this.describe = this.describe.bind(this);
+    this.pipe = this.pipe.bind(this);
+    this.readonly = this.readonly.bind(this);
+    this.isNullable = this.isNullable.bind(this);
+    this.isOptional = this.isOptional.bind(this);
+    this["~standard"] = {
+      version: 1,
+      vendor: "zod",
+      validate: (data) => this["~validate"](data)
+    };
+  }
   optional() {
     return ZodOptional.create(this, this._def);
   }
@@ -730,7 +776,7 @@ var ZodType = class {
     return this.nullable().optional();
   }
   array() {
-    return ZodArray.create(this, this._def);
+    return ZodArray.create(this);
   }
   promise() {
     return ZodPromise.create(this, this._def);
@@ -796,16 +842,20 @@ var ZodType = class {
 };
 var cuidRegex = /^c[^\s-]{8,}$/i;
 var cuid2Regex = /^[0-9a-z]+$/;
-var ulidRegex = /^[0-9A-HJKMNP-TV-Z]{26}$/;
+var ulidRegex = /^[0-9A-HJKMNP-TV-Z]{26}$/i;
 var uuidRegex = /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/i;
 var nanoidRegex = /^[a-z0-9_-]{21}$/i;
+var jwtRegex = /^[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+\.[A-Za-z0-9-_]*$/;
 var durationRegex = /^[-+]?P(?!$)(?:(?:[-+]?\d+Y)|(?:[-+]?\d+[.,]\d+Y$))?(?:(?:[-+]?\d+M)|(?:[-+]?\d+[.,]\d+M$))?(?:(?:[-+]?\d+W)|(?:[-+]?\d+[.,]\d+W$))?(?:(?:[-+]?\d+D)|(?:[-+]?\d+[.,]\d+D$))?(?:T(?=[\d+-])(?:(?:[-+]?\d+H)|(?:[-+]?\d+[.,]\d+H$))?(?:(?:[-+]?\d+M)|(?:[-+]?\d+[.,]\d+M$))?(?:[-+]?\d+(?:[.,]\d+)?S)?)??$/;
 var emailRegex = /^(?!\.)(?!.*\.\.)([A-Z0-9_'+\-\.]*)[A-Z0-9_+-]@([A-Z0-9][A-Z0-9\-]*\.)+[A-Z]{2,}$/i;
 var _emojiRegex = `^(\\p{Extended_Pictographic}|\\p{Emoji_Component})+$`;
 var emojiRegex;
 var ipv4Regex = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])$/;
-var ipv6Regex = /^(([a-f0-9]{1,4}:){7}|::([a-f0-9]{1,4}:){0,6}|([a-f0-9]{1,4}:){1}:([a-f0-9]{1,4}:){0,5}|([a-f0-9]{1,4}:){2}:([a-f0-9]{1,4}:){0,4}|([a-f0-9]{1,4}:){3}:([a-f0-9]{1,4}:){0,3}|([a-f0-9]{1,4}:){4}:([a-f0-9]{1,4}:){0,2}|([a-f0-9]{1,4}:){5}:([a-f0-9]{1,4}:){0,1})([a-f0-9]{1,4}|(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([0-9]{1,2}))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([0-9]{1,2})))$/;
+var ipv4CidrRegex = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\/(3[0-2]|[12]?[0-9])$/;
+var ipv6Regex = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$/;
+var ipv6CidrRegex = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))\/(12[0-8]|1[01][0-9]|[1-9]?[0-9])$/;
 var base64Regex = /^([0-9a-zA-Z+/]{4})*(([0-9a-zA-Z+/]{2}==)|([0-9a-zA-Z+/]{3}=))?$/;
+var base64urlRegex = /^([0-9a-zA-Z-_]{4})*(([0-9a-zA-Z-_]{2}(==)?)|([0-9a-zA-Z-_]{3}(=)?))?$/;
 var dateRegexSource = `((\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-((0[13578]|1[02])-(0[1-9]|[12]\\d|3[01])|(0[469]|11)-(0[1-9]|[12]\\d|30)|(02)-(0[1-9]|1\\d|2[0-8])))`;
 var dateRegex = new RegExp(`^${dateRegexSource}$`);
 function timeRegexSource(args) {
@@ -838,6 +888,33 @@ function isValidIP(ip, version) {
   }
   return false;
 }
+function isValidJWT(jwt, alg) {
+  if (!jwtRegex.test(jwt))
+    return false;
+  try {
+    const [header] = jwt.split(".");
+    const base64 = header.replace(/-/g, "+").replace(/_/g, "/").padEnd(header.length + (4 - header.length % 4) % 4, "=");
+    const decoded = JSON.parse(atob(base64));
+    if (typeof decoded !== "object" || decoded === null)
+      return false;
+    if (!decoded.typ || !decoded.alg)
+      return false;
+    if (alg && decoded.alg !== alg)
+      return false;
+    return true;
+  } catch (_a) {
+    return false;
+  }
+}
+function isValidCidr(ip, version) {
+  if ((version === "v4" || !version) && ipv4CidrRegex.test(ip)) {
+    return true;
+  }
+  if ((version === "v6" || !version) && ipv6CidrRegex.test(ip)) {
+    return true;
+  }
+  return false;
+}
 var ZodString = class _ZodString extends ZodType {
   _parse(input) {
     if (this._def.coerce) {
@@ -1094,6 +1171,26 @@ var ZodString = class _ZodString extends ZodType {
           });
           status.dirty();
         }
+      } else if (check.kind === "jwt") {
+        if (!isValidJWT(input.data, check.alg)) {
+          ctx = this._getOrReturnCtx(input, ctx);
+          addIssueToContext(ctx, {
+            validation: "jwt",
+            code: ZodIssueCode.invalid_string,
+            message: check.message
+          });
+          status.dirty();
+        }
+      } else if (check.kind === "cidr") {
+        if (!isValidCidr(input.data, check.version)) {
+          ctx = this._getOrReturnCtx(input, ctx);
+          addIssueToContext(ctx, {
+            validation: "cidr",
+            code: ZodIssueCode.invalid_string,
+            message: check.message
+          });
+          status.dirty();
+        }
       } else if (check.kind === "base64") {
         if (!base64Regex.test(input.data)) {
           ctx = this._getOrReturnCtx(input, ctx);
@@ -1104,6 +1201,16 @@ var ZodString = class _ZodString extends ZodType {
           });
           status.dirty();
         }
+      } else if (check.kind === "base64url") {
+        if (!base64urlRegex.test(input.data)) {
+          ctx = this._getOrReturnCtx(input, ctx);
+          addIssueToContext(ctx, {
+            validation: "base64url",
+            code: ZodIssueCode.invalid_string,
+            message: check.message
+          });
+          status.dirty();
+        }
       } else {
         util.assertNever(check);
       }
@@ -1150,9 +1257,21 @@ var ZodString = class _ZodString extends ZodType {
   base64(message) {
     return this._addCheck({ kind: "base64", ...errorUtil.errToObj(message) });
   }
+  base64url(message) {
+    return this._addCheck({
+      kind: "base64url",
+      ...errorUtil.errToObj(message)
+    });
+  }
+  jwt(options) {
+    return this._addCheck({ kind: "jwt", ...errorUtil.errToObj(options) });
+  }
   ip(options) {
     return this._addCheck({ kind: "ip", ...errorUtil.errToObj(options) });
   }
+  cidr(options) {
+    return this._addCheck({ kind: "cidr", ...errorUtil.errToObj(options) });
+  }
   datetime(options) {
     var _a, _b;
     if (typeof options === "string") {
@@ -1243,8 +1362,7 @@ var ZodString = class _ZodString extends ZodType {
     });
   }
   /**
-   * @deprecated Use z.string().min(1) instead.
-   * @see {@link ZodString.min}
+   * Equivalent to `.min(1)`
    */
   nonempty(message) {
     return this.min(1, errorUtil.errToObj(message));
@@ -1306,9 +1424,15 @@ var ZodString = class _ZodString extends ZodType {
   get isIP() {
     return !!this._def.checks.find((ch) => ch.kind === "ip");
   }
+  get isCIDR() {
+    return !!this._def.checks.find((ch) => ch.kind === "cidr");
+  }
   get isBase64() {
     return !!this._def.checks.find((ch) => ch.kind === "base64");
   }
+  get isBase64url() {
+    return !!this._def.checks.find((ch) => ch.kind === "base64url");
+  }
   get minLength() {
     let min = null;
     for (const ch of this._def.checks) {
@@ -1586,17 +1710,15 @@ var ZodBigInt = class _ZodBigInt extends ZodType {
   }
   _parse(input) {
     if (this._def.coerce) {
-      input.data = BigInt(input.data);
+      try {
+        input.data = BigInt(input.data);
+      } catch (_a) {
+        return this._getInvalidInput(input);
+      }
     }
     const parsedType = this._getType(input);
     if (parsedType !== ZodParsedType.bigint) {
-      const ctx2 = this._getOrReturnCtx(input);
-      addIssueToContext(ctx2, {
-        code: ZodIssueCode.invalid_type,
-        expected: ZodParsedType.bigint,
-        received: ctx2.parsedType
-      });
-      return INVALID;
+      return this._getInvalidInput(input);
     }
     let ctx = void 0;
     const status = new ParseStatus();
@@ -1643,6 +1765,15 @@ var ZodBigInt = class _ZodBigInt extends ZodType {
     }
     return { status: status.value, value: input.data };
   }
+  _getInvalidInput(input) {
+    const ctx = this._getOrReturnCtx(input);
+    addIssueToContext(ctx, {
+      code: ZodIssueCode.invalid_type,
+      expected: ZodParsedType.bigint,
+      received: ctx.parsedType
+    });
+    return INVALID;
+  }
   gte(value, message) {
     return this.setLimit("min", value, true, errorUtil.toString(message));
   }
@@ -3813,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
       });
@@ -3827,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": {
@@ -3850,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) {
@@ -3921,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;
           }
@@ -3929,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) {
@@ -3974,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) {
@@ -4006,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) {
@@ -4024,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 = [];
@@ -4060,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,
@@ -4069,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: {
@@ -4092,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));
@@ -4100,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));
@@ -4108,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) {
@@ -4125,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]
@@ -4231,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 = (() => {
@@ -4371,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
         };
       })();
@@ -4396,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(".")}]`
@@ -4405,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.db1f26d",
+  "version": "0.0.0-next.ee0aeaf",
   "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/server": "0.0.0-next.db1f26d",
-    "@orpc/transformer": "0.0.0-next.db1f26d",
-    "@orpc/shared": "0.0.0-next.db1f26d",
-    "@orpc/zod": "0.0.0-next.db1f26d",
-    "@orpc/contract": "0.0.0-next.db1f26d"
+    "@orpc/contract": "0.0.0-next.ee0aeaf",
+    "@orpc/server": "0.0.0-next.ee0aeaf",
+    "@orpc/transformer": "0.0.0-next.ee0aeaf",
+    "@orpc/zod": "0.0.0-next.ee0aeaf",
+    "@orpc/shared": "0.0.0-next.ee0aeaf"
   },
   "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'",