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

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

@@ -23,9 +23,5 @@ export declare function isObject(value: unknown): value is Record<string, unknow
  * @internal
  */
 export declare function omitPrototype<TObj extends Record<string, unknown>>(obj: TObj): TObj;
-/**
- * @internal
- */
-export declare function identity<TType>(x: TType): TType;
 export {};
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +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;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,GAAG,KAAK,CAE/C"}
+{"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-nuke-core.219+ac8042b2a",
+  "version": "11.0.0-alpha-tmp-export-from-main-nuke-core.227+874623cd0",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -157,5 +157,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "ac8042b2a39c2a4fb2f950a5a5097381ebe2c856"
+  "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 './unstable-core-do-not-import';
+} from '../../unstable-core-do-not-import';
 
 export type {
   /**
@@ -83,7 +83,7 @@ export type {
    * @deprecated use `AnyTRPCSubscriptionProcedure` instead
    */
   AnySubscriptionProcedure,
-} from './unstable-core-do-not-import';
+} from '../../unstable-core-do-not-import';
 
 export {
   /**
@@ -95,7 +95,7 @@ export {
    * @deprecated use `callTRPCProcedure` instead
    */
   callProcedure,
-} from './unstable-core-do-not-import';
+} 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/server/unstable-core-do-not-import`
  * @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/server/unstable-core-do-not-import`
  * @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/server/unstable-core-do-not-import`
  * @example
  * ```ts
  * import type { AnyTRPCRouter } from '@trpc/server'
@@ -9,7 +8,7 @@
  * ```
  */
 import type * as express from 'express';
-import type { AnyRouter } from '../@trpc-server';
+import type { AnyRouter } from '../@trpc/server';
 import type {
   NodeHTTPCreateContextFnOptions,
   NodeHTTPHandlerOptions,
@@ -29,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/server/unstable-core-do-not-import`
  * @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/server/unstable-core-do-not-import`
  * @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/server/unstable-core-do-not-import`
  * @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/server/unstable-core-do-not-import`
  * @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/server/unstable-core-do-not-import`
  * @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/server/unstable-core-do-not-import`
  * @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 {

package/src/adapters/node-http/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/server/unstable-core-do-not-import`
  * @example
  * ```ts
  * import type { AnyTRPCRouter } from '@trpc/server'
@@ -10,12 +9,13 @@
  */
 import type { IncomingMessage, ServerResponse } from 'http';
 // @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';
+// eslint-disable-next-line no-restricted-imports
 import type { MaybePromise } from '../../unstable-core-do-not-import';
 import type { NodeHTTPContentTypeHandler } from './internals/contentType';
 

package/src/adapters/standalone.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/server/unstable-core-do-not-import`
  * @example
  * ```ts
  * import type { AnyTRPCRouter } from '@trpc/server'
@@ -11,7 +10,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 '../@trpc/server';
 import type {
   NodeHTTPCreateContextFnOptions,
   NodeHTTPHandlerOptions,
@@ -36,7 +35,7 @@ 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,23 +1,25 @@
 import type { IncomingMessage } from 'http';
 import type ws from 'ws';
-import type { AnyRouter, inferRouterContext } from '../@trpc-server';
+import type { AnyRouter, inferRouterContext } from '../@trpc/server';
 import {
   callProcedure,
   getErrorShape,
   getTRPCErrorFromUnknown,
   transformTRPCResponse,
   TRPCError,
-} from '../@trpc-server';
-import type { BaseHandlerOptions } from '../http';
-import { isObservable } from '../observable';
-import type { Unsubscribable } from '../observable';
-import { parseTRPCMessage } from '../rpc';
+} 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 '../rpc';
+} from '../@trpc/server/rpc';
+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 type { NodeHTTPCreateContextFnOptions } from './node-http';
 

package/src/http.ts

@@ -1,26 +1 @@
-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';
+export * from './@trpc/server/http';

package/src/index.ts

@@ -1 +1 @@
-export * from './@trpc-server';
+export * from './@trpc/server';

package/src/observable/observable.ts

@@ -1,4 +1,3 @@
-import { identity } from '../unstable-core-do-not-import/utils';
 import type {
   Observable,
   Observer,
@@ -7,6 +6,10 @@ import type {
   UnaryFunction,
 } from './types';
 
+function identity<TType>(x: TType): TType {
+  return x;
+}
+
 /** @public */
 export type inferObservableValue<TObservable> = TObservable extends Observable<
   infer TValue,

package/src/rpc.ts

@@ -1,26 +1 @@
-// 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';
+export * from './@trpc/server/rpc';

package/src/shared.ts

@@ -23,4 +23,4 @@ export {
    * @deprecated `import { createTRPCFlatProxy } from '@trpc/server'` instead
    */
   createTRPCFlatProxy as createFlatProxy,
-} from './@trpc-server';
+} from './@trpc/server';

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

@@ -1,9 +1,12 @@
 /**
- * This file is here to make TypeScript happy and prevent _"The inferred type of 'createContext' cannot be named without a reference to [...]"_.
+ * **DO NOT IMPORT FROM HERE FILE**
  *
- * We're basically just re-exporting everything from core.
+ * This file is here to:
+ * - make TypeScript happy and prevent _"The inferred type of 'createContext' cannot be named without a reference to [...]"_.
+ * - the the glue between the official `@trpc/*`-packages
  *
- * If you need to import anything from here, please open an issue at https://github.com/trpc/trpc/issues
+ *
+ * If you seem to need to import anything from here, please open an issue at https://github.com/trpc/trpc/issues
  */
 export type { DefaultErrorShape, DefaultErrorData } from './error/formatter';
 export { getErrorShape } from './error/getErrorShape';

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

@@ -57,10 +57,3 @@ export function omitPrototype<TObj extends Record<string, unknown>>(
 ): TObj {
   return Object.assign(Object.create(null), obj);
 }
-
-/**
- * @internal
- */
-export function identity<TType>(x: TType): TType {
-  return x;
-}

package/dist/@trpc-server/http.d.ts

@@ -1,2 +0,0 @@
-export * from '../unstable-core-do-not-import';
-//# sourceMappingURL=http.d.ts.map

package/dist/@trpc-server/http.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/@trpc-server/http.ts"],"names":[],"mappings":"AAEA,cAAc,gCAAgC,CAAC"}

package/dist/@trpc-server.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"@trpc-server.d.ts","sourceRoot":"","sources":["../src/@trpc-server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS;AACT;;GAEG;AACH,iCAAiC,EACjC,iCAAiC,IAAI,2BAA2B,EAChE,QAAQ,EAER,aAAa,IAAI,iBAAiB,EAClC,uBAAuB,EACvB,qBAAqB,EACrB,eAAe,IAAI,mBAAmB,EACtC,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,+BAA+B,EACpC,KAAK,kCAAkC,EACvC,KAAK,YAAY,IAAI,gBAAgB,EACrC,KAAK,SAAS,IAAI,aAAa,EAC/B,KAAK,qBAAqB,IAAI,yBAAyB,EACvD,KAAK,uBAAuB,IAAI,2BAA2B,EAC3D,KAAK,aAAa,IAAI,iBAAiB,EACvC,KAAK,oBAAoB,IAAI,wBAAwB,EACrD,KAAK,iBAAiB,IAAI,qBAAqB,EAC/C,KAAK,qBAAqB,IAAI,yBAAyB,EACvD,KAAK,aAAa,IAAI,iBAAiB,EACvC,KAAK,wBAAwB,IAAI,4BAA4B,GAC9D,MAAM,+BAA+B,CAAC;AAEvC,YAAY;AACV;;GAEG;AACH,YAAY;AACZ;;GAEG;AACH,SAAS;AACT;;GAEG;AACH,qBAAqB;AACrB;;GAEG;AACH,uBAAuB;AAEvB;;GAEG;AACH,IAAI;AAEJ;;GAEG;AACH,WAAW;AACX;;GAEG;AACH,aAAa;AACb;;GAEG;AACH,oBAAoB;AAEpB;;GAEG;AACH,iBAAiB;AACjB;;GAEG;AACH,qBAAqB;AACrB;;GAEG;AACH,aAAa;AACb;;GAEG;AACH,wBAAwB,GACzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO;AACL;;GAEG;AACH,aAAa;AAEb;;GAEG;AACH,aAAa,GACd,MAAM,+BAA+B,CAAC;AAEvC;;;GAGG;AACH,MAAM,MAAM,oBAAoB,CAAC,SAAS,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,IACxE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC"}