@orpc/openapi 0.0.0-next.460b50b → 0.0.0-next.47dbd93

package/dist/shared/{openapi.CbIlrReM.d.ts → openapi.BGy4N6eR.d.ts}

@@ -1,11 +1,11 @@
 import { AnySchema, OpenAPI, AnyContractProcedure, AnyContractRouter } from '@orpc/contract';
 import { StandardOpenAPIJsonSerializerOptions } from '@orpc/openapi-client/standard';
-import { AnyProcedure, AnyRouter } from '@orpc/server';
-import { Promisable } from '@orpc/shared';
+import { AnyProcedure, TraverseContractProcedureCallbackOptions, AnyRouter } from '@orpc/server';
+import { Promisable, Value } from '@orpc/shared';
 import { JSONSchema } from 'json-schema-typed/draft-2020-12';
 
 interface SchemaConverterComponent {
-    allowedStrategies: SchemaConvertOptions['strategy'][];
+    allowedStrategies: readonly SchemaConvertOptions['strategy'][];
     schema: AnySchema;
     required: boolean;
     ref: string;
@@ -15,7 +15,7 @@ interface SchemaConvertOptions {
     /**
      * Common components should use `$ref` to represent themselves if matched.
      */
-    components?: SchemaConverterComponent[];
+    components?: readonly SchemaConverterComponent[];
     /**
      * Minimum schema structure depth required before using `$ref` for components.
      *
@@ -33,7 +33,7 @@ interface ConditionalSchemaConverter extends SchemaConverter {
 }
 declare class CompositeSchemaConverter implements SchemaConverter {
     private readonly converters;
-    constructor(converters: ConditionalSchemaConverter[]);
+    constructor(converters: readonly ConditionalSchemaConverter[]);
     convert(schema: AnySchema | undefined, options: SchemaConvertOptions): Promise<[required: boolean, jsonSchema: JSONSchema]>;
 }
 
@@ -44,9 +44,16 @@ interface OpenAPIGeneratorGenerateOptions extends Partial<Omit<OpenAPI.Document,
     /**
      * Exclude procedures from the OpenAPI specification.
      *
+     * @deprecated Use `filter` option instead.
      * @default () => false
      */
     exclude?: (procedure: AnyProcedure | AnyContractProcedure, path: readonly string[]) => boolean;
+    /**
+     * Filter procedures. Return `false` to exclude a procedure from the OpenAPI specification.
+     *
+     * @default true
+     */
+    filter?: Value<boolean, [options: TraverseContractProcedureCallbackOptions]>;
     /**
      * Common schemas to be used for $ref resolution.
      */
@@ -74,12 +81,27 @@ interface OpenAPIGeneratorGenerateOptions extends Partial<Omit<OpenAPI.Document,
          */
         strategy?: SchemaConvertOptions['strategy'];
         schema: AnySchema;
+    } | {
+        error: 'UndefinedError';
+        schema?: never;
     }>;
+    /**
+     * Define a custom JSON schema for the error response body when using
+     * type-safe errors. Helps align ORPC error formatting with existing API
+     * response standards or conventions.
+     *
+     * @remarks
+     * - Return `null | undefined` to use the default error response body shaper.
+     */
+    customErrorResponseBodySchema?: Value<JSONSchema | undefined | null, [
+        definedErrors: [code: string, defaultMessage: string, dataRequired: boolean, dataSchema: JSONSchema][],
+        status: number
+    ]>;
 }
 /**
  * The generator that converts oRPC routers/contracts to OpenAPI specifications.
  *
- * @see {@link https://orpc.unnoq.com/docs/openapi/openapi-specification OpenAPI Specification Docs}
+ * @see {@link https://orpc.dev/docs/openapi/openapi-specification OpenAPI Specification Docs}
  */
 declare class OpenAPIGenerator {
     #private;
@@ -89,9 +111,9 @@ declare class OpenAPIGenerator {
     /**
      * Generates OpenAPI specifications from oRPC routers/contracts.
      *
-     * @see {@link https://orpc.unnoq.com/docs/openapi/openapi-specification OpenAPI Specification Docs}
+     * @see {@link https://orpc.dev/docs/openapi/openapi-specification OpenAPI Specification Docs}
      */
-    generate(router: AnyContractRouter | AnyRouter, options?: OpenAPIGeneratorGenerateOptions): Promise<OpenAPI.Document>;
+    generate(router: AnyContractRouter | AnyRouter, { customErrorResponseBodySchema, commonSchemas, filter: baseFilter, exclude, ...baseDoc }?: OpenAPIGeneratorGenerateOptions): Promise<OpenAPI.Document>;
 }
 
 export { OpenAPIGenerator as b, CompositeSchemaConverter as e };

package/dist/shared/{openapi.C_3bk7bB.mjs → openapi.BwdtJjDu.mjs}

@@ -3,7 +3,7 @@ import { toHttpPath } from '@orpc/client/standard';
 import { fallbackContractConfig, getEventIteratorSchemaDetails } from '@orpc/contract';
 import { standardizeHTTPPath, StandardOpenAPIJsonSerializer, getDynamicParams } from '@orpc/openapi-client/standard';
 import { isProcedure, resolveContractProcedures } from '@orpc/server';
-import { isObject, stringifyJSON, findDeepMatches, toArray, clone } from '@orpc/shared';
+import { isObject, stringifyJSON, findDeepMatches, toArray, clone, value } from '@orpc/shared';
 import { TypeName } from 'json-schema-typed/draft-2020-12';
 
 const OPERATION_EXTENDER_SYMBOL = Symbol("ORPC_OPERATION_EXTENDER");
@@ -108,22 +108,47 @@ function isAnySchema(schema) {
   if (schema === true) {
     return true;
   }
-  if (Object.keys(schema).every((k) => !LOGIC_KEYWORDS.includes(k))) {
+  if (Object.keys(schema).filter((v) => schema[v] !== void 0).every((k) => !LOGIC_KEYWORDS.includes(k))) {
     return true;
   }
   return false;
 }
+function isNeverSchema(schema) {
+  if (schema === false) {
+    return true;
+  }
+  if (typeof schema === "object" && schema.not !== void 0) {
+    if (schema.not === true) {
+      return true;
+    }
+    if (typeof schema.not === "object" && Object.keys(schema.not).length === 0) {
+      return true;
+    }
+  }
+  return false;
+}
 function separateObjectSchema(schema, separatedProperties) {
-  if (Object.keys(schema).some((k) => k !== "type" && k !== "properties" && k !== "required" && LOGIC_KEYWORDS.includes(k))) {
+  if (Object.keys(schema).some(
+    (k) => !["type", "properties", "required", "additionalProperties"].includes(k) && LOGIC_KEYWORDS.includes(k) && schema[k] !== void 0
+  )) {
     return [{ type: "object" }, schema];
   }
   const matched = { ...schema };
   const rest = { ...schema };
-  matched.properties = schema.properties && Object.entries(schema.properties).filter(([key]) => separatedProperties.includes(key)).reduce((acc, [key, value]) => {
-    acc[key] = value;
+  matched.properties = separatedProperties.reduce((acc, key) => {
+    const keySchema = schema.properties?.[key] ?? schema.additionalProperties;
+    if (keySchema !== void 0) {
+      acc[key] = keySchema;
+    }
     return acc;
   }, {});
+  if (Object.keys(matched.properties).length === 0) {
+    matched.properties = void 0;
+  }
   matched.required = schema.required?.filter((key) => separatedProperties.includes(key));
+  if (matched.required?.length === 0) {
+    matched.required = void 0;
+  }
   matched.examples = schema.examples?.map((example) => {
     if (!isObject(example)) {
       return example;
@@ -135,11 +160,14 @@ function separateObjectSchema(schema, separatedProperties) {
       return acc;
     }, {});
   });
-  rest.properties = schema.properties && Object.entries(schema.properties).filter(([key]) => !separatedProperties.includes(key)).reduce((acc, [key, value]) => {
+  rest.properties = schema.properties && Object.entries(schema.properties).filter(([key]) => !separatedProperties.includes(key)).reduce((acc = {}, [key, value]) => {
     acc[key] = value;
     return acc;
-  }, {});
+  }, void 0);
   rest.required = schema.required?.filter((key) => !separatedProperties.includes(key));
+  if (rest.required?.length === 0) {
+    rest.required = void 0;
+  }
   rest.examples = schema.examples?.map((example) => {
     if (!isObject(example)) {
       return example;
@@ -250,7 +278,7 @@ function toOpenAPIContent(schema) {
       schema: toOpenAPISchema(file)
     };
   }
-  if (restSchema !== void 0) {
+  if (restSchema !== void 0 && !isAnySchema(restSchema) && !isNeverSchema(restSchema)) {
     content["application/json"] = {
       schema: toOpenAPISchema(restSchema)
     };
@@ -354,6 +382,107 @@ function resolveOpenAPIJsonSchemaRef(doc, schema) {
   const resolved = doc.components?.schemas?.[name];
   return resolved ?? schema;
 }
+function simplifyComposedObjectJsonSchemasAndRefs(schema, doc) {
+  if (doc) {
+    schema = resolveOpenAPIJsonSchemaRef(doc, schema);
+  }
+  if (typeof schema !== "object" || !schema.anyOf && !schema.oneOf && !schema.allOf) {
+    return schema;
+  }
+  const unionSchemas = [
+    ...toArray(schema.anyOf?.map((s) => simplifyComposedObjectJsonSchemasAndRefs(s, doc))),
+    ...toArray(schema.oneOf?.map((s) => simplifyComposedObjectJsonSchemasAndRefs(s, doc)))
+  ];
+  const objectUnionSchemas = [];
+  for (const u of unionSchemas) {
+    if (!isObjectSchema(u)) {
+      return schema;
+    }
+    objectUnionSchemas.push(u);
+  }
+  const mergedUnionPropertyMap = /* @__PURE__ */ new Map();
+  for (const u of objectUnionSchemas) {
+    if (u.properties) {
+      for (const [key, value] of Object.entries(u.properties)) {
+        let entry = mergedUnionPropertyMap.get(key);
+        if (!entry) {
+          const required = objectUnionSchemas.every((s) => s.required?.includes(key));
+          entry = { required, schemas: [] };
+          mergedUnionPropertyMap.set(key, entry);
+        }
+        entry.schemas.push(value);
+      }
+    }
+  }
+  const intersectionSchemas = toArray(schema.allOf?.map((s) => simplifyComposedObjectJsonSchemasAndRefs(s, doc)));
+  const objectIntersectionSchemas = [];
+  for (const u of intersectionSchemas) {
+    if (!isObjectSchema(u)) {
+      return schema;
+    }
+    objectIntersectionSchemas.push(u);
+  }
+  if (isObjectSchema(schema)) {
+    objectIntersectionSchemas.push(schema);
+  }
+  const mergedInteractionPropertyMap = /* @__PURE__ */ new Map();
+  for (const u of objectIntersectionSchemas) {
+    if (u.properties) {
+      for (const [key, value] of Object.entries(u.properties)) {
+        let entry = mergedInteractionPropertyMap.get(key);
+        if (!entry) {
+          const required = objectIntersectionSchemas.some((s) => s.required?.includes(key));
+          entry = { required, schemas: [] };
+          mergedInteractionPropertyMap.set(key, entry);
+        }
+        entry.schemas.push(value);
+      }
+    }
+  }
+  const resultObjectSchema = { type: "object", properties: {}, required: [] };
+  const keys = /* @__PURE__ */ new Set([
+    ...mergedUnionPropertyMap.keys(),
+    ...mergedInteractionPropertyMap.keys()
+  ]);
+  if (keys.size === 0) {
+    return schema;
+  }
+  const deduplicateSchemas = (schemas) => {
+    const seen = /* @__PURE__ */ new Set();
+    const result = [];
+    for (const schema2 of schemas) {
+      const key = stringifyJSON(schema2);
+      if (!seen.has(key)) {
+        seen.add(key);
+        result.push(schema2);
+      }
+    }
+    return result;
+  };
+  for (const key of keys) {
+    const unionEntry = mergedUnionPropertyMap.get(key);
+    const intersectionEntry = mergedInteractionPropertyMap.get(key);
+    resultObjectSchema.properties[key] = (() => {
+      const dedupedUnionSchemas = unionEntry ? deduplicateSchemas(unionEntry.schemas) : [];
+      const dedupedIntersectionSchemas = intersectionEntry ? deduplicateSchemas(intersectionEntry.schemas) : [];
+      if (!dedupedUnionSchemas.length) {
+        return dedupedIntersectionSchemas.length === 1 ? dedupedIntersectionSchemas[0] : { allOf: dedupedIntersectionSchemas };
+      }
+      if (!dedupedIntersectionSchemas.length) {
+        return dedupedUnionSchemas.length === 1 ? dedupedUnionSchemas[0] : { anyOf: dedupedUnionSchemas };
+      }
+      const allOf = deduplicateSchemas([
+        ...dedupedIntersectionSchemas,
+        dedupedUnionSchemas.length === 1 ? dedupedUnionSchemas[0] : { anyOf: dedupedUnionSchemas }
+      ]);
+      return allOf.length === 1 ? allOf[0] : { allOf };
+    })();
+    if (unionEntry?.required || intersectionEntry?.required) {
+      resultObjectSchema.required.push(key);
+    }
+  }
+  return resultObjectSchema;
+}
 
 class CompositeSchemaConverter {
   converters;
@@ -382,37 +511,38 @@ class OpenAPIGenerator {
   /**
    * Generates OpenAPI specifications from oRPC routers/contracts.
    *
-   * @see {@link https://orpc.unnoq.com/docs/openapi/openapi-specification OpenAPI Specification Docs}
+   * @see {@link https://orpc.dev/docs/openapi/openapi-specification OpenAPI Specification Docs}
    */
-  async generate(router, options = {}) {
-    const exclude = options.exclude ?? (() => false);
+  async generate(router, { customErrorResponseBodySchema, commonSchemas, filter: baseFilter, exclude, ...baseDoc } = {}) {
+    const filter = baseFilter ?? (({ contract, path }) => {
+      return !(exclude?.(contract, path) ?? false);
+    });
     const doc = {
-      ...clone(options),
-      info: options.info ?? { title: "API Reference", version: "0.0.0" },
-      openapi: "3.1.1",
-      exclude: void 0,
-      commonSchemas: void 0
+      ...clone(baseDoc),
+      info: baseDoc.info ?? { title: "API Reference", version: "0.0.0" },
+      openapi: "3.1.1"
     };
-    const baseSchemaConvertOptions = await this.#resolveCommonSchemas(doc, options.commonSchemas);
+    const { baseSchemaConvertOptions, undefinedErrorJsonSchema } = await this.#resolveCommonSchemas(doc, commonSchemas);
     const contracts = [];
-    await resolveContractProcedures({ path: [], router }, ({ contract, path }) => {
-      if (!exclude(contract, path)) {
-        contracts.push({ contract, path });
+    await resolveContractProcedures({ path: [], router }, (traverseOptions) => {
+      if (!value(filter, traverseOptions)) {
+        return;
       }
+      contracts.push(traverseOptions);
     });
     const errors = [];
     for (const { contract, path } of contracts) {
-      const operationId = path.join(".");
+      const stringPath = path.join(".");
       try {
         const def = contract["~orpc"];
         const method = toOpenAPIMethod(fallbackContractConfig("defaultMethod", def.route.method));
         const httpPath = toOpenAPIPath(def.route.path ?? toHttpPath(path));
         let operationObjectRef;
-        if (def.route.spec !== void 0) {
+        if (def.route.spec !== void 0 && typeof def.route.spec !== "function") {
           operationObjectRef = def.route.spec;
         } else {
           operationObjectRef = {
-            operationId,
+            operationId: def.route.operationId ?? stringPath,
             summary: def.route.summary,
             description: def.route.description,
             deprecated: def.route.deprecated,
@@ -420,7 +550,10 @@ class OpenAPIGenerator {
           };
           await this.#request(doc, operationObjectRef, def, baseSchemaConvertOptions);
           await this.#successResponse(doc, operationObjectRef, def, baseSchemaConvertOptions);
-          await this.#errorResponse(operationObjectRef, def, baseSchemaConvertOptions);
+          await this.#errorResponse(operationObjectRef, def, baseSchemaConvertOptions, undefinedErrorJsonSchema, customErrorResponseBodySchema);
+        }
+        if (typeof def.route.spec === "function") {
+          operationObjectRef = def.route.spec(operationObjectRef);
         }
         doc.paths ??= {};
         doc.paths[httpPath] ??= {};
@@ -430,7 +563,7 @@ class OpenAPIGenerator {
           throw e;
         }
         errors.push(
-          `[OpenAPIGenerator] Error occurred while generating OpenAPI for procedure at path: ${operationId}
+          `[OpenAPIGenerator] Error occurred while generating OpenAPI for procedure at path: ${stringPath}
 ${e.message}`
         );
       }
@@ -445,11 +578,26 @@ ${errors.join("\n\n")}`
     return this.serializer.serialize(doc)[0];
   }
   async #resolveCommonSchemas(doc, commonSchemas) {
-    const baseOptions = {};
+    let undefinedErrorJsonSchema = {
+      type: "object",
+      properties: {
+        defined: { const: false },
+        code: { type: "string" },
+        status: { type: "number" },
+        message: { type: "string" },
+        data: {}
+      },
+      required: ["defined", "code", "status", "message"]
+    };
+    const baseSchemaConvertOptions = {};
     if (commonSchemas) {
-      baseOptions.components = [];
+      baseSchemaConvertOptions.components = [];
       for (const key in commonSchemas) {
-        const { schema, strategy = "input" } = commonSchemas[key];
+        const options = commonSchemas[key];
+        if (options.schema === void 0) {
+          continue;
+        }
+        const { schema, strategy = "input" } = options;
         const [required, json] = await this.converter.convert(schema, { strategy });
         const allowedStrategies = [strategy];
         if (strategy === "input") {
@@ -463,7 +611,7 @@ ${errors.join("\n\n")}`
             allowedStrategies.push("input");
           }
         }
-        baseOptions.components.push({
+        baseSchemaConvertOptions.components.push({
           schema,
           required,
           ref: `#/components/schemas/${key}`,
@@ -473,11 +621,19 @@ ${errors.join("\n\n")}`
       doc.components ??= {};
       doc.components.schemas ??= {};
       for (const key in commonSchemas) {
-        const { schema, strategy = "input" } = commonSchemas[key];
+        const options = commonSchemas[key];
+        if (options.schema === void 0) {
+          if (options.error === "UndefinedError") {
+            doc.components.schemas[key] = toOpenAPISchema(undefinedErrorJsonSchema);
+            undefinedErrorJsonSchema = { $ref: `#/components/schemas/${key}` };
+          }
+          continue;
+        }
+        const { schema, strategy = "input" } = options;
         const [, json] = await this.converter.convert(
           schema,
           {
-            ...baseOptions,
+            ...baseSchemaConvertOptions,
             strategy,
             minStructureDepthForRef: 1
             // not allow use $ref for root schemas
@@ -486,7 +642,7 @@ ${errors.join("\n\n")}`
         doc.components.schemas[key] = toOpenAPISchema(json);
       }
     }
-    return baseOptions;
+    return { baseSchemaConvertOptions, undefinedErrorJsonSchema };
   }
   async #request(doc, ref, def, baseSchemaConvertOptions) {
     const method = fallbackContractConfig("defaultMethod", def.route.method);
@@ -507,13 +663,16 @@ ${errors.join("\n\n")}`
       def.inputSchema,
       {
         ...baseSchemaConvertOptions,
-        strategy: "input",
-        minStructureDepthForRef: dynamicParams?.length || inputStructure === "detailed" ? 1 : 0
+        strategy: "input"
       }
     );
+    let omitResponseBody = false;
     if (isAnySchema(schema) && !dynamicParams?.length) {
       return;
     }
+    if (inputStructure === "detailed" || inputStructure === "compact" && (dynamicParams?.length || method === "GET")) {
+      schema = simplifyComposedObjectJsonSchemasAndRefs(schema, doc);
+    }
     if (inputStructure === "compact") {
       if (dynamicParams?.length) {
         const error2 = new OpenAPIGeneratorError(
@@ -525,6 +684,7 @@ ${errors.join("\n\n")}`
         const [paramsSchema, rest] = separateObjectSchema(schema, dynamicParams);
         schema = rest;
         required = rest.required ? rest.required.length !== 0 : false;
+        omitResponseBody = !required && !rest.properties;
         if (!checkParamsSchema(paramsSchema, dynamicParams)) {
           throw error2;
         }
@@ -539,7 +699,7 @@ ${errors.join("\n\n")}`
         }
         ref.parameters ??= [];
         ref.parameters.push(...toOpenAPIParameters(schema, "query"));
-      } else {
+      } else if (!omitResponseBody) {
         ref.requestBody = {
           required,
           content: toOpenAPIContent(schema)
@@ -553,7 +713,7 @@ ${errors.join("\n\n")}`
     if (!isObjectSchema(schema)) {
       throw error;
     }
-    const resolvedParamSchema = schema.properties?.params !== void 0 ? resolveOpenAPIJsonSchemaRef(doc, schema.properties.params) : void 0;
+    const resolvedParamSchema = schema.properties?.params !== void 0 ? simplifyComposedObjectJsonSchemasAndRefs(schema.properties.params, doc) : void 0;
     if (dynamicParams?.length && (resolvedParamSchema === void 0 || !isObjectSchema(resolvedParamSchema) || !checkParamsSchema(resolvedParamSchema, dynamicParams))) {
       throw new OpenAPIGeneratorError(
         'When input structure is "detailed" and path has dynamic params, the "params" schema must be an object with all dynamic params as required.'
@@ -562,7 +722,7 @@ ${errors.join("\n\n")}`
     for (const from of ["params", "query", "headers"]) {
       const fromSchema = schema.properties?.[from];
       if (fromSchema !== void 0) {
-        const resolvedSchema = resolveOpenAPIJsonSchemaRef(doc, fromSchema);
+        const resolvedSchema = simplifyComposedObjectJsonSchemasAndRefs(fromSchema, doc);
         if (!isObjectSchema(resolvedSchema)) {
           throw error;
         }
@@ -623,13 +783,14 @@ ${errors.join("\n\n")}`
         
         But got: ${stringifyJSON(item)}
       `);
-      if (!isObjectSchema(item)) {
+      const simplifiedItem = simplifyComposedObjectJsonSchemasAndRefs(item, doc);
+      if (!isObjectSchema(simplifiedItem)) {
         throw error;
       }
       let schemaStatus;
       let schemaDescription;
-      if (item.properties?.status !== void 0) {
-        const statusSchema = resolveOpenAPIJsonSchemaRef(doc, item.properties.status);
+      if (simplifiedItem.properties?.status !== void 0) {
+        const statusSchema = resolveOpenAPIJsonSchemaRef(doc, simplifiedItem.properties.status);
         if (typeof statusSchema !== "object" || statusSchema.const === void 0 || typeof statusSchema.const !== "number" || !Number.isInteger(statusSchema.const) || isORPCErrorStatus(statusSchema.const)) {
           throw error;
         }
@@ -649,8 +810,8 @@ ${errors.join("\n\n")}`
       ref.responses[itemStatus] = {
         description: itemDescription
       };
-      if (item.properties?.headers !== void 0) {
-        const headersSchema = resolveOpenAPIJsonSchemaRef(doc, item.properties.headers);
+      if (simplifiedItem.properties?.headers !== void 0) {
+        const headersSchema = simplifyComposedObjectJsonSchemasAndRefs(simplifiedItem.properties.headers, doc);
         if (!isObjectSchema(headersSchema)) {
           throw error;
         }
@@ -660,61 +821,53 @@ ${errors.join("\n\n")}`
             ref.responses[itemStatus].headers ??= {};
             ref.responses[itemStatus].headers[key] = {
               schema: toOpenAPISchema(headerSchema),
-              required: item.required?.includes("headers") && headersSchema.required?.includes(key)
+              required: simplifiedItem.required?.includes("headers") && headersSchema.required?.includes(key)
             };
           }
         }
       }
-      if (item.properties?.body !== void 0) {
+      if (simplifiedItem.properties?.body !== void 0) {
         ref.responses[itemStatus].content = toOpenAPIContent(
-          applySchemaOptionality(item.required?.includes("body") ?? false, item.properties.body)
+          applySchemaOptionality(simplifiedItem.required?.includes("body") ?? false, simplifiedItem.properties.body)
         );
       }
     }
   }
-  async #errorResponse(ref, def, baseSchemaConvertOptions) {
+  async #errorResponse(ref, def, baseSchemaConvertOptions, undefinedErrorSchema, customErrorResponseBodySchema) {
     const errorMap = def.errorMap;
-    const errors = {};
+    const errorResponsesByStatus = {};
     for (const code in errorMap) {
       const config = errorMap[code];
       if (!config) {
         continue;
       }
       const status = fallbackORPCErrorStatus(code, config.status);
-      const message = fallbackORPCErrorMessage(code, config.message);
+      const defaultMessage = fallbackORPCErrorMessage(code, config.message);
+      errorResponsesByStatus[status] ??= { status, definedErrorDefinitions: [], errorSchemaVariants: [] };
       const [dataRequired, dataSchema] = await this.converter.convert(config.data, { ...baseSchemaConvertOptions, strategy: "output" });
-      errors[status] ??= [];
-      errors[status].push({
+      errorResponsesByStatus[status].definedErrorDefinitions.push([code, defaultMessage, dataRequired, dataSchema]);
+      errorResponsesByStatus[status].errorSchemaVariants.push({
         type: "object",
         properties: {
           defined: { const: true },
           code: { const: code },
           status: { const: status },
-          message: { type: "string", default: message },
+          message: { type: "string", default: defaultMessage },
           data: dataSchema
         },
         required: dataRequired ? ["defined", "code", "status", "message", "data"] : ["defined", "code", "status", "message"]
       });
     }
     ref.responses ??= {};
-    for (const status in errors) {
-      const schemas = errors[status];
-      ref.responses[status] = {
-        description: status,
-        content: toOpenAPIContent({
+    for (const statusString in errorResponsesByStatus) {
+      const errorResponse = errorResponsesByStatus[statusString];
+      const customBodySchema = value(customErrorResponseBodySchema, errorResponse.definedErrorDefinitions, errorResponse.status);
+      ref.responses[statusString] = {
+        description: statusString,
+        content: toOpenAPIContent(customBodySchema ?? {
           oneOf: [
-            ...schemas,
-            {
-              type: "object",
-              properties: {
-                defined: { const: false },
-                code: { type: "string" },
-                status: { type: "number" },
-                message: { type: "string" },
-                data: {}
-              },
-              required: ["defined", "code", "status", "message"]
-            }
+            ...errorResponse.errorSchemaVariants,
+            undefinedErrorSchema
           ]
         })
       };
@@ -722,4 +875,4 @@ ${errors.join("\n\n")}`
   }
 }
 
-export { CompositeSchemaConverter as C, LOGIC_KEYWORDS as L, OpenAPIGenerator as O, applyCustomOpenAPIOperation as a, toOpenAPIMethod as b, customOpenAPIOperation as c, toOpenAPIContent as d, toOpenAPIEventIteratorContent as e, toOpenAPIParameters as f, getCustomOpenAPIOperation as g, checkParamsSchema as h, toOpenAPISchema as i, isFileSchema as j, isObjectSchema as k, isAnySchema as l, filterSchemaBranches as m, applySchemaOptionality as n, expandUnionSchema as o, expandArrayableSchema as p, isPrimitiveSchema as q, resolveOpenAPIJsonSchemaRef as r, separateObjectSchema as s, toOpenAPIPath as t };
+export { CompositeSchemaConverter as C, LOGIC_KEYWORDS as L, OpenAPIGenerator as O, applyCustomOpenAPIOperation as a, toOpenAPIMethod as b, customOpenAPIOperation as c, toOpenAPIContent as d, toOpenAPIEventIteratorContent as e, toOpenAPIParameters as f, getCustomOpenAPIOperation as g, checkParamsSchema as h, toOpenAPISchema as i, isFileSchema as j, isObjectSchema as k, isAnySchema as l, isNeverSchema as m, separateObjectSchema as n, filterSchemaBranches as o, applySchemaOptionality as p, expandUnionSchema as q, resolveOpenAPIJsonSchemaRef as r, simplifyComposedObjectJsonSchemasAndRefs as s, toOpenAPIPath as t, expandArrayableSchema as u, isPrimitiveSchema as v };

package/dist/shared/openapi.DwaweYRb.d.mts

@@ -0,0 +1,54 @@
+import { StandardOpenAPISerializer, StandardOpenAPIJsonSerializerOptions, StandardBracketNotationSerializerOptions } from '@orpc/openapi-client/standard';
+import { AnyProcedure, TraverseContractProcedureCallbackOptions, AnyRouter, Context, Router } from '@orpc/server';
+import { StandardCodec, StandardParams, StandardMatcher, StandardMatchResult, StandardHandlerOptions, StandardHandler } from '@orpc/server/standard';
+import { ORPCError, HTTPPath } from '@orpc/client';
+import { StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
+import { Value } from '@orpc/shared';
+
+interface StandardOpenAPICodecOptions {
+    /**
+     * Customize how an ORPC error is encoded into a response body.
+     * Use this if your API needs a different error output structure.
+     *
+     * @remarks
+     * - Return `null | undefined` to fallback to default behavior
+     *
+     * @default ((e) => e.toJSON())
+     */
+    customErrorResponseBodyEncoder?: (error: ORPCError<any, any>) => unknown;
+}
+declare class StandardOpenAPICodec implements StandardCodec {
+    #private;
+    private readonly serializer;
+    private readonly customErrorResponseBodyEncoder;
+    constructor(serializer: StandardOpenAPISerializer, options?: StandardOpenAPICodecOptions);
+    decode(request: StandardLazyRequest, params: StandardParams | undefined, procedure: AnyProcedure): Promise<unknown>;
+    encode(output: unknown, procedure: AnyProcedure): StandardResponse;
+    encodeError(error: ORPCError<any, any>): StandardResponse;
+}
+
+interface StandardOpenAPIMatcherOptions {
+    /**
+     * Filter procedures. Return `false` to exclude a procedure from matching.
+     *
+     * @default true
+     */
+    filter?: Value<boolean, [options: TraverseContractProcedureCallbackOptions]>;
+}
+declare class StandardOpenAPIMatcher implements StandardMatcher {
+    private readonly filter;
+    private readonly tree;
+    private pendingRouters;
+    constructor(options?: StandardOpenAPIMatcherOptions);
+    init(router: AnyRouter, path?: readonly string[]): void;
+    match(method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
+}
+
+interface StandardOpenAPIHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardOpenAPIJsonSerializerOptions, StandardBracketNotationSerializerOptions, StandardOpenAPIMatcherOptions, StandardOpenAPICodecOptions {
+}
+declare class StandardOpenAPIHandler<T extends Context> extends StandardHandler<T> {
+    constructor(router: Router<any, T>, options: NoInfer<StandardOpenAPIHandlerOptions<T>>);
+}
+
+export { StandardOpenAPICodec as a, StandardOpenAPIHandler as c, StandardOpenAPIMatcher as e };
+export type { StandardOpenAPICodecOptions as S, StandardOpenAPIHandlerOptions as b, StandardOpenAPIMatcherOptions as d };