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

package/dist/subscription.js

@@ -0,0 +1,44 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var TRPCError = require('./TRPCError-ddec3395.js');
+var observable = require('./observable-3aa4d911.js');
+
+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(TRPCError.getErrorFromUnknown(err));
+    }
+    /* istanbul ignore else */
+
+
+    if (!stopped) {
+      timer = setTimeout(() => _pull(emit), opts.intervalMs);
+    }
+  }
+
+  return observable.observable(emit => {
+    _pull(emit).catch(err => emit.error(TRPCError.getErrorFromUnknown(err)));
+
+    return () => {
+      clearTimeout(timer);
+      stopped = true;
+    };
+  });
+}
+
+exports.subscriptionPullFactory = subscriptionPullFactory;

package/dist/subscription.mjs

@@ -0,0 +1,40 @@
+import { a as getErrorFromUnknown } from './TRPCError-7971540a.mjs';
+import { o as observable } from './observable-137ea1bd.mjs';
+
+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 observable(emit => {
+    _pull(emit).catch(err => emit.error(getErrorFromUnknown(err)));
+
+    return () => {
+      clearTimeout(timer);
+      stopped = true;
+    };
+  });
+}
+
+export { subscriptionPullFactory };

package/dist/subscription.ts.js

@@ -0,0 +1 @@
+

package/dist/transformTRPCResponse-333bed6c.js

@@ -0,0 +1,56 @@
+'use strict';
+
+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 ('data' in item.result) {
+    return { ...item,
+      result: { ...item.result,
+        data: router._def.transformer.output.serialize(item.result.data)
+      }
+    };
+  }
+
+  return item;
+}
+/**
+ * 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);
+}
+
+exports.callProcedure = callProcedure;
+exports.transformTRPCResponse = transformTRPCResponse;

package/dist/transformTRPCResponse-e0cba527.mjs

@@ -0,0 +1,53 @@
+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 ('data' in item.result) {
+    return { ...item,
+      result: { ...item.result,
+        data: router._def.transformer.output.serialize(item.result.data)
+      }
+    };
+  }
+
+  return item;
+}
+/**
+ * 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 { callProcedure as c, transformTRPCResponse as t };

package/dist/types.d.ts

@@ -30,4 +30,12 @@ export declare type ThenArg<T> = T extends PromiseLike<infer U> ? ThenArg<U> : T
  * @public
  */
 export declare type Dict<T> = Record<string, T | undefined>;
+/**
+ * @internal
+ * Creates a "lower-priority" type inference.
+ * https://github.com/microsoft/TypeScript/issues/14829#issuecomment-322267089
+ */
+export declare type InferLast<T> = T & {
+    [K in keyof T]: T[K];
+};
 //# 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":"AAGA;;GAEG;AACH,oBAAY,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;AAEpE;;GAEG;AACH,oBAAY,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;AAE5B;;GAEG;AACH,oBAAY,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC;KAClC,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GACvC,CAAC,CAAC,CAAC,CAAC,GACJ,CAAC,SAAS,MAAM,CAAC,GACjB,CAAC,CAAC,CAAC,CAAC,GACJ,KAAK;CACV,CAAC,CAAC;AAEH;;GAEG;AACH,oBAAY,QAAQ,CAClB,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,OAAO,SAAS,MAAM,IACpB;KACD,CAAC,IAAI,MAAM,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;CAC1D,CAAC;AAEF;;GAEG;AACH,oBAAY,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;AAE5C;;GAEG;AACH,oBAAY,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEzE;;GAEG;AACH,oBAAY,IAAI,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,oBAAY,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;AAEpE;;GAEG;AACH,oBAAY,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;AAE5B;;GAEG;AACH,oBAAY,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC;KAClC,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GACvC,CAAC,CAAC,CAAC,CAAC,GACJ,CAAC,SAAS,MAAM,CAAC,GACjB,CAAC,CAAC,CAAC,CAAC,GACJ,KAAK;CACV,CAAC,CAAC;AAEH;;GAEG;AACH,oBAAY,QAAQ,CAClB,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,OAAO,SAAS,MAAM,IACpB;KACD,CAAC,IAAI,MAAM,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;CAC1D,CAAC;AAEF;;GAEG;AACH,oBAAY,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;AAE5C;;GAEG;AACH,oBAAY,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEzE;;GAEG;AACH,oBAAY,IAAI,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;AAEpD;;;;GAIG;AACH,oBAAY,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC"}

package/observable/index.d.ts

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

package/observable/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "10.0.0-alpha.20",
+  "version": "10.0.0-alpha.23",
   "description": "tRPC Server",
   "author": "KATT",
   "license": "MIT",
@@ -12,7 +12,11 @@
   },
   "eslintConfig": {
     "rules": {
-      "explicit-module-boundary-types": "off"
+      "explicit-module-boundary-types": "off",
+      "no-restricted-imports": [
+        "error",
+        "@trpc/server"
+      ]
     }
   },
   "scripts": {
@@ -58,41 +62,59 @@
       "require": "./dist/adapters/ws.js",
       "default": "./dist/adapters/ws.js"
     },
+    "./adapters/fetch": {
+      "import": "./dist/adapters/fetch/index.mjs",
+      "require": "./dist/adapters/fetch/index.js",
+      "default": "./dist/adapters/fetch/index.js"
+    },
     "./rpc": {
       "import": "./dist/rpc/index.mjs",
       "require": "./dist/rpc/index.js",
       "default": "./dist/rpc/index.js"
+    },
+    "./observable": {
+      "import": "./dist/observable/index.mjs",
+      "require": "./dist/observable/index.js",
+      "default": "./dist/observable/index.js"
+    },
+    "./subscription": {
+      "import": "./dist/subscription.mjs",
+      "require": "./dist/subscription.js",
+      "default": "./dist/subscription.js"
     }
   },
   "files": [
     "README.md",
     "dist",
     "adapters",
-    "ws",
     "rpc",
+    "observable",
     "src"
   ],
   "publishConfig": {
     "access": "public"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^12.0.0",
-    "@testing-library/user-event": "^13.2.1",
+    "@cloudflare/workers-types": "^3.8.0",
+    "@fastify/websocket": "^5.0.0",
+    "@miniflare/core": "^2.4.0",
     "@types/express": "^4.17.12",
     "@types/hash-sum": "^1.0.0",
     "@types/ws": "^8.2.0",
     "abort-controller": "^3.0.0",
     "devalue": "^2.0.1",
+    "esbuild": "^0.14.38",
     "express": "^4.17.1",
     "fastify": "^3.27.1",
     "fastify-plugin": "^3.0.1",
     "fastify-websocket": "^4.0.0",
     "hash-sum": "^2.0.0",
     "jest": "^27.1.0",
+    "jest-environment-miniflare": "^2.4.0",
     "konn": "^0.7.0",
+    "miniflare": "^2.4.0",
     "myzod": "^1.3.1",
-    "next": "^12.0.1",
+    "next": "^12.1.6",
     "node-fetch": "^2.6.1",
     "superstruct": "^0.15.2",
     "typescript": "4.4.4",
@@ -103,5 +125,5 @@
   "dependencies": {
     "tslib": "^2.1.0"
   },
-  "gitHead": "b1d41d19a79b71045bf92dd6a5b8370a9f4f017c"
+  "gitHead": "c62ecdc84b32656b6ccb0f94188f34af4485ad58"
 }

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var codes = require('../../dist/codes-33cef953.cjs.dev.js');
+var codes = require('../../dist/codes-130e62df.cjs.dev.js');
 
 
 

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var codes = require('../../dist/codes-e0df67c4.cjs.prod.js');
+var codes = require('../../dist/codes-aff770a3.cjs.prod.js');
 
 
 

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

@@ -1 +1 @@
-export { T as TRPC_ERROR_CODES_BY_KEY, a as TRPC_ERROR_CODES_BY_NUMBER } from '../../dist/codes-fe07bf82.esm.js';
+export { T as TRPC_ERROR_CODES_BY_KEY, a as TRPC_ERROR_CODES_BY_NUMBER } from '../../dist/codes-5678cc97.esm.js';

package/src/TRPCError.ts

@@ -2,13 +2,13 @@ import { getMessageFromUnkownError } from './internals/errors';
 import { TRPC_ERROR_CODE_KEY } from './rpc/codes';
 
 export class TRPCError extends Error {
-  public readonly cause?: unknown;
+  public readonly cause?: Error | undefined;
   public readonly code;
 
   constructor(opts: {
     message?: string;
     code: TRPC_ERROR_CODE_KEY;
-    cause?: unknown;
+    cause?: Error;
   }) {
     const cause = opts.cause;
     const code = opts.code;

package/src/adapters/fastify/fastifyRequestHandler.ts

@@ -1,5 +1,4 @@
 import { FastifyReply, FastifyRequest } from 'fastify';
-import { URLSearchParams } from 'url';
 import { assertNotBrowser } from '../../assertNotBrowser';
 import {
   HTTPBaseHandlerOptions,

package/src/adapters/fastify/fastifyTRPCPlugin.ts

@@ -1,4 +1,4 @@
-/// <reference types="fastify-websocket" />
+/// <reference types="@fastify/websocket" />
 import { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
 import { FastifyHandlerOptions } from '.';
 import { AnyRouter } from '../..';

package/src/adapters/fetch/fetchRequestHandler.ts

@@ -0,0 +1,61 @@
+import { assertNotBrowser } from '../../assertNotBrowser';
+import { HTTPRequest } from '../../http/internals/types';
+import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
+import { AnyRouter } from '../../router';
+import { FetchHandlerOptions } from './types';
+
+assertNotBrowser();
+
+export type FetchHandlerRequestOptions<TRouter extends AnyRouter> = {
+  req: Request;
+  endpoint: string;
+} & FetchHandlerOptions<TRouter>;
+
+export async function fetchRequestHandler<TRouter extends AnyRouter>(
+  opts: FetchHandlerRequestOptions<TRouter>,
+): Promise<Response> {
+  const createContext = async () => {
+    return opts.createContext?.({ req: opts.req });
+  };
+
+  const url = new URL(opts.req.url);
+  const path = url.pathname.slice(opts.endpoint.length + 1);
+  const req: HTTPRequest = {
+    query: url.searchParams,
+    method: opts.req.method,
+    headers: Object.fromEntries(opts.req.headers),
+    body: await opts.req.text(),
+  };
+
+  const result = await resolveHTTPResponse({
+    req,
+    createContext,
+    path,
+    router: opts.router,
+    batching: opts.batching,
+    responseMeta: opts.responseMeta,
+    onError(o) {
+      opts?.onError?.({ ...o, req: opts.req });
+    },
+  });
+
+  const res = new Response(result.body, {
+    status: result.status,
+  });
+
+  for (const [key, value] of Object.entries(result.headers ?? {})) {
+    if (typeof value === 'undefined') {
+      continue;
+    }
+
+    if (typeof value === 'string') {
+      res.headers.set(key, value);
+      continue;
+    }
+
+    for (const v of value) {
+      res.headers.append(key, v);
+    }
+  }
+  return res;
+}

package/src/adapters/fetch/index.ts

@@ -0,0 +1,2 @@
+export * from './fetchRequestHandler';
+export * from './types';

package/src/adapters/fetch/types.ts

@@ -0,0 +1,28 @@
+import { HTTPBaseHandlerOptions } from '../../http/internals/types';
+import { AnyRouter, inferRouterContext } from '../../router';
+
+export type FetchCreateContextFnOptions = {
+  req: Request;
+};
+
+export type FetchCreateContextFn<TRouter extends AnyRouter> = (opts: {
+  req: Request;
+}) => inferRouterContext<TRouter> | Promise<inferRouterContext<TRouter>>;
+
+export type FetchCreateContextOption<TRouter extends AnyRouter> =
+  unknown extends inferRouterContext<TRouter>
+    ? {
+        /**
+         * @link https://trpc.io/docs/context
+         **/
+        createContext?: FetchCreateContextFn<TRouter>;
+      }
+    : {
+        /**
+         * @link https://trpc.io/docs/context
+         **/
+        createContext: FetchCreateContextFn<TRouter>;
+      };
+
+export type FetchHandlerOptions<TRouter extends AnyRouter> =
+  HTTPBaseHandlerOptions<TRouter, Request> & FetchCreateContextOption<TRouter>;

package/src/adapters/next.ts

@@ -7,7 +7,6 @@ import type {
 } from 'next/types';
 import { TRPCError } from '../TRPCError';
 import { AnyRouter } from '../router';
-import { TRPCErrorResponse } from '../rpc';
 import { nodeHTTPRequestHandler } from './node-http';
 import {
   NodeHTTPCreateContextFnOptions,
@@ -46,12 +45,11 @@ export function createNextApiHandler<TRouter extends AnyRouter>(
         path: undefined,
         input: undefined,
       });
-      const json: TRPCErrorResponse = {
+      res.statusCode = 500;
+      res.json({
         id: -1,
         error,
-      };
-      res.statusCode = 500;
-      res.json(json);
+      });
       return;
     }
 

package/src/adapters/node-http/nodeHTTPRequestHandler.ts

@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-import { URLSearchParams } from 'url';
 import { assertNotBrowser } from '../../assertNotBrowser';
 import { HTTPRequest } from '../../http/internals/types';
 import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';

package/src/adapters/node-http/types.ts

@@ -1,15 +1,17 @@
-import http from 'http';
-import qs from 'qs';
-import { inferRouterContext } from '../..';
+import { IncomingMessage, ServerResponse } from 'http';
 import { HTTPBaseHandlerOptions } from '../../http/internals/types';
-import { AnyRouter } from '../../router';
+import { AnyRouter, inferRouterContext } from '../../router';
 
-export type NodeHTTPRequest = http.IncomingMessage & {
+interface ParsedQs {
+  [key: string]: undefined | string | string[] | ParsedQs | ParsedQs[];
+}
+
+export type NodeHTTPRequest = IncomingMessage & {
   method?: string;
-  query?: qs.ParsedQs;
+  query?: ParsedQs;
   body?: unknown;
 };
-export type NodeHTTPResponse = http.ServerResponse;
+export type NodeHTTPResponse = ServerResponse;
 
 export type NodeHTTPCreateContextOption<
   TRouter extends AnyRouter,

package/src/adapters/standalone.ts

@@ -2,7 +2,6 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import http from 'http';
-import url from 'url';
 import { AnyRouter } from '../router';
 import {
   NodeHTTPCreateContextFnOptions,
@@ -22,12 +21,20 @@ export function createHTTPHandler<TRouter extends AnyRouter>(
   opts: CreateHTTPHandlerOptions<TRouter>,
 ) {
   return async (req: http.IncomingMessage, res: http.ServerResponse) => {
-    const endpoint = url.parse(req.url!).pathname!.slice(1);
+    // if no hostname, set a dummy one
+    const href = req.url!.startsWith('/')
+      ? `http://127.0.0.1${req.url}`
+      : req.url!;
+
+    // get procedure path and remove the leading slash
+    // /procedure -> procedure
+    const path = new URL(href).pathname.slice(1);
+
     await nodeHTTPRequestHandler({
       ...opts,
       req,
       res,
-      path: endpoint,
+      path,
     });
   };
 }