@orpc/server 0.0.0-next.ac2a918 → 0.0.0-next.ac2c329

package/dist/{chunk-MHVECKBC.js → shared/server.C37gDhSZ.mjs}

@@ -1,25 +1,56 @@
-// src/lazy.ts
-var LAZY_LOADER_SYMBOL = Symbol("ORPC_LAZY_LOADER");
-function lazy(loader) {
+import { isContractProcedure, ValidationError, mergePrefix, mergeErrorMap, enhanceRoute } from '@orpc/contract';
+import { fallbackORPCErrorStatus, ORPCError } from '@orpc/client';
+import { value, intercept } from '@orpc/shared';
+
+const LAZY_SYMBOL = Symbol("ORPC_LAZY_SYMBOL");
+function lazy(loader, meta = {}) {
   return {
-    [LAZY_LOADER_SYMBOL]: loader
+    [LAZY_SYMBOL]: {
+      loader,
+      meta
+    }
   };
 }
 function isLazy(item) {
-  return (typeof item === "object" || typeof item === "function") && item !== null && LAZY_LOADER_SYMBOL in item && typeof item[LAZY_LOADER_SYMBOL] === "function";
+  return (typeof item === "object" || typeof item === "function") && item !== null && LAZY_SYMBOL in item;
+}
+function getLazyMeta(lazied) {
+  return lazied[LAZY_SYMBOL].meta;
 }
 function unlazy(lazied) {
-  return isLazy(lazied) ? lazied[LAZY_LOADER_SYMBOL]() : Promise.resolve({ default: lazied });
+  return isLazy(lazied) ? lazied[LAZY_SYMBOL].loader() : Promise.resolve({ default: lazied });
+}
+
+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) {
+  return [...middlewares, addition];
 }
 
-// src/procedure.ts
-import { isContractProcedure } from "@orpc/contract";
-var Procedure = class {
+class Procedure {
   "~orpc";
   constructor(def) {
     this["~orpc"] = def;
   }
-};
+}
 function isProcedure(item) {
   if (item instanceof Procedure) {
     return true;
@@ -27,47 +58,10 @@ function isProcedure(item) {
   return isContractProcedure(item) && "middlewares" in item["~orpc"] && "inputValidationIndex" in item["~orpc"] && "outputValidationIndex" in item["~orpc"] && "handler" in item["~orpc"];
 }
 
-// src/lazy-utils.ts
-function flatLazy(lazied) {
-  const flattenLoader = async () => {
-    let current = await unlazy(lazied);
-    while (true) {
-      if (!isLazy(current.default)) {
-        break;
-      }
-      current = await unlazy(current.default);
-    }
-    return current;
-  };
-  return lazy(flattenLoader);
-}
-function createLazyProcedureFormAnyLazy(lazied) {
-  const lazyProcedure = lazy(async () => {
-    const { default: maybeProcedure } = await unlazy(flatLazy(lazied));
-    if (!isProcedure(maybeProcedure)) {
-      throw new Error(`
-            Expected a lazy<procedure> but got lazy<unknown>.
-            This should be caught by TypeScript compilation.
-            Please report this issue if this makes you feel uncomfortable.
-        `);
-    }
-    return { default: maybeProcedure };
-  });
-  return lazyProcedure;
-}
-
-// src/middleware.ts
-function middlewareOutputFn(output) {
-  return { output, context: {} };
+function mergeCurrentContext(context, other) {
+  return { ...context, ...other };
 }
 
-// src/procedure-client.ts
-import { ORPCError as ORPCError2 } from "@orpc/client";
-import { ValidationError } from "@orpc/contract";
-import { intercept, toError, value } from "@orpc/shared";
-
-// src/error.ts
-import { fallbackORPCErrorStatus, ORPCError } from "@orpc/client";
 function createORPCErrorConstructorMap(errors) {
   const proxy = new Proxy(errors, {
     get(target, code) {
@@ -105,7 +99,10 @@ async function validateORPCError(map, error) {
   return new ORPCError(code, { defined: true, status, message, data: validated.value, cause });
 }
 
-// src/procedure-client.ts
+function middlewareOutputFn(output) {
+  return { output, context: {} };
+}
+
 function createProcedureClient(lazyableProcedure, ...[options]) {
   return async (...[input, callerOptions]) => {
     const path = options?.path ?? [];
@@ -129,8 +126,8 @@ function createProcedureClient(lazyableProcedure, ...[options]) {
         (interceptorOptions) => executeProcedureInternal(interceptorOptions.procedure, interceptorOptions)
       );
     } catch (e) {
-      if (!(e instanceof ORPCError2)) {
-        throw toError(e);
+      if (!(e instanceof ORPCError)) {
+        throw e;
       }
       const validated = await validateORPCError(procedure["~orpc"].errorMap, e);
       throw validated;
@@ -144,7 +141,7 @@ async function validateInput(procedure, input) {
   }
   const result = await schema["~standard"].validate(input);
   if (result.issues) {
-    throw new ORPCError2("BAD_REQUEST", {
+    throw new ORPCError("BAD_REQUEST", {
       message: "Input validation failed",
       data: {
         issues: result.issues
@@ -161,7 +158,7 @@ async function validateOutput(procedure, output) {
   }
   const result = await schema["~standard"].validate(output);
   if (result.issues) {
-    throw new ORPCError2("INTERNAL_SERVER_ERROR", {
+    throw new ORPCError("INTERNAL_SERVER_ERROR", {
       message: "Output validation failed",
       cause: new ValidationError({ message: "Output validation failed", issues: result.issues })
     });
@@ -172,122 +169,47 @@ async function executeProcedureInternal(procedure, options) {
   const middlewares = procedure["~orpc"].middlewares;
   const inputValidationIndex = Math.min(Math.max(0, procedure["~orpc"].inputValidationIndex), middlewares.length);
   const outputValidationIndex = Math.min(Math.max(0, procedure["~orpc"].outputValidationIndex), middlewares.length);
-  let currentIndex = 0;
-  let currentContext = options.context;
-  let currentInput = options.input;
-  const next = async (...[nextOptions]) => {
-    const index = currentIndex;
-    currentIndex += 1;
-    currentContext = { ...currentContext, ...nextOptions?.context };
+  const next = async (index, context, input) => {
+    let currentInput = input;
     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 output = mid ? (await mid({
+      ...options,
+      context,
+      next: async (...[nextOptions]) => {
+        const nextContext = nextOptions?.context ?? {};
+        return {
+          output: await next(index + 1, mergeCurrentContext(context, nextContext), currentInput),
+          context: nextContext
+        };
+      }
+    }, currentInput, middlewareOutputFn)).output : await procedure["~orpc"].handler({ ...options, context, input: currentInput });
     if (index === outputValidationIndex) {
-      const validatedOutput = await validateOutput(procedure, result.output);
-      return {
-        ...result,
-        output: validatedOutput
-      };
+      return await validateOutput(procedure, output);
     }
-    return result;
+    return output;
   };
-  return (await next({})).output;
+  return next(0, options.context, options.input);
 }
 
-// src/hidden.ts
-var ROUTER_CONTRACT_SYMBOL = Symbol("ORPC_ROUTER_CONTRACT");
-function setRouterContract(obj, contract) {
-  return new Proxy(obj, {
+const HIDDEN_ROUTER_CONTRACT_SYMBOL = Symbol("ORPC_HIDDEN_ROUTER_CONTRACT");
+function setHiddenRouterContract(router, contract) {
+  return new Proxy(router, {
     get(target, key) {
-      if (key === ROUTER_CONTRACT_SYMBOL) {
+      if (key === HIDDEN_ROUTER_CONTRACT_SYMBOL) {
         return contract;
       }
       return Reflect.get(target, key);
     }
   });
 }
-function getRouterContract(obj) {
-  return obj[ROUTER_CONTRACT_SYMBOL];
-}
-var LAZY_ROUTER_PREFIX_SYMBOL = Symbol("ORPC_LAZY_ROUTER_PREFIX");
-function deepSetLazyRouterPrefix(router, prefix) {
-  return new Proxy(router, {
-    get(target, key) {
-      if (key !== LAZY_ROUTER_PREFIX_SYMBOL) {
-        const val = Reflect.get(target, key);
-        if (isLazy(val)) {
-          return deepSetLazyRouterPrefix(val, prefix);
-        }
-        return val;
-      }
-      return prefix;
-    }
-  });
-}
-function getLazyRouterPrefix(obj) {
-  return obj[LAZY_ROUTER_PREFIX_SYMBOL];
-}
-
-// src/router.ts
-import { adaptRoute, mergeErrorMap, mergePrefix } from "@orpc/contract";
-
-// src/middleware-utils.ts
-function dedupeMiddlewares(compare, middlewares) {
-  let min = 0;
-  for (let i = 0; i < middlewares.length; i++) {
-    const index = compare.indexOf(middlewares[i], min);
-    if (index === -1) {
-      return middlewares.slice(i);
-    }
-    min = index + 1;
-  }
-  return [];
-}
-function mergeMiddlewares(first, second) {
-  return [...first, ...dedupeMiddlewares(first, second)];
-}
-function addMiddleware(middlewares, addition) {
-  return [...middlewares, addition];
+function getHiddenRouterContract(router) {
+  return router[HIDDEN_ROUTER_CONTRACT_SYMBOL];
 }
 
-// src/router.ts
-function adaptRouter(router, options) {
-  if (isLazy(router)) {
-    const adapted2 = lazy(async () => {
-      const unlaziedRouter = (await unlazy(router)).default;
-      const adapted3 = adaptRouter(unlaziedRouter, options);
-      return { default: adapted3 };
-    });
-    const accessible = createAccessibleLazyRouter(adapted2);
-    const currentPrefix = getLazyRouterPrefix(router);
-    const prefix = currentPrefix ? mergePrefix(options.prefix, currentPrefix) : options.prefix;
-    if (prefix) {
-      return deepSetLazyRouterPrefix(accessible, prefix);
-    }
-    return accessible;
-  }
-  if (isProcedure(router)) {
-    const newMiddlewares = mergeMiddlewares(options.middlewares, router["~orpc"].middlewares);
-    const newMiddlewareAdded = newMiddlewares.length - router["~orpc"].middlewares.length;
-    const adapted2 = new Procedure({
-      ...router["~orpc"],
-      route: adaptRoute(router["~orpc"].route, options),
-      errorMap: mergeErrorMap(options.errorMap, router["~orpc"].errorMap),
-      middlewares: newMiddlewares,
-      inputValidationIndex: router["~orpc"].inputValidationIndex + newMiddlewareAdded,
-      outputValidationIndex: router["~orpc"].outputValidationIndex + newMiddlewareAdded
-    });
-    return adapted2;
-  }
-  const adapted = {};
-  for (const key in router) {
-    adapted[key] = adaptRouter(router[key], options);
-  }
-  return adapted;
-}
-function getRouterChild(router, ...path) {
+function getRouter(router, path) {
   let current = router;
   for (let i = 0; i < path.length; i++) {
     const segment = path[i];
@@ -303,89 +225,131 @@ function getRouterChild(router, ...path) {
     }
     const lazied = current;
     const rest = path.slice(i);
-    const newLazy = lazy(async () => {
+    return lazy(async () => {
       const unwrapped = await unlazy(lazied);
-      if (!unwrapped.default) {
-        return unwrapped;
-      }
-      const next = getRouterChild(unwrapped.default, ...rest);
-      return { default: next };
-    });
-    return flatLazy(newLazy);
+      const next = getRouter(unwrapped.default, rest);
+      return unlazy(next);
+    }, getLazyMeta(lazied));
   }
   return current;
 }
-
-// src/router-accessible-lazy.ts
 function createAccessibleLazyRouter(lazied) {
-  const flattenLazy = flatLazy(lazied);
-  const recursive = new Proxy(flattenLazy, {
+  const recursive = new Proxy(lazied, {
     get(target, key) {
       if (typeof key !== "string") {
         return Reflect.get(target, key);
       }
-      const next = getRouterChild(flattenLazy, key);
+      const next = getRouter(lazied, [key]);
       return createAccessibleLazyRouter(next);
     }
   });
   return recursive;
 }
-
-// src/utils.ts
-import { isContractProcedure as isContractProcedure2 } from "@orpc/contract";
-function eachContractProcedure(options, callback, laziedOptions = []) {
-  const hiddenContract = getRouterContract(options.router);
-  if (hiddenContract) {
-    return eachContractProcedure(
-      {
-        router: hiddenContract,
-        path: options.path
-      },
-      callback,
-      laziedOptions
-    );
+function enhanceRouter(router, options) {
+  if (isLazy(router)) {
+    const laziedMeta = getLazyMeta(router);
+    const enhancedPrefix = laziedMeta?.prefix ? mergePrefix(options.prefix, laziedMeta?.prefix) : options.prefix;
+    const enhanced2 = lazy(async () => {
+      const { default: unlaziedRouter } = await unlazy(router);
+      const enhanced3 = enhanceRouter(unlaziedRouter, options);
+      return unlazy(enhanced3);
+    }, {
+      ...laziedMeta,
+      prefix: enhancedPrefix
+    });
+    const accessible = createAccessibleLazyRouter(enhanced2);
+    return accessible;
+  }
+  if (isProcedure(router)) {
+    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"],
+      route: enhanceRoute(router["~orpc"].route, options),
+      errorMap: mergeErrorMap(options.errorMap, router["~orpc"].errorMap),
+      middlewares: newMiddlewares,
+      inputValidationIndex: router["~orpc"].inputValidationIndex + newMiddlewareAdded,
+      outputValidationIndex: router["~orpc"].outputValidationIndex + newMiddlewareAdded
+    });
+    return enhanced2;
   }
-  if (isLazy(options.router)) {
-    laziedOptions.push({
-      lazied: options.router,
+  const enhanced = {};
+  for (const key in router) {
+    enhanced[key] = enhanceRouter(router[key], options);
+  }
+  return enhanced;
+}
+function traverseContractProcedures(options, callback, lazyOptions = []) {
+  let currentRouter = options.router;
+  const hiddenContract = getHiddenRouterContract(options.router);
+  if (hiddenContract !== void 0) {
+    currentRouter = hiddenContract;
+  }
+  if (isLazy(currentRouter)) {
+    lazyOptions.push({
+      router: currentRouter,
       path: options.path
     });
-  } else if (isContractProcedure2(options.router)) {
+  } else if (isContractProcedure(currentRouter)) {
     callback({
-      contract: options.router,
+      contract: currentRouter,
       path: options.path
     });
   } else {
-    for (const key in options.router) {
-      eachContractProcedure(
+    for (const key in currentRouter) {
+      traverseContractProcedures(
         {
-          router: options.router[key],
+          router: currentRouter[key],
           path: [...options.path, key]
         },
         callback,
-        laziedOptions
+        lazyOptions
       );
     }
   }
-  return laziedOptions;
+  return lazyOptions;
 }
-async function eachAllContractProcedure(options, callback) {
+async function resolveContractProcedures(options, callback) {
   const pending = [options];
-  for (const item of pending) {
-    const lazies = eachContractProcedure(item, callback);
-    for (const lazy2 of lazies) {
-      const { default: router } = await unlazy(lazy2.lazied);
+  for (const options2 of pending) {
+    const lazyOptions = traverseContractProcedures(options2, callback);
+    for (const options3 of lazyOptions) {
+      const { default: router } = await unlazy(options3.router);
       pending.push({
-        path: lazy2.path,
-        router
+        router,
+        path: options3.path
       });
     }
   }
 }
-function convertPathToHttpPath(path) {
-  return `/${path.map(encodeURIComponent).join("/")}`;
+async function unlazyRouter(router) {
+  if (isProcedure(router)) {
+    return router;
+  }
+  const unlazied = {};
+  for (const key in router) {
+    const item = router[key];
+    const { default: unlaziedRouter } = await unlazy(item);
+    unlazied[key] = await unlazyRouter(unlaziedRouter);
+  }
+  return unlazied;
+}
+
+function createAssertedLazyProcedure(lazied) {
+  const lazyProcedure = lazy(async () => {
+    const { default: maybeProcedure } = await unlazy(lazied);
+    if (!isProcedure(maybeProcedure)) {
+      throw new Error(`
+            Expected a lazy<procedure> but got lazy<unknown>.
+            This should be caught by TypeScript compilation.
+            Please report this issue if this makes you feel uncomfortable.
+        `);
+    }
+    return { default: maybeProcedure };
+  }, getLazyMeta(lazied));
+  return lazyProcedure;
 }
-function createContractedProcedure(contract, procedure) {
+function createContractedProcedure(procedure, contract) {
   return new Procedure({
     ...procedure["~orpc"],
     errorMap: contract["~orpc"].errorMap,
@@ -393,29 +357,8 @@ function createContractedProcedure(contract, procedure) {
     meta: contract["~orpc"].meta
   });
 }
+function call(procedure, input, ...rest) {
+  return createProcedureClient(procedure, ...rest)(input);
+}
 
-export {
-  LAZY_LOADER_SYMBOL,
-  lazy,
-  isLazy,
-  unlazy,
-  Procedure,
-  isProcedure,
-  flatLazy,
-  createLazyProcedureFormAnyLazy,
-  addMiddleware,
-  middlewareOutputFn,
-  createProcedureClient,
-  setRouterContract,
-  getRouterContract,
-  deepSetLazyRouterPrefix,
-  getLazyRouterPrefix,
-  createAccessibleLazyRouter,
-  adaptRouter,
-  getRouterChild,
-  eachContractProcedure,
-  eachAllContractProcedure,
-  convertPathToHttpPath,
-  createContractedProcedure
-};
-//# sourceMappingURL=chunk-MHVECKBC.js.map
+export { LAZY_SYMBOL as L, Procedure as P, createContractedProcedure as a, addMiddleware as b, createProcedureClient as c, isLazy as d, enhanceRouter as e, createAssertedLazyProcedure as f, getRouter as g, createORPCErrorConstructorMap as h, isProcedure as i, getLazyMeta as j, middlewareOutputFn as k, lazy as l, mergeCurrentContext as m, isStartWithMiddlewares as n, mergeMiddlewares as o, call as p, getHiddenRouterContract as q, createAccessibleLazyRouter as r, setHiddenRouterContract as s, traverseContractProcedures as t, unlazy as u, validateORPCError as v, resolveContractProcedures as w, unlazyRouter as x };

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

@@ -0,0 +1,73 @@
+import { HTTPPath, ORPCError } from '@orpc/client';
+import { Meta, InferSchemaOutput, AnySchema, ErrorFromErrorMap } from '@orpc/contract';
+import { Interceptor, ThrowableError } from '@orpc/shared';
+import { StandardResponse, StandardLazyRequest } from '@orpc/standard-server';
+import { f as AnyRouter, h as AnyProcedure, C as Context, F as ProcedureClientInterceptorOptions, R as Router } from './server.DQJX4Gnf.mjs';
+
+type StandardParams = Record<string, string>;
+type StandardMatchResult = {
+    path: readonly string[];
+    procedure: AnyProcedure;
+    params?: StandardParams;
+} | undefined;
+interface StandardMatcher {
+    init(router: AnyRouter): void;
+    match(method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
+}
+interface StandardCodec {
+    encode(output: unknown, procedure: AnyProcedure): StandardResponse;
+    encodeError(error: ORPCError<any, any>): StandardResponse;
+    decode(request: StandardLazyRequest, params: StandardParams | undefined, procedure: AnyProcedure): Promise<unknown>;
+}
+
+interface StandardHandlerPlugin<TContext extends Context> {
+    order?: number;
+    init?(options: StandardHandlerOptions<TContext>): void;
+}
+declare class CompositeStandardHandlerPlugin<T extends Context, TPlugin extends StandardHandlerPlugin<T>> implements StandardHandlerPlugin<T> {
+    protected readonly plugins: TPlugin[];
+    constructor(plugins?: readonly TPlugin[]);
+    init(options: StandardHandlerOptions<T>): void;
+}
+
+interface StandardHandleOptions<T extends Context> {
+    prefix?: HTTPPath;
+    context: T;
+}
+type StandardHandleResult = {
+    matched: true;
+    response: StandardResponse;
+} | {
+    matched: false;
+    response: undefined;
+};
+interface StandardHandlerInterceptorOptions<T extends Context> extends StandardHandleOptions<T> {
+    request: StandardLazyRequest;
+}
+interface StandardHandlerOptions<TContext extends Context> {
+    plugins?: StandardHandlerPlugin<TContext>[];
+    /**
+     * Interceptors at the request level, helpful when you want catch errors
+     */
+    interceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult, ThrowableError>[];
+    /**
+     * Interceptors at the root level, helpful when you want override the request/response
+     */
+    rootInterceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult, ThrowableError>[];
+    /**
+     *
+     * Interceptors for procedure client.
+     */
+    clientInterceptors?: Interceptor<ProcedureClientInterceptorOptions<TContext, Record<never, never>, Meta>, InferSchemaOutput<AnySchema>, ErrorFromErrorMap<Record<never, never>>>[];
+}
+declare class StandardHandler<T extends Context> {
+    private readonly matcher;
+    private readonly codec;
+    private readonly interceptors;
+    private readonly clientInterceptors;
+    private readonly rootInterceptors;
+    constructor(router: Router<any, T>, matcher: StandardMatcher, codec: StandardCodec, options: NoInfer<StandardHandlerOptions<T>>);
+    handle(request: StandardLazyRequest, options: StandardHandleOptions<T>): Promise<StandardHandleResult>;
+}
+
+export { CompositeStandardHandlerPlugin as C, type StandardHandlerInterceptorOptions as S, type StandardHandlerPlugin as a, type StandardHandlerOptions as b, type StandardCodec as c, type StandardParams as d, type StandardMatcher as e, type StandardMatchResult as f, type StandardHandleOptions as g, type StandardHandleResult as h, StandardHandler as i };

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

@@ -0,0 +1,10 @@
+import { C as Context } from './server.DQJX4Gnf.mjs';
+import { g as StandardHandleOptions } from './server.ClO23hLW.mjs';
+
+type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
+    context?: T;
+} : {
+    context: T;
+});
+
+export type { FriendlyStandardHandleOptions as F };

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

@@ -0,0 +1,10 @@
+import { C as Context } from './server.DQJX4Gnf.js';
+import { g as StandardHandleOptions } from './server.DsVSuKTu.js';
+
+type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
+    context?: T;
+} : {
+    context: T;
+});
+
+export type { FriendlyStandardHandleOptions as F };