@trpc/server 11.0.0-alpha-tmp-export-from-main-nuke-core.240 → 11.0.0-alpha-tmp-export-from-main.222

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-alpha-tmp-export-from-main-nuke-core.240+d53651d70",
+  "version": "11.0.0-alpha-tmp-export-from-main.222+af7867f57",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -14,7 +14,8 @@
     "directory": "packages/server"
   },
   "scripts": {
-    "build": "rollup --config rollup.config.ts --configPlugin rollup-plugin-swc3",
+    "build": "bunchee",
+    "build-r": "rollup --config rollup.config.ts --configPlugin rollup-plugin-swc3",
     "dev": "pnpm build --watch",
     "codegen-entrypoints": "tsx entrypoints.script.ts",
     "benchmark": "tsc --project tsconfig.benchmark.json",
@@ -24,84 +25,164 @@
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js",
-      "default": "./dist/index.js"
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
     },
     "./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": {
+        "types": "./dist/adapters/aws-lambda/index.d.ts",
+        "default": "./dist/adapters/aws-lambda/index.mjs"
+      },
+      "require": {
+        "types": "./dist/adapters/aws-lambda/index.d.ts",
+        "default": "./dist/adapters/aws-lambda/index.js"
+      }
     },
     "./adapters/express": {
-      "import": "./dist/adapters/express.mjs",
-      "require": "./dist/adapters/express.js",
-      "default": "./dist/adapters/express.js"
+      "import": {
+        "types": "./dist/adapters/express.d.ts",
+        "default": "./dist/adapters/express.mjs"
+      },
+      "require": {
+        "types": "./dist/adapters/express.d.ts",
+        "default": "./dist/adapters/express.js"
+      }
     },
     "./adapters/fastify": {
-      "import": "./dist/adapters/fastify/index.mjs",
-      "require": "./dist/adapters/fastify/index.js",
-      "default": "./dist/adapters/fastify/index.js"
+      "import": {
+        "types": "./dist/adapters/fastify/index.d.ts",
+        "default": "./dist/adapters/fastify/index.mjs"
+      },
+      "require": {
+        "types": "./dist/adapters/fastify/index.d.ts",
+        "default": "./dist/adapters/fastify/index.js"
+      }
     },
     "./adapters/fetch": {
-      "import": "./dist/adapters/fetch/index.mjs",
-      "require": "./dist/adapters/fetch/index.js",
-      "default": "./dist/adapters/fetch/index.js"
+      "import": {
+        "types": "./dist/adapters/fetch/index.d.ts",
+        "default": "./dist/adapters/fetch/index.mjs"
+      },
+      "require": {
+        "types": "./dist/adapters/fetch/index.d.ts",
+        "default": "./dist/adapters/fetch/index.js"
+      }
     },
     "./adapters/next": {
-      "import": "./dist/adapters/next.mjs",
-      "require": "./dist/adapters/next.js",
-      "default": "./dist/adapters/next.js"
+      "import": {
+        "types": "./dist/adapters/next.d.ts",
+        "default": "./dist/adapters/next.mjs"
+      },
+      "require": {
+        "types": "./dist/adapters/next.d.ts",
+        "default": "./dist/adapters/next.js"
+      }
     },
     "./adapters/node-http/content-type/form-data": {
-      "import": "./dist/adapters/node-http/content-type/form-data/index.mjs",
-      "require": "./dist/adapters/node-http/content-type/form-data/index.js",
-      "default": "./dist/adapters/node-http/content-type/form-data/index.js"
+      "import": {
+        "types": "./dist/adapters/node-http/content-type/form-data/index.d.ts",
+        "default": "./dist/adapters/node-http/content-type/form-data/index.mjs"
+      },
+      "require": {
+        "types": "./dist/adapters/node-http/content-type/form-data/index.d.ts",
+        "default": "./dist/adapters/node-http/content-type/form-data/index.js"
+      }
     },
     "./adapters/node-http/content-type/json": {
-      "import": "./dist/adapters/node-http/content-type/json/index.mjs",
-      "require": "./dist/adapters/node-http/content-type/json/index.js",
-      "default": "./dist/adapters/node-http/content-type/json/index.js"
+      "import": {
+        "types": "./dist/adapters/node-http/content-type/json/index.d.ts",
+        "default": "./dist/adapters/node-http/content-type/json/index.mjs"
+      },
+      "require": {
+        "types": "./dist/adapters/node-http/content-type/json/index.d.ts",
+        "default": "./dist/adapters/node-http/content-type/json/index.js"
+      }
     },
     "./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": {
+        "types": "./dist/adapters/node-http/index.d.ts",
+        "default": "./dist/adapters/node-http/index.mjs"
+      },
+      "require": {
+        "types": "./dist/adapters/node-http/index.d.ts",
+        "default": "./dist/adapters/node-http/index.js"
+      }
     },
     "./adapters/standalone": {
-      "import": "./dist/adapters/standalone.mjs",
-      "require": "./dist/adapters/standalone.js",
-      "default": "./dist/adapters/standalone.js"
+      "import": {
+        "types": "./dist/adapters/standalone.d.ts",
+        "default": "./dist/adapters/standalone.mjs"
+      },
+      "require": {
+        "types": "./dist/adapters/standalone.d.ts",
+        "default": "./dist/adapters/standalone.js"
+      }
     },
     "./adapters/ws": {
-      "import": "./dist/adapters/ws.mjs",
-      "require": "./dist/adapters/ws.js",
-      "default": "./dist/adapters/ws.js"
+      "import": {
+        "types": "./dist/adapters/ws.d.ts",
+        "default": "./dist/adapters/ws.mjs"
+      },
+      "require": {
+        "types": "./dist/adapters/ws.d.ts",
+        "default": "./dist/adapters/ws.js"
+      }
     },
     "./http": {
-      "import": "./dist/http.mjs",
-      "require": "./dist/http.js",
-      "default": "./dist/http.js"
+      "import": {
+        "types": "./dist/http.d.ts",
+        "default": "./dist/http.mjs"
+      },
+      "require": {
+        "types": "./dist/http.d.ts",
+        "default": "./dist/http.js"
+      }
     },
     "./observable": {
-      "import": "./dist/observable/index.mjs",
-      "require": "./dist/observable/index.js",
-      "default": "./dist/observable/index.js"
+      "import": {
+        "types": "./dist/observable.d.ts",
+        "default": "./dist/observable.mjs"
+      },
+      "require": {
+        "types": "./dist/observable.d.ts",
+        "default": "./dist/observable.js"
+      }
     },
     "./rpc": {
-      "import": "./dist/rpc.mjs",
-      "require": "./dist/rpc.js",
-      "default": "./dist/rpc.js"
+      "import": {
+        "types": "./dist/rpc.d.ts",
+        "default": "./dist/rpc.mjs"
+      },
+      "require": {
+        "types": "./dist/rpc.d.ts",
+        "default": "./dist/rpc.js"
+      }
     },
     "./shared": {
-      "import": "./dist/shared.mjs",
-      "require": "./dist/shared.js",
-      "default": "./dist/shared.js"
+      "import": {
+        "types": "./dist/shared.d.ts",
+        "default": "./dist/shared.mjs"
+      },
+      "require": {
+        "types": "./dist/shared.d.ts",
+        "default": "./dist/shared.js"
+      }
     },
-    "./unstable-core-do-not-import": {
-      "import": "./dist/unstable-core-do-not-import/index.mjs",
-      "require": "./dist/unstable-core-do-not-import/index.js",
-      "default": "./dist/unstable-core-do-not-import/index.js"
+    "./unstableDontImportMe": {
+      "import": {
+        "types": "./dist/unstableDontImportMe.d.ts",
+        "default": "./dist/unstableDontImportMe.mjs"
+      },
+      "require": {
+        "types": "./dist/unstableDontImportMe.d.ts",
+        "default": "./dist/unstableDontImportMe.js"
+      }
     }
   },
   "files": [
@@ -114,12 +195,15 @@
     "observable",
     "rpc",
     "shared",
-    "unstable-core-do-not-import",
+    "unstableDontImportMe",
     "!**/*.test.*"
   ],
   "publishConfig": {
     "access": "public"
   },
+  "dependencies": {
+    "@trpc/core": "11.0.0-alpha-tmp-export-from-main.222+af7867f57"
+  },
   "devDependencies": {
     "@fastify/websocket": "^7.1.2",
     "@tanstack/react-query": "^5.0.0",
@@ -132,6 +216,7 @@
     "@types/ws": "^8.2.0",
     "@web3-storage/multipart-parser": "^1.0.0",
     "aws-lambda": "^1.0.7",
+    "bunchee": "4.4.1",
     "devalue": "^4.0.0",
     "eslint": "^8.40.0",
     "express": "^4.17.1",
@@ -157,5 +242,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "d53651d7097e731903e1d931b06ab7d24a3115e0"
+  "gitHead": "af7867f578c243ea1e10f0a8357094d43756d7d4"
 }

package/src/@trpc-server/http.ts

@@ -0,0 +1,2 @@
+// This should be moved to a like `@trpc/plugin`-package
+export * from '@trpc/core';

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

@@ -1,6 +1,7 @@
 /**
  * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
  *
+ * Do **not** import from `@trpc/core`
  * @example
  * ```ts
  * import type { AnyTRPCRouter } from '@trpc/server'
@@ -15,15 +16,15 @@ import type {
   Context as APIGWContext,
 } from 'aws-lambda';
 // @trpc/server
-import type { AnyRouter } from '../../@trpc/server';
+import type { AnyRouter } from '../..';
 // @trpc/server
-import { TRPCError } from '../../@trpc/server';
+import { TRPCError } from '../..';
 import type {
   HTTPRequest,
   HTTPResponse,
   ResolveHTTPRequestOptionsContextFn,
-} from '../../@trpc/server/http';
-import { resolveHTTPResponse } from '../../@trpc/server/http';
+} from '../../http';
+import { resolveHTTPResponse } from '../../http';
 import type {
   APIGatewayEvent,
   APIGatewayResult,

package/src/adapters/aws-lambda/utils.ts

@@ -1,6 +1,7 @@
 /**
  * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
  *
+ * Do **not** import from `@trpc/core`
  * @example
  * ```ts
  * import type { AnyTRPCRouter } from '@trpc/server'
@@ -14,16 +15,16 @@ import type {
   APIGatewayProxyStructuredResultV2,
   Context as APIGWContext,
 } from 'aws-lambda';
-import type { AnyRouter, inferRouterContext } from '../../@trpc/server'; // import @trpc/server
+import type { AnyRouter, inferRouterContext } from '../..'; // import @trpc/server
 
 // @trpc/server
-import { TRPCError } from '../../@trpc/server';
+import { TRPCError } from '../..';
 import type {
   HTTPHeaders,
   OnErrorFunction,
   ResponseMetaFn,
   TRPCRequestInfo,
-} from '../../@trpc/server/http';
+} from '../../http';
 
 export type APIGatewayEvent = APIGatewayProxyEvent | APIGatewayProxyEventV2;
 export type APIGatewayResult =

package/src/adapters/express.ts

@@ -1,6 +1,7 @@
 /**
  * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
  *
+ * Do **not** import from `@trpc/core`
  * @example
  * ```ts
  * import type { AnyTRPCRouter } from '@trpc/server'
@@ -8,7 +9,8 @@
  * ```
  */
 import type * as express from 'express';
-import type { AnyRouter } from '../@trpc/server';
+// @trpc/server
+import type { AnyRouter } from '..';
 import type {
   NodeHTTPCreateContextFnOptions,
   NodeHTTPHandlerOptions,

package/src/adapters/fastify/fastifyRequestHandler.ts

@@ -1,6 +1,7 @@
 /**
  * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
  *
+ * Do **not** import from `@trpc/core`
  * @example
  * ```ts
  * import type { AnyTRPCRouter } from '@trpc/server'
@@ -10,18 +11,15 @@
 import { Readable } from 'node:stream';
 import type { FastifyReply, FastifyRequest } from 'fastify';
 // @trpc/server
-import type { AnyRouter } from '../../@trpc/server';
+import type { AnyRouter } from '../..';
 import type {
   HTTPBaseHandlerOptions,
   HTTPRequest,
   HTTPResponse,
   ResolveHTTPRequestOptionsContextFn,
   ResponseChunk,
-} from '../../@trpc/server/http';
-import {
-  getBatchStreamFormatter,
-  resolveHTTPResponse,
-} from '../../@trpc/server/http';
+} from '../../http';
+import { getBatchStreamFormatter, resolveHTTPResponse } from '../../http';
 import type { NodeHTTPCreateContextOption } from '../node-http';
 
 export type FastifyHandlerOptions<

package/src/adapters/fastify/fastifyTRPCPlugin.ts

@@ -1,6 +1,7 @@
 /**
  * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
  *
+ * Do **not** import from `@trpc/core`
  * @example
  * ```ts
  * import type { AnyTRPCRouter } from '@trpc/server'
@@ -11,7 +12,7 @@
 import type { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
 import type { FastifyHandlerOptions } from '.';
 // @trpc/server
-import type { AnyRouter } from '../../@trpc/server';
+import type { AnyRouter } from '../..';
 import type { NodeHTTPCreateContextFnOptions } from '../node-http';
 import type { WSSHandlerOptions } from '../ws';
 import { applyWSSHandler } from '../ws';

package/src/adapters/fetch/fetchRequestHandler.ts

@@ -1,6 +1,7 @@
 /**
  * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
  *
+ * Do **not** import from `@trpc/core`
  * @example
  * ```ts
  * import type { AnyTRPCRouter } from '@trpc/server'
@@ -8,17 +9,14 @@
  * ```
  */
 // @trpc/server
-import type { AnyRouter } from '../../@trpc/server';
+import type { AnyRouter } from '../..';
 import type {
   HTTPRequest,
   HTTPResponse,
   ResolveHTTPRequestOptionsContextFn,
   ResponseChunk,
-} from '../../@trpc/server/http';
-import {
-  getBatchStreamFormatter,
-  resolveHTTPResponse,
-} from '../../@trpc/server/http';
+} from '../../http';
+import { getBatchStreamFormatter, resolveHTTPResponse } from '../../http';
 import type { FetchHandlerOptions } from './types';
 
 export type FetchHandlerRequestOptions<TRouter extends AnyRouter> =

package/src/adapters/fetch/types.ts

@@ -1,6 +1,7 @@
 /**
  * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
  *
+ * Do **not** import from `@trpc/core`
  * @example
  * ```ts
  * import type { AnyTRPCRouter } from '@trpc/server'
@@ -8,12 +9,12 @@
  * ```
  */
 // @trpc/server
-import type { AnyRouter, inferRouterContext } from '../../@trpc/server';
+import type { AnyRouter, inferRouterContext } from '../..';
 // @trpc/server/http
 import type {
   HTTPBaseHandlerOptions,
   TRPCRequestInfo,
-} from '../../@trpc/server/http';
+} from '../../@trpc-server/http';
 
 export type FetchCreateContextFnOptions = {
   req: Request;

package/src/adapters/next.ts

@@ -1,6 +1,7 @@
 /**
  * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
  *
+ * Do **not** import from `@trpc/core`
  * @example
  * ```ts
  * import type { AnyTRPCRouter } from '@trpc/server'
@@ -9,9 +10,9 @@
  */
 import type { NextApiHandler, NextApiRequest, NextApiResponse } from 'next';
 // @trpc/server
-import type { AnyRouter } from '../@trpc/server';
+import type { AnyRouter } from '..';
 // @trpc/server
-import { getErrorShape, TRPCError } from '../@trpc/server';
+import { getErrorShape, TRPCError } from '..';
 import type {
   NodeHTTPCreateContextFnOptions,
   NodeHTTPHandlerOptions,
@@ -22,6 +23,7 @@ export type CreateNextContextOptions = NodeHTTPCreateContextFnOptions<
   NextApiRequest,
   NextApiResponse
 >;
+export type { NextApiHandler, NextApiRequest, NextApiResponse } from 'next';
 
 export function createNextApiHandler<TRouter extends AnyRouter>(
   opts: NodeHTTPHandlerOptions<TRouter, NextApiRequest, NextApiResponse>,

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

@@ -14,7 +14,7 @@ import { Readable } from 'node:stream';
 // @ts-ignore the type definitions for this package are borked
 import { streamMultipart } from '@web3-storage/multipart-parser';
 // @trpc/server
-import type { CombinedDataTransformer } from '../../../../@trpc/server';
+import type { CombinedDataTransformer } from '../../../..';
 import { createNodeHTTPContentTypeHandler } from '../../internals/contentType';
 import type { NodeHTTPRequest } from '../../types';
 import { NodeOnDiskFile } from './fileUploadHandler';

package/src/adapters/node-http/content-type/json/getPostBody.ts

@@ -1,6 +1,6 @@
 // @trpc/server
-import { TRPCError } from '../../../../@trpc/server';
-import type { BodyResult } from '../../../../@trpc/server/http';
+import { TRPCError } from '../../../..';
+import type { BodyResult } from '../../../../http';
 import type { NodeHTTPRequest } from '../../types';
 
 export async function getPostBody(opts: {

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

@@ -1,4 +1,4 @@
-import { getJsonContentTypeInputs } from '../../../../@trpc/server/http';
+import { getJsonContentTypeInputs } from '../../../../http';
 import { createNodeHTTPContentTypeHandler } from '../../internals/contentType';
 import { getPostBody } from './getPostBody';
 

package/src/adapters/node-http/internals/contentType.ts

@@ -1,7 +1,7 @@
 // @trpc/server
-import type { AnyRouter } from '../../../@trpc/server';
+import type { AnyRouter } from '../../..';
 // @trpc/server/http
-import type { BaseContentTypeHandler } from '../../../@trpc/server/http';
+import type { BaseContentTypeHandler } from '../../../@trpc-server/http';
 import type {
   NodeHTTPRequest,
   NodeHTTPRequestHandlerOptions,

package/src/adapters/node-http/nodeHTTPRequestHandler.ts

@@ -1,6 +1,7 @@
 /**
  * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
  *
+ * Do **not** import from `@trpc/core`
  * @example
  * ```ts
  * import type { AnyTRPCRouter } from '@trpc/server'
@@ -9,17 +10,14 @@
  */
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 // @trpc/server
-import type { AnyRouter } from '../../@trpc/server';
+import type { AnyRouter } from '../..';
 import type {
   HTTPRequest,
   HTTPResponse,
   ResolveHTTPRequestOptionsContextFn,
   ResponseChunk,
-} from '../../@trpc/server/http';
-import {
-  getBatchStreamFormatter,
-  resolveHTTPResponse,
-} from '../../@trpc/server/http';
+} from '../../http';
+import { getBatchStreamFormatter, resolveHTTPResponse } from '../../http';
 import { nodeHTTPJSONContentTypeHandler } from './content-type/json';
 import type { NodeHTTPContentTypeHandler } from './internals/contentType';
 import type {

package/src/adapters/node-http/types.ts

@@ -1,6 +1,7 @@
 /**
  * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
  *
+ * Do **not** import from `@trpc/core`
  * @example
  * ```ts
  * import type { AnyTRPCRouter } from '@trpc/server'
@@ -8,15 +9,15 @@
  * ```
  */
 import type { IncomingMessage, ServerResponse } from 'http';
+// eslint-disable-next-line no-restricted-imports
+import type { MaybePromise } from '@trpc/core';
 // @trpc/server
-import type { AnyRouter, inferRouterContext } from '../../@trpc/server';
+import type { AnyRouter, inferRouterContext } from '../..';
 // @trpc/server/http
 import type {
   HTTPBaseHandlerOptions,
   TRPCRequestInfo,
-} from '../../@trpc/server/http';
-// eslint-disable-next-line no-restricted-imports
-import type { MaybePromise } from '../../unstable-core-do-not-import';
+} from '../../@trpc-server/http';
 import type { NodeHTTPContentTypeHandler } from './internals/contentType';
 
 interface ParsedQs {

package/src/adapters/standalone.ts

@@ -1,6 +1,7 @@
 /**
  * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
  *
+ * Do **not** import from `@trpc/core`
  * @example
  * ```ts
  * import type { AnyTRPCRouter } from '@trpc/server'
@@ -10,7 +11,7 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import http from 'http';
 // @trpc/server
-import type { AnyRouter } from '../@trpc/server';
+import type { AnyRouter } from '..';
 import type {
   NodeHTTPCreateContextFnOptions,
   NodeHTTPHandlerOptions,
@@ -36,7 +37,6 @@ export function createHTTPHandler<TRouter extends AnyRouter>(
     await nodeHTTPRequestHandler({
       // FIXME: no typecasting should be needed here
       ...(opts as CreateHTTPHandlerOptions<AnyRouter>),
-      ...(opts as any),
       req,
       res,
       path,

package/src/adapters/ws.ts

@@ -1,26 +1,25 @@
 import type { IncomingMessage } from 'http';
+// eslint-disable-next-line no-restricted-imports
+import type {
+  BaseHandlerOptions,
+  JSONRPC2,
+  MaybePromise,
+  TRPCClientOutgoingMessage,
+  TRPCReconnectNotification,
+  TRPCResponseMessage,
+  Unsubscribable,
+} from '@trpc/core';
 import type ws from 'ws';
-import type { AnyRouter, inferRouterContext } from '../@trpc/server';
+import type { AnyRouter, inferRouterContext } from '..';
 import {
   callProcedure,
   getErrorShape,
   getTRPCErrorFromUnknown,
   transformTRPCResponse,
   TRPCError,
-} from '../@trpc/server';
-import type { BaseHandlerOptions } from '../@trpc/server/http';
-import { parseTRPCMessage } from '../@trpc/server/rpc';
-// @trpc/server/rpc
-import type {
-  JSONRPC2,
-  TRPCClientOutgoingMessage,
-  TRPCReconnectNotification,
-  TRPCResponseMessage,
-} from '../@trpc/server/rpc';
+} from '..';
 import { isObservable } from '../observable';
-import type { Unsubscribable } from '../observable';
-// eslint-disable-next-line no-restricted-imports
-import type { MaybePromise } from '../unstable-core-do-not-import';
+import { parseTRPCMessage } from '../rpc';
 import type { NodeHTTPCreateContextFnOptions } from './node-http';
 
 /**