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

package/dist/shared/openapi.CGZ7t-VN.mjs

@@ -0,0 +1,17 @@
+import { StandardOpenAPIJsonSerializer, StandardBracketNotationSerializer, StandardOpenAPISerializer } from '@orpc/openapi-client/standard';
+import { FetchHandler } from '@orpc/server/fetch';
+import { StandardHandler } from '@orpc/server/standard';
+import { a as StandardOpenAPIMatcher, S as StandardOpenAPICodec } from './openapi.sdeu0I7N.mjs';
+
+class OpenAPIHandler extends FetchHandler {
+  constructor(router, options = {}) {
+    const jsonSerializer = new StandardOpenAPIJsonSerializer(options);
+    const bracketNotationSerializer = new StandardBracketNotationSerializer();
+    const serializer = new StandardOpenAPISerializer(jsonSerializer, bracketNotationSerializer);
+    const matcher = new StandardOpenAPIMatcher();
+    const codec = new StandardOpenAPICodec(serializer);
+    super(new StandardHandler(router, matcher, codec, options), options);
+  }
+}
+
+export { OpenAPIHandler as O };

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

@@ -0,0 +1,8 @@
+import { StandardOpenAPIJsonSerializerOptions } from '@orpc/openapi-client/standard';
+import { Context } from '@orpc/server';
+import { StandardHandlerOptions } from '@orpc/server/standard';
+
+interface StandardOpenAPIHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardOpenAPIJsonSerializerOptions {
+}
+
+export type { StandardOpenAPIHandlerOptions as S };

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

@@ -0,0 +1,8 @@
+import { StandardOpenAPIJsonSerializerOptions } from '@orpc/openapi-client/standard';
+import { Context } from '@orpc/server';
+import { StandardHandlerOptions } from '@orpc/server/standard';
+
+interface StandardOpenAPIHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardOpenAPIJsonSerializerOptions {
+}
+
+export type { StandardOpenAPIHandlerOptions as S };

package/dist/shared/{openapi.CDsfPHgw.mjs → openapi.sdeu0I7N.mjs}

@@ -1,12 +1,12 @@
 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 { toHttpPath } from '@orpc/client/standard';
+import { traverseContractProcedures, isProcedure, getLazyMeta, unlazy, getRouter, createContractedProcedure } from '@orpc/server';
 import { createRouter, addRoute, findRoute } from 'rou3';
-import { s as standardizeHTTPPath } from './openapi.BHG_gu5Z.mjs';
+import { standardizeHTTPPath } from '@orpc/openapi-client/standard';
 
-class OpenAPICodec {
-  constructor(serializer = new OpenAPISerializer()) {
+class StandardOpenAPICodec {
+  constructor(serializer) {
     this.serializer = serializer;
   }
   async decode(request, params, procedure) {
@@ -66,21 +66,25 @@ class OpenAPICodec {
     return {
       status: error.status,
       headers: {},
-      body: this.serializer.serialize(error.toJSON())
+      body: this.serializer.serialize(error.toJSON(), { outputFormat: "plain" })
     };
   }
 }
 
-class OpenAPIMatcher {
+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)]));
+}
+
+class StandardOpenAPIMatcher {
   tree = createRouter();
   pendingRouters = [];
   init(router, path = []) {
-    const laziedOptions = eachContractProcedure({
-      router,
-      path
-    }, ({ path: path2, contract }) => {
+    const laziedOptions = traverseContractProcedures({ 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);
+      const httpPath = toRou3Pattern(contract["~orpc"].route.path ?? toHttpPath(path2));
       if (isProcedure(contract)) {
         addRoute(this.tree, method, httpPath, {
           path: path2,
@@ -100,8 +104,8 @@ class OpenAPIMatcher {
     });
     this.pendingRouters.push(...laziedOptions.map((option) => ({
       ...option,
-      httpPathPrefix: convertPathToHttpPath(option.path),
-      laziedPrefix: getLazyRouterPrefix(option.lazied)
+      httpPathPrefix: toHttpPath(option.path),
+      laziedPrefix: getLazyMeta(option.router).prefix
     })));
   }
   async match(method, pathname) {
@@ -109,7 +113,7 @@ class OpenAPIMatcher {
       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);
+          const { default: router } = await unlazy(pendingRouter.router);
           this.init(router, pendingRouter.path);
         } else {
           newPendingRouters.push(pendingRouter);
@@ -122,14 +126,14 @@ class OpenAPIMatcher {
       return void 0;
     }
     if (!match.data.procedure) {
-      const { default: maybeProcedure } = await unlazy(getRouterChild(match.data.router, ...match.data.path));
+      const { default: maybeProcedure } = await unlazy(getRouter(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)}.
+          [Contract-First] Missing or invalid implementation for procedure at path: ${toHttpPath(match.data.path)}.
           Ensure that the procedure is correctly defined and matches the expected contract.
         `);
       }
-      match.data.procedure = createContractedProcedure(match.data.contract, maybeProcedure);
+      match.data.procedure = createContractedProcedure(maybeProcedure, match.data.contract);
     }
     return {
       path: match.data.path,
@@ -138,11 +142,5 @@ class OpenAPIMatcher {
     };
   }
 }
-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 };
+export { StandardOpenAPICodec as S, StandardOpenAPIMatcher as a, decodeParams as d, toRou3Pattern as t };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/openapi",
   "type": "module",
-  "version": "0.0.0-next.cd121e3",
+  "version": "0.0.0-next.ce2f84d",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -50,19 +50,17 @@
   ],
   "dependencies": {
     "json-schema-typed": "^8.0.1",
-    "openapi3-ts": "^4.4.0",
+    "openapi-types": "^12.1.3",
     "rou3": "^0.5.1",
-    "@orpc/client": "0.0.0-next.cd121e3",
-    "@orpc/contract": "0.0.0-next.cd121e3",
-    "@orpc/openapi-client": "0.0.0-next.cd121e3",
-    "@orpc/server": "0.0.0-next.cd121e3",
-    "@orpc/standard-server-fetch": "0.0.0-next.cd121e3",
-    "@orpc/shared": "0.0.0-next.cd121e3",
-    "@orpc/standard-server-node": "0.0.0-next.cd121e3",
-    "@orpc/standard-server": "0.0.0-next.cd121e3"
+    "@orpc/client": "0.0.0-next.ce2f84d",
+    "@orpc/contract": "0.0.0-next.ce2f84d",
+    "@orpc/openapi-client": "0.0.0-next.ce2f84d",
+    "@orpc/server": "0.0.0-next.ce2f84d",
+    "@orpc/shared": "0.0.0-next.ce2f84d",
+    "@orpc/standard-server": "0.0.0-next.ce2f84d"
   },
   "devDependencies": {
-    "zod": "^3.24.1"
+    "zod": "^3.24.2"
   },
   "scripts": {
     "build": "unbuild",

package/dist/shared/openapi.BHG_gu5Z.mjs

@@ -1,8 +0,0 @@
-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.D0VMNR6V.mjs

@@ -1,25 +0,0 @@
-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

@@ -1,7 +0,0 @@
-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

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