@orpc/openapi 0.0.0-next.3b1cf14 → 0.0.0-next.3f6c426

package/dist/{chunk-YXHH6XHB.js → chunk-WNX6GP4X.js}

@@ -351,46 +351,58 @@ var OpenAPIPayloadCodec = class {
     };
   }
   async decode(re) {
-    if (re instanceof Headers || re instanceof URLSearchParams || re instanceof FormData) {
-      return deserialize([...re.entries()]);
-    }
-    const contentType = re.headers.get("content-type");
-    const contentDisposition = re.headers.get("content-disposition");
-    const fileName = contentDisposition ? cd.parse(contentDisposition).parameters.filename : void 0;
-    if (fileName) {
-      const blob2 = await re.blob();
-      const file = new File([blob2], fileName, {
-        type: blob2.type
-      });
-      return file;
-    }
-    if (!contentType || contentType.startsWith("application/json")) {
-      if (!re.body) {
-        return void 0;
+    try {
+      if (re instanceof Headers || re instanceof URLSearchParams || re instanceof FormData) {
+        return deserialize([...re.entries()]);
       }
-      return await re.json();
-    }
-    if (contentType.startsWith("application/x-www-form-urlencoded")) {
-      const params = new URLSearchParams(await re.text());
-      return this.decode(params);
-    }
-    if (contentType.startsWith("text/")) {
-      const text = await re.text();
-      return text;
-    }
-    if (contentType.startsWith("multipart/form-data")) {
-      const form = await re.formData();
-      return this.decode(form);
+      const contentType = re.headers.get("content-type");
+      const contentDisposition = re.headers.get("content-disposition");
+      const fileName = contentDisposition ? cd.parse(contentDisposition).parameters.filename : void 0;
+      if (fileName) {
+        const blob2 = await re.blob();
+        const file = new File([blob2], fileName, {
+          type: blob2.type
+        });
+        return file;
+      }
+      if (!contentType || contentType.startsWith("application/json")) {
+        if (!re.body) {
+          return void 0;
+        }
+        const text = await re.text();
+        if (!text) {
+          return void 0;
+        }
+        return JSON.parse(text);
+      }
+      if (contentType.startsWith("application/x-www-form-urlencoded")) {
+        const params = new URLSearchParams(await re.text());
+        return this.decode(params);
+      }
+      if (contentType.startsWith("text/")) {
+        const text = await re.text();
+        return text;
+      }
+      if (contentType.startsWith("multipart/form-data")) {
+        const form = await re.formData();
+        return this.decode(form);
+      }
+      const blob = await re.blob();
+      return new File([blob], "blob", {
+        type: blob.type
+      });
+    } catch (e) {
+      throw new ORPCError({
+        code: "BAD_REQUEST",
+        message: "Cannot parse request/response. Please check the request/response body and Content-Type header.",
+        cause: e
+      });
     }
-    const blob = await re.blob();
-    return new File([blob], "blob", {
-      type: blob.type
-    });
   }
 };
 
 // src/adapters/fetch/openapi-procedure-matcher.ts
-import { getLazyRouterPrefix, getRouterChild, isProcedure, unlazy } from "@orpc/server";
+import { fallbackToGlobalConfig, getLazyRouterPrefix, getRouterChild, isProcedure, unlazy } from "@orpc/server";
 import { mapValues } from "@orpc/shared";
 var OpenAPIProcedureMatcher = class {
   constructor(hono, router) {
@@ -434,7 +446,7 @@ var OpenAPIProcedureMatcher = class {
   }
   add(path, router) {
     const lazies = forEachContractProcedure({ path, router }, ({ path: path2, contract }) => {
-      const method = contract["~orpc"].route?.method ?? "POST";
+      const method = fallbackToGlobalConfig("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]);
     });
@@ -473,7 +485,7 @@ var CompositeSchemaCoercer = class {
 };
 
 // src/adapters/fetch/openapi-handler.ts
-import { createProcedureClient, ORPCError as ORPCError2 } from "@orpc/server";
+import { createProcedureClient, fallbackToGlobalConfig as fallbackToGlobalConfig2, ORPCError as ORPCError2 } from "@orpc/server";
 import { executeWithHooks, isPlainObject as isPlainObject3, ORPC_HANDLER_HEADER, trim } from "@orpc/shared";
 var OpenAPIHandler = class {
   constructor(hono, router, options) {
@@ -519,7 +531,7 @@ var OpenAPIHandler = class {
       const { body, headers: resHeaders } = this.encodeOutput(matched.procedure, output, accept);
       return new Response(body, {
         headers: resHeaders,
-        status: contractDef.route?.successStatus ?? 200
+        status: fallbackToGlobalConfig2("defaultSuccessStatus", contractDef.route?.successStatus)
       });
     };
     try {
@@ -551,28 +563,26 @@ var OpenAPIHandler = class {
     }
   }
   async decodeInput(procedure, params, request) {
-    const inputStructure = procedure["~orpc"].contract["~orpc"].route?.inputStructure;
+    const inputStructure = fallbackToGlobalConfig2("defaultInputStructure", procedure["~orpc"].contract["~orpc"].route?.inputStructure);
     const url = new URL(request.url);
     const query = url.searchParams;
     const headers = request.headers;
-    if (!inputStructure || inputStructure === "compact") {
+    if (inputStructure === "compact") {
       return this.inputStructureCompact.build(
         params,
         request.method === "GET" ? await this.payloadCodec.decode(query) : await this.payloadCodec.decode(request)
       );
     }
-    const _expect = inputStructure;
     const decodedQuery = await this.payloadCodec.decode(query);
     const decodedHeaders = await this.payloadCodec.decode(headers);
     const decodedBody = await this.payloadCodec.decode(request);
     return this.inputStructureDetailed.build(params, decodedQuery, decodedHeaders, decodedBody);
   }
   encodeOutput(procedure, output, accept) {
-    const outputStructure = procedure["~orpc"].contract["~orpc"].route?.outputStructure;
-    if (!outputStructure || outputStructure === "compact") {
+    const outputStructure = fallbackToGlobalConfig2("defaultOutputStructure", procedure["~orpc"].contract["~orpc"].route?.outputStructure);
+    if (outputStructure === "compact") {
       return this.payloadCodec.encode(output, accept);
     }
-    const _expect = outputStructure;
     this.assertDetailedOutput(output);
     const headers = new Headers();
     if (output.headers) {
@@ -639,4 +649,4 @@ export {
   CompositeSchemaCoercer,
   OpenAPIHandler
 };
-//# sourceMappingURL=chunk-YXHH6XHB.js.map
+//# sourceMappingURL=chunk-WNX6GP4X.js.map

package/dist/fetch.js

@@ -10,7 +10,7 @@ import {
   parsePath,
   serialize,
   stringifyPath
-} from "./chunk-YXHH6XHB.js";
+} from "./chunk-WNX6GP4X.js";
 import "./chunk-KNYXLM77.js";
 
 // src/adapters/fetch/openapi-handler-server.ts

package/dist/index.js

@@ -35,11 +35,15 @@ var OpenAPIContentBuilder = class {
   }
 };
 
+// src/openapi-generator.ts
+import { fallbackToGlobalConfig as fallbackToGlobalConfig2 } from "@orpc/contract";
+
 // src/openapi-error.ts
 var OpenAPIError = class extends Error {
 };
 
 // src/openapi-input-structure-parser.ts
+import { fallbackToGlobalConfig } from "@orpc/contract";
 var OpenAPIInputStructureParser = class {
   constructor(schemaConverter, schemaUtils, pathParser) {
     this.schemaConverter = schemaConverter;
@@ -48,7 +52,7 @@ var OpenAPIInputStructureParser = class {
   }
   parse(contract, structure) {
     const inputSchema = this.schemaConverter.convert(contract["~orpc"].InputSchema, { strategy: "input" });
-    const method = contract["~orpc"].route?.method ?? "POST";
+    const method = fallbackToGlobalConfig("defaultMethod", contract["~orpc"].route?.method);
     const httpPath = contract["~orpc"].route?.path;
     if (this.schemaUtils.isAnySchema(inputSchema)) {
       return {
@@ -405,10 +409,12 @@ var OpenAPIGenerator = class {
         if (this.ignoreUndefinedPathProcedures && def.route?.path === void 0) {
           return;
         }
-        const method = def.route?.method ?? "POST";
+        const method = fallbackToGlobalConfig2("defaultMethod", def.route?.method);
         const httpPath = def.route?.path ? standardizeHTTPPath(def.route?.path) : `/${path.map(encodeURIComponent).join("/")}`;
-        const { paramsSchema, querySchema, headersSchema, bodySchema } = this.inputStructureParser.parse(contract, def.route?.inputStructure ?? "compact");
-        const { headersSchema: resHeadersSchema, bodySchema: resBodySchema } = this.outputStructureParser.parse(contract, def.route?.outputStructure ?? "compact");
+        const inputStructure = fallbackToGlobalConfig2("defaultInputStructure", def.route?.inputStructure);
+        const outputStructure = fallbackToGlobalConfig2("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, {
           required: true
         }) : [];
@@ -445,7 +451,7 @@ var OpenAPIGenerator = class {
           parameters: parameters.length ? parameters : void 0,
           requestBody,
           responses: {
-            [def.route?.successStatus ?? 200]: successResponse
+            [fallbackToGlobalConfig2("defaultSuccessStatus", def.route?.successStatus)]: successResponse
           }
         };
         builder.addPath(httpPath, {

package/dist/node.js

@@ -1,6 +1,6 @@
 import {
   OpenAPIHandler
-} from "./chunk-YXHH6XHB.js";
+} from "./chunk-WNX6GP4X.js";
 import "./chunk-KNYXLM77.js";
 
 // src/adapters/node/openapi-handler.ts

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

@@ -1,9 +1,9 @@
-import type { ContractRouter } from '@orpc/contract';
 import type { ANY_ROUTER } from '@orpc/server';
 import type { PublicOpenAPIInputStructureParser } from './openapi-input-structure-parser';
 import type { PublicOpenAPIOutputStructureParser } from './openapi-output-structure-parser';
 import type { PublicOpenAPIPathParser } from './openapi-path-parser';
 import type { SchemaConverter } from './schema-converter';
+import { type ContractRouter } from '@orpc/contract';
 import { type PublicJSONSerializer } from './json-serializer';
 import { type OpenAPI } from './openapi';
 import { type PublicOpenAPIContentBuilder } from './openapi-content-builder';

package/dist/src/openapi-input-structure-parser.d.ts

@@ -1,8 +1,8 @@
-import type { ANY_CONTRACT_PROCEDURE } from '@orpc/contract';
 import type { PublicOpenAPIPathParser } from './openapi-path-parser';
 import type { JSONSchema, ObjectSchema } from './schema';
 import type { SchemaConverter } from './schema-converter';
 import type { PublicSchemaUtils } from './schema-utils';
+import { type ANY_CONTRACT_PROCEDURE } from '@orpc/contract';
 export interface OpenAPIInputStructureParseResult {
     paramsSchema: ObjectSchema | undefined;
     querySchema: ObjectSchema | undefined;

package/package.json

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