@trpc/client 10.0.0-alpha.9 → 10.0.0-proxy-alpha.54

package/dist/splitLink-ad44a55d.mjs

@@ -0,0 +1,45 @@
+import { observable } from '@trpc/server/observable';
+
+/** @internal */ function createChain(opts) {
+    return observable((observer)=>{
+        function execute(index = 0, op = opts.op) {
+            const next = opts.links[index];
+            if (!next) {
+                throw new Error('No more links to execute - did you forget to add an ending link?');
+            }
+            const subscription = next({
+                op,
+                next (nextOp) {
+                    const nextObserver = execute(index + 1, nextOp);
+                    return nextObserver;
+                }
+            });
+            return subscription;
+        }
+        const obs$ = execute();
+        return obs$.subscribe(observer);
+    });
+}
+
+function asArray(value) {
+    return Array.isArray(value) ? value : [
+        value
+    ];
+}
+function splitLink(opts) {
+    return (runtime)=>{
+        const yes = asArray(opts.true).map((link)=>link(runtime));
+        const no = asArray(opts.false).map((link)=>link(runtime));
+        return (props)=>{
+            return observable((observer)=>{
+                const links = opts.condition(props.op) ? yes : no;
+                return createChain({
+                    op: props.op,
+                    links
+                }).subscribe(observer);
+            });
+        };
+    };
+}
+
+export { createChain as c, splitLink as s };

package/dist/transformResult-106791d7.mjs

@@ -0,0 +1,62 @@
+class TRPCClientError extends Error {
+    static from(cause, opts = {}) {
+        if (!(cause instanceof Error)) {
+            return new TRPCClientError(cause.error.message ?? '', {
+                ...opts,
+                cause: undefined,
+                result: cause
+            });
+        }
+        if (cause.name === 'TRPCClientError') {
+            return cause;
+        }
+        return new TRPCClientError(cause.message, {
+            ...opts,
+            cause,
+            result: null
+        });
+    }
+    constructor(message, opts){
+        const cause = opts?.cause;
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore https://github.com/tc39/proposal-error-cause
+        super(message, {
+            cause
+        });
+        this.meta = opts?.meta;
+        this.cause = cause;
+        this.shape = opts?.result?.error;
+        this.data = opts?.result?.error.data;
+        this.name = 'TRPCClientError';
+        Object.setPrototypeOf(this, TRPCClientError.prototype);
+    }
+}
+
+// FIXME:
+// - the generics here are probably unnecessary
+// - the RPC-spec could probably be simplified to combine HTTP + WS
+/** @internal */ function transformResult(response, runtime) {
+    if ('error' in response) {
+        const error = runtime.transformer.deserialize(response.error);
+        return {
+            ok: false,
+            error: {
+                ...response,
+                error
+            }
+        };
+    }
+    const result = {
+        ...response.result,
+        ...(!response.result.type || response.result.type === 'data') && {
+            type: 'data',
+            data: runtime.transformer.deserialize(response.result.data)
+        }
+    };
+    return {
+        ok: true,
+        result
+    };
+}
+
+export { TRPCClientError as T, transformResult as t };

package/dist/transformResult-e15ccdf6.js

@@ -0,0 +1,65 @@
+'use strict';
+
+class TRPCClientError extends Error {
+    static from(cause, opts = {}) {
+        if (!(cause instanceof Error)) {
+            return new TRPCClientError(cause.error.message ?? '', {
+                ...opts,
+                cause: undefined,
+                result: cause
+            });
+        }
+        if (cause.name === 'TRPCClientError') {
+            return cause;
+        }
+        return new TRPCClientError(cause.message, {
+            ...opts,
+            cause,
+            result: null
+        });
+    }
+    constructor(message, opts){
+        const cause = opts?.cause;
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore https://github.com/tc39/proposal-error-cause
+        super(message, {
+            cause
+        });
+        this.meta = opts?.meta;
+        this.cause = cause;
+        this.shape = opts?.result?.error;
+        this.data = opts?.result?.error.data;
+        this.name = 'TRPCClientError';
+        Object.setPrototypeOf(this, TRPCClientError.prototype);
+    }
+}
+
+// FIXME:
+// - the generics here are probably unnecessary
+// - the RPC-spec could probably be simplified to combine HTTP + WS
+/** @internal */ function transformResult(response, runtime) {
+    if ('error' in response) {
+        const error = runtime.transformer.deserialize(response.error);
+        return {
+            ok: false,
+            error: {
+                ...response,
+                error
+            }
+        };
+    }
+    const result = {
+        ...response.result,
+        ...(!response.result.type || response.result.type === 'data') && {
+            type: 'data',
+            data: runtime.transformer.deserialize(response.result.data)
+        }
+    };
+    return {
+        ok: true,
+        result
+    };
+}
+
+exports.TRPCClientError = TRPCClientError;
+exports.transformResult = transformResult;

package/links/httpBatchLink/dist/trpc-client-links-httpBatchLink.cjs.dev.js

@@ -2,16 +2,16 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _createForOfIteratorHelper = require('@babel/runtime/helpers/createForOfIteratorHelper');
-var transformRPCResponse = require('../../../dist/transformRPCResponse-57e80136.cjs.dev.js');
 var TRPCClientError = require('../../../dist/TRPCClientError-bfee2bf5.cjs.dev.js');
-require('@babel/runtime/helpers/createClass');
+var httpRequest = require('../../../dist/httpRequest-6b1f0c6f.cjs.dev.js');
+var _createForOfIteratorHelper = require('@babel/runtime/helpers/createForOfIteratorHelper');
+require('@babel/runtime/helpers/objectSpread2');
 require('@babel/runtime/helpers/classCallCheck');
+require('@babel/runtime/helpers/createClass');
 require('@babel/runtime/helpers/assertThisInitialized');
 require('@babel/runtime/helpers/inherits');
 require('@babel/runtime/helpers/createSuper');
 require('@babel/runtime/helpers/wrapNativeSuper');
-require('@babel/runtime/helpers/objectSpread2');
 
 /**
  * Dataloader that's very inspired by https://github.com/graphql/dataloader
@@ -78,6 +78,7 @@ function dataLoader(fetchMany, opts) {
     }
 
     var thisBatch = batch;
+    var dispatchImmediately = false;
     var promise = new Promise(function (resolve, reject) {
       var item = batchItem;
       item.reject = reject;
@@ -85,15 +86,10 @@ function dataLoader(fetchMany, opts) {
       thisBatch.items.push(item);
 
       if (typeof (opts === null || opts === void 0 ? void 0 : opts.maxBatchSize) !== 'undefined' && thisBatch.items.length >= opts.maxBatchSize) {
-        dispatch();
-        return;
+        dispatchImmediately = true;
       }
     });
 
-    if (!dispatchTimer) {
-      dispatchTimer = setTimeout(dispatch);
-    }
-
     var cancel = function cancel() {
       batchItem.cancelled = true;
 
@@ -107,6 +103,12 @@ function dataLoader(fetchMany, opts) {
       thisBatch.cancel();
     };
 
+    if (dispatchImmediately) {
+      dispatch();
+    } else if (!dispatchTimer) {
+      dispatchTimer = setTimeout(dispatch);
+    }
+
     return {
       promise: promise,
       cancel: cancel
@@ -133,7 +135,7 @@ function httpBatchLink(opts) {
           return op.input;
         });
 
-        var _httpRequest = transformRPCResponse.httpRequest({
+        var _httpRequest = httpRequest.httpRequest({
           url: url,
           inputs: inputs,
           path: path,
@@ -194,13 +196,13 @@ function httpBatchLink(opts) {
       };
 
       onDestroy(function () {
-        prevOnce(TRPCClientError.TRPCClientError.from(new transformRPCResponse.TRPCAbortError(), {
+        prevOnce(TRPCClientError.TRPCClientError.from(new httpRequest.TRPCAbortError(), {
           isDone: true
         }));
         cancel();
       });
       promise.then(function (envelope) {
-        prevOnce(transformRPCResponse.transformRPCResponse({
+        prevOnce(httpRequest.transformRPCResponse({
           envelope: envelope,
           runtime: runtime
         }));

package/links/httpBatchLink/dist/trpc-client-links-httpBatchLink.cjs.prod.js

@@ -2,16 +2,16 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _createForOfIteratorHelper = require('@babel/runtime/helpers/createForOfIteratorHelper');
-var transformRPCResponse = require('../../../dist/transformRPCResponse-739c13d0.cjs.prod.js');
 var TRPCClientError = require('../../../dist/TRPCClientError-e9bf96e9.cjs.prod.js');
-require('@babel/runtime/helpers/createClass');
+var httpRequest = require('../../../dist/httpRequest-66400297.cjs.prod.js');
+var _createForOfIteratorHelper = require('@babel/runtime/helpers/createForOfIteratorHelper');
+require('@babel/runtime/helpers/objectSpread2');
 require('@babel/runtime/helpers/classCallCheck');
+require('@babel/runtime/helpers/createClass');
 require('@babel/runtime/helpers/assertThisInitialized');
 require('@babel/runtime/helpers/inherits');
 require('@babel/runtime/helpers/createSuper');
 require('@babel/runtime/helpers/wrapNativeSuper');
-require('@babel/runtime/helpers/objectSpread2');
 
 /**
  * Dataloader that's very inspired by https://github.com/graphql/dataloader
@@ -78,6 +78,7 @@ function dataLoader(fetchMany, opts) {
     }
 
     var thisBatch = batch;
+    var dispatchImmediately = false;
     var promise = new Promise(function (resolve, reject) {
       var item = batchItem;
       item.reject = reject;
@@ -85,15 +86,10 @@ function dataLoader(fetchMany, opts) {
       thisBatch.items.push(item);
 
       if (typeof (opts === null || opts === void 0 ? void 0 : opts.maxBatchSize) !== 'undefined' && thisBatch.items.length >= opts.maxBatchSize) {
-        dispatch();
-        return;
+        dispatchImmediately = true;
       }
     });
 
-    if (!dispatchTimer) {
-      dispatchTimer = setTimeout(dispatch);
-    }
-
     var cancel = function cancel() {
       batchItem.cancelled = true;
 
@@ -107,6 +103,12 @@ function dataLoader(fetchMany, opts) {
       thisBatch.cancel();
     };
 
+    if (dispatchImmediately) {
+      dispatch();
+    } else if (!dispatchTimer) {
+      dispatchTimer = setTimeout(dispatch);
+    }
+
     return {
       promise: promise,
       cancel: cancel
@@ -133,7 +135,7 @@ function httpBatchLink(opts) {
           return op.input;
         });
 
-        var _httpRequest = transformRPCResponse.httpRequest({
+        var _httpRequest = httpRequest.httpRequest({
           url: url,
           inputs: inputs,
           path: path,
@@ -194,13 +196,13 @@ function httpBatchLink(opts) {
       };
 
       onDestroy(function () {
-        prevOnce(TRPCClientError.TRPCClientError.from(new transformRPCResponse.TRPCAbortError(), {
+        prevOnce(TRPCClientError.TRPCClientError.from(new httpRequest.TRPCAbortError(), {
           isDone: true
         }));
         cancel();
       });
       promise.then(function (envelope) {
-        prevOnce(transformRPCResponse.transformRPCResponse({
+        prevOnce(httpRequest.transformRPCResponse({
           envelope: envelope,
           runtime: runtime
         }));

package/links/httpBatchLink/dist/trpc-client-links-httpBatchLink.esm.js

@@ -1,13 +1,13 @@
-import _createForOfIteratorHelper from '@babel/runtime/helpers/esm/createForOfIteratorHelper';
-import { T as TRPCAbortError, t as transformRPCResponse, h as httpRequest } from '../../../dist/transformRPCResponse-f7f8b0e1.esm.js';
 import { T as TRPCClientError } from '../../../dist/TRPCClientError-09b8a26b.esm.js';
-import '@babel/runtime/helpers/createClass';
+import { T as TRPCAbortError, t as transformRPCResponse, h as httpRequest } from '../../../dist/httpRequest-62c5cce4.esm.js';
+import _createForOfIteratorHelper from '@babel/runtime/helpers/esm/createForOfIteratorHelper';
+import '@babel/runtime/helpers/objectSpread2';
 import '@babel/runtime/helpers/classCallCheck';
+import '@babel/runtime/helpers/createClass';
 import '@babel/runtime/helpers/assertThisInitialized';
 import '@babel/runtime/helpers/inherits';
 import '@babel/runtime/helpers/createSuper';
 import '@babel/runtime/helpers/wrapNativeSuper';
-import '@babel/runtime/helpers/objectSpread2';
 
 /**
  * Dataloader that's very inspired by https://github.com/graphql/dataloader
@@ -74,6 +74,7 @@ function dataLoader(fetchMany, opts) {
     }
 
     var thisBatch = batch;
+    var dispatchImmediately = false;
     var promise = new Promise(function (resolve, reject) {
       var item = batchItem;
       item.reject = reject;
@@ -81,15 +82,10 @@ function dataLoader(fetchMany, opts) {
       thisBatch.items.push(item);
 
       if (typeof (opts === null || opts === void 0 ? void 0 : opts.maxBatchSize) !== 'undefined' && thisBatch.items.length >= opts.maxBatchSize) {
-        dispatch();
-        return;
+        dispatchImmediately = true;
       }
     });
 
-    if (!dispatchTimer) {
-      dispatchTimer = setTimeout(dispatch);
-    }
-
     var cancel = function cancel() {
       batchItem.cancelled = true;
 
@@ -103,6 +99,12 @@ function dataLoader(fetchMany, opts) {
       thisBatch.cancel();
     };
 
+    if (dispatchImmediately) {
+      dispatch();
+    } else if (!dispatchTimer) {
+      dispatchTimer = setTimeout(dispatch);
+    }
+
     return {
       promise: promise,
       cancel: cancel

package/links/httpLink/dist/trpc-client-links-httpLink.cjs.dev.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var TRPCClientError = require('../../../dist/TRPCClientError-bfee2bf5.cjs.dev.js');
-var transformRPCResponse = require('../../../dist/transformRPCResponse-57e80136.cjs.dev.js');
+var httpRequest = require('../../../dist/httpRequest-6b1f0c6f.cjs.dev.js');
 require('@babel/runtime/helpers/objectSpread2');
 require('@babel/runtime/helpers/classCallCheck');
 require('@babel/runtime/helpers/createClass');
@@ -25,7 +25,7 @@ function httpLink(opts) {
           input = op.input,
           type = op.type;
 
-      var _httpRequest = transformRPCResponse.httpRequest({
+      var _httpRequest = httpRequest.httpRequest({
         runtime: runtime,
         type: type,
         input: input,
@@ -47,13 +47,13 @@ function httpLink(opts) {
       };
 
       onDestroy(function () {
-        prevOnce(TRPCClientError.TRPCClientError.from(new transformRPCResponse.TRPCAbortError(), {
+        prevOnce(TRPCClientError.TRPCClientError.from(new httpRequest.TRPCAbortError(), {
           isDone: true
         }));
         cancel();
       });
       promise.then(function (envelope) {
-        prevOnce(transformRPCResponse.transformRPCResponse({
+        prevOnce(httpRequest.transformRPCResponse({
           envelope: envelope,
           runtime: runtime
         }));

package/links/httpLink/dist/trpc-client-links-httpLink.cjs.prod.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var TRPCClientError = require('../../../dist/TRPCClientError-e9bf96e9.cjs.prod.js');
-var transformRPCResponse = require('../../../dist/transformRPCResponse-739c13d0.cjs.prod.js');
+var httpRequest = require('../../../dist/httpRequest-66400297.cjs.prod.js');
 require('@babel/runtime/helpers/objectSpread2');
 require('@babel/runtime/helpers/classCallCheck');
 require('@babel/runtime/helpers/createClass');
@@ -25,7 +25,7 @@ function httpLink(opts) {
           input = op.input,
           type = op.type;
 
-      var _httpRequest = transformRPCResponse.httpRequest({
+      var _httpRequest = httpRequest.httpRequest({
         runtime: runtime,
         type: type,
         input: input,
@@ -47,13 +47,13 @@ function httpLink(opts) {
       };
 
       onDestroy(function () {
-        prevOnce(TRPCClientError.TRPCClientError.from(new transformRPCResponse.TRPCAbortError(), {
+        prevOnce(TRPCClientError.TRPCClientError.from(new httpRequest.TRPCAbortError(), {
           isDone: true
         }));
         cancel();
       });
       promise.then(function (envelope) {
-        prevOnce(transformRPCResponse.transformRPCResponse({
+        prevOnce(httpRequest.transformRPCResponse({
           envelope: envelope,
           runtime: runtime
         }));

package/links/httpLink/dist/trpc-client-links-httpLink.esm.js

@@ -1,5 +1,5 @@
 import { T as TRPCClientError } from '../../../dist/TRPCClientError-09b8a26b.esm.js';
-import { h as httpRequest, T as TRPCAbortError, t as transformRPCResponse } from '../../../dist/transformRPCResponse-f7f8b0e1.esm.js';
+import { h as httpRequest, T as TRPCAbortError, t as transformRPCResponse } from '../../../dist/httpRequest-62c5cce4.esm.js';
 import '@babel/runtime/helpers/objectSpread2';
 import '@babel/runtime/helpers/classCallCheck';
 import '@babel/runtime/helpers/createClass';

package/links/wsLink/dist/trpc-client-links-wsLink.cjs.dev.js

@@ -115,7 +115,7 @@ function createWSClient(opts) {
   }
 
   function createWS() {
-    var conn = new WebSocket(url);
+    var conn = new WebSocketImpl(url);
     clearTimeout(connectTimer);
     connectTimer = null;
     conn.addEventListener('open', function () {
@@ -275,6 +275,8 @@ function createWSClient(opts) {
     close: function close() {
       state = 'closed';
       closeIfNoPending(activeConnection);
+      clearTimeout(connectTimer);
+      connectTimer = null;
     },
     request: request,
     getConnection: function getConnection() {

package/links/wsLink/dist/trpc-client-links-wsLink.cjs.prod.js

@@ -115,7 +115,7 @@ function createWSClient(opts) {
   }
 
   function createWS() {
-    var conn = new WebSocket(url);
+    var conn = new WebSocketImpl(url);
     clearTimeout(connectTimer);
     connectTimer = null;
     conn.addEventListener('open', function () {
@@ -275,6 +275,8 @@ function createWSClient(opts) {
     close: function close() {
       state = 'closed';
       closeIfNoPending(activeConnection);
+      clearTimeout(connectTimer);
+      connectTimer = null;
     },
     request: request,
     getConnection: function getConnection() {

package/links/wsLink/dist/trpc-client-links-wsLink.esm.js

@@ -111,7 +111,7 @@ function createWSClient(opts) {
   }
 
   function createWS() {
-    var conn = new WebSocket(url);
+    var conn = new WebSocketImpl(url);
     clearTimeout(connectTimer);
     connectTimer = null;
     conn.addEventListener('open', function () {
@@ -271,6 +271,8 @@ function createWSClient(opts) {
     close: function close() {
       state = 'closed';
       closeIfNoPending(activeConnection);
+      clearTimeout(connectTimer);
+      connectTimer = null;
     },
     request: request,
     getConnection: function getConnection() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "10.0.0-alpha.9",
+  "version": "10.0.0-proxy-alpha.54",
   "description": "tRPC Client lib",
   "author": "KATT",
   "license": "MIT",
@@ -10,6 +10,14 @@
     "url": "git+https://github.com/trpc/trpc.git",
     "directory": "packages/client"
   },
+  "eslintConfig": {
+    "rules": {
+      "no-restricted-imports": [
+        "error",
+        "@trpc/client"
+      ]
+    }
+  },
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "typings": "dist/index.d.ts",
@@ -19,68 +27,49 @@
       "require": "./dist/index.js",
       "default": "./dist/index.js"
     },
-    "./links/httpBatchLink": {
-      "import": "./dist/links/httpBatchLink.mjs",
-      "require": "./dist/links/httpBatchLink.js",
-      "default": "./dist/links/httpBatchLink.js"
-    },
     "./links/httpLink": {
       "import": "./dist/links/httpLink.mjs",
       "require": "./dist/links/httpLink.js",
       "default": "./dist/links/httpLink.js"
     },
-    "./links/loggerLink": {
-      "import": "./dist/links/loggerLink.mjs",
-      "require": "./dist/links/loggerLink.js",
-      "default": "./dist/links/loggerLink.js"
+    "./links/httpBatchLink": {
+      "import": "./dist/links/httpBatchLink.mjs",
+      "require": "./dist/links/httpBatchLink.js",
+      "default": "./dist/links/httpBatchLink.js"
     },
     "./links/splitLink": {
       "import": "./dist/links/splitLink.mjs",
       "require": "./dist/links/splitLink.js",
       "default": "./dist/links/splitLink.js"
     },
-    "./links/transformerLink": {
-      "import": "./dist/links/transformerLink.mjs",
-      "require": "./dist/links/transformerLink.js",
-      "default": "./dist/links/transformerLink.js"
+    "./links/loggerLink": {
+      "import": "./dist/links/loggerLink.mjs",
+      "require": "./dist/links/loggerLink.js",
+      "default": "./dist/links/loggerLink.js"
     },
     "./links/wsLink": {
       "import": "./dist/links/wsLink.mjs",
       "require": "./dist/links/wsLink.js",
       "default": "./dist/links/wsLink.js"
-    },
-    "./rx": {
-      "import": "./dist/rx/index.mjs",
-      "require": "./dist/rx/index.js",
-      "default": "./dist/rx/index.js"
-    },
-    "./rx/operators": {
-      "import": "./dist/rx/operators/index.mjs",
-      "require": "./dist/rx/operators/index.js",
-      "default": "./dist/rx/operators/index.js"
     }
   },
   "files": [
-    "README.md",
     "dist",
-    "links",
     "src",
-    "rx"
+    "README.md",
+    "links"
   ],
   "scripts": {
-    "build": "rollup -c"
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.9.0"
+    "ts-watch": "tsc --project tsconfig.watch.json"
   },
   "peerDependencies": {
-    "@trpc/server": "10.0.0-alpha.9"
+    "@trpc/server": "10.0.0-proxy-alpha.54"
   },
   "devDependencies": {
-    "@trpc/server": "10.0.0-alpha.9"
+    "@trpc/server": "10.0.0-proxy-alpha.54"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4d4ac63ab25a2b684ac61e905f9067aa201f8b0c"
+  "gitHead": "31315be8455a5bdba0ab49793a7e043b65a9d722"
 }