@orpc/openapi 0.0.0-next.df486d6 → 0.0.0-next.e0f01a5

package/dist/index.d.mts

@@ -3,6 +3,7 @@ import { OpenAPIV3_1 } from 'openapi-types';
 export { OpenAPIV3_1 as OpenAPI } from 'openapi-types';
 import { StandardOpenAPIJsonSerializerOptions } from '@orpc/openapi-client/standard';
 import { AnyRouter } from '@orpc/server';
+import { Promisable } from '@orpc/shared';
 import { JSONSchema } from 'json-schema-typed/draft-2020-12';
 export { JSONSchema, Format as JSONSchemaFormat } from 'json-schema-typed/draft-2020-12';
 import { HTTPPath, HTTPMethod } from '@orpc/client';
@@ -34,15 +35,15 @@ interface SchemaConvertOptions {
     strategy: 'input' | 'output';
 }
 interface SchemaConverter {
-    convert(schema: AnySchema | undefined, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
+    convert(schema: AnySchema | undefined, options: SchemaConvertOptions): Promisable<[required: boolean, jsonSchema: JSONSchema]>;
 }
 interface ConditionalSchemaConverter extends SchemaConverter {
-    condition(schema: AnySchema | undefined, options: SchemaConvertOptions): boolean;
+    condition(schema: AnySchema | undefined, options: SchemaConvertOptions): Promisable<boolean>;
 }
 declare class CompositeSchemaConverter implements SchemaConverter {
     private readonly converters;
     constructor(converters: ConditionalSchemaConverter[]);
-    convert(schema: AnySchema | undefined, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
+    convert(schema: AnySchema | undefined, options: SchemaConvertOptions): Promise<[required: boolean, jsonSchema: JSONSchema]>;
 }
 
 interface OpenAPIGeneratorOptions extends StandardOpenAPIJsonSerializerOptions {

package/dist/index.d.ts

@@ -3,6 +3,7 @@ import { OpenAPIV3_1 } from 'openapi-types';
 export { OpenAPIV3_1 as OpenAPI } from 'openapi-types';
 import { StandardOpenAPIJsonSerializerOptions } from '@orpc/openapi-client/standard';
 import { AnyRouter } from '@orpc/server';
+import { Promisable } from '@orpc/shared';
 import { JSONSchema } from 'json-schema-typed/draft-2020-12';
 export { JSONSchema, Format as JSONSchemaFormat } from 'json-schema-typed/draft-2020-12';
 import { HTTPPath, HTTPMethod } from '@orpc/client';
@@ -34,15 +35,15 @@ interface SchemaConvertOptions {
     strategy: 'input' | 'output';
 }
 interface SchemaConverter {
-    convert(schema: AnySchema | undefined, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
+    convert(schema: AnySchema | undefined, options: SchemaConvertOptions): Promisable<[required: boolean, jsonSchema: JSONSchema]>;
 }
 interface ConditionalSchemaConverter extends SchemaConverter {
-    condition(schema: AnySchema | undefined, options: SchemaConvertOptions): boolean;
+    condition(schema: AnySchema | undefined, options: SchemaConvertOptions): Promisable<boolean>;
 }
 declare class CompositeSchemaConverter implements SchemaConverter {
     private readonly converters;
     constructor(converters: ConditionalSchemaConverter[]);
-    convert(schema: AnySchema | undefined, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
+    convert(schema: AnySchema | undefined, options: SchemaConvertOptions): Promise<[required: boolean, jsonSchema: JSONSchema]>;
 }
 
 interface OpenAPIGeneratorOptions extends StandardOpenAPIJsonSerializerOptions {

package/dist/index.mjs

@@ -287,9 +287,9 @@ class CompositeSchemaConverter {
   constructor(converters) {
     this.converters = converters;
   }
-  convert(schema, options) {
+  async convert(schema, options) {
     for (const converter of this.converters) {
-      if (converter.condition(schema, options)) {
+      if (await converter.condition(schema, options)) {
         return converter.convert(schema, options);
       }
     }
@@ -309,8 +309,12 @@ class OpenAPIGenerator {
   async generate(router, base) {
     const doc = clone(base);
     doc.openapi = "3.1.1";
-    const errors = [];
+    const contracts = [];
     await resolveContractProcedures({ path: [], router }, ({ contract, path }) => {
+      contracts.push({ contract, path });
+    });
+    const errors = [];
+    for (const { contract, path } of contracts) {
       const operationId = path.join(".");
       try {
         const def = contract["~orpc"];
@@ -323,9 +327,9 @@ class OpenAPIGenerator {
           deprecated: def.route.deprecated,
           tags: def.route.tags?.map((tag) => tag)
         };
-        this.#request(operationObjectRef, def);
-        this.#successResponse(operationObjectRef, def);
-        this.#errorResponse(operationObjectRef, def);
+        await this.#request(operationObjectRef, def);
+        await this.#successResponse(operationObjectRef, def);
+        await this.#errorResponse(operationObjectRef, def);
         doc.paths ??= {};
         doc.paths[httpPath] ??= {};
         doc.paths[httpPath][method] = applyCustomOpenAPIOperation(operationObjectRef, contract);
@@ -338,7 +342,7 @@ class OpenAPIGenerator {
 ${e.message}`
         );
       }
-    });
+    }
     if (errors.length) {
       throw new OpenAPIGeneratorError(
         `Some error occurred during OpenAPI generation:
@@ -348,22 +352,22 @@ ${errors.join("\n\n")}`
     }
     return this.serializer.serialize(doc)[0];
   }
-  #request(ref, def) {
+  async #request(ref, def) {
     const method = fallbackContractConfig("defaultMethod", def.route.method);
     const details = getEventIteratorSchemaDetails(def.inputSchema);
     if (details) {
       ref.requestBody = {
         required: true,
         content: toOpenAPIEventIteratorContent(
-          this.converter.convert(details.yields, { strategy: "input" }),
-          this.converter.convert(details.returns, { strategy: "input" })
+          await this.converter.convert(details.yields, { strategy: "input" }),
+          await this.converter.convert(details.returns, { strategy: "input" })
         )
       };
       return;
     }
     const dynamicParams = getDynamicParams(def.route.path)?.map((v) => v.name);
     const inputStructure = fallbackContractConfig("defaultInputStructure", def.route.inputStructure);
-    let [required, schema] = this.converter.convert(def.inputSchema, { strategy: "input" });
+    let [required, schema] = await this.converter.convert(def.inputSchema, { strategy: "input" });
     if (isAnySchema(schema) && !dynamicParams?.length) {
       return;
     }
@@ -429,7 +433,7 @@ ${errors.join("\n\n")}`
       };
     }
   }
-  #successResponse(ref, def) {
+  async #successResponse(ref, def) {
     const outputSchema = def.outputSchema;
     const status = fallbackContractConfig("defaultSuccessStatus", def.route.successStatus);
     const description = fallbackContractConfig("defaultSuccessDescription", def.route?.successDescription);
@@ -440,13 +444,13 @@ ${errors.join("\n\n")}`
       ref.responses[status] = {
         description,
         content: toOpenAPIEventIteratorContent(
-          this.converter.convert(eventIteratorSchemaDetails.yields, { strategy: "output" }),
-          this.converter.convert(eventIteratorSchemaDetails.returns, { strategy: "output" })
+          await this.converter.convert(eventIteratorSchemaDetails.yields, { strategy: "output" }),
+          await this.converter.convert(eventIteratorSchemaDetails.returns, { strategy: "output" })
         )
       };
       return;
     }
-    const [required, json] = this.converter.convert(outputSchema, { strategy: "output" });
+    const [required, json] = await this.converter.convert(outputSchema, { strategy: "output" });
     ref.responses ??= {};
     ref.responses[status] = {
       description
@@ -479,7 +483,7 @@ ${errors.join("\n\n")}`
       );
     }
   }
-  #errorResponse(ref, def) {
+  async #errorResponse(ref, def) {
     const errorMap = def.errorMap;
     const errors = {};
     for (const code in errorMap) {
@@ -489,7 +493,7 @@ ${errors.join("\n\n")}`
       }
       const status = fallbackORPCErrorStatus(code, config.status);
       const message = fallbackORPCErrorMessage(code, config.message);
-      const [dataRequired, dataSchema] = this.converter.convert(config.data, { strategy: "output" });
+      const [dataRequired, dataSchema] = await this.converter.convert(config.data, { strategy: "output" });
       errors[status] ??= [];
       errors[status].push({
         type: "object",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/openapi",
   "type": "module",
-  "version": "0.0.0-next.df486d6",
+  "version": "0.0.0-next.e0f01a5",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -42,12 +42,12 @@
     "json-schema-typed": "^8.0.1",
     "openapi-types": "^12.1.3",
     "rou3": "^0.5.1",
-    "@orpc/client": "0.0.0-next.df486d6",
-    "@orpc/contract": "0.0.0-next.df486d6",
-    "@orpc/server": "0.0.0-next.df486d6",
-    "@orpc/openapi-client": "0.0.0-next.df486d6",
-    "@orpc/shared": "0.0.0-next.df486d6",
-    "@orpc/standard-server": "0.0.0-next.df486d6"
+    "@orpc/client": "0.0.0-next.e0f01a5",
+    "@orpc/openapi-client": "0.0.0-next.e0f01a5",
+    "@orpc/shared": "0.0.0-next.e0f01a5",
+    "@orpc/contract": "0.0.0-next.e0f01a5",
+    "@orpc/server": "0.0.0-next.e0f01a5",
+    "@orpc/standard-server": "0.0.0-next.e0f01a5"
   },
   "devDependencies": {
     "zod": "^3.24.2"