@orpc/server 0.0.0-next.9b9ade5 → 0.0.0-next.9d7bfaa

package/dist/shared/{server.CSZRzcSW.mjs → server.qf03T-Xn.mjs}

@@ -1,51 +1,68 @@
+import { toHttpPath, StandardRPCJsonSerializer, StandardRPCSerializer } from '@orpc/client/standard';
+import { toArray, intercept, parseEmptyableJSON } from '@orpc/shared';
+import '@orpc/standard-server/batch';
 import { ORPCError, toORPCError } from '@orpc/client';
-import { intercept, trim, parseEmptyableJSON } from '@orpc/shared';
-import { C as CompositePlugin } from './server.Q6ZmnTgO.mjs';
-import { c as createProcedureClient, t as traverseContractProcedures, a as toHttpPath, i as isProcedure, u as unlazy, g as getRouter, b as createContractedProcedure } from './server.CMrS28Go.mjs';
+import { S as StrictGetMethodPlugin } from './server.BW-nUGgA.mjs';
+import { c as createProcedureClient, t as traverseContractProcedures, i as isProcedure, u as unlazy, g as getRouter, a as createContractedProcedure } from './server.DG7Tamti.mjs';
+
+class CompositeStandardHandlerPlugin {
+  plugins;
+  constructor(plugins = []) {
+    this.plugins = [...plugins].sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
+  }
+  init(options) {
+    for (const plugin of this.plugins) {
+      plugin.init?.(options);
+    }
+  }
+}
 
 class StandardHandler {
   constructor(router, matcher, codec, options) {
     this.matcher = matcher;
     this.codec = codec;
-    this.options = options;
-    this.plugin = new CompositePlugin(options.plugins);
-    this.plugin.init(this.options);
+    const plugins = new CompositeStandardHandlerPlugin(options.plugins);
+    plugins.init(options);
+    this.interceptors = toArray(options.interceptors);
+    this.clientInterceptors = toArray(options.clientInterceptors);
+    this.rootInterceptors = toArray(options.rootInterceptors);
     this.matcher.init(router);
   }
-  plugin;
-  handle(request, ...[options]) {
+  interceptors;
+  clientInterceptors;
+  rootInterceptors;
+  async handle(request, options) {
+    const prefix = options.prefix?.replace(/\/$/, "") || void 0;
+    if (prefix && !request.url.pathname.startsWith(`${prefix}/`) && request.url.pathname !== prefix) {
+      return { matched: false, response: void 0 };
+    }
     return intercept(
-      this.options.rootInterceptors ?? [],
-      {
-        request,
-        ...options,
-        context: options?.context ?? {}
-        // context is optional only when all fields are optional so we can safely force it to have a context
-      },
+      this.rootInterceptors,
+      { ...options, request, prefix },
       async (interceptorOptions) => {
         let isDecoding = false;
         try {
           return await intercept(
-            this.options.interceptors ?? [],
+            this.interceptors,
             interceptorOptions,
-            async (interceptorOptions2) => {
-              const method = interceptorOptions2.request.method;
-              const url = interceptorOptions2.request.url;
-              const pathname = `/${trim(url.pathname.replace(interceptorOptions2.prefix ?? "", ""), "/")}`;
-              const match = await this.matcher.match(method, pathname);
+            async ({ request: request2, context, prefix: prefix2 }) => {
+              const method = request2.method;
+              const url = request2.url;
+              const pathname = prefix2 ? url.pathname.replace(prefix2, "") : url.pathname;
+              const match = await this.matcher.match(method, `/${pathname.replace(/^\/|\/$/g, "")}`);
               if (!match) {
                 return { matched: false, response: void 0 };
               }
               const client = createProcedureClient(match.procedure, {
-                context: interceptorOptions2.context,
+                context,
                 path: match.path,
-                interceptors: this.options.clientInterceptors
+                interceptors: this.clientInterceptors
               });
               isDecoding = true;
-              const input = await this.codec.decode(request, match.params, match.procedure);
+              const input = await this.codec.decode(request2, match.params, match.procedure);
               isDecoding = false;
-              const lastEventId = Array.isArray(request.headers["last-event-id"]) ? request.headers["last-event-id"].at(-1) : request.headers["last-event-id"];
-              const output = await client(input, { signal: request.signal, lastEventId });
+              const lastEventId = Array.isArray(request2.headers["last-event-id"]) ? request2.headers["last-event-id"].at(-1) : request2.headers["last-event-id"];
+              const output = await client(input, { signal: request2.signal, lastEventId });
               const response = this.codec.encode(output, match.procedure);
               return {
                 matched: true,
@@ -54,7 +71,7 @@ class StandardHandler {
             }
           );
         } catch (e) {
-          const error = isDecoding ? new ORPCError("BAD_REQUEST", {
+          const error = isDecoding && !(e instanceof ORPCError) ? new ORPCError("BAD_REQUEST", {
             message: `Malformed request. Ensure the request body is properly formatted and the 'Content-Type' header is set correctly.`,
             cause: e
           }) : toORPCError(e);
@@ -69,7 +86,7 @@ class StandardHandler {
   }
 }
 
-class RPCCodec {
+class StandardRPCCodec {
   constructor(serializer) {
     this.serializer = serializer;
   }
@@ -93,7 +110,7 @@ class RPCCodec {
   }
 }
 
-class RPCMatcher {
+class StandardRPCMatcher {
   tree = {};
   pendingRouters = [];
   init(router, path = []) {
@@ -155,4 +172,19 @@ class RPCMatcher {
   }
 }
 
-export { RPCCodec as R, StandardHandler as S, RPCMatcher as a };
+class StandardRPCHandler extends StandardHandler {
+  constructor(router, options) {
+    options.plugins ??= [];
+    const strictGetMethodPluginEnabled = options.strictGetMethodPluginEnabled ?? true;
+    if (strictGetMethodPluginEnabled) {
+      options.plugins.push(new StrictGetMethodPlugin());
+    }
+    const jsonSerializer = new StandardRPCJsonSerializer(options);
+    const serializer = new StandardRPCSerializer(jsonSerializer);
+    const matcher = new StandardRPCMatcher();
+    const codec = new StandardRPCCodec(serializer);
+    super(router, matcher, codec, options);
+  }
+}
+
+export { CompositeStandardHandlerPlugin as C, StandardHandler as S, StandardRPCCodec as a, StandardRPCHandler as b, StandardRPCMatcher as c };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.0.0-next.9b9ade5",
+  "version": "0.0.0-next.9d7bfaa",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -34,16 +34,6 @@
       "import": "./dist/adapters/fetch/index.mjs",
       "default": "./dist/adapters/fetch/index.mjs"
     },
-    "./hono": {
-      "types": "./dist/adapters/hono/index.d.mts",
-      "import": "./dist/adapters/hono/index.mjs",
-      "default": "./dist/adapters/hono/index.mjs"
-    },
-    "./next": {
-      "types": "./dist/adapters/next/index.d.mts",
-      "import": "./dist/adapters/next/index.mjs",
-      "default": "./dist/adapters/next/index.mjs"
-    },
     "./node": {
       "types": "./dist/adapters/node/index.d.mts",
       "import": "./dist/adapters/node/index.mjs",
@@ -53,20 +43,16 @@
   "files": [
     "dist"
   ],
-  "peerDependencies": {
-    "hono": ">=4.6.0",
-    "next": ">=14.0.0"
-  },
   "dependencies": {
-    "@orpc/contract": "0.0.0-next.9b9ade5",
-    "@orpc/client": "0.0.0-next.9b9ade5",
-    "@orpc/shared": "0.0.0-next.9b9ade5",
-    "@orpc/standard-server": "0.0.0-next.9b9ade5",
-    "@orpc/standard-server-fetch": "0.0.0-next.9b9ade5",
-    "@orpc/standard-server-node": "0.0.0-next.9b9ade5"
+    "@orpc/client": "0.0.0-next.9d7bfaa",
+    "@orpc/contract": "0.0.0-next.9d7bfaa",
+    "@orpc/shared": "0.0.0-next.9d7bfaa",
+    "@orpc/standard-server-fetch": "0.0.0-next.9d7bfaa",
+    "@orpc/standard-server-node": "0.0.0-next.9d7bfaa",
+    "@orpc/standard-server": "0.0.0-next.9d7bfaa"
   },
   "devDependencies": {
-    "light-my-request": "^6.5.1"
+    "supertest": "^7.1.0"
   },
   "scripts": {
     "build": "unbuild",

package/dist/adapters/hono/index.d.mts

@@ -1,19 +0,0 @@
-import { FetchHandler } from '../fetch/index.mjs';
-export { FetchHandleResult, RPCHandler } from '../fetch/index.mjs';
-import { Value, MaybeOptionalOptions } from '@orpc/shared';
-import { Context as Context$1, MiddlewareHandler } from 'hono';
-import { C as Context } from '../../shared/server.CPteJIPP.mjs';
-import { S as StandardHandleOptions } from '../../shared/server.CM3tWr3C.mjs';
-import '@orpc/standard-server-fetch';
-import '@orpc/client';
-import '@orpc/contract';
-import '@orpc/standard-server';
-
-type CreateMiddlewareOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
-    context?: Value<T, [Context$1]>;
-} : {
-    context: Value<T, [Context$1]>;
-});
-declare function createMiddleware<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<CreateMiddlewareOptions<T>>): MiddlewareHandler;
-
-export { type CreateMiddlewareOptions, FetchHandler, createMiddleware };

package/dist/adapters/hono/index.d.ts

@@ -1,19 +0,0 @@
-import { FetchHandler } from '../fetch/index.js';
-export { FetchHandleResult, RPCHandler } from '../fetch/index.js';
-import { Value, MaybeOptionalOptions } from '@orpc/shared';
-import { Context as Context$1, MiddlewareHandler } from 'hono';
-import { C as Context } from '../../shared/server.CPteJIPP.js';
-import { S as StandardHandleOptions } from '../../shared/server.DmW25ynm.js';
-import '@orpc/standard-server-fetch';
-import '@orpc/client';
-import '@orpc/contract';
-import '@orpc/standard-server';
-
-type CreateMiddlewareOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
-    context?: Value<T, [Context$1]>;
-} : {
-    context: Value<T, [Context$1]>;
-});
-declare function createMiddleware<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<CreateMiddlewareOptions<T>>): MiddlewareHandler;
-
-export { type CreateMiddlewareOptions, FetchHandler, createMiddleware };

package/dist/adapters/hono/index.mjs

@@ -1,32 +0,0 @@
-export { R as RPCHandler } from '../../shared/server.Cq3B6PoL.mjs';
-import { value } from '@orpc/shared';
-import '@orpc/client/standard';
-import '@orpc/standard-server-fetch';
-import '../../shared/server.CSZRzcSW.mjs';
-import '@orpc/client';
-import '../../shared/server.Q6ZmnTgO.mjs';
-import '../../shared/server.CMrS28Go.mjs';
-import '@orpc/contract';
-
-function createMiddleware(handler, ...[options]) {
-  return async (c, next) => {
-    const bodyProps = /* @__PURE__ */ new Set(["arrayBuffer", "blob", "formData", "json", "text"]);
-    const request = c.req.method === "GET" || c.req.method === "HEAD" ? c.req.raw : new Proxy(c.req.raw, {
-      // https://github.com/honojs/middleware/blob/main/packages/trpc-server/src/index.ts#L39
-      get(target, prop) {
-        if (bodyProps.has(prop)) {
-          return () => c.req[prop]();
-        }
-        return Reflect.get(target, prop, target);
-      }
-    });
-    const context = await value(options?.context ?? {}, c);
-    const { matched, response } = await handler.handle(request, { ...options, context });
-    if (matched) {
-      return c.newResponse(response.body, response);
-    }
-    await next();
-  };
-}
-
-export { createMiddleware };

package/dist/adapters/next/index.d.mts

@@ -1,26 +0,0 @@
-import { FetchHandler } from '../fetch/index.mjs';
-export { FetchHandleResult, RPCHandler } from '../fetch/index.mjs';
-import { Value, MaybeOptionalOptions } from '@orpc/shared';
-import { NextRequest } from 'next/server';
-import { C as Context } from '../../shared/server.CPteJIPP.mjs';
-import { S as StandardHandleOptions } from '../../shared/server.CM3tWr3C.mjs';
-import '@orpc/standard-server-fetch';
-import '@orpc/client';
-import '@orpc/contract';
-import '@orpc/standard-server';
-
-type ServeOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
-    context?: Value<T, [NextRequest]>;
-} : {
-    context: Value<T, [NextRequest]>;
-});
-interface ServeResult {
-    GET(req: NextRequest): Promise<Response>;
-    POST(req: NextRequest): Promise<Response>;
-    PUT(req: NextRequest): Promise<Response>;
-    PATCH(req: NextRequest): Promise<Response>;
-    DELETE(req: NextRequest): Promise<Response>;
-}
-declare function serve<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<ServeOptions<T>>): ServeResult;
-
-export { FetchHandler, type ServeOptions, type ServeResult, serve };

package/dist/adapters/next/index.d.ts

@@ -1,26 +0,0 @@
-import { FetchHandler } from '../fetch/index.js';
-export { FetchHandleResult, RPCHandler } from '../fetch/index.js';
-import { Value, MaybeOptionalOptions } from '@orpc/shared';
-import { NextRequest } from 'next/server';
-import { C as Context } from '../../shared/server.CPteJIPP.js';
-import { S as StandardHandleOptions } from '../../shared/server.DmW25ynm.js';
-import '@orpc/standard-server-fetch';
-import '@orpc/client';
-import '@orpc/contract';
-import '@orpc/standard-server';
-
-type ServeOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
-    context?: Value<T, [NextRequest]>;
-} : {
-    context: Value<T, [NextRequest]>;
-});
-interface ServeResult {
-    GET(req: NextRequest): Promise<Response>;
-    POST(req: NextRequest): Promise<Response>;
-    PUT(req: NextRequest): Promise<Response>;
-    PATCH(req: NextRequest): Promise<Response>;
-    DELETE(req: NextRequest): Promise<Response>;
-}
-declare function serve<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<ServeOptions<T>>): ServeResult;
-
-export { FetchHandler, type ServeOptions, type ServeResult, serve };

package/dist/adapters/next/index.mjs

@@ -1,29 +0,0 @@
-export { R as RPCHandler } from '../../shared/server.Cq3B6PoL.mjs';
-import { value } from '@orpc/shared';
-import '@orpc/client/standard';
-import '@orpc/standard-server-fetch';
-import '../../shared/server.CSZRzcSW.mjs';
-import '@orpc/client';
-import '../../shared/server.Q6ZmnTgO.mjs';
-import '../../shared/server.CMrS28Go.mjs';
-import '@orpc/contract';
-
-function serve(handler, ...[options]) {
-  const main = async (req) => {
-    const context = await value(options?.context ?? {}, req);
-    const { matched, response } = await handler.handle(req, { ...options, context });
-    if (matched) {
-      return response;
-    }
-    return new Response(`Cannot find a matching procedure for ${req.url}`, { status: 404 });
-  };
-  return {
-    GET: main,
-    POST: main,
-    PUT: main,
-    PATCH: main,
-    DELETE: main
-  };
-}
-
-export { serve };

package/dist/shared/server.Cq3B6PoL.mjs

@@ -1,28 +0,0 @@
-import { RPCSerializer } from '@orpc/client/standard';
-import { toStandardLazyRequest, toFetchResponse } from '@orpc/standard-server-fetch';
-import { S as StandardHandler, a as RPCMatcher, R as RPCCodec } from './server.CSZRzcSW.mjs';
-
-class RPCHandler {
-  standardHandler;
-  constructor(router, options = {}) {
-    const serializer = new RPCSerializer();
-    const matcher = new RPCMatcher();
-    const codec = new RPCCodec(serializer);
-    this.standardHandler = new StandardHandler(router, matcher, codec, options);
-  }
-  async handle(request, ...[
-    options = {}
-  ]) {
-    const standardRequest = toStandardLazyRequest(request);
-    const result = await this.standardHandler.handle(standardRequest, options);
-    if (!result.matched) {
-      return result;
-    }
-    return {
-      matched: true,
-      response: toFetchResponse(result.response, options)
-    };
-  }
-}
-
-export { RPCHandler as R };

package/dist/shared/server.Q6ZmnTgO.mjs

@@ -1,12 +0,0 @@
-class CompositePlugin {
-  constructor(plugins = []) {
-    this.plugins = plugins;
-  }
-  init(options) {
-    for (const plugin of this.plugins) {
-      plugin.init?.(options);
-    }
-  }
-}
-
-export { CompositePlugin as C };