@trpc/server 10.12.0 → 10.13.1

package/src/core/internals/config.ts

@@ -19,7 +19,8 @@ export const isServerDefault: boolean =
   typeof window === 'undefined' ||
   'Deno' in window ||
   globalThis.process?.env?.NODE_ENV === 'test' ||
-  !!globalThis.process?.env?.JEST_WORKER_ID;
+  !!globalThis.process?.env?.JEST_WORKER_ID ||
+  !!globalThis.process?.env?.VITEST_WORKER_ID;
 
 /**
  * The runtime config that are used and actually represents real values underneath

package/src/core/internals/procedureBuilder.ts

@@ -1,11 +1,5 @@
-import { TRPCError } from '../../error/TRPCError';
-import { getTRPCErrorFromUnknown } from '../../error/utils';
-import {
-  InferOptional,
-  MaybePromise,
-  Simplify,
-  UndefinedKeys,
-} from '../../types';
+import { TRPCError, getTRPCErrorFromUnknown } from '../../error/TRPCError';
+import { MaybePromise, Simplify } from '../../types';
 import {
   MiddlewareBuilder,
   MiddlewareFunction,
@@ -68,19 +62,9 @@ export interface BuildProcedure<
       : TParams
   > {}
 
-type Merge<TType, TWith> = {
-  [TKey in keyof TType | keyof TWith]: TKey extends keyof TType
-    ? TKey extends keyof TWith
-      ? TType[TKey] & TWith[TKey]
-      : TType[TKey]
-    : TWith[TKey & keyof TWith];
-};
-
 type OverwriteIfDefined<TType, TWith> = UnsetMarker extends TType
   ? TWith
-  : Simplify<
-      InferOptional<Merge<TType, TWith>, UndefinedKeys<Merge<TType, TWith>>>
-    >;
+  : Simplify<TType & TWith>;
 
 type ErrorMessage<TMessage extends string> = TMessage;
 
@@ -104,9 +88,13 @@ export interface ProcedureBuilder<TParams extends ProcedureParams> {
   input<$Parser extends Parser>(
     schema: TParams['_input_out'] extends UnsetMarker
       ? $Parser
-      : inferParser<$Parser>['out'] extends Record<string, unknown>
-      ? TParams['_input_out'] extends Record<string, unknown>
-        ? $Parser
+      : inferParser<$Parser>['out'] extends Record<string, unknown> | undefined
+      ? TParams['_input_out'] extends Record<string, unknown> | undefined
+        ? undefined extends inferParser<$Parser>['out'] // if current is optional the previous must be too
+          ? undefined extends TParams['_input_out']
+            ? $Parser
+            : ErrorMessage<'Cannot chain an optional parser to a required parser'>
+          : $Parser
         : ErrorMessage<'All input parsers did not resolve to an object'>
       : ErrorMessage<'All input parsers did not resolve to an object'>,
   ): ProcedureBuilder<{

package/src/deprecated/internals/procedure.ts

@@ -1,8 +1,5 @@
-import { TRPCError } from '../../error/TRPCError';
-import {
-  getCauseFromUnknown,
-  getTRPCErrorFromUnknown,
-} from '../../error/utils';
+import { TRPCError, getTRPCErrorFromUnknown } from '../../error/TRPCError';
+import { getCauseFromUnknown } from '../../error/utils';
 import { InferLast } from '../../types';
 import { ProcedureType } from '../router';
 import {

package/src/error/TRPCError.ts

@@ -4,6 +4,26 @@ import {
 } from '../error/utils';
 import { TRPC_ERROR_CODE_KEY } from '../rpc/codes';
 
+export function getTRPCErrorFromUnknown(cause: unknown): TRPCError {
+  const error = getErrorFromUnknown(cause);
+  // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
+  // ref https://github.com/trpc/trpc/issues/331
+  if (error.name === 'TRPCError') {
+    return cause as TRPCError;
+  }
+
+  const trpcError = new TRPCError({
+    code: 'INTERNAL_SERVER_ERROR',
+    cause: error,
+    message: error.message,
+  });
+
+  // Inherit stack from error
+  trpcError.stack = error.stack;
+
+  return trpcError;
+}
+
 export class TRPCError extends Error {
   public readonly cause?;
   public readonly code;

package/src/error/utils.ts

@@ -1,5 +1,3 @@
-import { TRPCError } from './TRPCError';
-
 export function getMessageFromUnknownError(
   err: unknown,
   fallback: string,
@@ -7,7 +5,6 @@ export function getMessageFromUnknownError(
   if (typeof err === 'string') {
     return err;
   }
-
   if (err instanceof Error && typeof err.message === 'string') {
     return err.message;
   }
@@ -22,26 +19,6 @@ export function getErrorFromUnknown(cause: unknown): Error {
   return new Error(message);
 }
 
-export function getTRPCErrorFromUnknown(cause: unknown): TRPCError {
-  const error = getErrorFromUnknown(cause);
-  // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
-  // ref https://github.com/trpc/trpc/issues/331
-  if (error.name === 'TRPCError') {
-    return cause as TRPCError;
-  }
-
-  const trpcError = new TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    cause: error,
-    message: error.message,
-  });
-
-  // Inherit stack from error
-  trpcError.stack = error.stack;
-
-  return trpcError;
-}
-
 export function getCauseFromUnknown(cause: unknown) {
   if (cause instanceof Error) {
     return cause;

package/src/http/resolveHTTPResponse.ts

@@ -6,8 +6,8 @@ import {
   inferRouterContext,
   inferRouterError,
 } from '../core';
-import { TRPCError } from '../error/TRPCError';
-import { getCauseFromUnknown, getTRPCErrorFromUnknown } from '../error/utils';
+import { TRPCError, getTRPCErrorFromUnknown } from '../error/TRPCError';
+import { getCauseFromUnknown } from '../error/utils';
 import { transformTRPCResponse } from '../internals/transformTRPCResponse';
 import { TRPCResponse } from '../rpc';
 import { Maybe } from '../types';
@@ -124,7 +124,7 @@ export async function resolveHTTPResponse<
     if (isBatchCall && !batchingEnabled) {
       throw new Error(`Batching is not enabled on the server`);
     }
-    /* istanbul ignore if  */
+    /* istanbul ignore if -- @preserve */
     if (type === 'subscription') {
       throw new TRPCError({
         message: 'Subscriptions should use wsLink',
@@ -154,7 +154,7 @@ export async function resolveHTTPResponse<
         };
       }
 
-      /* istanbul ignore if  */
+      /* istanbul ignore if -- @preserve */
       if (
         rawInput == null ||
         typeof rawInput !== 'object' ||

package/src/internals.ts

@@ -8,5 +8,5 @@ export type {
   ProcedureBuilder,
   BuildProcedure,
 } from './core/internals/procedureBuilder';
-export type { unsetMarker } from './core/internals/utils';
+export type { Overwrite, unsetMarker } from './core/internals/utils';
 export type { MiddlewareFunction, MiddlewareBuilder } from './core/middleware';

package/src/observable/observable.test.ts

@@ -6,9 +6,9 @@ test('vanilla observable - complete()', () => {
     observer.complete();
   });
 
-  const next = jest.fn();
-  const error = jest.fn();
-  const complete = jest.fn();
+  const next = vi.fn();
+  const error = vi.fn();
+  const complete = vi.fn();
   obs.subscribe({
     next,
     error,
@@ -25,9 +25,9 @@ test('vanilla observable - unsubscribe()', () => {
     observer.next(1);
   });
 
-  const next = jest.fn();
-  const error = jest.fn();
-  const complete = jest.fn();
+  const next = vi.fn();
+  const error = vi.fn();
+  const complete = vi.fn();
   const sub = obs$.subscribe({
     next,
     error,
@@ -42,9 +42,9 @@ test('vanilla observable - unsubscribe()', () => {
 
 test('pipe - combine operators', () => {
   const taps = {
-    next: jest.fn(),
-    complete: jest.fn(),
-    error: jest.fn(),
+    next: vi.fn(),
+    complete: vi.fn(),
+    error: vi.fn(),
   };
   const obs = observable<number, Error>((observer) => {
     observer.next(1);
@@ -54,9 +54,9 @@ test('pipe - combine operators', () => {
     tap(taps),
   );
   {
-    const next = jest.fn();
-    const error = jest.fn();
-    const complete = jest.fn();
+    const next = vi.fn();
+    const error = vi.fn();
+    const complete = vi.fn();
     obs.subscribe({
       next,
       error,
@@ -69,9 +69,9 @@ test('pipe - combine operators', () => {
   }
 
   {
-    const next = jest.fn();
-    const error = jest.fn();
-    const complete = jest.fn();
+    const next = vi.fn();
+    const error = vi.fn();
+    const complete = vi.fn();
     obs.subscribe({
       next,
       error,

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

@@ -39,7 +39,7 @@ test('map', () => {
       ee.off('data', callback);
     };
   });
-  const pipeCalls = jest.fn();
+  const pipeCalls = vi.fn();
   const piped = eventObservable.pipe(
     map((...args) => {
       pipeCalls(...args);
@@ -48,7 +48,7 @@ test('map', () => {
     }),
   );
 
-  const next = jest.fn();
+  const next = vi.fn();
   const subscription = piped.subscribe({
     next(value) {
       expectTypeOf<number>(value);

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

@@ -10,9 +10,9 @@ test('share', () => {
   );
 
   {
-    const next = jest.fn();
-    const error = jest.fn();
-    const complete = jest.fn();
+    const next = vi.fn();
+    const error = vi.fn();
+    const complete = vi.fn();
     var subscription1 = obs.subscribe({
       next,
       error,
@@ -26,9 +26,9 @@ test('share', () => {
 
   {
     // subscribe again - it's shared so should not propagate any results
-    const next = jest.fn();
-    const error = jest.fn();
-    const complete = jest.fn();
+    const next = vi.fn();
+    const error = vi.fn();
+    const complete = vi.fn();
     var subscription2 = obs.subscribe({
       next,
       error,
@@ -43,9 +43,9 @@ test('share', () => {
   subscription2.unsubscribe();
   // now it should be reset so we can do a new subscription
   {
-    const next = jest.fn();
-    const error = jest.fn();
-    const complete = jest.fn();
+    const next = vi.fn();
+    const error = vi.fn();
+    const complete = vi.fn();
     var subscription3 = obs.subscribe({
       next,
       error,

package/src/subscription.ts

@@ -1,4 +1,4 @@
-import { getTRPCErrorFromUnknown } from './error/utils';
+import { getTRPCErrorFromUnknown } from './error/TRPCError';
 import { Observable, Observer, observable } from './observable';
 
 /**
@@ -15,17 +15,17 @@ export function subscriptionPullFactory<TOutput>(opts: {
   let timer: any;
   let stopped = false;
   async function _pull(emit: Observer<TOutput, unknown>) {
-    /* istanbul ignore next */
+    /* istanbul ignore next -- @preserve */
     if (stopped) {
       return;
     }
     try {
       await opts.pull(emit);
-    } catch (err /* istanbul ignore next */) {
+    } catch (err /* istanbul ignore next -- @preserve */) {
       emit.error(getTRPCErrorFromUnknown(err));
     }
 
-    /* istanbul ignore else */
+    /* istanbul ignore else -- @preserve */
     if (!stopped) {
       timer = setTimeout(() => _pull(emit), opts.intervalMs);
     }

package/src/transformer.ts

@@ -1,25 +1,53 @@
 /**
  * @public
  */
-export type DataTransformer = {
+export interface DataTransformer {
   serialize(object: any): any;
   deserialize(object: any): any;
-};
+}
+
+interface InputDataTransformer extends DataTransformer {
+  /**
+   * This function runs **on the client** before sending the data to the server.
+   */
+  serialize(object: any): any;
+  /**
+   * This function runs **on the server** to transform the data before it is passed to the resolver
+   */
+  deserialize(object: any): any;
+}
+
+interface OutputDataTransformer extends DataTransformer {
+  /**
+   * This function runs **on the server** before sending the data to the client.
+   */
+  serialize(object: any): any;
+  /**
+   * This function runs **only on the client** to transform the data sent from the server.
+   */
+  deserialize(object: any): any;
+}
 
 /**
  * @public
  */
-export type CombinedDataTransformer = {
-  input: DataTransformer;
-  output: DataTransformer;
-};
+export interface CombinedDataTransformer {
+  /**
+   * Specify how the data sent from the client to the server should be transformed.
+   */
+  input: InputDataTransformer;
+  /**
+   * Specify how the data sent from the server to the client should be transformed.
+   */
+  output: OutputDataTransformer;
+}
 
 /**
  * @public
  */
 export type CombinedDataTransformerClient = {
-  input: Pick<DataTransformer, 'serialize'>;
-  output: Pick<DataTransformer, 'deserialize'>;
+  input: Pick<CombinedDataTransformer['input'], 'serialize'>;
+  output: Pick<CombinedDataTransformer['output'], 'deserialize'>;
 };
 
 /**

package/adapters/aws-lambda/dist/trpc-server-adapters-aws-lambda.cjs.d.ts

@@ -1 +0,0 @@
-export * from "../../../dist/declarations/src/adapters/aws-lambda/index";

package/adapters/aws-lambda/dist/trpc-server-adapters-aws-lambda.cjs.dev.js

@@ -1,190 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var transformTRPCResponse = require('../../../dist/transformTRPCResponse-36a41418.cjs.dev.js');
-require('../../../dist/router-ee876044.cjs.dev.js');
-require('events');
-require('http');
-require('url');
-require('../../../dist/nodeHTTPRequestHandler-9a93c255.cjs.dev.js');
-var resolveHTTPResponse = require('../../../dist/resolveHTTPResponse-ab01e4b9.cjs.dev.js');
-require('../../../dist/codes-130e62df.cjs.dev.js');
-
-function isPayloadV1(event) {
-  return determinePayloadFormat(event) == '1.0';
-}
-function isPayloadV2(event) {
-  return determinePayloadFormat(event) == '2.0';
-}
-
-function determinePayloadFormat(event) {
-  // https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html
-  // According to AWS support, version is is extracted from the version property in the event.
-  // If there is no version property, then the version is implied as 1.0
-  const unknownEvent = event;
-
-  if (typeof unknownEvent.version === 'undefined') {
-    return '1.0';
-  } else {
-    if (['1.0', '2.0'].includes(unknownEvent.version)) {
-      return unknownEvent.version;
-    } else {
-      return 'custom';
-    }
-  }
-}
-
-const UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE = 'Custom payload format version not handled by this adapter. Please use either 1.0 or 2.0. More information here' + 'https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html';
-
-function lambdaEventToHTTPRequest(event) {
-  const query = new URLSearchParams();
-
-  for (const [key, value] of Object.entries((_event$queryStringPar = event.queryStringParameters) !== null && _event$queryStringPar !== void 0 ? _event$queryStringPar : {})) {
-    var _event$queryStringPar;
-
-    if (typeof value !== 'undefined') {
-      query.append(key, value);
-    }
-  }
-
-  return {
-    method: getHTTPMethod(event),
-    query: query,
-    headers: event.headers,
-    body: event.body
-  };
-}
-
-function getHTTPMethod(event) {
-  if (isPayloadV1(event)) {
-    return event.httpMethod;
-  }
-
-  if (isPayloadV2(event)) {
-    return event.requestContext.http.method;
-  }
-
-  throw new transformTRPCResponse.TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
-  });
-}
-
-function getPath(event) {
-  if (isPayloadV1(event)) {
-    const matches = event.resource.matchAll(/\{(.*?)\}/g);
-
-    for (const match of matches) {
-      const group = match[1];
-
-      if (group.includes('+') && event.pathParameters) {
-        return event.pathParameters[group.replace('+', '')] || '';
-      }
-    }
-
-    return event.path.slice(1);
-  }
-
-  if (isPayloadV2(event)) {
-    const matches = event.routeKey.matchAll(/\{(.*?)\}/g);
-
-    for (const match of matches) {
-      const group = match[1];
-
-      if (group.includes('+') && event.pathParameters) {
-        return event.pathParameters[group.replace('+', '')] || '';
-      }
-    }
-
-    return event.rawPath.slice(1);
-  }
-
-  throw new transformTRPCResponse.TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
-  });
-}
-
-function transformHeaders(headers) {
-  const obj = {};
-
-  for (const [key, value] of Object.entries(headers)) {
-    if (typeof value === 'undefined') {
-      continue;
-    }
-
-    obj[key] = Array.isArray(value) ? value.join(',') : value;
-  }
-
-  return obj;
-}
-
-function tRPCOutputToAPIGatewayOutput(event, response) {
-  if (isPayloadV1(event)) {
-    var _response$body, _response$headers;
-
-    const resp = {
-      statusCode: response.status,
-      body: (_response$body = response.body) !== null && _response$body !== void 0 ? _response$body : '',
-      headers: transformHeaders((_response$headers = response.headers) !== null && _response$headers !== void 0 ? _response$headers : {})
-    };
-    return resp;
-  } else if (isPayloadV2(event)) {
-    var _response$body2, _response$headers2;
-
-    const resp = {
-      statusCode: response.status,
-      body: (_response$body2 = response.body) !== null && _response$body2 !== void 0 ? _response$body2 : undefined,
-      headers: transformHeaders((_response$headers2 = response.headers) !== null && _response$headers2 !== void 0 ? _response$headers2 : {})
-    };
-    return resp;
-  } else {
-    throw new transformTRPCResponse.TRPCError({
-      code: 'INTERNAL_SERVER_ERROR',
-      message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
-    });
-  }
-}
-/** Will check the createContext of the TRouter and get the parameter of event.
- * @internal
- **/
-
-
-function awsLambdaRequestHandler(opts) {
-  return async (event, context) => {
-    const req = lambdaEventToHTTPRequest(event);
-    const path = getPath(event);
-
-    const createContext = async function _createContext() {
-      var _opts$createContext;
-
-      return await ((_opts$createContext = opts.createContext) === null || _opts$createContext === void 0 ? void 0 : _opts$createContext.call(opts, {
-        event,
-        context
-      }));
-    };
-
-    const response = await resolveHTTPResponse.resolveHTTPResponse({
-      router: opts.router,
-      batching: opts.batching,
-      responseMeta: opts === null || opts === void 0 ? void 0 : opts.responseMeta,
-      createContext,
-      req,
-      path,
-      error: null,
-
-      onError(o) {
-        var _opts$onError;
-
-        opts === null || opts === void 0 ? void 0 : (_opts$onError = opts.onError) === null || _opts$onError === void 0 ? void 0 : _opts$onError.call(opts, { ...o,
-          req: event
-        });
-      }
-
-    });
-    return tRPCOutputToAPIGatewayOutput(event, response);
-  };
-}
-
-exports.awsLambdaRequestHandler = awsLambdaRequestHandler;

package/adapters/aws-lambda/dist/trpc-server-adapters-aws-lambda.cjs.js

@@ -1,7 +0,0 @@
-'use strict';
-
-if (process.env.NODE_ENV === "production") {
-  module.exports = require("./trpc-server-adapters-aws-lambda.cjs.prod.js");
-} else {
-  module.exports = require("./trpc-server-adapters-aws-lambda.cjs.dev.js");
-}