@trpc/server 11.3.1 → 11.3.2-canary.2

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "@trpc/server",
-  "version": "11.3.1",
+  "type": "module",
+  "sideEffects": false,
+  "version": "11.3.2-canary.2+b0426132b",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
-  "typings": "dist/index.d.ts",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.cts",
   "homepage": "https://trpc.io",
   "repository": {
     "type": "git",
@@ -14,9 +16,8 @@
     "directory": "packages/server"
   },
   "scripts": {
-    "build": "rollup --config rollup.config.ts --configPlugin rollup-plugin-swc3",
-    "dev": "pnpm build --watch",
-    "codegen-entrypoints": "tsx entrypoints.script.ts",
+    "build": "tsdown",
+    "dev": "tsdown --watch",
     "benchmark": "tsc --project tsconfig.benchmark.json",
     "lint": "eslint --cache src",
     "ts-watch": "tsc --watch"
@@ -24,79 +25,154 @@
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js",
-      "default": "./dist/index.js"
+      "import": {
+        "default": "./dist/index.mjs",
+        "types": "./dist/index.d.mts"
+      },
+      "require": {
+        "default": "./dist/index.cjs",
+        "types": "./dist/index.d.cts"
+      }
     },
     "./adapters/aws-lambda": {
-      "import": "./dist/adapters/aws-lambda/index.mjs",
-      "require": "./dist/adapters/aws-lambda/index.js",
-      "default": "./dist/adapters/aws-lambda/index.js"
+      "import": {
+        "default": "./dist/adapters/aws-lambda/index.mjs",
+        "types": "./dist/adapters/aws-lambda/index.d.mts"
+      },
+      "require": {
+        "default": "./dist/adapters/aws-lambda/index.cjs",
+        "types": "./dist/adapters/aws-lambda/index.d.cts"
+      }
     },
     "./adapters/express": {
-      "import": "./dist/adapters/express.mjs",
-      "require": "./dist/adapters/express.js",
-      "default": "./dist/adapters/express.js"
+      "import": {
+        "default": "./dist/adapters/express.mjs",
+        "types": "./dist/adapters/express.d.mts"
+      },
+      "require": {
+        "default": "./dist/adapters/express.cjs",
+        "types": "./dist/adapters/express.d.cts"
+      }
     },
     "./adapters/fastify": {
-      "import": "./dist/adapters/fastify/index.mjs",
-      "require": "./dist/adapters/fastify/index.js",
-      "default": "./dist/adapters/fastify/index.js"
+      "import": {
+        "default": "./dist/adapters/fastify/index.mjs",
+        "types": "./dist/adapters/fastify/index.d.mts"
+      },
+      "require": {
+        "default": "./dist/adapters/fastify/index.cjs",
+        "types": "./dist/adapters/fastify/index.d.cts"
+      }
     },
     "./adapters/fetch": {
-      "import": "./dist/adapters/fetch/index.mjs",
-      "require": "./dist/adapters/fetch/index.js",
-      "default": "./dist/adapters/fetch/index.js"
+      "import": {
+        "default": "./dist/adapters/fetch/index.mjs",
+        "types": "./dist/adapters/fetch/index.d.mts"
+      },
+      "require": {
+        "default": "./dist/adapters/fetch/index.cjs",
+        "types": "./dist/adapters/fetch/index.d.cts"
+      }
     },
     "./adapters/next-app-dir": {
-      "import": "./dist/adapters/next-app-dir.mjs",
-      "require": "./dist/adapters/next-app-dir.js",
-      "default": "./dist/adapters/next-app-dir.js"
+      "import": {
+        "default": "./dist/adapters/next-app-dir.mjs",
+        "types": "./dist/adapters/next-app-dir.d.mts"
+      },
+      "require": {
+        "default": "./dist/adapters/next-app-dir.cjs",
+        "types": "./dist/adapters/next-app-dir.d.cts"
+      }
     },
     "./adapters/next": {
-      "import": "./dist/adapters/next.mjs",
-      "require": "./dist/adapters/next.js",
-      "default": "./dist/adapters/next.js"
+      "import": {
+        "default": "./dist/adapters/next.mjs",
+        "types": "./dist/adapters/next.d.mts"
+      },
+      "require": {
+        "default": "./dist/adapters/next.cjs",
+        "types": "./dist/adapters/next.d.cts"
+      }
     },
     "./adapters/node-http": {
-      "import": "./dist/adapters/node-http/index.mjs",
-      "require": "./dist/adapters/node-http/index.js",
-      "default": "./dist/adapters/node-http/index.js"
+      "import": {
+        "default": "./dist/adapters/node-http/index.mjs",
+        "types": "./dist/adapters/node-http/index.d.mts"
+      },
+      "require": {
+        "default": "./dist/adapters/node-http/index.cjs",
+        "types": "./dist/adapters/node-http/index.d.cts"
+      }
     },
     "./adapters/standalone": {
-      "import": "./dist/adapters/standalone.mjs",
-      "require": "./dist/adapters/standalone.js",
-      "default": "./dist/adapters/standalone.js"
+      "import": {
+        "default": "./dist/adapters/standalone.mjs",
+        "types": "./dist/adapters/standalone.d.mts"
+      },
+      "require": {
+        "default": "./dist/adapters/standalone.cjs",
+        "types": "./dist/adapters/standalone.d.cts"
+      }
     },
     "./adapters/ws": {
-      "import": "./dist/adapters/ws.mjs",
-      "require": "./dist/adapters/ws.js",
-      "default": "./dist/adapters/ws.js"
+      "import": {
+        "default": "./dist/adapters/ws.mjs",
+        "types": "./dist/adapters/ws.d.mts"
+      },
+      "require": {
+        "default": "./dist/adapters/ws.cjs",
+        "types": "./dist/adapters/ws.d.cts"
+      }
     },
     "./http": {
-      "import": "./dist/http.mjs",
-      "require": "./dist/http.js",
-      "default": "./dist/http.js"
+      "import": {
+        "default": "./dist/http.mjs",
+        "types": "./dist/http.d.mts"
+      },
+      "require": {
+        "default": "./dist/http.cjs",
+        "types": "./dist/http.d.cts"
+      }
     },
     "./observable": {
-      "import": "./dist/observable/index.mjs",
-      "require": "./dist/observable/index.js",
-      "default": "./dist/observable/index.js"
+      "import": {
+        "default": "./dist/observable/index.mjs",
+        "types": "./dist/observable/index.d.mts"
+      },
+      "require": {
+        "default": "./dist/observable/index.cjs",
+        "types": "./dist/observable/index.d.cts"
+      }
     },
     "./rpc": {
-      "import": "./dist/rpc.mjs",
-      "require": "./dist/rpc.js",
-      "default": "./dist/rpc.js"
+      "import": {
+        "default": "./dist/rpc.mjs",
+        "types": "./dist/rpc.d.mts"
+      },
+      "require": {
+        "default": "./dist/rpc.cjs",
+        "types": "./dist/rpc.d.cts"
+      }
     },
     "./shared": {
-      "import": "./dist/shared.mjs",
-      "require": "./dist/shared.js",
-      "default": "./dist/shared.js"
+      "import": {
+        "default": "./dist/shared.mjs",
+        "types": "./dist/shared.d.mts"
+      },
+      "require": {
+        "default": "./dist/shared.cjs",
+        "types": "./dist/shared.d.cts"
+      }
     },
     "./unstable-core-do-not-import": {
-      "import": "./dist/unstable-core-do-not-import.mjs",
-      "require": "./dist/unstable-core-do-not-import.js",
-      "default": "./dist/unstable-core-do-not-import.js"
+      "import": {
+        "default": "./dist/unstable-core-do-not-import.mjs",
+        "types": "./dist/unstable-core-do-not-import.d.mts"
+      },
+      "require": {
+        "default": "./dist/unstable-core-do-not-import.cjs",
+        "types": "./dist/unstable-core-do-not-import.d.cts"
+      }
     }
   },
   "files": [
@@ -118,6 +194,7 @@
   },
   "devDependencies": {
     "@fastify/websocket": "^10.0.1",
+    "@oxc-project/runtime": "0.69.0",
     "@tanstack/react-query": "^5.80.3",
     "@types/aws-lambda": "^8.10.149",
     "@types/express": "^5.0.0",
@@ -136,10 +213,9 @@
     "next": "^15.3.1",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
-    "rollup": "^4.34.8",
     "superjson": "^1.12.4",
     "superstruct": "^2.0.0",
-    "tsx": "^4.19.3",
+    "tsdown": "0.12.7",
     "typescript": "^5.8.2",
     "valibot": "1.1.0",
     "ws": "^8.0.0",
@@ -152,5 +228,5 @@
   "peerDependencies": {
     "typescript": ">=5.7.2"
   },
-  "gitHead": "c97573dd72086529c3f26dcc5e96d8152337b7f7"
+  "gitHead": "b0426132b53af5b3a679063522429e5842f577e4"
 }

package/rpc/package.json

@@ -0,0 +1 @@
+{"main":"../dist/rpc.cjs","module":"../dist/rpc.mjs","types":"../dist/rpc.d.cts"}

package/shared/package.json

@@ -0,0 +1 @@
+{"main":"../dist/shared.cjs","module":"../dist/shared.mjs","types":"../dist/shared.d.cts"}

package/src/@trpc/server/index.ts

@@ -24,19 +24,38 @@ export {
   type inferTransformedSubscriptionOutput,
   type AnyProcedure as AnyTRPCProcedure,
   type AnyRouter as AnyTRPCRouter,
+  type RouterDef as TRPCRouterDef,
+  type RouterBuilder as TRPCRouterBuilder,
+  type RouterCallerFactory as TRPCRouterCallerFactory,
+  type RootConfig as TRPCRootConfig,
   type AnyRootTypes as AnyTRPCRootTypes,
+  type MiddlewareFunction as TRPCMiddlewareFunction,
+  type MiddlewareBuilder as TRPCMiddlewareBuilder,
   type AnyMiddlewareFunction as AnyTRPCMiddlewareFunction,
   type CombinedDataTransformer as TRPCCombinedDataTransformer,
   type ProcedureType as TRPCProcedureType,
   type AnyMutationProcedure as AnyTRPCMutationProcedure,
   type AnyQueryProcedure as AnyTRPCQueryProcedure,
   type RouterRecord as TRPCRouterRecord,
+  type MergeRouters as TRPCMergeRouters,
   type AnySubscriptionProcedure as AnyTRPCSubscriptionProcedure,
   type CreateContextCallback,
   type MutationProcedure as TRPCMutationProcedure,
   type QueryProcedure as TRPCQueryProcedure,
+  type BuiltRouter as TRPCBuiltRouter,
   type SubscriptionProcedure as TRPCSubscriptionProcedure,
   type TRPCBuilder,
+  type ProcedureBuilder as TRPCProcedureBuilder,
+  type RuntimeConfigOptions as TRPCRuntimeConfigOptions,
+  type TRPCRootObject,
+  type ErrorFormatter as TRPCErrorFormatter,
+  type TRPCErrorShape,
+  type DefaultErrorShape as TRPCDefaultErrorShape,
+  type DefaultErrorData as TRPCDefaultErrorData,
+  type TRPC_ERROR_CODE_KEY,
+  type TRPC_ERROR_CODE_NUMBER,
+  type DecorateCreateRouterOptions as TRPCDecorateCreateRouterOptions,
+  type CreateRouterOptions as TRPCCreateRouterOptions,
   StandardSchemaV1Error,
   /**
    * @deprecated use `tracked(id, data)` instead
@@ -51,6 +70,11 @@ export {
    */
   lazy as experimental_lazy,
   callProcedure as callTRPCProcedure,
+
+  /**
+   * @internal
+   */
+  type UnsetMarker as TRPCUnsetMarker,
 } from '../../unstable-core-do-not-import';
 
 export type {

package/src/unstable-core-do-not-import/http/contentType.ts

@@ -1,7 +1,7 @@
 import { TRPCError } from '../error/TRPCError';
 import type { ProcedureType } from '../procedure';
 import { getProcedureAtPath, type AnyRouter } from '../router';
-import { isObject, unsetMarker } from '../utils';
+import { isObject } from '../utils';
 import { parseConnectionParamsFromString } from './parseConnectionParams';
 import type { TRPCAcceptHeader, TRPCRequestInfo } from './types';
 
@@ -25,13 +25,14 @@ type ContentTypeHandler = {
  */
 function memo<TReturn>(fn: () => Promise<TReturn>) {
   let promise: Promise<TReturn> | null = null;
-  let value: TReturn | typeof unsetMarker = unsetMarker;
+  const sym = Symbol.for('@trpc/server/http/memo');
+  let value: TReturn | typeof sym = sym;
   return {
     /**
      * Lazily read the value
      */
     read: async (): Promise<TReturn> => {
-      if (value !== unsetMarker) {
+      if (value !== sym) {
         return value;
       }
 
@@ -56,7 +57,7 @@ function memo<TReturn>(fn: () => Promise<TReturn>) {
      * Get an already stored result
      */
     result: (): TReturn | undefined => {
-      return value !== unsetMarker ? value : undefined;
+      return value !== sym ? value : undefined;
     },
   };
 }

package/src/unstable-core-do-not-import/initTRPC.ts

@@ -3,10 +3,18 @@ import {
   type DefaultErrorShape,
   type ErrorFormatter,
 } from './error/formatter';
+import type { MiddlewareBuilder, MiddlewareFunction } from './middleware';
 import { createMiddlewareFactory } from './middleware';
+import type { ProcedureBuilder } from './procedureBuilder';
 import { createBuilder } from './procedureBuilder';
-import type { CreateRootTypes } from './rootConfig';
+import type { AnyRootTypes, CreateRootTypes } from './rootConfig';
 import { isServerDefault, type RootConfig } from './rootConfig';
+import type {
+  AnyRouter,
+  MergeRouters,
+  RouterBuilder,
+  RouterCallerFactory,
+} from './router';
 import {
   createCallerFactory,
   createRouterFactory,
@@ -15,11 +23,15 @@ import {
 import type { DataTransformerOptions } from './transformer';
 import { defaultTransformer, getDataTransformer } from './transformer';
 import type { Unwrap, ValidateShape } from './types';
+import type { UnsetMarker } from './utils';
 
 type inferErrorFormatterShape<TType> =
   TType extends ErrorFormatter<any, infer TShape> ? TShape : DefaultErrorShape;
-interface RuntimeConfigOptions<TContext extends object, TMeta extends object>
-  extends Partial<
+/** @internal */
+export interface RuntimeConfigOptions<
+  TContext extends object,
+  TMeta extends object,
+> extends Partial<
     Omit<
       RootConfig<{
         ctx: TContext;
@@ -39,6 +51,69 @@ interface RuntimeConfigOptions<TContext extends object, TMeta extends object>
 
 type ContextCallback = (...args: any[]) => object | Promise<object>;
 
+export interface TRPCRootObject<
+  TContext extends object,
+  TMeta extends object,
+  TOptions extends RuntimeConfigOptions<TContext, TMeta>,
+  $Root extends AnyRootTypes = {
+    ctx: TContext;
+    meta: TMeta;
+    errorShape: undefined extends TOptions['errorFormatter']
+      ? DefaultErrorShape
+      : inferErrorFormatterShape<TOptions['errorFormatter']>;
+    transformer: undefined extends TOptions['transformer'] ? false : true;
+  },
+> {
+  /**
+   * Your router config
+   * @internal
+   */
+  _config: RootConfig<$Root>;
+
+  /**
+   * Builder object for creating procedures
+   * @see https://trpc.io/docs/v11/server/procedures
+   */
+  procedure: ProcedureBuilder<
+    TContext,
+    TMeta,
+    object,
+    UnsetMarker,
+    UnsetMarker,
+    UnsetMarker,
+    UnsetMarker,
+    false
+  >;
+
+  /**
+   * Create reusable middlewares
+   * @see https://trpc.io/docs/v11/server/middlewares
+   */
+  middleware: <$ContextOverrides>(
+    fn: MiddlewareFunction<TContext, TMeta, object, $ContextOverrides, unknown>,
+  ) => MiddlewareBuilder<TContext, TMeta, $ContextOverrides, unknown>;
+
+  /**
+   * Create a router
+   * @see https://trpc.io/docs/v11/server/routers
+   */
+  router: RouterBuilder<$Root>;
+
+  /**
+   * Merge Routers
+   * @see https://trpc.io/docs/v11/server/merging-routers
+   */
+  mergeRouters: <TRouters extends AnyRouter[]>(
+    ...routerList: [...TRouters]
+  ) => MergeRouters<TRouters>;
+
+  /**
+   * Create a server-side caller for a router
+   * @see https://trpc.io/docs/v11/server/server-side-calls
+   */
+  createCallerFactory: RouterCallerFactory<$Root>;
+}
+
 class TRPCBuilder<TContext extends object, TMeta extends object> {
   /**
    * Add a context shape as a generic to the root object
@@ -65,7 +140,7 @@ class TRPCBuilder<TContext extends object, TMeta extends object> {
    */
   create<TOptions extends RuntimeConfigOptions<TContext, TMeta>>(
     opts?: ValidateShape<TOptions, RuntimeConfigOptions<TContext, TMeta>>,
-  ) {
+  ): TRPCRootObject<TContext, TMeta, TOptions> {
     type $Root = CreateRootTypes<{
       ctx: TContext;
       meta: TMeta;

package/src/unstable-core-do-not-import/router.ts

@@ -132,18 +132,26 @@ function isLazy<TAny>(input: unknown): input is Lazy<TAny> {
   return typeof input === 'function' && lazySymbol in input;
 }
 
+/**
+ * @internal
+ */
+export interface RouterDef<
+  TRoot extends AnyRootTypes,
+  TRecord extends RouterRecord,
+> {
+  _config: RootConfig<TRoot>;
+  router: true;
+  procedure?: never;
+  procedures: TRecord;
+  record: TRecord;
+  lazy: Record<string, LazyLoader<AnyRouter>>;
+}
+
 export interface Router<
   TRoot extends AnyRootTypes,
   TRecord extends RouterRecord,
 > {
-  _def: {
-    _config: RootConfig<TRoot>;
-    router: true;
-    procedure?: never;
-    procedures: TRecord;
-    record: TRecord;
-    lazy: Record<string, LazyLoader<AnyRouter>>;
-  };
+  _def: RouterDef<TRoot, TRecord>;
   /**
    * @see https://trpc.io/docs/v11/server/server-side-calls
    */
@@ -152,8 +160,14 @@ export interface Router<
 
 export type BuiltRouter<
   TRoot extends AnyRootTypes,
-  TDef extends RouterRecord,
-> = Router<TRoot, TDef> & TDef;
+  TRecord extends RouterRecord,
+> = Router<TRoot, TRecord> & TRecord;
+
+export interface RouterBuilder<TRoot extends AnyRootTypes> {
+  <TIn extends CreateRouterOptions>(
+    _: TIn,
+  ): BuiltRouter<TRoot, DecorateCreateRouterOptions<TIn>>;
+}
 
 export type AnyRouter = Router<any, any>;
 
@@ -200,6 +214,7 @@ const reservedWords = [
   'apply',
 ];
 
+/** @internal */
 export type CreateRouterOptions = {
   [key: string]:
     | AnyProcedure
@@ -208,6 +223,7 @@ export type CreateRouterOptions = {
     | Lazy<AnyRouter>;
 };
 
+/** @internal */
 export type DecorateCreateRouterOptions<
   TRouterOptions extends CreateRouterOptions,
 > = {
@@ -410,7 +426,15 @@ export async function callProcedure(
   return proc(opts);
 }
 
-export function createCallerFactory<TRoot extends AnyRootTypes>() {
+export interface RouterCallerFactory<TRoot extends AnyRootTypes> {
+  <TRecord extends RouterRecord>(
+    router: Pick<Router<TRoot, TRecord>, '_def'>,
+  ): RouterCaller<TRoot, TRecord>;
+}
+
+export function createCallerFactory<
+  TRoot extends AnyRootTypes,
+>(): RouterCallerFactory<TRoot> {
   return function createCallerInner<TRecord extends RouterRecord>(
     router: Pick<Router<TRoot, TRecord>, '_def'>,
   ): RouterCaller<TRoot, TRecord> {
@@ -464,7 +488,7 @@ export function createCallerFactory<TRoot extends AnyRootTypes>() {
 }
 
 /** @internal */
-type MergeRouters<
+export type MergeRouters<
   TRouters extends AnyRouter[],
   TRoot extends AnyRootTypes = TRouters[0]['_def']['_config']['$types'],
   TRecord extends RouterRecord = {},

package/src/unstable-core-do-not-import/utils.ts

@@ -1,6 +1,7 @@
 /** @internal */
-export const unsetMarker = Symbol();
-export type UnsetMarker = typeof unsetMarker;
+export type UnsetMarker = 'unsetMarker' & {
+  __brand: 'unsetMarker';
+};
 
 /**
  * Ensures there are no duplicate keys when building a procedure.

package/unstable-core-do-not-import/package.json

@@ -0,0 +1 @@
+{"main":"../dist/unstable-core-do-not-import.cjs","module":"../dist/unstable-core-do-not-import.mjs","types":"../dist/unstable-core-do-not-import.d.cts"}

package/adapters/aws-lambda/index.d.ts

@@ -1 +0,0 @@
-export * from '../../dist/adapters/aws-lambda';

package/adapters/aws-lambda/index.js

@@ -1 +0,0 @@
-module.exports = require('../../dist/adapters/aws-lambda');

package/adapters/express/index.d.ts

@@ -1 +0,0 @@
-export * from '../../dist/adapters/express';

package/adapters/express/index.js

@@ -1 +0,0 @@
-module.exports = require('../../dist/adapters/express');

package/adapters/fastify/index.d.ts

@@ -1 +0,0 @@
-export * from '../../dist/adapters/fastify';

package/adapters/fastify/index.js

@@ -1 +0,0 @@
-module.exports = require('../../dist/adapters/fastify');

package/adapters/fetch/index.d.ts

@@ -1 +0,0 @@
-export * from '../../dist/adapters/fetch';

package/adapters/fetch/index.js

@@ -1 +0,0 @@
-module.exports = require('../../dist/adapters/fetch');

package/adapters/next/index.d.ts

@@ -1 +0,0 @@
-export * from '../../dist/adapters/next';

package/adapters/next/index.js

@@ -1 +0,0 @@
-module.exports = require('../../dist/adapters/next');

package/adapters/next-app-dir/index.d.ts

@@ -1 +0,0 @@
-export * from '../../dist/adapters/next-app-dir';

package/adapters/next-app-dir/index.js

@@ -1 +0,0 @@
-module.exports = require('../../dist/adapters/next-app-dir');

package/adapters/node-http/content-type/form-data/index.d.ts

@@ -1 +0,0 @@
-export * from '../../../../dist/adapters/node-http/content-type/form-data';

package/adapters/node-http/content-type/form-data/index.js

@@ -1 +0,0 @@
-module.exports = require('../../../../dist/adapters/node-http/content-type/form-data');

package/adapters/node-http/content-type/json/index.d.ts

@@ -1 +0,0 @@
-export * from '../../../../dist/adapters/node-http/content-type/json';

package/adapters/node-http/content-type/json/index.js

@@ -1 +0,0 @@
-module.exports = require('../../../../dist/adapters/node-http/content-type/json');

package/adapters/node-http/index.d.ts

@@ -1 +0,0 @@
-export * from '../../dist/adapters/node-http';

package/adapters/node-http/index.js

@@ -1 +0,0 @@
-module.exports = require('../../dist/adapters/node-http');

package/adapters/standalone/index.d.ts

@@ -1 +0,0 @@
-export * from '../../dist/adapters/standalone';

package/adapters/standalone/index.js

@@ -1 +0,0 @@
-module.exports = require('../../dist/adapters/standalone');

package/adapters/ws/index.d.ts

@@ -1 +0,0 @@
-export * from '../../dist/adapters/ws';

package/adapters/ws/index.js

@@ -1 +0,0 @@
-module.exports = require('../../dist/adapters/ws');