@trpc/server 11.0.0-next-alpha.170 → 11.0.0-next-alpha.175

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-next-alpha.170+a44668277",
+  "version": "11.0.0-next-alpha.175+2d1b3f6ac",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -13,28 +13,12 @@
     "url": "git+https://github.com/trpc/trpc.git",
     "directory": "packages/server"
   },
-  "eslintConfig": {
-    "overrides": [
-      {
-        "files": [
-          "src"
-        ],
-        "rules": {
-          "explicit-module-boundary-types": "off",
-          "no-restricted-imports": [
-            "error",
-            "@trpc/server"
-          ]
-        }
-      }
-    ]
-  },
   "scripts": {
     "build": "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",
-    "lint": "eslint --cache --ext \".js,.ts,.tsx\" --ignore-path ../../.gitignore --report-unused-disable-directives src",
+    "lint": "eslint --cache --ext \".js,.ts,.tsx\" --ignore-path ../../.gitignore src",
     "ts-watch": "tsc --watch"
   },
   "exports": {
@@ -131,7 +115,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@trpc/core": "11.0.0-next-alpha.170+a44668277"
+    "@trpc/core": "11.0.0-next-alpha.175+2d1b3f6ac"
   },
   "devDependencies": {
     "@fastify/websocket": "^7.1.2",
@@ -170,5 +154,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "a446682775ee7aacd919b5bf5bb995ecdf45f920"
+  "gitHead": "2d1b3f6ac5bcb646f634bd27cd6ff04155feab8e"
 }

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

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

package/src/@trpc-server.ts

@@ -0,0 +1,60 @@
+export {
+  TRPCError,
+  /**
+   * @deprecated use `experimental_trpcMiddleware` instead
+   */
+  experimental_standaloneMiddleware,
+  experimental_standaloneMiddleware as experimental_trpcMiddleware,
+  initTRPC,
+  callProcedure as callTRPCProcedure,
+  getTRPCErrorFromUnknown,
+  transformTRPCResponse,
+  type inferProcedureInput,
+  type inferProcedureOutput,
+  type inferRouterError,
+  type inferRouterInputs,
+  type inferRouterOutputs,
+  type inferRouterContext,
+  type AnyProcedure as AnyTRPCProcedure,
+  type AnyRouter as AnyTRPCRouter,
+  type AnyMiddlewareFunction as AnyTRPCMiddlewareFunction,
+  type CombinedDataTransformer as TRPCCombinedDataTransformer,
+} from './@trpc-core-unstable-do-not-import-this-please';
+
+export type {
+  /**
+   * @deprecated use `AnyTRPCProcedure` instead
+   */
+  AnyProcedure,
+  /**
+   * @deprecated use `AnyTRPCRouter` instead
+   */
+  AnyRouter,
+  /**
+   * @deprecated use `AnyTRPCMiddlewareFunction` instead
+   */
+  AnyMiddlewareFunction,
+  /**
+   * @deprecated use `TRPCCombinedDataTransformer` instead
+   */
+  CombinedDataTransformer,
+} from '@trpc/core';
+
+export {
+  /**
+   * @deprecated use `getTRPCErrorShape` instead
+   */
+  getErrorShape,
+
+  /**
+   * @deprecated use `callTRPCProcedure` instead
+   */
+  callProcedure,
+} from '@trpc/core';
+
+/**
+ * @deprecated
+ * Use `Awaited<ReturnType<typeof myFunction>>` instead
+ */
+export type inferAsyncReturnType<TFunction extends (...args: any[]) => any> =
+  Awaited<ReturnType<TFunction>>;

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

@@ -1,5 +1,13 @@
-import type { AnyRouter } from '@trpc/core';
-import { TRPCError } from '@trpc/core';
+/**
+ * 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'
+ * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
+ * ```
+ */
 import type {
   APIGatewayProxyEvent,
   APIGatewayProxyEventV2,
@@ -7,6 +15,10 @@ import type {
   APIGatewayProxyStructuredResultV2,
   Context as APIGWContext,
 } from 'aws-lambda';
+// @trpc/server
+import type { AnyRouter } from '../../@trpc-server';
+// @trpc/server
+import { TRPCError } from '../../@trpc-server';
 import type {
   HTTPRequest,
   HTTPResponse,

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

@@ -1,5 +1,13 @@
-import type { AnyRouter, inferRouterContext } from '@trpc/core';
-import { TRPCError } from '@trpc/core';
+/**
+ * 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'
+ * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
+ * ```
+ */
 import type {
   APIGatewayProxyEvent,
   APIGatewayProxyEventV2,
@@ -7,6 +15,10 @@ import type {
   APIGatewayProxyStructuredResultV2,
   Context as APIGWContext,
 } from 'aws-lambda';
+import type { AnyRouter, inferRouterContext } from '../../@trpc-server'; // import @trpc/server
+
+// @trpc/server
+import { TRPCError } from '../../@trpc-server';
 import type {
   HTTPHeaders,
   OnErrorFunction,

package/src/adapters/express.ts

@@ -1,5 +1,16 @@
-import type { AnyRouter } from '@trpc/core';
+/**
+ * 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'
+ * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
+ * ```
+ */
 import type * as express from 'express';
+// @trpc/server
+import type { AnyRouter } from '../@trpc-server';
 import type {
   NodeHTTPCreateContextFnOptions,
   NodeHTTPHandlerOptions,

package/src/adapters/fastify/fastifyRequestHandler.ts

@@ -1,6 +1,17 @@
+/**
+ * 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'
+ * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
+ * ```
+ */
 import { Readable } from 'node:stream';
-import type { AnyRouter } from '@trpc/core';
 import type { FastifyReply, FastifyRequest } from 'fastify';
+// @trpc/server
+import type { AnyRouter } from '../../@trpc-server';
 import type {
   HTTPBaseHandlerOptions,
   HTTPRequest,

package/src/adapters/fastify/fastifyTRPCPlugin.ts

@@ -1,7 +1,18 @@
+/**
+ * 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'
+ * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
+ * ```
+ */
 /// <reference types="@fastify/websocket" />
-import type { AnyRouter } from '@trpc/core';
 import type { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
 import type { FastifyHandlerOptions } 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,4 +1,15 @@
-import type { AnyRouter } from '@trpc/core';
+/**
+ * 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'
+ * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
+ * ```
+ */
+// @trpc/server
+import type { AnyRouter } from '../../@trpc-server';
 import type {
   HTTPRequest,
   HTTPResponse,

package/src/adapters/fetch/types.ts

@@ -1,5 +1,20 @@
-import type { AnyRouter, inferRouterContext } from '@trpc/core';
-import type { HTTPBaseHandlerOptions, TRPCRequestInfo } from '../../http';
+/**
+ * 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'
+ * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
+ * ```
+ */
+// @trpc/server
+import type { AnyRouter, inferRouterContext } from '../../@trpc-server';
+// @trpc/server/http
+import type {
+  HTTPBaseHandlerOptions,
+  TRPCRequestInfo,
+} from '../../@trpc-server/http';
 
 export type FetchCreateContextFnOptions = {
   req: Request;

package/src/adapters/next.ts

@@ -1,6 +1,18 @@
-import type { AnyRouter } from '@trpc/core';
-import { getErrorShape, TRPCError } from '@trpc/core';
+/**
+ * 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'
+ * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
+ * ```
+ */
 import type { NextApiHandler, NextApiRequest, NextApiResponse } from 'next';
+// @trpc/server
+import type { AnyRouter } from '../@trpc-server';
+// @trpc/server
+import { getErrorShape, TRPCError } from '../@trpc-server';
 import type {
   NodeHTTPCreateContextFnOptions,
   NodeHTTPHandlerOptions,

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

@@ -10,10 +10,11 @@
  */
 import * as fs from 'fs/promises';
 import { Readable } from 'node:stream';
-import type { CombinedDataTransformer } from '@trpc/core';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @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 { createNodeHTTPContentTypeHandler } from '../../internals/contentType';
 import type { NodeHTTPRequest } from '../../types';
 import { NodeOnDiskFile } from './fileUploadHandler';

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

@@ -1,4 +1,5 @@
-import { TRPCError } from '@trpc/core';
+// @trpc/server
+import { TRPCError } from '../../../../@trpc-server';
 import type { BodyResult } from '../../../../http';
 import type { NodeHTTPRequest } from '../../types';
 

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

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

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

@@ -1,5 +1,16 @@
+/**
+ * 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'
+ * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
+ * ```
+ */
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-import type { AnyRouter } from '@trpc/core';
+// @trpc/server
+import type { AnyRouter } from '../../@trpc-server';
 import type {
   HTTPRequest,
   HTTPResponse,

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

@@ -1,6 +1,23 @@
+/**
+ * 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'
+ * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
+ * ```
+ */
 import type { IncomingMessage, ServerResponse } from 'http';
-import type { AnyRouter, inferRouterContext, MaybePromise } from '@trpc/core';
-import type { HTTPBaseHandlerOptions, TRPCRequestInfo } from '../../http';
+// eslint-disable-next-line no-restricted-imports
+import type { MaybePromise } from '@trpc/core';
+// @trpc/server
+import type { AnyRouter, inferRouterContext } from '../../@trpc-server';
+// @trpc/server/http
+import type {
+  HTTPBaseHandlerOptions,
+  TRPCRequestInfo,
+} from '../../@trpc-server/http';
 import type { NodeHTTPContentTypeHandler } from './internals/contentType';
 
 interface ParsedQs {

package/src/adapters/standalone.ts

@@ -1,6 +1,17 @@
+/**
+ * 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'
+ * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
+ * ```
+ */
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import http from 'http';
-import type { AnyRouter } from '@trpc/core';
+// @trpc/server
+import type { AnyRouter } from '../@trpc-server';
 import type {
   NodeHTTPCreateContextFnOptions,
   NodeHTTPHandlerOptions,

package/src/adapters/ws.ts

@@ -1,12 +1,6 @@
 import type { IncomingMessage } from 'http';
-import type { AnyRouter, inferRouterContext, MaybePromise } from '@trpc/core';
-import {
-  callProcedure,
-  getErrorShape,
-  getTRPCErrorFromUnknown,
-  transformTRPCResponse,
-  TRPCError,
-} from '@trpc/core';
+// eslint-disable-next-line no-restricted-imports
+import type { MaybePromise } from '@trpc/core';
 import type { BaseHandlerOptions } from '@trpc/core/http';
 import type { Unsubscribable } from '@trpc/core/observable';
 import { isObservable } from '@trpc/core/observable';
@@ -18,6 +12,14 @@ import type {
 } from '@trpc/core/rpc';
 import { parseTRPCMessage } from '@trpc/core/rpc';
 import type ws from 'ws';
+import type { AnyRouter, inferRouterContext } from '../@trpc-server';
+import {
+  callProcedure,
+  getErrorShape,
+  getTRPCErrorFromUnknown,
+  transformTRPCResponse,
+  TRPCError,
+} from '../@trpc-server';
 import type { NodeHTTPCreateContextFnOptions } from './node-http';
 
 /**

package/src/http.ts

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

package/src/index.ts

@@ -1,35 +1 @@
-export {
-  TRPCError,
-  /**
-   * @deprecated use `experimental_trpcMiddleware` instead
-   */
-  experimental_standaloneMiddleware,
-  experimental_standaloneMiddleware as experimental_trpcMiddleware,
-  initTRPC,
-  type inferProcedureInput,
-  type inferProcedureOutput,
-  type inferRouterError,
-  type inferRouterInputs,
-  type inferRouterOutputs,
-  type AnyProcedure as AnyTRPCProcedure,
-  type AnyRouter as AnyTRPCRouter,
-} from './unstableDoNotImportThis';
-
-export type {
-  /**
-   * @deprecated use `AnyTRPCProcedure` instead
-   */
-  AnyProcedure,
-  /**
-   * @deprecated use `AnyTRPCRouter` instead
-   */
-  AnyRouter,
-  AnyMiddlewareFunction,
-} from '@trpc/core';
-
-/**
- * @deprecated
- * Use `Awaited<ReturnType<typeof myFunction>>` instead
- */
-export type inferAsyncReturnType<TFunction extends (...args: any[]) => any> =
-  Awaited<ReturnType<TFunction>>;
+export * from './@trpc-server';

package/dist/unstableDoNotImportThis.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"unstableDoNotImportThis.d.ts","sourceRoot":"","sources":["../src/unstableDoNotImportThis.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,YAAY,CAAC"}