@orpc/openapi 0.0.0-next.9b3a030 → 0.0.0-next.a2e4a58

package/dist/{chunk-YOKECDND.js → chunk-GEDPF5HA.js}

@@ -1,6 +1,6 @@
 import {
   OpenAPIHandler
-} from "./chunk-XYIZDXKB.js";
+} from "./chunk-UG6W4GSA.js";
 
 // src/adapters/fetch/openapi-handler-server.ts
 import { TrieRouter } from "hono/router/trie-router";
@@ -22,4 +22,4 @@ export {
   OpenAPIServerHandler,
   OpenAPIServerlessHandler
 };
-//# sourceMappingURL=chunk-YOKECDND.js.map
+//# sourceMappingURL=chunk-GEDPF5HA.js.map

package/dist/{chunk-XYIZDXKB.js → chunk-UG6W4GSA.js}

@@ -2,7 +2,7 @@ import {
   JSONSerializer,
   forEachContractProcedure,
   standardizeHTTPPath
-} from "./chunk-KNYXLM77.js";
+} from "./chunk-V4HFPIEN.js";
 
 // src/adapters/fetch/bracket-notation.ts
 import { isPlainObject } from "@orpc/shared";
@@ -402,7 +402,8 @@ var OpenAPIPayloadCodec = class {
 };
 
 // src/adapters/fetch/openapi-procedure-matcher.ts
-import { fallbackToGlobalConfig, getLazyRouterPrefix, getRouterChild, isProcedure, unlazy } from "@orpc/server";
+import { fallbackContractConfig } from "@orpc/contract";
+import { getLazyRouterPrefix, getRouterChild, isProcedure, unlazy } from "@orpc/server";
 import { mapValues } from "@orpc/shared";
 var OpenAPIProcedureMatcher = class {
   constructor(hono, router) {
@@ -446,7 +447,7 @@ var OpenAPIProcedureMatcher = class {
   }
   add(path, router) {
     const lazies = forEachContractProcedure({ path, router }, ({ path: path2, contract }) => {
-      const method = fallbackToGlobalConfig("defaultMethod", contract["~orpc"].route?.method);
+      const method = fallbackContractConfig("defaultMethod", contract["~orpc"].route?.method);
       const httpPath = contract["~orpc"].route?.path ? this.convertOpenAPIPathToRouterPath(contract["~orpc"].route?.path) : `/${path2.map(encodeURIComponent).join("/")}`;
       this.hono.add(method, httpPath, [httpPath, path2]);
     });
@@ -485,7 +486,8 @@ var CompositeSchemaCoercer = class {
 };
 
 // src/adapters/fetch/openapi-handler.ts
-import { createProcedureClient, fallbackToGlobalConfig as fallbackToGlobalConfig2, ORPCError as ORPCError2 } from "@orpc/server";
+import { fallbackContractConfig as fallbackContractConfig2 } from "@orpc/contract";
+import { createProcedureClient, ORPCError as ORPCError2 } from "@orpc/server";
 import { executeWithHooks, isPlainObject as isPlainObject3, trim } from "@orpc/shared";
 var OpenAPIHandler = class {
   constructor(hono, router, options) {
@@ -519,16 +521,15 @@ var OpenAPIHandler = class {
       const contractDef = matched.procedure["~orpc"].contract["~orpc"];
       const input = await this.decodeInput(matched.procedure, matched.params, request);
       const coercedInput = this.compositeSchemaCoercer.coerce(contractDef.InputSchema, input);
-      const client = createProcedureClient({
+      const client = createProcedureClient(matched.procedure, {
         context,
-        procedure: matched.procedure,
         path: matched.path
       });
       const output = await client(coercedInput, { signal: request.signal });
       const { body, headers: resHeaders } = this.encodeOutput(matched.procedure, output, accept);
       const response = new Response(body, {
         headers: resHeaders,
-        status: fallbackToGlobalConfig2("defaultSuccessStatus", contractDef.route?.successStatus)
+        status: fallbackContractConfig2("defaultSuccessStatus", contractDef.route?.successStatus)
       });
       return { matched: true, response };
     };
@@ -563,7 +564,7 @@ var OpenAPIHandler = class {
     }
   }
   async decodeInput(procedure, params, request) {
-    const inputStructure = fallbackToGlobalConfig2("defaultInputStructure", procedure["~orpc"].contract["~orpc"].route?.inputStructure);
+    const inputStructure = fallbackContractConfig2("defaultInputStructure", procedure["~orpc"].contract["~orpc"].route?.inputStructure);
     const url = new URL(request.url);
     const query = url.searchParams;
     const headers = request.headers;
@@ -579,7 +580,7 @@ var OpenAPIHandler = class {
     return this.inputStructureDetailed.build(params, decodedQuery, decodedHeaders, decodedBody);
   }
   encodeOutput(procedure, output, accept) {
-    const outputStructure = fallbackToGlobalConfig2("defaultOutputStructure", procedure["~orpc"].contract["~orpc"].route?.outputStructure);
+    const outputStructure = fallbackContractConfig2("defaultOutputStructure", procedure["~orpc"].contract["~orpc"].route?.outputStructure);
     if (outputStructure === "compact") {
       return this.payloadCodec.encode(output, accept);
     }
@@ -649,4 +650,4 @@ export {
   CompositeSchemaCoercer,
   OpenAPIHandler
 };
-//# sourceMappingURL=chunk-XYIZDXKB.js.map
+//# sourceMappingURL=chunk-UG6W4GSA.js.map

package/dist/{chunk-KNYXLM77.js → chunk-V4HFPIEN.js}

@@ -104,4 +104,4 @@ export {
   forEachAllContractProcedure,
   standardizeHTTPPath
 };
-//# sourceMappingURL=chunk-KNYXLM77.js.map
+//# sourceMappingURL=chunk-V4HFPIEN.js.map

package/dist/fetch.js

@@ -1,7 +1,7 @@
 import {
   OpenAPIServerHandler,
   OpenAPIServerlessHandler
-} from "./chunk-YOKECDND.js";
+} from "./chunk-GEDPF5HA.js";
 import {
   CompositeSchemaCoercer,
   InputStructureCompact,
@@ -14,8 +14,8 @@ import {
   parsePath,
   serialize,
   stringifyPath
-} from "./chunk-XYIZDXKB.js";
-import "./chunk-KNYXLM77.js";
+} from "./chunk-UG6W4GSA.js";
+import "./chunk-V4HFPIEN.js";
 export {
   CompositeSchemaCoercer,
   InputStructureCompact,

package/dist/hono.js

@@ -1,7 +1,7 @@
 import {
   OpenAPIServerHandler,
   OpenAPIServerlessHandler
-} from "./chunk-YOKECDND.js";
+} from "./chunk-GEDPF5HA.js";
 import {
   CompositeSchemaCoercer,
   InputStructureCompact,
@@ -14,8 +14,8 @@ import {
   parsePath,
   serialize,
   stringifyPath
-} from "./chunk-XYIZDXKB.js";
-import "./chunk-KNYXLM77.js";
+} from "./chunk-UG6W4GSA.js";
+import "./chunk-V4HFPIEN.js";
 export {
   CompositeSchemaCoercer,
   InputStructureCompact,

package/dist/index.js

@@ -3,7 +3,7 @@ import {
   forEachAllContractProcedure,
   forEachContractProcedure,
   standardizeHTTPPath
-} from "./chunk-KNYXLM77.js";
+} from "./chunk-V4HFPIEN.js";
 
 // src/openapi.ts
 import { OpenApiBuilder } from "openapi3-ts/oas31";
@@ -36,7 +36,7 @@ var OpenAPIContentBuilder = class {
 };
 
 // src/openapi-generator.ts
-import { fallbackORPCErrorStatus, fallbackToGlobalConfig as fallbackToGlobalConfig2 } from "@orpc/contract";
+import { fallbackContractConfig as fallbackContractConfig2, fallbackORPCErrorStatus } from "@orpc/contract";
 import { group } from "@orpc/shared";
 
 // src/openapi-error.ts
@@ -44,7 +44,7 @@ var OpenAPIError = class extends Error {
 };
 
 // src/openapi-input-structure-parser.ts
-import { fallbackToGlobalConfig } from "@orpc/contract";
+import { fallbackContractConfig } from "@orpc/contract";
 var OpenAPIInputStructureParser = class {
   constructor(schemaConverter, schemaUtils, pathParser) {
     this.schemaConverter = schemaConverter;
@@ -53,7 +53,7 @@ var OpenAPIInputStructureParser = class {
   }
   parse(contract, structure) {
     const inputSchema = this.schemaConverter.convert(contract["~orpc"].InputSchema, { strategy: "input" });
-    const method = fallbackToGlobalConfig("defaultMethod", contract["~orpc"].route?.method);
+    const method = fallbackContractConfig("defaultMethod", contract["~orpc"].route?.method);
     const httpPath = contract["~orpc"].route?.path;
     if (this.schemaUtils.isAnySchema(inputSchema)) {
       return {
@@ -412,10 +412,10 @@ var OpenAPIGenerator = class {
         if (this.ignoreUndefinedPathProcedures && def.route?.path === void 0) {
           return;
         }
-        const method = fallbackToGlobalConfig2("defaultMethod", def.route?.method);
+        const method = fallbackContractConfig2("defaultMethod", def.route?.method);
         const httpPath = def.route?.path ? standardizeHTTPPath(def.route?.path) : `/${path.map(encodeURIComponent).join("/")}`;
-        const inputStructure = fallbackToGlobalConfig2("defaultInputStructure", def.route?.inputStructure);
-        const outputStructure = fallbackToGlobalConfig2("defaultOutputStructure", def.route?.outputStructure);
+        const inputStructure = fallbackContractConfig2("defaultInputStructure", def.route?.inputStructure);
+        const outputStructure = fallbackContractConfig2("defaultOutputStructure", def.route?.outputStructure);
         const { paramsSchema, querySchema, headersSchema, bodySchema } = this.inputStructureParser.parse(contract, inputStructure);
         const { headersSchema: resHeadersSchema, bodySchema: resBodySchema } = this.outputStructureParser.parse(contract, outputStructure);
         const params = paramsSchema ? this.parametersBuilder.build("path", paramsSchema, {
@@ -429,8 +429,8 @@ var OpenAPIGenerator = class {
           content: this.contentBuilder.build(bodySchema)
         } : void 0;
         const responses = {};
-        responses[fallbackToGlobalConfig2("defaultSuccessStatus", def.route?.successStatus)] = {
-          description: fallbackToGlobalConfig2("defaultSuccessDescription", def.route?.successDescription),
+        responses[fallbackContractConfig2("defaultSuccessStatus", def.route?.successStatus)] = {
+          description: fallbackContractConfig2("defaultSuccessDescription", def.route?.successDescription),
           content: resBodySchema !== void 0 ? this.contentBuilder.build(resBodySchema, {
             example: def.outputExample
           }) : void 0,

package/dist/next.js

@@ -1,7 +1,7 @@
 import {
   OpenAPIServerHandler,
   OpenAPIServerlessHandler
-} from "./chunk-YOKECDND.js";
+} from "./chunk-GEDPF5HA.js";
 import {
   CompositeSchemaCoercer,
   InputStructureCompact,
@@ -14,8 +14,8 @@ import {
   parsePath,
   serialize,
   stringifyPath
-} from "./chunk-XYIZDXKB.js";
-import "./chunk-KNYXLM77.js";
+} from "./chunk-UG6W4GSA.js";
+import "./chunk-V4HFPIEN.js";
 export {
   CompositeSchemaCoercer,
   InputStructureCompact,

package/dist/node.js

@@ -1,7 +1,7 @@
 import {
   OpenAPIHandler
-} from "./chunk-XYIZDXKB.js";
-import "./chunk-KNYXLM77.js";
+} from "./chunk-UG6W4GSA.js";
+import "./chunk-V4HFPIEN.js";
 
 // src/adapters/node/openapi-handler.ts
 import { createRequest, sendResponse } from "@orpc/server/node";

package/dist/src/openapi-generator.d.ts

@@ -61,7 +61,7 @@ export declare class OpenAPIGenerator {
     private readonly considerMissingTagDefinitionAsError;
     private readonly strictErrorResponses;
     constructor(options?: OpenAPIGeneratorOptions);
-    generate(router: ContractRouter | ANY_ROUTER, doc: Omit<OpenAPI.OpenAPIObject, 'openapi'>): Promise<OpenAPI.OpenAPIObject>;
+    generate(router: ContractRouter<any> | ANY_ROUTER, doc: Omit<OpenAPI.OpenAPIObject, 'openapi'>): Promise<OpenAPI.OpenAPIObject>;
 }
 export {};
 //# sourceMappingURL=openapi-generator.d.ts.map

package/dist/src/utils.d.ts

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/openapi",
   "type": "module",
-  "version": "0.0.0-next.9b3a030",
+  "version": "0.0.0-next.a2e4a58",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -58,9 +58,9 @@
     "json-schema-typed": "^8.0.1",
     "openapi3-ts": "^4.4.0",
     "wildcard-match": "^5.1.3",
-    "@orpc/contract": "0.0.0-next.9b3a030",
-    "@orpc/shared": "0.0.0-next.9b3a030",
-    "@orpc/server": "0.0.0-next.9b3a030"
+    "@orpc/contract": "0.0.0-next.a2e4a58",
+    "@orpc/shared": "0.0.0-next.a2e4a58",
+    "@orpc/server": "0.0.0-next.a2e4a58"
   },
   "devDependencies": {
     "@readme/openapi-parser": "^2.6.0",