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

package/dist/shared/{server.CM3tWr3C.d.mts → server.BeJithK4.d.mts}

@@ -1,7 +1,7 @@
 import { HTTPPath, AnySchema, Meta, InferSchemaOutput, ErrorFromErrorMap } from '@orpc/contract';
 import { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
 import { StandardResponse, StandardLazyRequest } from '@orpc/standard-server';
-import { a as AnyRouter, A as AnyProcedure, C as Context, P as ProcedureClientInterceptorOptions, R as Router } from './server.CPteJIPP.mjs';
+import { a as AnyRouter, A as AnyProcedure, C as Context, P as ProcedureClientInterceptorOptions, R as Router } from './server.BYTulgUc.mjs';
 import { ORPCError } from '@orpc/client';
 
 type StandardParams = Record<string, string>;
@@ -72,4 +72,4 @@ declare class CompositePlugin<TContext extends Context> implements HandlerPlugin
     init(options: StandardHandlerOptions<TContext>): void;
 }
 
-export { CompositePlugin as C, type HandlerPlugin as H, type StandardHandleOptions as S, type StandardHandlerInterceptorOptions as a, type StandardHandlerOptions as b, type StandardCodec as c, type StandardParams as d, type StandardMatcher as e, type StandardMatchResult as f, type StandardHandleResult as g, StandardHandler as h };
+export { CompositePlugin as C, type HandlerPlugin as H, type StandardHandleOptions as S, type StandardHandlerOptions as a, type StandardHandlerInterceptorOptions as b, type StandardCodec as c, type StandardParams as d, type StandardMatcher as e, type StandardMatchResult as f, type StandardHandleResult as g, StandardHandler as h };

package/dist/shared/{server.CMrS28Go.mjs → server.BtxZnWJ9.mjs}

@@ -21,7 +21,24 @@ function unlazy(lazied) {
   return isLazy(lazied) ? lazied[LAZY_SYMBOL].loader() : Promise.resolve({ default: lazied });
 }
 
-function mergeMiddlewares(first, second) {
+function isStartWithMiddlewares(middlewares, compare) {
+  if (compare.length > middlewares.length) {
+    return false;
+  }
+  for (let i = 0; i < middlewares.length; i++) {
+    if (compare[i] === void 0) {
+      return true;
+    }
+    if (middlewares[i] !== compare[i]) {
+      return false;
+    }
+  }
+  return true;
+}
+function mergeMiddlewares(first, second, options) {
+  if (options.dedupeLeading && isStartWithMiddlewares(second, first)) {
+    return second;
+  }
   return [...first, ...second];
 }
 function addMiddleware(middlewares, addition) {
@@ -41,6 +58,10 @@ function isProcedure(item) {
   return isContractProcedure(item) && "middlewares" in item["~orpc"] && "inputValidationIndex" in item["~orpc"] && "outputValidationIndex" in item["~orpc"] && "handler" in item["~orpc"];
 }
 
+function mergeCurrentContext(context, other) {
+  return { ...context, ...other };
+}
+
 function createORPCErrorConstructorMap(errors) {
   const proxy = new Proxy(errors, {
     get(target, code) {
@@ -153,23 +174,30 @@ async function executeProcedureInternal(procedure, options) {
   let currentInput = options.input;
   const next = async (...[nextOptions]) => {
     const index = currentIndex;
+    const midContext = nextOptions?.context ?? {};
     currentIndex += 1;
-    currentContext = { ...currentContext, ...nextOptions?.context };
+    currentContext = mergeCurrentContext(currentContext, midContext);
     if (index === inputValidationIndex) {
       currentInput = await validateInput(procedure, currentInput);
     }
     const mid = middlewares[index];
-    const result = mid ? await mid({ ...options, context: currentContext, next }, currentInput, middlewareOutputFn) : { output: await procedure["~orpc"].handler({ ...options, context: currentContext, input: currentInput }), context: currentContext };
+    const result = mid ? {
+      context: midContext,
+      output: (await mid({ ...options, context: currentContext, next }, currentInput, middlewareOutputFn)).output
+    } : {
+      context: midContext,
+      output: await procedure["~orpc"].handler({ ...options, context: currentContext, input: currentInput })
+    };
     if (index === outputValidationIndex) {
       const validatedOutput = await validateOutput(procedure, result.output);
       return {
-        ...result,
+        context: result.context,
         output: validatedOutput
       };
     }
     return result;
   };
-  return (await next({})).output;
+  return (await next()).output;
 }
 
 const HIDDEN_ROUTER_CONTRACT_SYMBOL = Symbol("ORPC_HIDDEN_ROUTER_CONTRACT");
@@ -239,7 +267,7 @@ function enhanceRouter(router, options) {
     return accessible;
   }
   if (isProcedure(router)) {
-    const newMiddlewares = mergeMiddlewares(options.middlewares, router["~orpc"].middlewares);
+    const newMiddlewares = mergeMiddlewares(options.middlewares, router["~orpc"].middlewares, { dedupeLeading: options.dedupeLeadingMiddlewares });
     const newMiddlewareAdded = newMiddlewares.length - router["~orpc"].middlewares.length;
     const enhanced2 = new Procedure({
       ...router["~orpc"],
@@ -343,4 +371,4 @@ function toHttpPath(path) {
   return `/${path.map(encodeURIComponent).join("/")}`;
 }
 
-export { LAZY_SYMBOL as L, Procedure as P, toHttpPath as a, createContractedProcedure as b, createProcedureClient as c, addMiddleware as d, enhanceRouter as e, isLazy as f, getRouter as g, createAssertedLazyProcedure as h, isProcedure as i, getLazyMeta as j, call as k, lazy as l, middlewareOutputFn as m, getHiddenRouterContract as n, createAccessibleLazyRouter as o, unlazyRouter as p, resolveContractProcedures as r, setHiddenRouterContract as s, traverseContractProcedures as t, unlazy as u };
+export { LAZY_SYMBOL as L, Procedure as P, toHttpPath as a, createContractedProcedure as b, createProcedureClient as c, addMiddleware as d, enhanceRouter as e, isLazy as f, getRouter as g, createAssertedLazyProcedure as h, isProcedure as i, createORPCErrorConstructorMap as j, getLazyMeta as k, lazy as l, mergeCurrentContext as m, middlewareOutputFn as n, isStartWithMiddlewares as o, mergeMiddlewares as p, call as q, getHiddenRouterContract as r, setHiddenRouterContract as s, traverseContractProcedures as t, unlazy as u, validateORPCError as v, createAccessibleLazyRouter as w, resolveContractProcedures as x, unlazyRouter as y };

package/dist/shared/server.Bz_xNBjz.d.mts

@@ -0,0 +1,8 @@
+import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
+import { C as Context } from './server.BYTulgUc.mjs';
+import { a as StandardHandlerOptions } from './server.BeJithK4.mjs';
+
+interface StandardRPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardRPCJsonSerializerOptions {
+}
+
+export type { StandardRPCHandlerOptions as S };

package/dist/shared/{server.Cq3B6PoL.mjs → server.DoP20NVH.mjs}

@@ -1,13 +1,14 @@
-import { RPCSerializer } from '@orpc/client/standard';
+import { StandardRPCJsonSerializer, StandardRPCSerializer } 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';
+import { S as StandardHandler, b as StandardRPCMatcher, a as StandardRPCCodec } from './server.jG7ZuX3S.mjs';
 
 class RPCHandler {
   standardHandler;
   constructor(router, options = {}) {
-    const serializer = new RPCSerializer();
-    const matcher = new RPCMatcher();
-    const codec = new RPCCodec(serializer);
+    const jsonSerializer = new StandardRPCJsonSerializer(options);
+    const serializer = new StandardRPCSerializer(jsonSerializer);
+    const matcher = new StandardRPCMatcher();
+    const codec = new StandardRPCCodec(serializer);
     this.standardHandler = new StandardHandler(router, matcher, codec, options);
   }
   async handle(request, ...[

package/dist/shared/server.EhgR_5_I.d.ts

@@ -0,0 +1,8 @@
+import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
+import { C as Context } from './server.BYTulgUc.js';
+import { a as StandardHandlerOptions } from './server.B3Tm0IXY.js';
+
+interface StandardRPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardRPCJsonSerializerOptions {
+}
+
+export type { StandardRPCHandlerOptions as S };

package/dist/shared/{server.CSZRzcSW.mjs → server.jG7ZuX3S.mjs}

@@ -1,7 +1,7 @@
 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 { c as createProcedureClient, t as traverseContractProcedures, a as toHttpPath, i as isProcedure, u as unlazy, g as getRouter, b as createContractedProcedure } from './server.BtxZnWJ9.mjs';
 
 class StandardHandler {
   constructor(router, matcher, codec, options) {
@@ -69,7 +69,7 @@ class StandardHandler {
   }
 }
 
-class RPCCodec {
+class StandardRPCCodec {
   constructor(serializer) {
     this.serializer = serializer;
   }
@@ -93,7 +93,7 @@ class RPCCodec {
   }
 }
 
-class RPCMatcher {
+class StandardRPCMatcher {
   tree = {};
   pendingRouters = [];
   init(router, path = []) {
@@ -155,4 +155,4 @@ class RPCMatcher {
   }
 }
 
-export { RPCCodec as R, StandardHandler as S, RPCMatcher as a };
+export { StandardHandler as S, StandardRPCCodec as a, StandardRPCMatcher as b };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.0.0-next.9b9ade5",
+  "version": "0.0.0-next.9dfcee8",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -58,12 +58,12 @@
     "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.9dfcee8",
+    "@orpc/shared": "0.0.0-next.9dfcee8",
+    "@orpc/standard-server": "0.0.0-next.9dfcee8",
+    "@orpc/contract": "0.0.0-next.9dfcee8",
+    "@orpc/standard-server-fetch": "0.0.0-next.9dfcee8",
+    "@orpc/standard-server-node": "0.0.0-next.9dfcee8"
   },
   "devDependencies": {
     "light-my-request": "^6.5.1"