@trpc/server 10.0.0-alpha.20 → 10.0.0-alpha.23

package/src/subscription.ts

@@ -1,135 +1,17 @@
-import { EventEmitter } from 'events';
 import { getErrorFromUnknown } from './internals/errors';
+import { Observable, Observer, observable } from './observable';
 
-interface SubscriptionEvents<TOutput> {
-  data: (data: TOutput) => void;
-  destroy: () => void;
-  error: (error: Error) => void;
-}
-declare interface SubscriptionEventEmitter<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;
-}
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-class SubscriptionEventEmitter<TOutput> extends EventEmitter {}
-
-type UnsubscribeFn = () => void;
-type EmitFn<TOutput> = (data: TOutput) => void;
-
-export type SubscriptionEmit<TOutput> = {
-  data: EmitFn<TOutput>;
-  error: EmitFn<Error>;
-};
-export type SubscriptionCallback<TOutput> = (
-  emit: SubscriptionEmit<TOutput>,
-) => UnsubscribeFn | Promise<UnsubscribeFn>;
-
-/**
- * @beta
- */
-export class Subscription<TOutput = unknown> {
-  private readonly events: SubscriptionEventEmitter<TOutput>;
-  private callback;
-  private isDestroyed: boolean;
-
-  constructor(callback: SubscriptionCallback<TOutput>) {
-    this.isDestroyed = false;
-    this.events = new SubscriptionEventEmitter<TOutput>();
-    this.callback = callback;
-  }
-
-  public destroy() {
-    if (this.isDestroyed) {
-      return;
-    }
-    // debug('Subscription.destroy()', reason);
-    this.isDestroyed = true;
-    this.events.emit('destroy');
-    this.events.removeAllListeners();
-  }
-
-  public async start() {
-    /* istanbul ignore next */
-    if (this.isDestroyed) {
-      throw new Error('Called start() on a destroyed subscription');
-    }
-    try {
-      const emit: SubscriptionEmit<TOutput> = {
-        error: (err) => this.emitError(err),
-        data: (data) => this.emitOutput(data),
-      };
-      const cancel = await this.callback(emit);
-      if (
-        this.isDestroyed
-        /* istanbul ignore next */
-      ) {
-        cancel();
-      } else {
-        this.events.on('destroy', cancel);
-      }
-    } catch (
-      cause
-      /* istanbul ignore next */
-    ) {
-      this.emitError(getErrorFromUnknown(cause));
-    }
-  }
-
-  /* istanbul ignore next */
-  /**
-   * @deprecated This method is just here to help with `inferSubscriptionOutput` which I can't get working without it
-   */
-  public output(): TOutput {
-    throw new Error('Not in use');
-  }
-
-  /**
-   * Emit data
-   */
-  emitOutput(data: TOutput) {
-    this.events.emit('data', data);
-  }
-  /**
-   * Emit error
-   */
-  emitError(err: Error) {
-    this.events.emit('error', err);
-  }
-
-  on(...args: Parameters<SubscriptionEventEmitter<TOutput>['on']>) {
-    return this.events.on(...args);
-  }
-  off(...args: Parameters<SubscriptionEventEmitter<TOutput>['off']>) {
-    return this.events.off(...args);
-  }
-}
-
-/**
- * @alpha Might be removed
- */
 export function subscriptionPullFactory<TOutput>(opts: {
   /**
    * The interval of how often the function should run
    */
   intervalMs: number;
-  pull(emit: SubscriptionEmit<TOutput>): void | Promise<void>;
-}): Subscription<TOutput> {
+  pull(emit: Observer<TOutput, unknown>): void | Promise<void>;
+}): Observable<TOutput, unknown> {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let timer: any;
   let stopped = false;
-  async function _pull(emit: SubscriptionEmit<TOutput>) {
+  async function _pull(emit: Observer<TOutput, unknown>) {
     /* istanbul ignore next */
     if (stopped) {
       return;
@@ -146,7 +28,7 @@ export function subscriptionPullFactory<TOutput>(opts: {
     }
   }
 
-  return new Subscription<TOutput>((emit) => {
+  return observable<TOutput>((emit) => {
     _pull(emit).catch((err) => emit.error(getErrorFromUnknown(err)));
     return () => {
       clearTimeout(timer);

package/src/types.ts

@@ -46,3 +46,10 @@ export type ThenArg<T> = T extends PromiseLike<infer U> ? ThenArg<U> : T;
  * @public
  */
 export type Dict<T> = Record<string, T | undefined>;
+
+/**
+ * @internal
+ * Creates a "lower-priority" type inference.
+ * https://github.com/microsoft/TypeScript/issues/14829#issuecomment-322267089
+ */
+export type InferLast<T> = T & { [K in keyof T]: T[K] };

package/dist/http/ResponseMeta.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ResponseMeta.d.ts","sourceRoot":"","sources":["../../src/http/ResponseMeta.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC"}

package/dist/internals/wrapCallSafe.d.ts

@@ -1,16 +0,0 @@
-declare type AsyncFn<T> = () => Promise<T> | T;
-/**
- * Wrap a function in a safe wrapper that never throws
- * Returns a discriminated union
- */
-export declare function wrapCallSafe<T>(fn: AsyncFn<T>): Promise<{
-    ok: true;
-    data: T;
-    error?: undefined;
-} | {
-    ok: false;
-    error: unknown;
-    data?: undefined;
-}>;
-export {};
-//# sourceMappingURL=wrapCallSafe.d.ts.map

package/dist/internals/wrapCallSafe.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"wrapCallSafe.d.ts","sourceRoot":"","sources":["../../src/internals/wrapCallSafe.ts"],"names":[],"mappings":"AAAA,aAAK,OAAO,CAAC,CAAC,IAAI,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AACvC;;;GAGG;AACH,wBAAsB,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;;;;;;;;GAanD"}

package/dist/subscription-0d8a48ec.mjs

@@ -1,133 +0,0 @@
-import { EventEmitter } from 'events';
-import { g as getErrorFromUnknown } from './transformTRPCResponse-ff424ff4.mjs';
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-class SubscriptionEventEmitter extends EventEmitter {}
-
-/**
- * @beta
- */
-class Subscription {
-  constructor(callback) {
-    this.events = void 0;
-    this.callback = void 0;
-    this.isDestroyed = void 0;
-    this.isDestroyed = false;
-    this.events = new SubscriptionEventEmitter();
-    this.callback = callback;
-  }
-
-  destroy() {
-    if (this.isDestroyed) {
-      return;
-    } // debug('Subscription.destroy()', reason);
-
-
-    this.isDestroyed = true;
-    this.events.emit('destroy');
-    this.events.removeAllListeners();
-  }
-
-  async start() {
-    /* istanbul ignore next */
-    if (this.isDestroyed) {
-      throw new Error('Called start() on a destroyed subscription');
-    }
-
-    try {
-      const emit = {
-        error: err => this.emitError(err),
-        data: data => this.emitOutput(data)
-      };
-      const cancel = await this.callback(emit);
-
-      if (this.isDestroyed
-      /* istanbul ignore next */
-      ) {
-        cancel();
-      } else {
-        this.events.on('destroy', cancel);
-      }
-    } catch (cause
-    /* istanbul ignore next */
-    ) {
-      this.emitError(getErrorFromUnknown(cause));
-    }
-  }
-  /* istanbul ignore next */
-
-  /**
-   * @deprecated This method is just here to help with `inferSubscriptionOutput` which I can't get working without it
-   */
-
-
-  output() {
-    throw new Error('Not in use');
-  }
-  /**
-   * Emit data
-   */
-
-
-  emitOutput(data) {
-    this.events.emit('data', data);
-  }
-  /**
-   * Emit error
-   */
-
-
-  emitError(err) {
-    this.events.emit('error', err);
-  }
-
-  on(...args) {
-    return this.events.on(...args);
-  }
-
-  off(...args) {
-    return this.events.off(...args);
-  }
-
-}
-/**
- * @alpha Might be removed
- */
-
-function subscriptionPullFactory(opts) {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  let timer;
-  let stopped = false;
-
-  async function _pull(emit) {
-    /* istanbul ignore next */
-    if (stopped) {
-      return;
-    }
-
-    try {
-      await opts.pull(emit);
-    } catch (err
-    /* istanbul ignore next */
-    ) {
-      emit.error(getErrorFromUnknown(err));
-    }
-    /* istanbul ignore else */
-
-
-    if (!stopped) {
-      timer = setTimeout(() => _pull(emit), opts.intervalMs);
-    }
-  }
-
-  return new Subscription(emit => {
-    _pull(emit).catch(err => emit.error(getErrorFromUnknown(err)));
-
-    return () => {
-      clearTimeout(timer);
-      stopped = true;
-    };
-  });
-}
-
-export { Subscription as S, subscriptionPullFactory as s };

package/dist/subscription-41611bc2.js

@@ -1,136 +0,0 @@
-'use strict';
-
-var events = require('events');
-var transformTRPCResponse = require('./transformTRPCResponse-43a869de.js');
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-class SubscriptionEventEmitter extends events.EventEmitter {}
-
-/**
- * @beta
- */
-class Subscription {
-  constructor(callback) {
-    this.events = void 0;
-    this.callback = void 0;
-    this.isDestroyed = void 0;
-    this.isDestroyed = false;
-    this.events = new SubscriptionEventEmitter();
-    this.callback = callback;
-  }
-
-  destroy() {
-    if (this.isDestroyed) {
-      return;
-    } // debug('Subscription.destroy()', reason);
-
-
-    this.isDestroyed = true;
-    this.events.emit('destroy');
-    this.events.removeAllListeners();
-  }
-
-  async start() {
-    /* istanbul ignore next */
-    if (this.isDestroyed) {
-      throw new Error('Called start() on a destroyed subscription');
-    }
-
-    try {
-      const emit = {
-        error: err => this.emitError(err),
-        data: data => this.emitOutput(data)
-      };
-      const cancel = await this.callback(emit);
-
-      if (this.isDestroyed
-      /* istanbul ignore next */
-      ) {
-        cancel();
-      } else {
-        this.events.on('destroy', cancel);
-      }
-    } catch (cause
-    /* istanbul ignore next */
-    ) {
-      this.emitError(transformTRPCResponse.getErrorFromUnknown(cause));
-    }
-  }
-  /* istanbul ignore next */
-
-  /**
-   * @deprecated This method is just here to help with `inferSubscriptionOutput` which I can't get working without it
-   */
-
-
-  output() {
-    throw new Error('Not in use');
-  }
-  /**
-   * Emit data
-   */
-
-
-  emitOutput(data) {
-    this.events.emit('data', data);
-  }
-  /**
-   * Emit error
-   */
-
-
-  emitError(err) {
-    this.events.emit('error', err);
-  }
-
-  on(...args) {
-    return this.events.on(...args);
-  }
-
-  off(...args) {
-    return this.events.off(...args);
-  }
-
-}
-/**
- * @alpha Might be removed
- */
-
-function subscriptionPullFactory(opts) {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  let timer;
-  let stopped = false;
-
-  async function _pull(emit) {
-    /* istanbul ignore next */
-    if (stopped) {
-      return;
-    }
-
-    try {
-      await opts.pull(emit);
-    } catch (err
-    /* istanbul ignore next */
-    ) {
-      emit.error(transformTRPCResponse.getErrorFromUnknown(err));
-    }
-    /* istanbul ignore else */
-
-
-    if (!stopped) {
-      timer = setTimeout(() => _pull(emit), opts.intervalMs);
-    }
-  }
-
-  return new Subscription(emit => {
-    _pull(emit).catch(err => emit.error(transformTRPCResponse.getErrorFromUnknown(err)));
-
-    return () => {
-      clearTimeout(timer);
-      stopped = true;
-    };
-  });
-}
-
-exports.Subscription = Subscription;
-exports.subscriptionPullFactory = subscriptionPullFactory;

package/dist/transformTRPCResponse-ff424ff4.mjs

@@ -1,105 +0,0 @@
-function getMessageFromUnkownError(err, fallback) {
-  if (typeof err === 'string') {
-    return err;
-  }
-
-  if (err instanceof Error && typeof err.message === 'string') {
-    return err.message;
-  }
-
-  return fallback;
-}
-function 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 (cause instanceof Error && cause.name === 'TRPCError') {
-    return cause;
-  }
-
-  const err = new TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    cause
-  }); // take stack trace from cause
-
-  if (cause instanceof Error) {
-    err.stack = cause.stack;
-  }
-
-  return err;
-}
-
-class TRPCError extends Error {
-  constructor(opts) {
-    var _opts$message;
-
-    const cause = opts.cause;
-    const code = opts.code;
-    const message = (_opts$message = opts.message) !== null && _opts$message !== void 0 ? _opts$message : getMessageFromUnkownError(cause, code); // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore https://github.com/tc39/proposal-error-cause
-
-    super(message, {
-      cause
-    });
-    this.cause = void 0;
-    this.code = void 0;
-    this.code = code;
-    this.cause = cause;
-    this.name = 'TRPCError';
-    Object.setPrototypeOf(this, new.target.prototype);
-  }
-
-}
-
-async function callProcedure(opts) {
-  const {
-    type,
-    path,
-    input
-  } = opts;
-  const caller = opts.router.createCaller(opts.ctx);
-
-  if (type === 'query') {
-    return caller.query(path, input);
-  }
-
-  if (type === 'mutation') {
-    return caller.mutation(path, input);
-  }
-
-  if (type === 'subscription') {
-    const sub = await caller.subscription(path, input);
-    return sub;
-  }
-  /* istanbul ignore next */
-
-
-  throw new Error(`Unknown procedure type ${type}`);
-}
-
-function transformTRPCResponseItem(router, item) {
-  if ('error' in item) {
-    return { ...item,
-      error: router._def.transformer.output.serialize(item.error)
-    };
-  }
-
-  if (item.result.type !== 'data') {
-    return item;
-  }
-
-  return { ...item,
-    result: { ...item.result,
-      data: router._def.transformer.output.serialize(item.result.data)
-    }
-  };
-}
-/**
- * Takes a unserialized `TRPCResponse` and serializes it with the router's transformers
- **/
-
-
-function transformTRPCResponse(router, itemOrItems) {
-  return Array.isArray(itemOrItems) ? itemOrItems.map(item => transformTRPCResponseItem(router, item)) : transformTRPCResponseItem(router, itemOrItems);
-}
-
-export { TRPCError as T, callProcedure as c, getErrorFromUnknown as g, transformTRPCResponse as t };

package/src/internals/wrapCallSafe.ts

@@ -1,19 +0,0 @@
-type AsyncFn<T> = () => Promise<T> | T;
-/**
- * Wrap a function in a safe wrapper that never throws
- * Returns a discriminated union
- */
-export async function wrapCallSafe<T>(fn: AsyncFn<T>) {
-  try {
-    const data = await fn();
-    return {
-      ok: true as const,
-      data,
-    };
-  } catch (cause) {
-    return {
-      ok: false as const,
-      error: cause,
-    };
-  }
-}

package/ws/dist/trpc-server-ws.cjs.d.ts

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

package/ws/dist/trpc-server-ws.cjs.dev.js

@@ -1,15 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var adapters_ws_dist_trpcServerAdaptersWs = require('../../adapters/ws/dist/trpc-server-adapters-ws.cjs.dev.js');
-require('../../dist/transformTRPCResponse-8248515e.cjs.dev.js');
-require('../../dist/subscription-9e007280.cjs.dev.js');
-require('events');
-
-/**
- * @deprecated replace your import with `@trpc/server/adapters/ws`
- */
-const applyWSSHandler = adapters_ws_dist_trpcServerAdaptersWs.applyWSSHandler;
-
-exports.applyWSSHandler = applyWSSHandler;

package/ws/dist/trpc-server-ws.cjs.js

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

package/ws/dist/trpc-server-ws.cjs.prod.js

@@ -1,15 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var adapters_ws_dist_trpcServerAdaptersWs = require('../../adapters/ws/dist/trpc-server-adapters-ws.cjs.prod.js');
-require('../../dist/transformTRPCResponse-dcbf66c5.cjs.prod.js');
-require('../../dist/subscription-12fb50be.cjs.prod.js');
-require('events');
-
-/**
- * @deprecated replace your import with `@trpc/server/adapters/ws`
- */
-const applyWSSHandler = adapters_ws_dist_trpcServerAdaptersWs.applyWSSHandler;
-
-exports.applyWSSHandler = applyWSSHandler;

package/ws/dist/trpc-server-ws.esm.js

@@ -1,11 +0,0 @@
-import { applyWSSHandler as applyWSSHandler$1 } from '../../adapters/ws/dist/trpc-server-adapters-ws.esm.js';
-import '../../dist/transformTRPCResponse-f73dc4a2.esm.js';
-import '../../dist/subscription-a81120d6.esm.js';
-import 'events';
-
-/**
- * @deprecated replace your import with `@trpc/server/adapters/ws`
- */
-const applyWSSHandler = applyWSSHandler$1;
-
-export { applyWSSHandler };

package/ws/index.d.ts

@@ -1 +0,0 @@
-export * from '../dist/ws';

package/ws/index.js

@@ -1 +0,0 @@
-module.exports = require('../dist/ws/index');