@orpc/openapi 0.0.0-next.fe39bf3 → 0.0.0-next.ff41b3a

package/dist/{chunk-LPBZEW4B.js → shared/openapi.p5tsmBXx.mjs}

@@ -1,15 +1,14 @@
-import {
-  standardizeHTTPPath
-} from "./chunk-XGHV4TH3.js";
+import { standardizeHTTPPath, StandardOpenAPIJsonSerializer, StandardBracketNotationSerializer, StandardOpenAPISerializer } from '@orpc/openapi-client/standard';
+import { StandardHandler } from '@orpc/server/standard';
+import { fallbackContractConfig } from '@orpc/contract';
+import { isObject } from '@orpc/shared';
+import { toHttpPath } from '@orpc/client/standard';
+import { traverseContractProcedures, isProcedure, getLazyMeta, unlazy, getRouter, createContractedProcedure } from '@orpc/server';
+import { createRouter, addRoute, findRoute } from 'rou3';
 
-// src/adapters/standard/openapi-codec.ts
-import { OpenAPISerializer } from "@orpc/client/openapi";
-import { fallbackContractConfig } from "@orpc/contract";
-import { isObject } from "@orpc/shared";
-var OpenAPICodec = class {
-  serializer;
-  constructor(options) {
-    this.serializer = options?.serializer ?? new OpenAPISerializer();
+class StandardOpenAPICodec {
+  constructor(serializer) {
+    this.serializer = serializer;
   }
   async decode(request, params, procedure) {
     const inputStructure = fallbackContractConfig("defaultInputStructure", procedure["~orpc"].route.inputStructure);
@@ -68,32 +67,25 @@ var OpenAPICodec = class {
     return {
       status: error.status,
       headers: {},
-      body: this.serializer.serialize(error.toJSON())
+      body: this.serializer.serialize(error.toJSON(), { outputFormat: "plain" })
     };
   }
-};
+}
+
+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)]));
+}
 
-// src/adapters/standard/openapi-matcher.ts
-import { fallbackContractConfig as fallbackContractConfig2 } from "@orpc/contract";
-import { convertPathToHttpPath, createContractedProcedure, eachContractProcedure, getLazyRouterPrefix, getRouterChild, isProcedure, unlazy } from "@orpc/server";
-import { addRoute, createRouter, findRoute } from "rou3";
-var OpenAPIMatcher = class {
+class StandardOpenAPIMatcher {
   tree = createRouter();
-  ignoreUndefinedMethod;
-  constructor(options) {
-    this.ignoreUndefinedMethod = options?.ignoreUndefinedMethod ?? false;
-  }
   pendingRouters = [];
   init(router, path = []) {
-    const laziedOptions = eachContractProcedure({
-      router,
-      path
-    }, ({ path: path2, contract }) => {
-      if (!contract["~orpc"].route.method && this.ignoreUndefinedMethod) {
-        return;
-      }
-      const method = fallbackContractConfig2("defaultMethod", contract["~orpc"].route.method);
-      const httpPath = contract["~orpc"].route.path ? toRou3Pattern(contract["~orpc"].route.path) : convertPathToHttpPath(path2);
+    const laziedOptions = traverseContractProcedures({ router, path }, ({ path: path2, contract }) => {
+      const method = fallbackContractConfig("defaultMethod", contract["~orpc"].route.method);
+      const httpPath = toRou3Pattern(contract["~orpc"].route.path ?? toHttpPath(path2));
       if (isProcedure(contract)) {
         addRoute(this.tree, method, httpPath, {
           path: path2,
@@ -113,8 +105,8 @@ var OpenAPIMatcher = class {
     });
     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) {
@@ -122,7 +114,7 @@ var OpenAPIMatcher = class {
       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);
@@ -135,14 +127,14 @@ var OpenAPIMatcher = class {
       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,
@@ -150,16 +142,17 @@ var OpenAPIMatcher = class {
       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)]));
+
+class StandardOpenAPIHandler extends StandardHandler {
+  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(router, matcher, codec, options);
+  }
 }
 
-export {
-  OpenAPICodec,
-  OpenAPIMatcher
-};
-//# sourceMappingURL=chunk-LPBZEW4B.js.map
+export { StandardOpenAPICodec as S, StandardOpenAPIHandler as a, StandardOpenAPIMatcher as b, decodeParams as d, toRou3Pattern as t };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/openapi",
   "type": "module",
-  "version": "0.0.0-next.fe39bf3",
+  "version": "0.0.0-next.ff41b3a",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -15,61 +15,45 @@
   ],
   "exports": {
     ".": {
-      "types": "./dist/src/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.js"
+      "types": "./dist/index.d.mts",
+      "import": "./dist/index.mjs",
+      "default": "./dist/index.mjs"
     },
     "./standard": {
-      "types": "./dist/src/adapters/standard/index.d.ts",
-      "import": "./dist/standard.js",
-      "default": "./dist/standard.js"
+      "types": "./dist/adapters/standard/index.d.mts",
+      "import": "./dist/adapters/standard/index.mjs",
+      "default": "./dist/adapters/standard/index.mjs"
     },
     "./fetch": {
-      "types": "./dist/src/adapters/fetch/index.d.ts",
-      "import": "./dist/fetch.js",
-      "default": "./dist/fetch.js"
-    },
-    "./hono": {
-      "types": "./dist/src/adapters/hono/index.d.ts",
-      "import": "./dist/hono.js",
-      "default": "./dist/hono.js"
-    },
-    "./next": {
-      "types": "./dist/src/adapters/next/index.d.ts",
-      "import": "./dist/next.js",
-      "default": "./dist/next.js"
+      "types": "./dist/adapters/fetch/index.d.mts",
+      "import": "./dist/adapters/fetch/index.mjs",
+      "default": "./dist/adapters/fetch/index.mjs"
     },
     "./node": {
-      "types": "./dist/src/adapters/node/index.d.ts",
-      "import": "./dist/node.js",
-      "default": "./dist/node.js"
-    },
-    "./🔒/*": {
-      "types": "./dist/src/*.d.ts"
+      "types": "./dist/adapters/node/index.d.mts",
+      "import": "./dist/adapters/node/index.mjs",
+      "default": "./dist/adapters/node/index.mjs"
     }
   },
   "files": [
-    "!**/*.map",
-    "!**/*.tsbuildinfo",
     "dist"
   ],
   "dependencies": {
-    "@orpc/server-standard": "^0.4.0",
-    "@orpc/server-standard-fetch": "^0.4.0",
-    "@orpc/server-standard-node": "^0.4.0",
     "json-schema-typed": "^8.0.1",
-    "openapi3-ts": "^4.4.0",
-    "rou3": "^0.5.1",
-    "@orpc/client": "0.0.0-next.fe39bf3",
-    "@orpc/contract": "0.0.0-next.fe39bf3",
-    "@orpc/shared": "0.0.0-next.fe39bf3",
-    "@orpc/server": "0.0.0-next.fe39bf3"
+    "openapi-types": "^12.1.3",
+    "rou3": "^0.6.0",
+    "@orpc/client": "0.0.0-next.ff41b3a",
+    "@orpc/contract": "0.0.0-next.ff41b3a",
+    "@orpc/server": "0.0.0-next.ff41b3a",
+    "@orpc/openapi-client": "0.0.0-next.ff41b3a",
+    "@orpc/shared": "0.0.0-next.ff41b3a",
+    "@orpc/standard-server": "0.0.0-next.ff41b3a"
   },
   "devDependencies": {
-    "zod": "^3.24.1"
+    "zod": "^3.24.2"
   },
   "scripts": {
-    "build": "tsup --onSuccess='tsc -b --noCheck'",
+    "build": "unbuild",
     "build:watch": "pnpm run build --watch",
     "type:check": "tsc -b"
   }

package/dist/chunk-UU2TTVB2.js

@@ -1,32 +0,0 @@
-import {
-  OpenAPICodec,
-  OpenAPIMatcher
-} from "./chunk-LPBZEW4B.js";
-
-// src/adapters/fetch/openapi-handler.ts
-import { toFetchResponse, toStandardRequest } from "@orpc/server-standard-fetch";
-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(request, ...rest) {
-    const standardRequest = toStandardRequest(request);
-    const result = await this.standardHandler.handle(standardRequest, ...rest);
-    if (!result.matched) {
-      return result;
-    }
-    return {
-      matched: true,
-      response: toFetchResponse(result.response)
-    };
-  }
-};
-
-export {
-  OpenAPIHandler
-};
-//# sourceMappingURL=chunk-UU2TTVB2.js.map

package/dist/chunk-XGHV4TH3.js

@@ -1,13 +0,0 @@
-// src/utils.ts
-function standardizeHTTPPath(path) {
-  return `/${path.replace(/\/{2,}/g, "/").replace(/^\/|\/$/g, "")}`;
-}
-function toOpenAPI31RoutePattern(path) {
-  return standardizeHTTPPath(path).replace(/\{\+([^}]+)\}/g, "{$1}");
-}
-
-export {
-  standardizeHTTPPath,
-  toOpenAPI31RoutePattern
-};
-//# sourceMappingURL=chunk-XGHV4TH3.js.map

package/dist/fetch.js

@@ -1,9 +0,0 @@
-import {
-  OpenAPIHandler
-} from "./chunk-UU2TTVB2.js";
-import "./chunk-LPBZEW4B.js";
-import "./chunk-XGHV4TH3.js";
-export {
-  OpenAPIHandler
-};
-//# sourceMappingURL=fetch.js.map

package/dist/hono.js

@@ -1,9 +0,0 @@
-import {
-  OpenAPIHandler
-} from "./chunk-UU2TTVB2.js";
-import "./chunk-LPBZEW4B.js";
-import "./chunk-XGHV4TH3.js";
-export {
-  OpenAPIHandler
-};
-//# sourceMappingURL=hono.js.map