@trpc/server 11.0.0-alpha-tmp-export-from-main.211 → 11.0.0-alpha-tmp-export-from-main-nuke-core.227

package/dist/unstable-core-do-not-import/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/unstable-core-do-not-import/types.ts"],"names":[],"mappings":"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"}

package/dist/unstable-core-do-not-import/utils.d.ts

@@ -0,0 +1,27 @@
+type KeyFromValue<TValue, TType extends Record<PropertyKey, PropertyKey>> = {
+    [K in keyof TType]: TValue extends TType[K] ? K : never;
+}[keyof TType];
+type Invert<TType extends Record<PropertyKey, PropertyKey>> = {
+    [TValue in TType[keyof TType]]: KeyFromValue<TValue, TType>;
+};
+/**
+ * @internal
+ */
+export declare function invert<TRecord extends Record<PropertyKey, PropertyKey>>(obj: TRecord): Invert<TRecord>;
+/**
+ * Ensures there are no duplicate keys when building a procedure.
+ * @internal
+ */
+export declare function mergeWithoutOverrides<TType extends Record<string, unknown>>(obj1: TType, ...objs: Partial<TType>[]): TType;
+/**
+ * Check that value is object
+ * @internal
+ */
+export declare function isObject(value: unknown): value is Record<string, unknown>;
+/**
+ * Create an object without inheriting anything from `Object.prototype`
+ * @internal
+ */
+export declare function omitPrototype<TObj extends Record<string, unknown>>(obj: TObj): TObj;
+export {};
+//# sourceMappingURL=utils.d.ts.map

package/dist/unstable-core-do-not-import/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/unstable-core-do-not-import/utils.ts"],"names":[],"mappings":"AAAA,KAAK,YAAY,CAAC,MAAM,EAAE,KAAK,SAAS,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,IAAI;KACzE,CAAC,IAAI,MAAM,KAAK,GAAG,MAAM,SAAS,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK;CACxD,CAAC,MAAM,KAAK,CAAC,CAAC;AAEf,KAAK,MAAM,CAAC,KAAK,SAAS,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,IAAI;KAC3D,MAAM,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC;CAC5D,CAAC;AACF;;GAEG;AACH,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,EACrE,GAAG,EAAE,OAAO,GACX,MAAM,CAAC,OAAO,CAAC,CAOjB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACzE,IAAI,EAAE,KAAK,EACX,GAAG,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,GACxB,KAAK,CAYP;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEzE;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChE,GAAG,EAAE,IAAI,GACR,IAAI,CAEN"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-alpha-tmp-export-from-main.211+de13a9c6f",
+  "version": "11.0.0-alpha-tmp-export-from-main-nuke-core.227+874623cd0",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -24,154 +24,84 @@
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.js",
+      "default": "./dist/index.js"
     },
     "./adapters/aws-lambda": {
-      "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"
-      }
+      "import": "./dist/adapters/aws-lambda/index.mjs",
+      "require": "./dist/adapters/aws-lambda/index.js",
+      "default": "./dist/adapters/aws-lambda/index.js"
     },
     "./adapters/express": {
-      "import": {
-        "types": "./dist/adapters/express.d.ts",
-        "default": "./dist/adapters/express.mjs"
-      },
-      "require": {
-        "types": "./dist/adapters/express.d.ts",
-        "default": "./dist/adapters/express.js"
-      }
+      "import": "./dist/adapters/express.mjs",
+      "require": "./dist/adapters/express.js",
+      "default": "./dist/adapters/express.js"
     },
     "./adapters/fastify": {
-      "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"
-      }
+      "import": "./dist/adapters/fastify/index.mjs",
+      "require": "./dist/adapters/fastify/index.js",
+      "default": "./dist/adapters/fastify/index.js"
     },
     "./adapters/fetch": {
-      "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"
-      }
+      "import": "./dist/adapters/fetch/index.mjs",
+      "require": "./dist/adapters/fetch/index.js",
+      "default": "./dist/adapters/fetch/index.js"
     },
     "./adapters/next": {
-      "import": {
-        "types": "./dist/adapters/next.d.ts",
-        "default": "./dist/adapters/next.mjs"
-      },
-      "require": {
-        "types": "./dist/adapters/next.d.ts",
-        "default": "./dist/adapters/next.js"
-      }
+      "import": "./dist/adapters/next.mjs",
+      "require": "./dist/adapters/next.js",
+      "default": "./dist/adapters/next.js"
     },
     "./adapters/node-http/content-type/form-data": {
-      "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"
-      }
+      "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"
     },
     "./adapters/node-http/content-type/json": {
-      "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"
-      }
+      "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"
     },
     "./adapters/node-http": {
-      "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"
-      }
+      "import": "./dist/adapters/node-http/index.mjs",
+      "require": "./dist/adapters/node-http/index.js",
+      "default": "./dist/adapters/node-http/index.js"
     },
     "./adapters/standalone": {
-      "import": {
-        "types": "./dist/adapters/standalone.d.ts",
-        "default": "./dist/adapters/standalone.mjs"
-      },
-      "require": {
-        "types": "./dist/adapters/standalone.d.ts",
-        "default": "./dist/adapters/standalone.js"
-      }
+      "import": "./dist/adapters/standalone.mjs",
+      "require": "./dist/adapters/standalone.js",
+      "default": "./dist/adapters/standalone.js"
     },
     "./adapters/ws": {
-      "import": {
-        "types": "./dist/adapters/ws.d.ts",
-        "default": "./dist/adapters/ws.mjs"
-      },
-      "require": {
-        "types": "./dist/adapters/ws.d.ts",
-        "default": "./dist/adapters/ws.js"
-      }
+      "import": "./dist/adapters/ws.mjs",
+      "require": "./dist/adapters/ws.js",
+      "default": "./dist/adapters/ws.js"
     },
     "./http": {
-      "import": {
-        "types": "./dist/http.d.ts",
-        "default": "./dist/http.mjs"
-      },
-      "require": {
-        "types": "./dist/http.d.ts",
-        "default": "./dist/http.js"
-      }
+      "import": "./dist/http.mjs",
+      "require": "./dist/http.js",
+      "default": "./dist/http.js"
     },
     "./observable": {
-      "import": {
-        "types": "./dist/observable.d.ts",
-        "default": "./dist/observable.mjs"
-      },
-      "require": {
-        "types": "./dist/observable.d.ts",
-        "default": "./dist/observable.js"
-      }
+      "import": "./dist/observable/index.mjs",
+      "require": "./dist/observable/index.js",
+      "default": "./dist/observable/index.js"
     },
     "./rpc": {
-      "import": {
-        "types": "./dist/rpc.d.ts",
-        "default": "./dist/rpc.mjs"
-      },
-      "require": {
-        "types": "./dist/rpc.d.ts",
-        "default": "./dist/rpc.js"
-      }
+      "import": "./dist/rpc.mjs",
+      "require": "./dist/rpc.js",
+      "default": "./dist/rpc.js"
     },
     "./shared": {
-      "import": {
-        "types": "./dist/shared.d.ts",
-        "default": "./dist/shared.mjs"
-      },
-      "require": {
-        "types": "./dist/shared.d.ts",
-        "default": "./dist/shared.js"
-      }
+      "import": "./dist/shared.mjs",
+      "require": "./dist/shared.js",
+      "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"
     }
   },
   "files": [
@@ -184,14 +114,12 @@
     "observable",
     "rpc",
     "shared",
+    "unstable-core-do-not-import",
     "!**/*.test.*"
   ],
   "publishConfig": {
     "access": "public"
   },
-  "dependencies": {
-    "@trpc/core": "11.0.0-alpha-tmp-export-from-main.211+de13a9c6f"
-  },
   "devDependencies": {
     "@fastify/websocket": "^7.1.2",
     "@tanstack/react-query": "^5.0.0",
@@ -229,5 +157,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "de13a9c6f5e727386dce61ecf8e698c4901b01a7"
+  "gitHead": "874623cd00465e2b73655de5e235ce5167d2cebd"
 }

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

@@ -0,0 +1,26 @@
+export {
+  getHTTPStatusCode,
+  getHTTPStatusCodeFromError,
+} from '../../unstable-core-do-not-import';
+export { resolveHTTPResponse } from '../../unstable-core-do-not-import';
+export type {
+  BaseHandlerOptions,
+  HTTPBaseHandlerOptions,
+  HTTPHeaders,
+  HTTPRequest,
+  HTTPResponse,
+  OnErrorFunction,
+  ProcedureCall,
+  ResolveHTTPRequestOptionsContextFn,
+  ResponseChunk,
+  ResponseMeta,
+  ResponseMetaFn,
+  TRPCRequestInfo,
+} from '../../unstable-core-do-not-import';
+
+export { getBatchStreamFormatter } from '../../unstable-core-do-not-import';
+export type {
+  BaseContentTypeHandler,
+  BodyResult,
+} from '../../unstable-core-do-not-import';
+export { getJsonContentTypeInputs } from '../../unstable-core-do-not-import';

package/src/{@trpc-server.ts → @trpc/server/index.ts}

@@ -29,7 +29,7 @@ export {
   type ProcedureRouterRecord as TRPCProcedureRouterRecord,
   type ProcedureArgs as TRPCProcedureArgs,
   type AnySubscriptionProcedure as AnyTRPCSubscriptionProcedure,
-} from './@trpc-core-unstable-do-not-import-this-please';
+} from '../../unstable-core-do-not-import';
 
 export type {
   /**
@@ -83,7 +83,7 @@ export type {
    * @deprecated use `AnyTRPCSubscriptionProcedure` instead
    */
   AnySubscriptionProcedure,
-} from '@trpc/core';
+} from '../../unstable-core-do-not-import';
 
 export {
   /**
@@ -95,7 +95,7 @@ export {
    * @deprecated use `callTRPCProcedure` instead
    */
   callProcedure,
-} from '@trpc/core';
+} from '../../unstable-core-do-not-import';
 
 /**
  * @deprecated

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

@@ -0,0 +1,26 @@
+// Note: this should likely be moved to a sort of `@trpc/plugin` package
+export type {
+  JSONRPC2,
+  TRPCClientIncomingMessage,
+  TRPCClientIncomingRequest,
+  TRPCClientOutgoingMessage,
+  TRPCClientOutgoingRequest,
+  TRPCErrorResponse,
+  TRPCErrorShape,
+  TRPCReconnectNotification,
+  TRPCRequest,
+  TRPCRequestMessage,
+  TRPCResponse,
+  TRPCResponseMessage,
+  TRPCResult,
+  TRPCResultMessage,
+  TRPCSubscriptionStopNotification,
+  TRPCSuccessResponse,
+  TRPC_ERROR_CODE_KEY,
+  TRPC_ERROR_CODE_NUMBER,
+} from '../../unstable-core-do-not-import';
+export {
+  TRPC_ERROR_CODES_BY_KEY,
+  TRPC_ERROR_CODES_BY_NUMBER,
+  parseTRPCMessage,
+} from '../../unstable-core-do-not-import';

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

@@ -1,7 +1,6 @@
 /**
  * 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'
@@ -16,15 +15,15 @@ import type {
   Context as APIGWContext,
 } from 'aws-lambda';
 // @trpc/server
-import type { AnyRouter } from '../../@trpc-server';
+import type { AnyRouter } from '../../@trpc/server';
 // @trpc/server
-import { TRPCError } from '../../@trpc-server';
+import { TRPCError } from '../../@trpc/server';
 import type {
   HTTPRequest,
   HTTPResponse,
   ResolveHTTPRequestOptionsContextFn,
-} from '../../http';
-import { resolveHTTPResponse } from '../../http';
+} from '../../@trpc/server/http';
+import { resolveHTTPResponse } from '../../@trpc/server/http';
 import type {
   APIGatewayEvent,
   APIGatewayResult,

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

@@ -1,7 +1,6 @@
 /**
  * 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,16 +14,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 '../../@trpc/server'; // import @trpc/server
 
 // @trpc/server
-import { TRPCError } from '../../@trpc-server';
+import { TRPCError } from '../../@trpc/server';
 import type {
   HTTPHeaders,
   OnErrorFunction,
   ResponseMetaFn,
   TRPCRequestInfo,
-} from '../../http';
+} from '../../@trpc/server/http';
 
 export type APIGatewayEvent = APIGatewayProxyEvent | APIGatewayProxyEventV2;
 export type APIGatewayResult =

package/src/adapters/express.ts

@@ -1,7 +1,6 @@
 /**
  * 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,8 +8,7 @@
  * ```
  */
 import type * as express from 'express';
-// @trpc/server
-import type { AnyRouter } from '../@trpc-server';
+import type { AnyRouter } from '../@trpc/server';
 import type {
   NodeHTTPCreateContextFnOptions,
   NodeHTTPHandlerOptions,
@@ -30,11 +28,7 @@ export function createExpressMiddleware<TRouter extends AnyRouter>(
 
     await nodeHTTPRequestHandler({
       // FIXME: no typecasting should be needed here
-      ...(opts as NodeHTTPHandlerOptions<
-        AnyRouter,
-        express.Request,
-        express.Response
-      >),
+      ...(opts as any),
       req,
       res,
       path: endpoint,

package/src/adapters/fastify/fastifyRequestHandler.ts

@@ -1,7 +1,6 @@
 /**
  * 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,15 +10,18 @@
 import { Readable } from 'node:stream';
 import type { FastifyReply, FastifyRequest } from 'fastify';
 // @trpc/server
-import type { AnyRouter } from '../../@trpc-server';
+import type { AnyRouter } from '../../@trpc/server';
 import type {
   HTTPBaseHandlerOptions,
   HTTPRequest,
   HTTPResponse,
   ResolveHTTPRequestOptionsContextFn,
   ResponseChunk,
-} from '../../http';
-import { getBatchStreamFormatter, resolveHTTPResponse } from '../../http';
+} from '../../@trpc/server/http';
+import {
+  getBatchStreamFormatter,
+  resolveHTTPResponse,
+} from '../../@trpc/server/http';
 import type { NodeHTTPCreateContextOption } from '../node-http';
 
 export type FastifyHandlerOptions<

package/src/adapters/fastify/fastifyTRPCPlugin.ts

@@ -1,7 +1,6 @@
 /**
  * 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'
@@ -12,7 +11,7 @@
 import type { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
 import type { FastifyHandlerOptions } from '.';
 // @trpc/server
-import type { AnyRouter } from '../../@trpc-server';
+import type { AnyRouter } from '../../@trpc/server';
 import type { NodeHTTPCreateContextFnOptions } from '../node-http';
 import type { WSSHandlerOptions } from '../ws';
 import { applyWSSHandler } from '../ws';

package/src/adapters/fetch/fetchRequestHandler.ts

@@ -1,7 +1,6 @@
 /**
  * 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,14 +8,17 @@
  * ```
  */
 // @trpc/server
-import type { AnyRouter } from '../../@trpc-server';
+import type { AnyRouter } from '../../@trpc/server';
 import type {
   HTTPRequest,
   HTTPResponse,
   ResolveHTTPRequestOptionsContextFn,
   ResponseChunk,
-} from '../../http';
-import { getBatchStreamFormatter, resolveHTTPResponse } from '../../http';
+} from '../../@trpc/server/http';
+import {
+  getBatchStreamFormatter,
+  resolveHTTPResponse,
+} from '../../@trpc/server/http';
 import type { FetchHandlerOptions } from './types';
 
 export type FetchHandlerRequestOptions<TRouter extends AnyRouter> =

package/src/adapters/fetch/types.ts

@@ -1,7 +1,6 @@
 /**
  * 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,12 +8,12 @@
  * ```
  */
 // @trpc/server
-import type { AnyRouter, inferRouterContext } from '../../@trpc-server';
+import type { AnyRouter, inferRouterContext } from '../../@trpc/server';
 // @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,7 +1,6 @@
 /**
  * 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,9 +9,9 @@
  */
 import type { NextApiHandler, NextApiRequest, NextApiResponse } from 'next';
 // @trpc/server
-import type { AnyRouter } from '../@trpc-server';
+import type { AnyRouter } from '../@trpc/server';
 // @trpc/server
-import { getErrorShape, TRPCError } from '../@trpc-server';
+import { getErrorShape, TRPCError } from '../@trpc/server';
 import type {
   NodeHTTPCreateContextFnOptions,
   NodeHTTPHandlerOptions,
@@ -63,11 +62,7 @@ export function createNextApiHandler<TRouter extends AnyRouter>(
 
     await nodeHTTPRequestHandler({
       // FIXME: no typecasting should be needed here
-      ...(opts as NodeHTTPHandlerOptions<
-        AnyRouter,
-        NextApiRequest,
-        NextApiResponse
-      >),
+      ...(opts as any),
       req,
       res,
       path,

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 '../../../../@trpc/server';
 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 '../../../../http';
+import { TRPCError } from '../../../../@trpc/server';
+import type { BodyResult } from '../../../../@trpc/server/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 '../../../../http';
+import { getJsonContentTypeInputs } from '../../../../@trpc/server/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';
 // @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,7 +1,6 @@
 /**
  * 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,14 +9,17 @@
  */
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 // @trpc/server
-import type { AnyRouter } from '../../@trpc-server';
+import type { AnyRouter } from '../../@trpc/server';
 import type {
   HTTPRequest,
   HTTPResponse,
   ResolveHTTPRequestOptionsContextFn,
   ResponseChunk,
-} from '../../http';
-import { getBatchStreamFormatter, resolveHTTPResponse } from '../../http';
+} from '../../@trpc/server/http';
+import {
+  getBatchStreamFormatter,
+  resolveHTTPResponse,
+} from '../../@trpc/server/http';
 import { nodeHTTPJSONContentTypeHandler } from './content-type/json';
 import type { NodeHTTPContentTypeHandler } from './internals/contentType';
 import type {