@orpc/openapi 0.0.0-next.ccd4e42 → 0.0.0-next.cd121e3

package/dist/{index.js → index.mjs}

@@ -1,14 +1,61 @@
-import {
-  JSONSerializer,
-  standardizeHTTPPath
-} from "./chunk-BHJYKXQL.js";
+import { isProcedure, eachAllContractProcedure } from '@orpc/server';
+import { OpenApiBuilder } from 'openapi3-ts/oas31';
+export { OpenApiBuilder } from 'openapi3-ts/oas31';
+import { findDeepMatches, isObject, get, omit, group } from '@orpc/shared';
+import { fallbackORPCErrorStatus } from '@orpc/client';
+import { fallbackContractConfig, getEventIteratorSchemaDetails } from '@orpc/contract';
+import { OpenAPIJsonSerializer } from '@orpc/openapi-client/standard';
+import * as draft202012 from 'json-schema-typed/draft-2020-12';
+export { draft202012 as JSONSchema };
+export { Format as JSONSchemaFormat } from 'json-schema-typed/draft-2020-12';
+import { t as toOpenAPI31RoutePattern } from './shared/openapi.BHG_gu5Z.mjs';
+export { s as standardizeHTTPPath } from './shared/openapi.BHG_gu5Z.mjs';
 
-// src/openapi.ts
-import { OpenApiBuilder } from "openapi3-ts/oas31";
+const OPERATION_EXTENDER_SYMBOL = Symbol("ORPC_OPERATION_EXTENDER");
+function setOperationExtender(o, extend) {
+  return new Proxy(o, {
+    get(target, prop, receiver) {
+      if (prop === OPERATION_EXTENDER_SYMBOL) {
+        return extend;
+      }
+      return Reflect.get(target, prop, receiver);
+    }
+  });
+}
+function getOperationExtender(o) {
+  return o[OPERATION_EXTENDER_SYMBOL];
+}
+function extendOperation(operation, procedure) {
+  const operationExtenders = [];
+  for (const errorItem of Object.values(procedure["~orpc"].errorMap)) {
+    const maybeExtender = getOperationExtender(errorItem);
+    if (maybeExtender) {
+      operationExtenders.push(maybeExtender);
+    }
+  }
+  if (isProcedure(procedure)) {
+    for (const middleware of procedure["~orpc"].middlewares) {
+      const maybeExtender = getOperationExtender(middleware);
+      if (maybeExtender) {
+        operationExtenders.push(maybeExtender);
+      }
+    }
+  }
+  let currentOperation = operation;
+  for (const extender of operationExtenders) {
+    if (typeof extender === "function") {
+      currentOperation = extender(currentOperation, procedure);
+    } else {
+      currentOperation = {
+        ...currentOperation,
+        ...extender
+      };
+    }
+  }
+  return currentOperation;
+}
 
-// src/openapi-content-builder.ts
-import { findDeepMatches } from "@orpc/shared";
-var OpenAPIContentBuilder = class {
+class OpenAPIContentBuilder {
   constructor(schemaUtils) {
     this.schemaUtils = schemaUtils;
   }
@@ -31,20 +78,12 @@ var OpenAPIContentBuilder = class {
     }
     return content;
   }
-};
+}
 
-// src/openapi-generator.ts
-import { fallbackContractConfig as fallbackContractConfig2, fallbackORPCErrorStatus } from "@orpc/contract";
-import { eachAllContractProcedure } from "@orpc/server";
-import { group } from "@orpc/shared";
+class OpenAPIError extends Error {
+}
 
-// src/openapi-error.ts
-var OpenAPIError = class extends Error {
-};
-
-// src/openapi-input-structure-parser.ts
-import { fallbackContractConfig } from "@orpc/contract";
-var OpenAPIInputStructureParser = class {
+class OpenAPIInputStructureParser {
   constructor(schemaConverter, schemaUtils, pathParser) {
     this.schemaConverter = schemaConverter;
     this.schemaUtils = schemaUtils;
@@ -135,10 +174,9 @@ var OpenAPIInputStructureParser = class {
       bodySchema: method !== "GET" ? rest : void 0
     };
   }
-};
+}
 
-// src/openapi-output-structure-parser.ts
-var OpenAPIOutputStructureParser = class {
+class OpenAPIOutputStructureParser {
   constructor(schemaConverter, schemaUtils) {
     this.schemaConverter = schemaConverter;
     this.schemaUtils = schemaUtils;
@@ -180,17 +218,15 @@ var OpenAPIOutputStructureParser = class {
       bodySchema: outputSchema
     };
   }
-};
+}
 
-// src/openapi-parameters-builder.ts
-import { get, isPlainObject, omit } from "@orpc/shared";
-var OpenAPIParametersBuilder = class {
+class OpenAPIParametersBuilder {
   build(paramIn, jsonSchema, options) {
     const parameters = [];
     for (const name in jsonSchema.properties) {
       const schema = jsonSchema.properties[name];
       const paramExamples = jsonSchema.examples?.filter((example) => {
-        return isPlainObject(example) && name in example;
+        return isObject(example) && name in example;
       }).map((example) => {
         return example[name];
       });
@@ -218,10 +254,9 @@ var OpenAPIParametersBuilder = class {
     }
     return headersObject;
   }
-};
+}
 
-// src/openapi-path-parser.ts
-var OpenAPIPathParser = class {
+class OpenAPIPathParser {
   parseDynamicParams(path) {
     const raws = path.match(/\{([^}]+)\}/g) ?? [];
     return raws.map((raw) => {
@@ -229,10 +264,9 @@ var OpenAPIPathParser = class {
       return { name, raw };
     });
   }
-};
+}
 
-// src/schema-converter.ts
-var CompositeSchemaConverter = class {
+class CompositeSchemaConverter {
   converters;
   constructor(converters) {
     this.converters = converters;
@@ -248,15 +282,9 @@ var CompositeSchemaConverter = class {
     }
     return {};
   }
-};
-
-// src/schema-utils.ts
-import { isPlainObject as isPlainObject2 } from "@orpc/shared";
+}
 
-// src/schema.ts
-import * as JSONSchema from "json-schema-typed/draft-2020-12";
-import { Format } from "json-schema-typed/draft-2020-12";
-var NON_LOGIC_KEYWORDS = [
+const NON_LOGIC_KEYWORDS = [
   // Core Documentation Keywords
   "$anchor",
   "$comment",
@@ -284,13 +312,12 @@ var NON_LOGIC_KEYWORDS = [
   "$dynamicRef"
 ];
 
-// src/schema-utils.ts
-var SchemaUtils = class {
+class SchemaUtils {
   isFileSchema(schema) {
-    return typeof schema === "object" && schema.type === "string" && typeof schema.contentMediaType === "string";
+    return isObject(schema) && schema.type === "string" && typeof schema.contentMediaType === "string";
   }
   isObjectSchema(schema) {
-    return typeof schema === "object" && schema.type === "object";
+    return isObject(schema) && schema.type === "object";
   }
   isAnySchema(schema) {
     return schema === true || Object.keys(schema).filter((key) => !NON_LOGIC_KEYWORDS.includes(key)).length === 0;
@@ -313,7 +340,7 @@ var SchemaUtils = class {
     }, {});
     matched.required = schema.required?.filter((key) => separatedProperties.includes(key));
     matched.examples = schema.examples?.map((example) => {
-      if (!isPlainObject2(example)) {
+      if (!isObject(example)) {
         return example;
       }
       return Object.entries(example).reduce((acc, [key, value]) => {
@@ -329,7 +356,7 @@ var SchemaUtils = class {
     }, {});
     rest.required = schema.required?.filter((key) => !separatedProperties.includes(key));
     rest.examples = schema.examples?.map((example) => {
-      if (!isPlainObject2(example)) {
+      if (!isObject(example)) {
         return example;
       }
       return Object.entries(example).reduce((acc, [key, value]) => {
@@ -369,10 +396,9 @@ var SchemaUtils = class {
     }
     return [matches, schema];
   }
-};
+}
 
-// src/openapi-generator.ts
-var OpenAPIGenerator = class {
+class OpenAPIGenerator {
   contentBuilder;
   parametersBuilder;
   schemaConverter;
@@ -389,7 +415,7 @@ var OpenAPIGenerator = class {
     this.parametersBuilder = options?.parametersBuilder ?? new OpenAPIParametersBuilder();
     this.schemaConverter = new CompositeSchemaConverter(options?.schemaConverters ?? []);
     this.schemaUtils = options?.schemaUtils ?? new SchemaUtils();
-    this.jsonSerializer = options?.jsonSerializer ?? new JSONSerializer();
+    this.jsonSerializer = options?.jsonSerializer ?? new OpenAPIJsonSerializer();
     this.contentBuilder = options?.contentBuilder ?? new OpenAPIContentBuilder(this.schemaUtils);
     this.pathParser = new OpenAPIPathParser();
     this.inputStructureParser = options?.inputStructureParser ?? new OpenAPIInputStructureParser(this.schemaConverter, this.schemaUtils, this.pathParser);
@@ -414,28 +440,125 @@ var OpenAPIGenerator = class {
         if (this.ignoreUndefinedPathProcedures && def.route?.path === void 0) {
           return;
         }
-        const method = fallbackContractConfig2("defaultMethod", def.route?.method);
-        const httpPath = def.route?.path ? standardizeHTTPPath(def.route?.path) : `/${path.map(encodeURIComponent).join("/")}`;
-        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, {
-          required: true
-        }) : [];
-        const query = querySchema ? this.parametersBuilder.build("query", querySchema) : [];
-        const headers = headersSchema ? this.parametersBuilder.build("header", headersSchema) : [];
-        const parameters = [...params, ...query, ...headers];
-        const requestBody = bodySchema !== void 0 ? {
-          required: this.schemaUtils.isUndefinableSchema(bodySchema),
-          content: this.contentBuilder.build(bodySchema)
-        } : void 0;
-        const responses = {};
-        responses[fallbackContractConfig2("defaultSuccessStatus", def.route?.successStatus)] = {
-          description: fallbackContractConfig2("defaultSuccessDescription", def.route?.successDescription),
-          content: resBodySchema !== void 0 ? this.contentBuilder.build(resBodySchema) : void 0,
-          headers: resHeadersSchema !== void 0 ? this.parametersBuilder.buildHeadersObject(resHeadersSchema) : void 0
-        };
+        const method = fallbackContractConfig("defaultMethod", def.route?.method);
+        const httpPath = def.route?.path ? toOpenAPI31RoutePattern(def.route?.path) : `/${path.map(encodeURIComponent).join("/")}`;
+        const { parameters, requestBody } = (() => {
+          const eventIteratorSchemaDetails = getEventIteratorSchemaDetails(def.inputSchema);
+          if (eventIteratorSchemaDetails) {
+            const requestBody3 = {
+              required: true,
+              content: {
+                "text/event-stream": {
+                  schema: {
+                    oneOf: [
+                      {
+                        type: "object",
+                        properties: {
+                          event: { type: "string", const: "message" },
+                          data: this.schemaConverter.convert(eventIteratorSchemaDetails.yields, { strategy: "input" }),
+                          id: { type: "string" },
+                          retry: { type: "number" }
+                        },
+                        required: ["event", "data"]
+                      },
+                      {
+                        type: "object",
+                        properties: {
+                          event: { type: "string", const: "done" },
+                          data: this.schemaConverter.convert(eventIteratorSchemaDetails.returns, { strategy: "input" }),
+                          id: { type: "string" },
+                          retry: { type: "number" }
+                        },
+                        required: ["event", "data"]
+                      },
+                      {
+                        type: "object",
+                        properties: {
+                          event: { type: "string", const: "error" },
+                          data: {},
+                          id: { type: "string" },
+                          retry: { type: "number" }
+                        },
+                        required: ["event", "data"]
+                      }
+                    ]
+                  }
+                }
+              }
+            };
+            return { requestBody: requestBody3, parameters: [] };
+          }
+          const inputStructure = fallbackContractConfig("defaultInputStructure", def.route?.inputStructure);
+          const { paramsSchema, querySchema, headersSchema, bodySchema } = this.inputStructureParser.parse(contract, inputStructure);
+          const params = paramsSchema ? this.parametersBuilder.build("path", paramsSchema, {
+            required: true
+          }) : [];
+          const query = querySchema ? this.parametersBuilder.build("query", querySchema) : [];
+          const headers = headersSchema ? this.parametersBuilder.build("header", headersSchema) : [];
+          const parameters2 = [...params, ...query, ...headers];
+          const requestBody2 = bodySchema !== void 0 ? {
+            required: this.schemaUtils.isUndefinableSchema(bodySchema),
+            content: this.contentBuilder.build(bodySchema)
+          } : void 0;
+          return { parameters: parameters2, requestBody: requestBody2 };
+        })();
+        const { responses } = (() => {
+          const eventIteratorSchemaDetails = getEventIteratorSchemaDetails(def.outputSchema);
+          if (eventIteratorSchemaDetails) {
+            const responses3 = {};
+            responses3[fallbackContractConfig("defaultSuccessStatus", def.route?.successStatus)] = {
+              description: fallbackContractConfig("defaultSuccessDescription", def.route?.successDescription),
+              content: {
+                "text/event-stream": {
+                  schema: {
+                    oneOf: [
+                      {
+                        type: "object",
+                        properties: {
+                          event: { type: "string", const: "message" },
+                          data: this.schemaConverter.convert(eventIteratorSchemaDetails.yields, { strategy: "input" }),
+                          id: { type: "string" },
+                          retry: { type: "number" }
+                        },
+                        required: ["event", "data"]
+                      },
+                      {
+                        type: "object",
+                        properties: {
+                          event: { type: "string", const: "done" },
+                          data: this.schemaConverter.convert(eventIteratorSchemaDetails.returns, { strategy: "input" }),
+                          id: { type: "string" },
+                          retry: { type: "number" }
+                        },
+                        required: ["event", "data"]
+                      },
+                      {
+                        type: "object",
+                        properties: {
+                          event: { type: "string", const: "error" },
+                          data: {},
+                          id: { type: "string" },
+                          retry: { type: "number" }
+                        },
+                        required: ["event", "data"]
+                      }
+                    ]
+                  }
+                }
+              }
+            };
+            return { responses: responses3 };
+          }
+          const outputStructure = fallbackContractConfig("defaultOutputStructure", def.route?.outputStructure);
+          const { headersSchema: resHeadersSchema, bodySchema: resBodySchema } = this.outputStructureParser.parse(contract, outputStructure);
+          const responses2 = {};
+          responses2[fallbackContractConfig("defaultSuccessStatus", def.route?.successStatus)] = {
+            description: fallbackContractConfig("defaultSuccessDescription", def.route?.successDescription),
+            content: resBodySchema !== void 0 ? this.contentBuilder.build(resBodySchema) : void 0,
+            headers: resHeadersSchema !== void 0 ? this.parametersBuilder.buildHeadersObject(resHeadersSchema) : void 0
+          };
+          return { responses: responses2 };
+        })();
         const errors = group(Object.entries(def.errorMap ?? {}).filter(([_, config]) => config).map(([code, config]) => ({
           ...config,
           code,
@@ -506,8 +629,9 @@ var OpenAPIGenerator = class {
           requestBody,
           responses
         };
+        const extendedOperation = extendOperation(operation, contract);
         builder.addPath(httpPath, {
-          [method.toLocaleLowerCase()]: operation
+          [method.toLocaleLowerCase()]: extendedOperation
         });
       } catch (e) {
         if (e instanceof OpenAPIError) {
@@ -526,21 +650,12 @@ var OpenAPIGenerator = class {
         }
       }
     });
-    return this.jsonSerializer.serialize(builder.getSpec());
+    return this.jsonSerializer.serialize(builder.getSpec())[0];
   }
+}
+
+const oo = {
+  spec: setOperationExtender
 };
-export {
-  CompositeSchemaConverter,
-  JSONSchema,
-  Format as JSONSchemaFormat,
-  JSONSerializer,
-  NON_LOGIC_KEYWORDS,
-  OpenAPIContentBuilder,
-  OpenAPIGenerator,
-  OpenAPIParametersBuilder,
-  OpenAPIPathParser,
-  OpenApiBuilder,
-  SchemaUtils,
-  standardizeHTTPPath
-};
-//# sourceMappingURL=index.js.map
+
+export { CompositeSchemaConverter, NON_LOGIC_KEYWORDS, OpenAPIContentBuilder, OpenAPIGenerator, OpenAPIParametersBuilder, OpenAPIPathParser, SchemaUtils, extendOperation, getOperationExtender, oo, setOperationExtender, toOpenAPI31RoutePattern };

package/dist/shared/openapi.BHG_gu5Z.mjs

@@ -0,0 +1,8 @@
+function standardizeHTTPPath(path) {
+  return `/${path.replace(/\/{2,}/g, "/").replace(/^\/|\/$/g, "")}`;
+}
+function toOpenAPI31RoutePattern(path) {
+  return standardizeHTTPPath(path).replace(/\{\+([^}]+)\}/g, "{$1}");
+}
+
+export { standardizeHTTPPath as s, toOpenAPI31RoutePattern as t };

package/dist/shared/openapi.CDsfPHgw.mjs

@@ -0,0 +1,148 @@
+import { fallbackContractConfig } from '@orpc/contract';
+import { OpenAPISerializer } from '@orpc/openapi-client/standard';
+import { isObject } from '@orpc/shared';
+import { eachContractProcedure, convertPathToHttpPath, isProcedure, getLazyRouterPrefix, unlazy, getRouterChild, createContractedProcedure } from '@orpc/server';
+import { createRouter, addRoute, findRoute } from 'rou3';
+import { s as standardizeHTTPPath } from './openapi.BHG_gu5Z.mjs';
+
+class OpenAPICodec {
+  constructor(serializer = new OpenAPISerializer()) {
+    this.serializer = serializer;
+  }
+  async decode(request, params, procedure) {
+    const inputStructure = fallbackContractConfig("defaultInputStructure", procedure["~orpc"].route.inputStructure);
+    if (inputStructure === "compact") {
+      const data = request.method === "GET" ? this.serializer.deserialize(request.url.searchParams) : this.serializer.deserialize(await request.body());
+      if (data === void 0) {
+        return params;
+      }
+      if (isObject(data)) {
+        return {
+          ...params,
+          ...data
+        };
+      }
+      return data;
+    }
+    const deserializeSearchParams = () => {
+      return this.serializer.deserialize(request.url.searchParams);
+    };
+    return {
+      params,
+      get query() {
+        const value = deserializeSearchParams();
+        Object.defineProperty(this, "query", { value, writable: true });
+        return value;
+      },
+      set query(value) {
+        Object.defineProperty(this, "query", { value, writable: true });
+      },
+      headers: request.headers,
+      body: this.serializer.deserialize(await request.body())
+    };
+  }
+  encode(output, procedure) {
+    const successStatus = fallbackContractConfig("defaultSuccessStatus", procedure["~orpc"].route.successStatus);
+    const outputStructure = fallbackContractConfig("defaultOutputStructure", procedure["~orpc"].route.outputStructure);
+    if (outputStructure === "compact") {
+      return {
+        status: successStatus,
+        headers: {},
+        body: this.serializer.serialize(output)
+      };
+    }
+    if (!isObject(output)) {
+      throw new Error(
+        'Invalid output structure for "detailed" output. Expected format: { body: any, headers?: Record<string, string | string[] | undefined> }'
+      );
+    }
+    return {
+      status: successStatus,
+      headers: output.headers ?? {},
+      body: this.serializer.serialize(output.body)
+    };
+  }
+  encodeError(error) {
+    return {
+      status: error.status,
+      headers: {},
+      body: this.serializer.serialize(error.toJSON())
+    };
+  }
+}
+
+class OpenAPIMatcher {
+  tree = createRouter();
+  pendingRouters = [];
+  init(router, path = []) {
+    const laziedOptions = eachContractProcedure({
+      router,
+      path
+    }, ({ path: path2, contract }) => {
+      const method = fallbackContractConfig("defaultMethod", contract["~orpc"].route.method);
+      const httpPath = contract["~orpc"].route.path ? toRou3Pattern(contract["~orpc"].route.path) : convertPathToHttpPath(path2);
+      if (isProcedure(contract)) {
+        addRoute(this.tree, method, httpPath, {
+          path: path2,
+          contract,
+          procedure: contract,
+          // this mean dev not used contract-first so we can used contract as procedure directly
+          router
+        });
+      } else {
+        addRoute(this.tree, method, httpPath, {
+          path: path2,
+          contract,
+          procedure: void 0,
+          router
+        });
+      }
+    });
+    this.pendingRouters.push(...laziedOptions.map((option) => ({
+      ...option,
+      httpPathPrefix: convertPathToHttpPath(option.path),
+      laziedPrefix: getLazyRouterPrefix(option.lazied)
+    })));
+  }
+  async match(method, pathname) {
+    if (this.pendingRouters.length) {
+      const newPendingRouters = [];
+      for (const pendingRouter of this.pendingRouters) {
+        if (!pendingRouter.laziedPrefix || pathname.startsWith(pendingRouter.laziedPrefix) || pathname.startsWith(pendingRouter.httpPathPrefix)) {
+          const { default: router } = await unlazy(pendingRouter.lazied);
+          this.init(router, pendingRouter.path);
+        } else {
+          newPendingRouters.push(pendingRouter);
+        }
+      }
+      this.pendingRouters = newPendingRouters;
+    }
+    const match = findRoute(this.tree, method, pathname);
+    if (!match) {
+      return void 0;
+    }
+    if (!match.data.procedure) {
+      const { default: maybeProcedure } = await unlazy(getRouterChild(match.data.router, ...match.data.path));
+      if (!isProcedure(maybeProcedure)) {
+        throw new Error(`
+          [Contract-First] Missing or invalid implementation for procedure at path: ${convertPathToHttpPath(match.data.path)}.
+          Ensure that the procedure is correctly defined and matches the expected contract.
+        `);
+      }
+      match.data.procedure = createContractedProcedure(match.data.contract, maybeProcedure);
+    }
+    return {
+      path: match.data.path,
+      procedure: match.data.procedure,
+      params: match.params ? decodeParams(match.params) : void 0
+    };
+  }
+}
+function toRou3Pattern(path) {
+  return standardizeHTTPPath(path).replace(/\{\+([^}]+)\}/g, "**:$1").replace(/\{([^}]+)\}/g, ":$1");
+}
+function decodeParams(params) {
+  return Object.fromEntries(Object.entries(params).map(([key, value]) => [key, decodeURIComponent(value)]));
+}
+
+export { OpenAPICodec as O, OpenAPIMatcher as a };

package/dist/shared/openapi.D0VMNR6V.mjs

@@ -0,0 +1,25 @@
+import { StandardHandler } from '@orpc/server/standard';
+import { toStandardRequest, toFetchResponse } from '@orpc/standard-server-fetch';
+import { a as OpenAPIMatcher, O as OpenAPICodec } from './openapi.CDsfPHgw.mjs';
+
+class OpenAPIHandler {
+  standardHandler;
+  constructor(router, options) {
+    const matcher = options?.matcher ?? new OpenAPIMatcher();
+    const codec = options?.codec ?? new OpenAPICodec();
+    this.standardHandler = new StandardHandler(router, matcher, codec, options);
+  }
+  async handle(request, ...[options]) {
+    const standardRequest = toStandardRequest(request);
+    const result = await this.standardHandler.handle(standardRequest, options);
+    if (!result.matched) {
+      return result;
+    }
+    return {
+      matched: true,
+      response: toFetchResponse(result.response, options)
+    };
+  }
+}
+
+export { OpenAPIHandler as O };

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

@@ -0,0 +1,7 @@
+import { Context } from '@orpc/server';
+import { RPCHandlerOptions } from '@orpc/server/standard';
+
+interface OpenAPIHandlerOptions<T extends Context> extends RPCHandlerOptions<T> {
+}
+
+export type { OpenAPIHandlerOptions as O };

package/dist/shared/openapi.Dz_6xooR.d.ts

@@ -0,0 +1,7 @@
+import { Context } from '@orpc/server';
+import { RPCHandlerOptions } from '@orpc/server/standard';
+
+interface OpenAPIHandlerOptions<T extends Context> extends RPCHandlerOptions<T> {
+}
+
+export type { OpenAPIHandlerOptions as O };