@orpc/openapi 0.34.0 → 0.35.0

package/dist/node.js

@@ -1,46 +1,30 @@
 import {
-  OpenAPIHandler
-} from "./chunk-SOVQ5ARD.js";
-import "./chunk-Q2LSK6YZ.js";
+  OpenAPICodec,
+  OpenAPIMatcher
+} from "./chunk-M5HOHBLW.js";
+import "./chunk-BHJYKXQL.js";
 
 // src/adapters/node/openapi-handler.ts
-import { createRequest, sendResponse } from "@orpc/server/node";
-var OpenAPIHandler2 = class {
-  openapiFetchHandler;
-  constructor(hono, router, options) {
-    this.openapiFetchHandler = new OpenAPIHandler(hono, router, options);
+import { nodeHttpResponseSendStandardResponse, nodeHttpToStandardRequest } from "@orpc/server/node";
+import { StandardHandler } from "@orpc/server/standard";
+var OpenAPIHandler = class {
+  standardHandler;
+  constructor(router, options) {
+    const matcher = options?.matcher ?? new OpenAPIMatcher(options);
+    const codec = options?.codec ?? new OpenAPICodec(options);
+    this.standardHandler = new StandardHandler(router, matcher, codec, { ...options });
   }
-  async handle(req, res, ...[options]) {
-    const request = createRequest(req, res);
-    const castedOptions = options ?? {};
-    const result = await this.openapiFetchHandler.handle(request, castedOptions);
-    if (result.matched === false) {
+  async handle(req, res, ...rest) {
+    const standardRequest = nodeHttpToStandardRequest(req, res);
+    const result = await this.standardHandler.handle(standardRequest, ...rest);
+    if (!result.matched) {
       return { matched: false };
     }
-    await options?.beforeSend?.(result.response, castedOptions.context);
-    await sendResponse(res, result.response);
+    await nodeHttpResponseSendStandardResponse(res, result.response);
     return { matched: true };
   }
 };
-
-// src/adapters/node/openapi-handler-server.ts
-import { TrieRouter } from "hono/router/trie-router";
-var OpenAPIServerHandler = class extends OpenAPIHandler2 {
-  constructor(router, options) {
-    super(new TrieRouter(), router, options);
-  }
-};
-
-// src/adapters/node/openapi-handler-serverless.ts
-import { LinearRouter } from "hono/router/linear-router";
-var OpenAPIServerlessHandler = class extends OpenAPIHandler2 {
-  constructor(router, options) {
-    super(new LinearRouter(), router, options);
-  }
-};
 export {
-  OpenAPIHandler2 as OpenAPIHandler,
-  OpenAPIServerHandler,
-  OpenAPIServerlessHandler
+  OpenAPIHandler
 };
 //# sourceMappingURL=node.js.map

package/dist/src/adapters/fetch/index.d.ts

@@ -1,10 +1,2 @@
-export * from './bracket-notation';
-export * from './input-structure-compact';
-export * from './input-structure-detailed';
 export * from './openapi-handler';
-export * from './openapi-handler-server';
-export * from './openapi-handler-serverless';
-export * from './openapi-payload-codec';
-export * from './openapi-procedure-matcher';
-export * from './schema-coercer';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/adapters/fetch/openapi-handler.d.ts

@@ -1,32 +1,10 @@
 import type { Context, Router } from '@orpc/server';
-import type { FetchHandler, FetchHandleRest, FetchHandleResult } from '@orpc/server/fetch';
-import type { PublicInputStructureCompact } from './input-structure-compact';
-import { type Hooks } from '@orpc/shared';
-import { type PublicJSONSerializer } from '../../json-serializer';
-import { type PublicInputStructureDetailed } from './input-structure-detailed';
-import { type PublicOpenAPIPayloadCodec } from './openapi-payload-codec';
-import { type Hono, type PublicOpenAPIProcedureMatcher } from './openapi-procedure-matcher';
-import { type SchemaCoercer } from './schema-coercer';
-export type OpenAPIHandlerOptions<T extends Context> = Hooks<Request, FetchHandleResult, T, any> & {
-    jsonSerializer?: PublicJSONSerializer;
-    procedureMatcher?: PublicOpenAPIProcedureMatcher;
-    payloadCodec?: PublicOpenAPIPayloadCodec;
-    inputBuilderSimple?: PublicInputStructureCompact;
-    inputBuilderFull?: PublicInputStructureDetailed;
-    schemaCoercers?: SchemaCoercer[];
-};
+import type { FetchHandler, FetchHandleResult } from '@orpc/server/fetch';
+import type { StandardHandleRest } from '@orpc/server/standard';
+import type { OpenAPIHandlerOptions } from '../standard';
 export declare class OpenAPIHandler<T extends Context> implements FetchHandler<T> {
-    private readonly options?;
-    private readonly procedureMatcher;
-    private readonly payloadCodec;
-    private readonly inputStructureCompact;
-    private readonly inputStructureDetailed;
-    private readonly compositeSchemaCoercer;
-    constructor(hono: Hono, router: Router<T, any>, options?: NoInfer<OpenAPIHandlerOptions<T>> | undefined);
-    handle(request: Request, ...[options]: FetchHandleRest<T>): Promise<FetchHandleResult>;
-    private decodeInput;
-    private encodeOutput;
-    private assertDetailedOutput;
-    private convertToORPCError;
+    private readonly standardHandler;
+    constructor(router: Router<T, any>, options?: NoInfer<OpenAPIHandlerOptions<T>>);
+    handle(request: Request, ...rest: StandardHandleRest<T>): Promise<FetchHandleResult>;
 }
 //# sourceMappingURL=openapi-handler.d.ts.map

package/dist/src/adapters/node/index.d.ts

@@ -1,5 +1,2 @@
 export * from './openapi-handler';
-export * from './openapi-handler-server';
-export * from './openapi-handler-serverless';
-export * from './types';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/adapters/node/openapi-handler.d.ts

@@ -1,11 +1,10 @@
 import type { Context, Router } from '@orpc/server';
-import type { IncomingMessage, ServerResponse } from 'node:http';
-import type { OpenAPIHandlerOptions } from '../fetch/openapi-handler';
-import type { Hono } from '../fetch/openapi-procedure-matcher';
-import { type RequestHandler, type RequestHandleRest, type RequestHandleResult } from '@orpc/server/node';
-export declare class OpenAPIHandler<T extends Context> implements RequestHandler<T> {
-    private readonly openapiFetchHandler;
-    constructor(hono: Hono, router: Router<T, any>, options?: NoInfer<OpenAPIHandlerOptions<T>>);
-    handle(req: IncomingMessage, res: ServerResponse, ...[options]: RequestHandleRest<T>): Promise<RequestHandleResult>;
+import type { NodeHttpHandler, NodeHttpHandleResult, NodeHttpRequest, NodeHttpResponse } from '@orpc/server/node';
+import type { StandardHandleRest } from '@orpc/server/standard';
+import type { OpenAPIHandlerOptions } from '../standard';
+export declare class OpenAPIHandler<T extends Context> implements NodeHttpHandler<T> {
+    private readonly standardHandler;
+    constructor(router: Router<T, any>, options?: NoInfer<OpenAPIHandlerOptions<T>>);
+    handle(req: NodeHttpRequest, res: NodeHttpResponse, ...rest: StandardHandleRest<T>): Promise<NodeHttpHandleResult>;
 }
 //# sourceMappingURL=openapi-handler.d.ts.map

package/dist/src/adapters/standard/index.d.ts

@@ -0,0 +1,7 @@
+export * as BracketNotation from './bracket-notation';
+export * from './openapi-codec';
+export * from './openapi-handler';
+export * from './openapi-matcher';
+export * from './openapi-serializer';
+export * from './schema-coercer';
+//# sourceMappingURL=index.d.ts.map

package/dist/src/adapters/standard/openapi-codec.d.ts

@@ -0,0 +1,18 @@
+import type { AnyProcedure } from '@orpc/server';
+import type { StandardCodec, StandardParams, StandardRequest, StandardResponse } from '@orpc/server/standard';
+import { type ORPCError } from '@orpc/contract';
+import { OpenAPISerializer } from './openapi-serializer';
+import { type SchemaCoercer } from './schema-coercer';
+export interface OpenAPICodecOptions {
+    serializer?: OpenAPISerializer;
+    schemaCoercers?: SchemaCoercer[];
+}
+export declare class OpenAPICodec implements StandardCodec {
+    private readonly serializer;
+    private readonly compositeSchemaCoercer;
+    constructor(options?: OpenAPICodecOptions);
+    decode(request: StandardRequest, params: StandardParams | undefined, procedure: AnyProcedure): Promise<unknown>;
+    encode(output: unknown, procedure: AnyProcedure): StandardResponse;
+    encodeError(error: ORPCError<any, any>): StandardResponse;
+}
+//# sourceMappingURL=openapi-codec.d.ts.map

package/dist/src/adapters/standard/openapi-handler.d.ts

@@ -0,0 +1,7 @@
+import type { Context } from '@orpc/server';
+import type { RPCHandlerOptions } from '@orpc/server/standard';
+import type { OpenAPICodecOptions } from './openapi-codec';
+import type { OpenAPIMatcherOptions } from './openapi-matcher';
+export interface OpenAPIHandlerOptions<T extends Context> extends RPCHandlerOptions<T>, OpenAPIMatcherOptions, OpenAPICodecOptions {
+}
+//# sourceMappingURL=openapi-handler.d.ts.map

package/dist/src/adapters/standard/openapi-matcher.d.ts

@@ -0,0 +1,20 @@
+import type { AnyRouter } from '@orpc/server';
+import type { StandardMatcher, StandardMatchResult } from '@orpc/server/standard';
+import { type HTTPPath } from '@orpc/contract';
+export interface OpenAPIMatcherOptions {
+    /**
+     * Ignore procedure that does not have a method defined in the contract.
+     *
+     * @default false
+     */
+    ignoreUndefinedMethod?: boolean;
+}
+export declare class OpenAPIMatcher implements StandardMatcher {
+    private readonly tree;
+    private readonly ignoreUndefinedMethod;
+    constructor(options?: OpenAPIMatcherOptions);
+    private pendingRouters;
+    init(router: AnyRouter, path?: string[]): void;
+    match(method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
+}
+//# sourceMappingURL=openapi-matcher.d.ts.map

package/dist/src/adapters/standard/openapi-serializer.d.ts

@@ -0,0 +1,11 @@
+import type { PublicJSONSerializer } from '../../json-serializer';
+export interface OpenAPISerializerOptions {
+    jsonSerializer?: PublicJSONSerializer;
+}
+export declare class OpenAPISerializer {
+    private readonly jsonSerializer;
+    constructor(options?: OpenAPISerializerOptions);
+    serialize(data: unknown): unknown;
+    deserialize(serialized: unknown): unknown;
+}
+//# sourceMappingURL=openapi-serializer.d.ts.map

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

@@ -1,9 +1,9 @@
-import type { AnyRouter } 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 AnyRouter } from '@orpc/server';
 import { type PublicJSONSerializer } from './json-serializer';
 import { type OpenAPI } from './openapi';
 import { type PublicOpenAPIContentBuilder } from './openapi-content-builder';

package/dist/src/utils.d.ts

@@ -1,18 +1,3 @@
-import type { AnyContractProcedure, AnyContractRouter, HTTPPath } from '@orpc/contract';
-import type { AnyProcedure, AnyRouter, Lazy } from '@orpc/server';
-export interface EachLeafOptions {
-    router: AnyContractRouter | AnyRouter;
-    path: string[];
-}
-export interface EachLeafCallbackOptions {
-    contract: AnyContractProcedure;
-    path: string[];
-}
-export interface EachContractLeafResultItem {
-    router: Lazy<AnyProcedure> | Lazy<Record<string, AnyRouter> | AnyProcedure>;
-    path: string[];
-}
-export declare function forEachContractProcedure(options: EachLeafOptions, callback: (options: EachLeafCallbackOptions) => void, result?: EachContractLeafResultItem[], isCurrentRouterContract?: boolean): EachContractLeafResultItem[];
-export declare function forEachAllContractProcedure(router: AnyContractRouter | AnyRouter, callback: (options: EachLeafCallbackOptions) => void): Promise<void>;
+import type { HTTPPath } from '@orpc/contract';
 export declare function standardizeHTTPPath(path: HTTPPath): HTTPPath;
 //# sourceMappingURL=utils.d.ts.map

package/dist/standard.js

@@ -0,0 +1,16 @@
+import {
+  CompositeSchemaCoercer,
+  OpenAPICodec,
+  OpenAPIMatcher,
+  OpenAPISerializer,
+  bracket_notation_exports
+} from "./chunk-M5HOHBLW.js";
+import "./chunk-BHJYKXQL.js";
+export {
+  bracket_notation_exports as BracketNotation,
+  CompositeSchemaCoercer,
+  OpenAPICodec,
+  OpenAPIMatcher,
+  OpenAPISerializer
+};
+//# sourceMappingURL=standard.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/openapi",
   "type": "module",
-  "version": "0.34.0",
+  "version": "0.35.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -19,6 +19,11 @@
       "import": "./dist/index.js",
       "default": "./dist/index.js"
     },
+    "./standard": {
+      "types": "./dist/src/adapters/standard/index.d.ts",
+      "import": "./dist/standard.js",
+      "default": "./dist/standard.js"
+    },
     "./fetch": {
       "types": "./dist/src/adapters/fetch/index.d.ts",
       "import": "./dist/fetch.js",
@@ -54,13 +59,13 @@
     "content-disposition": "^0.5.4",
     "escape-string-regexp": "^5.0.0",
     "fast-content-type-parse": "^2.0.0",
-    "hono": "^4.6.12",
     "json-schema-typed": "^8.0.1",
     "openapi3-ts": "^4.4.0",
+    "rou3": "^0.5.1",
     "wildcard-match": "^5.1.3",
-    "@orpc/contract": "0.34.0",
-    "@orpc/server": "0.34.0",
-    "@orpc/shared": "0.34.0"
+    "@orpc/contract": "0.35.0",
+    "@orpc/shared": "0.35.0",
+    "@orpc/server": "0.35.0"
   },
   "devDependencies": {
     "@readme/openapi-parser": "^2.6.0",

package/dist/chunk-Q2LSK6YZ.js

@@ -1,102 +0,0 @@
-// src/json-serializer.ts
-import { isPlainObject } from "@orpc/shared";
-var JSONSerializer = class {
-  serialize(payload) {
-    if (payload instanceof Set)
-      return this.serialize([...payload]);
-    if (payload instanceof Map)
-      return this.serialize([...payload.entries()]);
-    if (Array.isArray(payload)) {
-      return payload.map((v) => v === void 0 ? "undefined" : this.serialize(v));
-    }
-    if (Number.isNaN(payload))
-      return "NaN";
-    if (typeof payload === "bigint")
-      return payload.toString();
-    if (payload instanceof Date && Number.isNaN(payload.getTime())) {
-      return "Invalid Date";
-    }
-    if (payload instanceof RegExp)
-      return payload.toString();
-    if (payload instanceof URL)
-      return payload.toString();
-    if (!isPlainObject(payload))
-      return payload;
-    return Object.keys(payload).reduce(
-      (carry, key) => {
-        const val = payload[key];
-        carry[key] = this.serialize(val);
-        return carry;
-      },
-      {}
-    );
-  }
-};
-
-// src/utils.ts
-import { isContractProcedure } from "@orpc/contract";
-import { getRouterContract, isLazy, unlazy } from "@orpc/server";
-function forEachContractProcedure(options, callback, result = [], isCurrentRouterContract = false) {
-  const hiddenContract = getRouterContract(options.router);
-  if (!isCurrentRouterContract && hiddenContract) {
-    return forEachContractProcedure(
-      {
-        path: options.path,
-        router: hiddenContract
-      },
-      callback,
-      result,
-      true
-    );
-  }
-  if (isLazy(options.router)) {
-    result.push({
-      router: options.router,
-      path: options.path
-    });
-  } else if (isContractProcedure(options.router)) {
-    callback({
-      contract: options.router,
-      path: options.path
-    });
-  } else {
-    for (const key in options.router) {
-      forEachContractProcedure(
-        {
-          router: options.router[key],
-          path: [...options.path, key]
-        },
-        callback,
-        result
-      );
-    }
-  }
-  return result;
-}
-async function forEachAllContractProcedure(router, callback) {
-  const pending = [{
-    path: [],
-    router
-  }];
-  for (const item of pending) {
-    const lazies = forEachContractProcedure(item, callback);
-    for (const lazy of lazies) {
-      const { default: router2 } = await unlazy(lazy.router);
-      pending.push({
-        path: lazy.path,
-        router: router2
-      });
-    }
-  }
-}
-function standardizeHTTPPath(path) {
-  return `/${path.replace(/\/{2,}/g, "/").replace(/^\/|\/$/g, "")}`;
-}
-
-export {
-  JSONSerializer,
-  forEachContractProcedure,
-  forEachAllContractProcedure,
-  standardizeHTTPPath
-};
-//# sourceMappingURL=chunk-Q2LSK6YZ.js.map