@trpc/server 11.0.0-next-beta.208 → 11.0.0-next-beta.218

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,

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,
@@ -23,6 +22,10 @@ export type CreateNextContextOptions = NodeHTTPCreateContextFnOptions<
   NextApiRequest,
   NextApiResponse
 >;
+
+/**
+ * Preventing "TypeScript where it's tough not to get "The inferred type of 'xxxx' cannot be named without a reference to [...]"
+ */
 export type { NextApiHandler, NextApiRequest, NextApiResponse } from 'next';
 
 export function createNextApiHandler<TRouter extends AnyRouter>(

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 {

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/core`
  * @example
  * ```ts
  * import type { AnyTRPCRouter } from '@trpc/server'
@@ -9,15 +8,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';
 // @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';
 
 interface ParsedQs {

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/core`
  * @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,
@@ -37,6 +36,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,25 +1,26 @@
 import type { IncomingMessage } from 'http';
-// 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';
-import type {
-  JSONRPC2,
-  TRPCClientOutgoingMessage,
-  TRPCReconnectNotification,
-  TRPCResponseMessage,
-} from '@trpc/core/rpc';
-import { parseTRPCMessage } from '@trpc/core/rpc';
 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';
+} 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';
+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 +1 @@
-export * from './@trpc-server/http';
+export * from './@trpc/server/http';

package/src/index.ts

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

package/src/observable/index.ts

@@ -0,0 +1,10 @@
+export type { inferObservableValue } from './observable';
+export { isObservable, observable, observableToPromise } from './observable';
+export { map, share, tap } from './operators';
+export type {
+  Observable,
+  Observer,
+  TeardownLogic,
+  Unsubscribable,
+  UnsubscribeFn,
+} from './types';

package/src/observable/observable.ts

@@ -0,0 +1,158 @@
+import type {
+  Observable,
+  Observer,
+  OperatorFunction,
+  TeardownLogic,
+  UnaryFunction,
+} from './types';
+
+function identity<TType>(x: TType): TType {
+  return x;
+}
+
+/** @public */
+export type inferObservableValue<TObservable> = TObservable extends Observable<
+  infer TValue,
+  unknown
+>
+  ? TValue
+  : never;
+
+/** @public */
+export function isObservable(x: unknown): x is Observable<unknown, unknown> {
+  return typeof x === 'object' && x !== null && 'subscribe' in x;
+}
+
+/** @public */
+export function observable<TValue, TError = unknown>(
+  subscribe: (observer: Observer<TValue, TError>) => TeardownLogic,
+): Observable<TValue, TError> {
+  const self: Observable<TValue, TError> = {
+    subscribe(observer) {
+      let teardownRef: TeardownLogic | null = null;
+      let isDone = false;
+      let unsubscribed = false;
+      let teardownImmediately = false;
+      function unsubscribe() {
+        if (teardownRef === null) {
+          teardownImmediately = true;
+          return;
+        }
+        if (unsubscribed) {
+          return;
+        }
+        unsubscribed = true;
+
+        if (typeof teardownRef === 'function') {
+          teardownRef();
+        } else if (teardownRef) {
+          teardownRef.unsubscribe();
+        }
+      }
+      teardownRef = subscribe({
+        next(value) {
+          if (isDone) {
+            return;
+          }
+          observer.next?.(value);
+        },
+        error(err) {
+          if (isDone) {
+            return;
+          }
+          isDone = true;
+          observer.error?.(err);
+          unsubscribe();
+        },
+        complete() {
+          if (isDone) {
+            return;
+          }
+          isDone = true;
+          observer.complete?.();
+          unsubscribe();
+        },
+      });
+      if (teardownImmediately) {
+        unsubscribe();
+      }
+      return {
+        unsubscribe,
+      };
+    },
+    pipe(
+      ...operations: OperatorFunction<any, any, any, any>[]
+    ): Observable<any, any> {
+      return pipeFromArray(operations)(self) as any;
+    },
+  };
+  return self;
+}
+
+function pipeFromArray<TSource, TReturn>(
+  fns: UnaryFunction<TSource, TReturn>[],
+): UnaryFunction<TSource, TReturn> {
+  if (fns.length === 0) {
+    return identity as UnaryFunction<any, any>;
+  }
+
+  if (fns.length === 1) {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    return fns[0]!;
+  }
+
+  return function piped(input: TSource): TReturn {
+    return fns.reduce(
+      (prev: any, fn: UnaryFunction<TSource, TReturn>) => fn(prev),
+      input as any,
+    );
+  };
+}
+
+class ObservableAbortError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'ObservableAbortError';
+    Object.setPrototypeOf(this, ObservableAbortError.prototype);
+  }
+}
+
+/** @internal */
+export function observableToPromise<TValue>(
+  observable: Observable<TValue, unknown>,
+) {
+  let abort: () => void;
+  const promise = new Promise<TValue>((resolve, reject) => {
+    let isDone = false;
+    function onDone() {
+      if (isDone) {
+        return;
+      }
+      isDone = true;
+      reject(new ObservableAbortError('This operation was aborted.'));
+      obs$.unsubscribe();
+    }
+    const obs$ = observable.subscribe({
+      next(data) {
+        isDone = true;
+        resolve(data);
+        onDone();
+      },
+      error(data) {
+        isDone = true;
+        reject(data);
+        onDone();
+      },
+      complete() {
+        isDone = true;
+        onDone();
+      },
+    });
+    abort = onDone;
+  });
+  return {
+    promise,
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    abort: abort!,
+  };
+}