@trpc/server 10.27.3 → 10.28.1

package/dist/types.d.ts

@@ -1,78 +1,78 @@
-/**
- * @internal
- */
-export declare type identity<TType> = TType;
-export declare type InferOptional<TType, TKeys extends keyof TType> = Partial<Pick<TType, TKeys>> & Omit<TType, TKeys>;
-export declare type UndefinedKeys<TType> = {
-    [K in keyof TType]: undefined extends TType[K] ? K : never;
-}[keyof TType];
-/**
- * @internal
- */
-export declare type FlatOverwrite<TType, TWith> = InferOptional<{
-    [TKey in keyof TWith | keyof TType]: TKey extends keyof TWith ? TWith[TKey] : TKey extends keyof TType ? TType[TKey] : never;
-}, UndefinedKeys<TType> | UndefinedKeys<TWith>>;
-/**
- * @internal
- */
-export declare type IntersectionError<TKey extends string> = `The property '${TKey}' in your router collides with a built-in method, rename this router or procedure on your backend.`;
-/**
- * @internal
- */
-export declare type ProtectedIntersection<TType, TWith> = keyof TType & keyof TWith extends never ? TType & TWith : IntersectionError<keyof TType & keyof TWith & string>;
-/**
- * @public
- */
-export declare type Maybe<TType> = TType | undefined | null;
-/**
- * @internal
- */
-export declare type ThenArg<TType> = TType extends PromiseLike<infer U> ? ThenArg<U> : TType;
-/**
- * @internal
- * @see https://github.com/ianstormtaylor/superstruct/blob/7973400cd04d8ad92bbdc2b6f35acbfb3c934079/src/utils.ts#L323-L325
- */
-export declare type Simplify<TType> = TType extends any[] | Date ? TType : {
-    [K in keyof TType]: TType[K];
-};
-/**
- * @public
- */
-export declare type Dict<TType> = Record<string, TType | undefined>;
-/**
- * @public
- */
-export declare type MaybePromise<TType> = TType | Promise<TType>;
-/**
- * @internal
- *
- * Creates a "lower-priority" type inference.
- * https://github.com/microsoft/TypeScript/issues/14829#issuecomment-322267089
- */
-export declare type InferLast<TType> = TType & {
-    [KeyType in keyof TType]: TType[KeyType];
-};
-/**
- * @public
- */
-export declare type inferAsyncReturnType<TFunction extends (...args: any) => any> = ThenArg<ReturnType<TFunction>>;
-export declare type FilterKeys<TObj extends object, TFilter> = {
-    [TKey in keyof TObj]: TObj[TKey] extends TFilter ? TKey : never;
-}[keyof TObj];
-/**
- * @internal
- */
-export declare type Filter<TObj extends object, TFilter> = Pick<TObj, FilterKeys<TObj, TFilter>>;
-/**
- * Unwrap return type if the type is a function (sync or async), else use the type as is
- * @internal
- */
-export declare type Unwrap<TType> = TType extends (...args: any[]) => infer R ? ThenArg<R> : TType;
-/**
- * Makes the object recursively optional
- * @internal
- */
-export declare type DeepPartial<TObject> = TObject extends object ? {
-    [P in keyof TObject]?: DeepPartial<TObject[P]>;
-} : TObject;
+/**
+ * @internal
+ */
+export type identity<TType> = TType;
+export type InferOptional<TType, TKeys extends keyof TType> = Partial<Pick<TType, TKeys>> & Omit<TType, TKeys>;
+export type UndefinedKeys<TType> = {
+    [K in keyof TType]: undefined extends TType[K] ? K : never;
+}[keyof TType];
+/**
+ * @internal
+ */
+export type FlatOverwrite<TType, TWith> = InferOptional<{
+    [TKey in keyof TWith | keyof TType]: TKey extends keyof TWith ? TWith[TKey] : TKey extends keyof TType ? TType[TKey] : never;
+}, UndefinedKeys<TType> | UndefinedKeys<TWith>>;
+/**
+ * @internal
+ */
+export type IntersectionError<TKey extends string> = `The property '${TKey}' in your router collides with a built-in method, rename this router or procedure on your backend.`;
+/**
+ * @internal
+ */
+export type ProtectedIntersection<TType, TWith> = keyof TType & keyof TWith extends never ? TType & TWith : IntersectionError<keyof TType & keyof TWith & string>;
+/**
+ * @public
+ */
+export type Maybe<TType> = TType | undefined | null;
+/**
+ * @internal
+ */
+export type ThenArg<TType> = TType extends PromiseLike<infer U> ? ThenArg<U> : TType;
+/**
+ * @internal
+ * @see https://github.com/ianstormtaylor/superstruct/blob/7973400cd04d8ad92bbdc2b6f35acbfb3c934079/src/utils.ts#L323-L325
+ */
+export type Simplify<TType> = TType extends any[] | Date ? TType : {
+    [K in keyof TType]: TType[K];
+};
+/**
+ * @public
+ */
+export type Dict<TType> = Record<string, TType | undefined>;
+/**
+ * @public
+ */
+export type MaybePromise<TType> = TType | Promise<TType>;
+/**
+ * @internal
+ *
+ * Creates a "lower-priority" type inference.
+ * https://github.com/microsoft/TypeScript/issues/14829#issuecomment-322267089
+ */
+export type InferLast<TType> = TType & {
+    [KeyType in keyof TType]: TType[KeyType];
+};
+/**
+ * @public
+ */
+export type inferAsyncReturnType<TFunction extends (...args: any) => any> = ThenArg<ReturnType<TFunction>>;
+export type FilterKeys<TObj extends object, TFilter> = {
+    [TKey in keyof TObj]: TObj[TKey] extends TFilter ? TKey : never;
+}[keyof TObj];
+/**
+ * @internal
+ */
+export type Filter<TObj extends object, TFilter> = Pick<TObj, FilterKeys<TObj, TFilter>>;
+/**
+ * Unwrap return type if the type is a function (sync or async), else use the type as is
+ * @internal
+ */
+export type Unwrap<TType> = TType extends (...args: any[]) => infer R ? ThenArg<R> : TType;
+/**
+ * Makes the object recursively optional
+ * @internal
+ */
+export type DeepPartial<TObject> = TObject extends object ? {
+    [P in keyof TObject]?: DeepPartial<TObject[P]>;
+} : TObject;
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "10.27.3",
+  "version": "10.28.1",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -130,7 +130,8 @@
     "rpc",
     "observable",
     "subscription",
-    "shared"
+    "shared",
+    "!**/*.test.*"
   ],
   "publishConfig": {
     "access": "public"
@@ -141,7 +142,7 @@
     "@types/aws-lambda": "^8.10.97",
     "@types/express": "^4.17.17",
     "@types/hash-sum": "^1.0.0",
-    "@types/node": "^18.7.20",
+    "@types/node": "^18.16.16",
     "@types/react": "^18.2.6",
     "@types/react-dom": "^18.2.4",
     "@types/ws": "^8.2.0",
@@ -149,7 +150,7 @@
     "aws-lambda": "^1.0.7",
     "devalue": "^4.0.0",
     "eslint": "^8.40.0",
-    "expect-type": "^0.15.0",
+    "expect-type": "^0.16.0",
     "express": "^4.17.1",
     "fastify": "^4.13.0",
     "fastify-plugin": "^4.5.0",
@@ -163,11 +164,14 @@
     "superstruct": "^1.0.0",
     "tslib": "^2.5.0",
     "tsx": "^3.12.7",
-    "typescript": "^4.8.3",
+    "typescript": "^5.0.4",
     "vitest": "^0.28.5",
     "ws": "^8.0.0",
     "yup": "^1.0.0",
     "zod": "^3.0.0"
   },
-  "gitHead": "a7bca8888003f0a2f3e8b966e44442bb576bfff2"
+  "funding": [
+    "https://trpc.io/sponsor"
+  ],
+  "gitHead": "ea70b1c33899b66f964a7d11f5a8710148f03f8e"
 }

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

@@ -184,7 +184,7 @@ export function createFileUploadHandler({
   };
 }
 
-export class NodeOnDiskFile implements File {
+export class NodeOnDiskFile {
   name: string;
   lastModified = 0;
   webkitRelativePath = '';
@@ -208,7 +208,7 @@ export class NodeOnDiskFile implements File {
     return stats.size;
   }
 
-  slice(start?: number, end?: number, type?: string): Blob {
+  slice(start?: number, end?: number, type?: string): NodeOnDiskFile {
     if (typeof start === 'number' && start < 0) start = this.size + start;
     if (typeof end === 'number' && end < 0) end = this.size + end;
 
@@ -248,7 +248,7 @@ export class NodeOnDiskFile implements File {
       stream = stream.pipe(streamSlice(this.slicer.start, this.slicer.end));
     }
 
-    return Readable.toWeb(stream);
+    return Readable.toWeb(stream) as ReadableStream<Uint8Array>;
   }
 
   async text(): Promise<string> {

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

@@ -1,3 +1,5 @@
+import { NodeOnDiskFile } from './fileUploadHandler';
+
 /**
  * @see https://github.com/remix-run/remix/blob/0bcb4a304dd2f08f6032c3bf0c3aa7eb5b976901/packages/remix-server-runtime/formData.ts
  */
@@ -10,7 +12,7 @@ export type UploadHandlerPart = {
 
 export type UploadHandler = (
   part: UploadHandlerPart,
-) => Promise<File | string | null | undefined>;
+) => Promise<NodeOnDiskFile | File | string | null | undefined>;
 
 export function composeUploadHandlers(
   ...handlers: UploadHandler[]

package/src/core/router.ts

@@ -25,7 +25,7 @@ import {
 export type ProcedureRecord = Record<string, AnyProcedure>;
 
 export interface ProcedureRouterRecord {
-  [key: string]: AnyProcedure | AnyRouter | ProcedureRouterRecord;
+  [key: string]: AnyProcedure | AnyRouter;
 }
 
 /**
@@ -97,9 +97,7 @@ type DecorateProcedure<TProcedure extends AnyProcedure> = (
  * @internal
  */
 type DecoratedProcedureRecord<TProcedures extends ProcedureRouterRecord> = {
-  [TKey in keyof TProcedures]: TProcedures[TKey] extends ProcedureRouterRecord
-    ? DecoratedProcedureRecord<TProcedures[TKey]>
-    : TProcedures[TKey] extends AnyRouter
+  [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter
     ? DecoratedProcedureRecord<TProcedures[TKey]['_def']['record']>
     : TProcedures[TKey] extends AnyProcedure
     ? DecorateProcedure<TProcedures[TKey]>
@@ -146,17 +144,11 @@ export interface Router<TDef extends AnyRouterDef> {
 export type AnyRouter = Router<AnyRouterDef>;
 
 function isRouter(
-  procedureOrRouter: AnyProcedure | AnyRouter | ProcedureRouterRecord,
+  procedureOrRouter: AnyProcedure | AnyRouter,
 ): procedureOrRouter is AnyRouter {
   return 'router' in procedureOrRouter._def;
 }
 
-function isNestedRouter(
-  procedureOrRouter: AnyProcedure | AnyRouter | ProcedureRouterRecord,
-): procedureOrRouter is ProcedureRouterRecord {
-  return !('_def' in procedureOrRouter);
-}
-
 const emptyRouter = {
   _ctx: null as any,
   _errorShape: null as any,
@@ -177,10 +169,6 @@ const reservedWords = [
    * since JS will think that `.then` is something that exists
    */
   'then',
-  /**
-   * `_def` is a reserved word because it's used internally a lot
-   */
-  '_def',
 ];
 
 /**
@@ -216,33 +204,11 @@ export function createRouterFactory<TConfig extends AnyRootConfig>(
       );
     }
 
-    const newProcedures: ProcedureRouterRecord = {};
-    for (const [key, procedureOrRouter] of Object.entries(procedures ?? {})) {
-      const value = procedures[key] ?? {};
-
-      if (isNestedRouter(value)) {
-        newProcedures[key] = createRouterInner(value);
-        continue;
-      }
-
-      if (isRouter(value)) {
-        newProcedures[key] = procedureOrRouter;
-        continue;
-      }
-
-      newProcedures[key] = procedureOrRouter;
-    }
-
     const routerProcedures: ProcedureRecord = omitPrototype({});
     function recursiveGetPaths(procedures: ProcedureRouterRecord, path = '') {
       for (const [key, procedureOrRouter] of Object.entries(procedures ?? {})) {
         const newPath = `${path}${key}`;
 
-        if (isNestedRouter(procedureOrRouter)) {
-          recursiveGetPaths(procedureOrRouter, `${newPath}.`);
-          continue;
-        }
-
         if (isRouter(procedureOrRouter)) {
           recursiveGetPaths(procedureOrRouter._def.procedures, `${newPath}.`);
           continue;
@@ -255,14 +221,14 @@ export function createRouterFactory<TConfig extends AnyRootConfig>(
         routerProcedures[newPath] = procedureOrRouter;
       }
     }
-    recursiveGetPaths(newProcedures);
+    recursiveGetPaths(procedures);
 
     const _def: AnyRouterDef<TConfig> = {
       _config: config,
       router: true,
       procedures: routerProcedures,
       ...emptyRouter,
-      record: newProcedures,
+      record: procedures,
       queries: Object.entries(routerProcedures)
         .filter((pair) => (pair[1] as any)._def.query)
         .reduce((acc, [key, val]) => ({ ...acc, [key]: val }), {}),
@@ -275,7 +241,7 @@ export function createRouterFactory<TConfig extends AnyRootConfig>(
     };
 
     const router: AnyRouter = {
-      ...newProcedures,
+      ...procedures,
       _def,
       createCaller(ctx) {
         const proxy = createRecursiveProxy(({ path, args }) => {
@@ -333,7 +299,6 @@ export function createRouterFactory<TConfig extends AnyRootConfig>(
         return this._def._config.errorFormatter({ ...opts, shape });
       },
     };
-
     return router as any;
   };
 }

package/src/shared/createProxy/index.ts

@@ -19,9 +19,10 @@ function createInnerProxy(callback: ProxyCallback, path: string[]) {
       return createInnerProxy(callback, [...path, key]);
     },
     apply(_1, _2, args) {
+      const isApply = path[path.length - 1] === 'apply';
       return callback({
-        args,
-        path,
+        args: isApply ? (args.length >= 2 ? args[1] : []) : args,
+        path: isApply ? path.slice(0, -1) : path,
       });
     },
   });

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

@@ -1,49 +0,0 @@
-import { EventEmitter } from 'events';
-import { getPostBody } from './getPostBody';
-
-test('has body', async () => {
-  const body = {};
-  const resolvedBody = await getPostBody({
-    req: {
-      body,
-      headers: {
-        'content-type': 'application/json',
-      },
-    },
-  } as any);
-  expect(resolvedBody).toMatchInlineSnapshot(`
-    Object {
-      "data": Object {},
-      "ok": true,
-      "preprocessed": true,
-    }
-  `);
-});
-
-test('req as eventemitter', async () => {
-  const events = new EventEmitter();
-  setTimeout(() => {
-    events.emit(
-      'data',
-      JSON.stringify({
-        hello: 'there',
-      }),
-    );
-    events.emit('end');
-  }, 5);
-
-  (events as any).headers = {};
-  const result = await getPostBody({
-    req: events,
-  } as any);
-
-  expect(result.ok).toBeTruthy();
-  expect((result as any).data).toBeTruthy();
-  expect(result).toMatchInlineSnapshot(`
-    Object {
-      "data": "{\\"hello\\":\\"there\\"}",
-      "ok": true,
-      "preprocessed": false,
-    }
-  `);
-});

package/src/observable/observable.test.ts

@@ -1,100 +0,0 @@
-import { observable, share, tap } from '.';
-
-test('vanilla observable - complete()', () => {
-  const obs = observable<number, Error>((observer) => {
-    observer.next(1);
-    observer.complete();
-  });
-
-  const next = vi.fn();
-  const error = vi.fn();
-  const complete = vi.fn();
-  obs.subscribe({
-    next,
-    error,
-    complete,
-  });
-  expect(next.mock.calls).toHaveLength(1);
-  expect(complete.mock.calls).toHaveLength(1);
-  expect(error.mock.calls).toHaveLength(0);
-  expect(next.mock.calls[0]![0]!).toBe(1);
-});
-
-test('vanilla observable - unsubscribe()', () => {
-  const obs$ = observable<number, Error>((observer) => {
-    observer.next(1);
-  });
-
-  const next = vi.fn();
-  const error = vi.fn();
-  const complete = vi.fn();
-  const sub = obs$.subscribe({
-    next,
-    error,
-    complete,
-  });
-  sub.unsubscribe();
-  expect(next.mock.calls).toHaveLength(1);
-  expect(complete.mock.calls).toHaveLength(0);
-  expect(error.mock.calls).toHaveLength(0);
-  expect(next.mock.calls[0]![0]!).toBe(1);
-});
-
-test('pipe - combine operators', () => {
-  const taps = {
-    next: vi.fn(),
-    complete: vi.fn(),
-    error: vi.fn(),
-  };
-  const obs = observable<number, Error>((observer) => {
-    observer.next(1);
-  }).pipe(
-    // operators:
-    share(),
-    tap(taps),
-  );
-  {
-    const next = vi.fn();
-    const error = vi.fn();
-    const complete = vi.fn();
-    obs.subscribe({
-      next,
-      error,
-      complete,
-    });
-    expect(next.mock.calls).toHaveLength(1);
-    expect(complete.mock.calls).toHaveLength(0);
-    expect(error.mock.calls).toHaveLength(0);
-    expect(next.mock.calls[0]![0]!).toBe(1);
-  }
-
-  {
-    const next = vi.fn();
-    const error = vi.fn();
-    const complete = vi.fn();
-    obs.subscribe({
-      next,
-      error,
-      complete,
-    });
-    expect(next.mock.calls).toHaveLength(0);
-    expect(complete.mock.calls).toHaveLength(0);
-    expect(error.mock.calls).toHaveLength(0);
-  }
-
-  expect({
-    next: taps.next.mock.calls,
-    error: taps.error.mock.calls,
-    complete: taps.complete.mock.calls,
-  }).toMatchInlineSnapshot(`
-    Object {
-      "complete": Array [],
-      "error": Array [],
-      "next": Array [
-        Array [
-          1,
-        ],
-      ],
-    }
-  `);
-});

package/src/observable/operators/map.test.ts

@@ -1,91 +0,0 @@
-import { EventEmitter } from 'events';
-import { map } from '.';
-import { observable } from '../observable';
-
-interface SubscriptionEvents<TOutput> {
-  data: (data: TOutput) => void;
-}
-
-declare interface CustomEventEmitter<TOutput> {
-  on<U extends keyof SubscriptionEvents<TOutput>>(
-    event: U,
-    listener: SubscriptionEvents<TOutput>[U],
-  ): this;
-
-  once<U extends keyof SubscriptionEvents<TOutput>>(
-    event: U,
-    listener: SubscriptionEvents<TOutput>[U],
-  ): this;
-
-  emit<U extends keyof SubscriptionEvents<TOutput>>(
-    event: U,
-    ...args: Parameters<SubscriptionEvents<TOutput>[U]>
-  ): boolean;
-}
-class CustomEventEmitter<TOutput>
-  extends EventEmitter
-  implements CustomEventEmitter<TOutput> {}
-test('map', () => {
-  type EventShape = { num: number };
-  const ee = new CustomEventEmitter<EventShape>();
-  const eventObservable = observable<EventShape, unknown>((observer) => {
-    const callback = (data: EventShape) => {
-      observer.next(data);
-    };
-    ee.on('data', callback);
-
-    return () => {
-      ee.off('data', callback);
-    };
-  });
-  const pipeCalls = vi.fn();
-  const piped = eventObservable.pipe(
-    map((...args) => {
-      pipeCalls(...args);
-      const [value] = args;
-      return value.num;
-    }),
-  );
-
-  const next = vi.fn();
-  const subscription = piped.subscribe({
-    next(value) {
-      expectTypeOf<number>(value);
-      next(value);
-    },
-  });
-  expect(next).not.toHaveBeenCalled();
-  ee.emit('data', { num: 1 });
-  ee.emit('data', { num: 2 });
-  expect(next).toHaveBeenCalledTimes(2);
-  expect(next.mock.calls).toMatchInlineSnapshot(`
-    Array [
-      Array [
-        1,
-      ],
-      Array [
-        2,
-      ],
-    ]
-  `);
-  expect(pipeCalls.mock.calls).toMatchInlineSnapshot(`
-    Array [
-      Array [
-        Object {
-          "num": 1,
-        },
-        0,
-      ],
-      Array [
-        Object {
-          "num": 2,
-        },
-        1,
-      ],
-    ]
-  `);
-
-  expect(ee.listeners('data')).toHaveLength(1);
-  subscription.unsubscribe();
-  expect(ee.listeners('data')).toHaveLength(0);
-});