@trpc/server 10.0.0-alpha.27 → 10.0.0-alpha.28

package/dist/adapters/ws.d.ts

@@ -4,7 +4,7 @@ import { IncomingMessage } from 'http';
 import ws from 'ws';
 import { AnyRouter } from '../core';
 import { BaseHandlerOptions } from '../internals/types';
-import { NodeHTTPCreateContextOption } from './node-http';
+import { NodeHTTPCreateContextFnOptions, NodeHTTPCreateContextOption } from './node-http';
 /**
  * Web socket server handler
  */
@@ -12,6 +12,7 @@ export declare type WSSHandlerOptions<TRouter extends AnyRouter> = BaseHandlerOp
     wss: ws.Server;
     process?: NodeJS.Process;
 } & NodeHTTPCreateContextOption<TRouter, IncomingMessage, ws>;
+export declare type CreateWSSContextFnOptions = NodeHTTPCreateContextFnOptions<IncomingMessage, ws>;
 export declare function applyWSSHandler<TRouter extends AnyRouter>(opts: WSSHandlerOptions<TRouter>): {
     broadcastReconnectNotification: () => void;
 };

package/dist/adapters/ws.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/adapters/ws.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACvC,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,SAAS,EAAqC,MAAM,SAAS,CAAC;AAIvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AASxD,OAAO,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAyE1D;;GAEG;AACH,oBAAY,iBAAiB,CAAC,OAAO,SAAS,SAAS,IAAI,kBAAkB,CAC3E,OAAO,EACP,eAAe,CAChB,GAAG;IACF,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;CAC1B,GAAG,2BAA2B,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC;AAE9D,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EA6OjC"}
+{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/adapters/ws.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACvC,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,SAAS,EAAqC,MAAM,SAAS,CAAC;AAIvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AASxD,OAAO,EACL,8BAA8B,EAC9B,2BAA2B,EAC5B,MAAM,aAAa,CAAC;AAyErB;;GAEG;AACH,oBAAY,iBAAiB,CAAC,OAAO,SAAS,SAAS,IAAI,kBAAkB,CAC3E,OAAO,EACP,eAAe,CAChB,GAAG;IACF,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;CAC1B,GAAG,2BAA2B,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC;AAE9D,oBAAY,yBAAyB,GAAG,8BAA8B,CACpE,eAAe,EACf,EAAE,CACH,CAAC;AAEF,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EA6OjC"}

package/dist/core/initTRPC.d.ts

@@ -1,7 +1,7 @@
-import { mergeRoutersGeneric } from './internals/__generated__/mergeRoutersGeneric';
 import { DefaultErrorShape, ErrorFormatter, ErrorFormatterShape } from '../error/formatter';
 import { CombinedDataTransformer, DataTransformerOptions, DefaultDataTransformer } from '../transformer';
 import { InitGenerics, InitOptions } from './internals/config';
+import { mergeRoutersGeneric } from './internals/mergeRoutersGeneric';
 import { PickFirstDefined, ValidateShape } from './internals/utils';
 export declare function initTRPC<TParams extends Partial<InitGenerics> = {}>(): <TOptions extends Partial<InitOptions<{
     ctx: TParams['ctx'] extends undefined ? {} : NonNullable<TParams['ctx']>;

package/dist/core/initTRPC.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initTRPC.d.ts","sourceRoot":"","sources":["../../src/core/initTRPC.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,mBAAmB,EAEpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,uBAAuB,EACvB,sBAAsB,EACtB,sBAAsB,EAGvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAGL,YAAY,EACZ,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAIpE,wBAAgB,QAAQ,CAAC,OAAO,SAAS,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE;SAE1D,OAAO,CAAC,KAAK,CAAC,SAAS,SAAS,GAAG,EAAE,GAAG,YAAY,OAAO,CAAC,KAAK,CAAC,CAAC;UAClE,OAAO,CAAC,MAAM,CAAC,SAAS,SAAS,GAAG,EAAE,GAAG,YAAY,OAAO,CAAC,MAAM,CAAC,CAAC;;SADtE,OAAO,CAAC,KAAK,CAAC,SAAS,SAAS,GAAG,EAAE,GAAG,YAAY,OAAO,CAAC,KAAK,CAAC,CAAC;UAClE,OAAO,CAAC,MAAM,CAAC,SAAS,SAAS,GAAG,EAAE,GAAG,YAAY,OAAO,CAAC,MAAM,CAAC,CAAC;;IAiCzE;;;OAGG;;;;;;;IAEH;;OAEG;;;;;;;;;;IAEH;;OAEG;;;;;;;;;;;;;;;;;;IAEH;;;OAGG;;;;;;;;;;;;;;;;;;;IAKH;;OAEG;;EAIR"}
+{"version":3,"file":"initTRPC.d.ts","sourceRoot":"","sources":["../../src/core/initTRPC.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,mBAAmB,EAEpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,uBAAuB,EACvB,sBAAsB,EACtB,sBAAsB,EAGvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAGL,YAAY,EACZ,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAIpE,wBAAgB,QAAQ,CAAC,OAAO,SAAS,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE;SAE1D,OAAO,CAAC,KAAK,CAAC,SAAS,SAAS,GAAG,EAAE,GAAG,YAAY,OAAO,CAAC,KAAK,CAAC,CAAC;UAClE,OAAO,CAAC,MAAM,CAAC,SAAS,SAAS,GAAG,EAAE,GAAG,YAAY,OAAO,CAAC,MAAM,CAAC,CAAC;;SADtE,OAAO,CAAC,KAAK,CAAC,SAAS,SAAS,GAAG,EAAE,GAAG,YAAY,OAAO,CAAC,KAAK,CAAC,CAAC;UAClE,OAAO,CAAC,MAAM,CAAC,SAAS,SAAS,GAAG,EAAE,GAAG,YAAY,OAAO,CAAC,MAAM,CAAC,CAAC;;IAiCzE;;;OAGG;;;;;;;IAEH;;OAEG;;;;;;;;;;IAEH;;OAEG;;;;;;;;;;;;;;;;;;IAEH;;;OAGG;;;;;;;;;;;;;;;;;;;IAKH;;OAEG;;EAIR"}

package/dist/index.js

@@ -1095,11 +1095,12 @@ function mergeRouters(...routerList) {
 }
 
 /**
- * @deprecated Only keeping this for future reference if our testing was a false-positive
+ * Thanks to @phryneas!
+ * 
+ * @link https://twitter.com/phry/status/1538516854058242048
  */
-
-function mergeRoutersGeneric(...args) {
-  return mergeRouters(...args);
+function mergeRoutersGeneric(...routers) {
+  return mergeRouters(...routers);
 }
 
 // TODO make this into a callbag?

package/dist/index.mjs

@@ -1093,11 +1093,12 @@ function mergeRouters(...routerList) {
 }
 
 /**
- * @deprecated Only keeping this for future reference if our testing was a false-positive
+ * Thanks to @phryneas!
+ * 
+ * @link https://twitter.com/phry/status/1538516854058242048
  */
-
-function mergeRoutersGeneric(...args) {
-  return mergeRouters(...args);
+function mergeRoutersGeneric(...routers) {
+  return mergeRouters(...routers);
 }
 
 // TODO make this into a callbag?

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "10.0.0-alpha.27",
+  "version": "10.0.0-alpha.28",
   "description": "tRPC Server",
   "author": "KATT",
   "license": "MIT",
@@ -133,5 +133,5 @@
   "dependencies": {
     "tslib": "^2.1.0"
   },
-  "gitHead": "bef0292d6b89d3be3a4cb8c21fb12f5f4ec2f896"
+  "gitHead": "9252bd0df8523fc90b56bdd4228b8662ad507198"
 }

package/src/adapters/ws.ts

@@ -13,7 +13,10 @@ import {
   TRPCResponseMessage,
 } from '../rpc';
 import { CombinedDataTransformer } from '../transformer';
-import { NodeHTTPCreateContextOption } from './node-http';
+import {
+  NodeHTTPCreateContextFnOptions,
+  NodeHTTPCreateContextOption,
+} from './node-http';
 
 /* istanbul ignore next */
 function assertIsObject(obj: unknown): asserts obj is Record<string, unknown> {
@@ -97,6 +100,11 @@ export type WSSHandlerOptions<TRouter extends AnyRouter> = BaseHandlerOptions<
   process?: NodeJS.Process;
 } & NodeHTTPCreateContextOption<TRouter, IncomingMessage, ws>;
 
+export type CreateWSSContextFnOptions = NodeHTTPCreateContextFnOptions<
+  IncomingMessage,
+  ws
+>;
+
 export function applyWSSHandler<TRouter extends AnyRouter>(
   opts: WSSHandlerOptions<TRouter>,
 ) {

package/src/core/initTRPC.ts

@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/ban-types */
-import { mergeRoutersGeneric } from './internals/__generated__/mergeRoutersGeneric';
 import {
   DefaultErrorShape,
   ErrorFormatter,
@@ -19,6 +18,7 @@ import {
   InitGenerics,
   InitOptions,
 } from './internals/config';
+import { mergeRoutersGeneric } from './internals/mergeRoutersGeneric';
 import { createBuilder } from './internals/procedureBuilder';
 import { PickFirstDefined, ValidateShape } from './internals/utils';
 import { createMiddlewareFactory } from './middleware';