@trpc/client 9.16.0 → 10.0.0-alpha.1

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

@@ -2,16 +2,29 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var observable = require('../../../dist/observable-ccb54234.cjs.prod.js');
+var createChain = require('../../../dist/createChain-e45e052a.cjs.prod.js');
+
+function asArray(value) {
+  return Array.isArray(value) ? value : [value];
+}
+
 function splitLink(opts) {
   return function (rt) {
-    var links = 'left' in opts ? {
-      true: opts.left,
-      false: opts.right
-    } : opts;
-    var yes = links.true(rt);
-    var no = links.false(rt);
+    var yes = asArray(opts.true).map(function (link) {
+      return link(rt);
+    });
+    var no = asArray(opts.false).map(function (link) {
+      return link(rt);
+    });
     return function (props) {
-      opts.condition(props.op) ? yes(props) : no(props);
+      return observable.observable(function (observer) {
+        var links = opts.condition(props.op) ? yes : no;
+        return createChain.createChain({
+          op: props.op,
+          links: links
+        }).subscribe(observer);
+      });
     };
   };
 }

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

@@ -1,13 +1,26 @@
+import { o as observable } from '../../../dist/observable-01534ea8.esm.js';
+import { c as createChain } from '../../../dist/createChain-e45e6cf2.esm.js';
+
+function asArray(value) {
+  return Array.isArray(value) ? value : [value];
+}
+
 function splitLink(opts) {
   return function (rt) {
-    var links = 'left' in opts ? {
-      true: opts.left,
-      false: opts.right
-    } : opts;
-    var yes = links.true(rt);
-    var no = links.false(rt);
+    var yes = asArray(opts.true).map(function (link) {
+      return link(rt);
+    });
+    var no = asArray(opts.false).map(function (link) {
+      return link(rt);
+    });
     return function (props) {
-      opts.condition(props.op) ? yes(props) : no(props);
+      return observable(function (observer) {
+        var links = opts.condition(props.op) ? yes : no;
+        return createChain({
+          op: props.op,
+          links: links
+        }).subscribe(observer);
+      });
     };
   };
 }

package/links/transformerLink/dist/trpc-client-links-transformerLink.cjs.d.ts

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

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

@@ -0,0 +1,67 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
+var observable = require('../../../dist/observable-9aad8c3e.cjs.dev.js');
+
+/**
+ * @internal
+ */
+function transformOperationResult(result, transformer) {
+  if ('error' in result.data) {
+    return _objectSpread(_objectSpread({}, result), {}, {
+      data: _objectSpread(_objectSpread({}, result.data), {}, {
+        error: transformer.deserialize(result.data.error)
+      })
+    });
+  }
+
+  if (result.data.result.type !== 'data') {
+    return result;
+  }
+
+  return _objectSpread(_objectSpread({}, result), {}, {
+    data: _objectSpread(_objectSpread({}, result.data), {}, {
+      result: _objectSpread(_objectSpread({}, result.data.result), {}, {
+        data: transformer.deserialize(result.data.result.data)
+      })
+    })
+  });
+}
+
+function transformerLink(transformer) {
+  var _transformer = transformer ? 'input' in transformer ? {
+    serialize: transformer.input.serialize,
+    deserialize: transformer.output.deserialize
+  } : transformer : {
+    serialize: function serialize(data) {
+      return data;
+    },
+    deserialize: function deserialize(data) {
+      return data;
+    }
+  };
+
+  return function () {
+    return function (props) {
+      var input = _transformer.serialize(props.op.input);
+
+      return observable.observable(function (observer) {
+        var next$ = props.next(_objectSpread(_objectSpread({}, props.op), {}, {
+          input: input
+        })).subscribe({
+          next: function next(value) {
+            var transformed = transformOperationResult(value, _transformer);
+            observer.next(transformed);
+          },
+          error: observer.error,
+          complete: observer.complete
+        });
+        return next$;
+      });
+    };
+  };
+}
+
+exports.transformerLink = transformerLink;

package/links/transformerLink/dist/trpc-client-links-transformerLink.cjs.js

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

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

@@ -0,0 +1,67 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
+var observable = require('../../../dist/observable-ccb54234.cjs.prod.js');
+
+/**
+ * @internal
+ */
+function transformOperationResult(result, transformer) {
+  if ('error' in result.data) {
+    return _objectSpread(_objectSpread({}, result), {}, {
+      data: _objectSpread(_objectSpread({}, result.data), {}, {
+        error: transformer.deserialize(result.data.error)
+      })
+    });
+  }
+
+  if (result.data.result.type !== 'data') {
+    return result;
+  }
+
+  return _objectSpread(_objectSpread({}, result), {}, {
+    data: _objectSpread(_objectSpread({}, result.data), {}, {
+      result: _objectSpread(_objectSpread({}, result.data.result), {}, {
+        data: transformer.deserialize(result.data.result.data)
+      })
+    })
+  });
+}
+
+function transformerLink(transformer) {
+  var _transformer = transformer ? 'input' in transformer ? {
+    serialize: transformer.input.serialize,
+    deserialize: transformer.output.deserialize
+  } : transformer : {
+    serialize: function serialize(data) {
+      return data;
+    },
+    deserialize: function deserialize(data) {
+      return data;
+    }
+  };
+
+  return function () {
+    return function (props) {
+      var input = _transformer.serialize(props.op.input);
+
+      return observable.observable(function (observer) {
+        var next$ = props.next(_objectSpread(_objectSpread({}, props.op), {}, {
+          input: input
+        })).subscribe({
+          next: function next(value) {
+            var transformed = transformOperationResult(value, _transformer);
+            observer.next(transformed);
+          },
+          error: observer.error,
+          complete: observer.complete
+        });
+        return next$;
+      });
+    };
+  };
+}
+
+exports.transformerLink = transformerLink;

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

@@ -0,0 +1,63 @@
+import _objectSpread from '@babel/runtime/helpers/esm/objectSpread2';
+import { o as observable } from '../../../dist/observable-01534ea8.esm.js';
+
+/**
+ * @internal
+ */
+function transformOperationResult(result, transformer) {
+  if ('error' in result.data) {
+    return _objectSpread(_objectSpread({}, result), {}, {
+      data: _objectSpread(_objectSpread({}, result.data), {}, {
+        error: transformer.deserialize(result.data.error)
+      })
+    });
+  }
+
+  if (result.data.result.type !== 'data') {
+    return result;
+  }
+
+  return _objectSpread(_objectSpread({}, result), {}, {
+    data: _objectSpread(_objectSpread({}, result.data), {}, {
+      result: _objectSpread(_objectSpread({}, result.data.result), {}, {
+        data: transformer.deserialize(result.data.result.data)
+      })
+    })
+  });
+}
+
+function transformerLink(transformer) {
+  var _transformer = transformer ? 'input' in transformer ? {
+    serialize: transformer.input.serialize,
+    deserialize: transformer.output.deserialize
+  } : transformer : {
+    serialize: function serialize(data) {
+      return data;
+    },
+    deserialize: function deserialize(data) {
+      return data;
+    }
+  };
+
+  return function () {
+    return function (props) {
+      var input = _transformer.serialize(props.op.input);
+
+      return observable(function (observer) {
+        var next$ = props.next(_objectSpread(_objectSpread({}, props.op), {}, {
+          input: input
+        })).subscribe({
+          next: function next(value) {
+            var transformed = transformOperationResult(value, _transformer);
+            observer.next(transformed);
+          },
+          error: observer.error,
+          complete: observer.complete
+        });
+        return next$;
+      });
+    };
+  };
+}
+
+export { transformerLink };

package/links/transformerLink/package.json

@@ -0,0 +1,4 @@
+{
+  "main": "dist/trpc-client-links-transformerLink.cjs.js",
+  "module": "dist/trpc-client-links-transformerLink.esm.js"
+}

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

@@ -2,13 +2,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _assertThisInitialized = require('@babel/runtime/helpers/assertThisInitialized');
 var _inherits = require('@babel/runtime/helpers/inherits');
 var _createSuper = require('@babel/runtime/helpers/createSuper');
 var _wrapNativeSuper = require('@babel/runtime/helpers/wrapNativeSuper');
-var TRPCClientError = require('../../../dist/TRPCClientError-bfee2bf5.cjs.dev.js');
+var observable = require('../../../dist/observable-9aad8c3e.cjs.dev.js');
+var TRPCClientError = require('../../../dist/TRPCClientError-a5312a5f.cjs.dev.js');
+require('@babel/runtime/helpers/objectSpread2');
 require('@babel/runtime/helpers/createClass');
 
 /* istanbul ignore next */
@@ -148,24 +149,19 @@ function createWSClient(opts) {
       }
     };
 
-    var handleIncomingResponse = function handleIncomingResponse(res) {
-      var _req$callbacks$onNext, _req$callbacks2;
+    var handleIncomingResponse = function handleIncomingResponse(data) {
+      var _req$callbacks$next, _req$callbacks;
 
-      var req = res.id !== null && pendingRequests[res.id];
+      var req = data.id !== null && pendingRequests[data.id];
 
       if (!req) {
         // do something?
         return;
       }
 
-      if ('error' in res) {
-        var _req$callbacks$onErro, _req$callbacks;
-
-        (_req$callbacks$onErro = (_req$callbacks = req.callbacks).onError) === null || _req$callbacks$onErro === void 0 ? void 0 : _req$callbacks$onErro.call(_req$callbacks, res);
-        return;
-      }
-
-      (_req$callbacks$onNext = (_req$callbacks2 = req.callbacks).onNext) === null || _req$callbacks$onNext === void 0 ? void 0 : _req$callbacks$onNext.call(_req$callbacks2, res.result);
+      (_req$callbacks$next = (_req$callbacks = req.callbacks).next) === null || _req$callbacks$next === void 0 ? void 0 : _req$callbacks$next.call(_req$callbacks, {
+        data: data
+      });
 
       if (req.ws !== activeConnection && conn === activeConnection) {
         var oldWs = req.ws; // gracefully replace old connection with this
@@ -174,10 +170,8 @@ function createWSClient(opts) {
         closeIfNoPending(oldWs);
       }
 
-      if (res.result.type === 'stopped' && conn === activeConnection) {
-        var _req$callbacks$onDone, _req$callbacks3;
-
-        (_req$callbacks$onDone = (_req$callbacks3 = req.callbacks).onDone) === null || _req$callbacks$onDone === void 0 ? void 0 : _req$callbacks$onDone.call(_req$callbacks3);
+      if ('result' in data && data.result.type === 'stopped' && conn === activeConnection) {
+        req.callbacks.complete();
       }
     };
 
@@ -203,7 +197,7 @@ function createWSClient(opts) {
       }
 
       for (var key in pendingRequests) {
-        var _req$callbacks$onErro2, _req$callbacks4;
+        var _req$callbacks$error, _req$callbacks2;
 
         var req = pendingRequests[key];
 
@@ -211,13 +205,13 @@ function createWSClient(opts) {
           continue;
         }
 
-        (_req$callbacks$onErro2 = (_req$callbacks4 = req.callbacks).onError) === null || _req$callbacks$onErro2 === void 0 ? void 0 : _req$callbacks$onErro2.call(_req$callbacks4, TRPCClientError.TRPCClientError.from(new TRPCWebSocketClosedError('WebSocket closed prematurely')));
+        (_req$callbacks$error = (_req$callbacks2 = req.callbacks).error) === null || _req$callbacks$error === void 0 ? void 0 : _req$callbacks$error.call(_req$callbacks2, TRPCClientError.TRPCClientError.from(new TRPCWebSocketClosedError('WebSocket closed prematurely')));
 
         if (req.type !== 'subscription') {
-          var _req$callbacks$onDone2, _req$callbacks5;
+          var _req$callbacks$comple, _req$callbacks3;
 
           delete pendingRequests[key];
-          (_req$callbacks$onDone2 = (_req$callbacks5 = req.callbacks).onDone) === null || _req$callbacks$onDone2 === void 0 ? void 0 : _req$callbacks$onDone2.call(_req$callbacks5);
+          (_req$callbacks$comple = (_req$callbacks3 = req.callbacks).complete) === null || _req$callbacks$comple === void 0 ? void 0 : _req$callbacks$comple.call(_req$callbacks3);
         } else if (state !== 'closed') {
           // request restart of sub with next connection
           resumeSubscriptionOnReconnect(req);
@@ -251,14 +245,14 @@ function createWSClient(opts) {
     outgoing.push(envelope);
     dispatch();
     return function () {
-      var _pendingRequests$id, _callbacks$onDone;
+      var _pendingRequests$id, _callbacks$complete;
 
       var callbacks = (_pendingRequests$id = pendingRequests[id]) === null || _pendingRequests$id === void 0 ? void 0 : _pendingRequests$id.callbacks;
       delete pendingRequests[id];
       outgoing = outgoing.filter(function (msg) {
         return msg.id !== id;
       });
-      callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onDone = callbacks.onDone) === null || _callbacks$onDone === void 0 ? void 0 : _callbacks$onDone.call(callbacks);
+      callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$complete = callbacks.complete) === null || _callbacks$complete === void 0 ? void 0 : _callbacks$complete.call(callbacks);
 
       if (op.type === 'subscription') {
         outgoing.push({
@@ -322,70 +316,52 @@ var TRPCSubscriptionEndedError = /*#__PURE__*/function (_Error2) {
 }( /*#__PURE__*/_wrapNativeSuper(Error));
 
 function wsLink(opts) {
-  // initialized config
-  return function (rt) {
+  return function () {
     var client = opts.client;
     return function (_ref2) {
-      var op = _ref2.op,
-          prev = _ref2.prev,
-          onDestroy = _ref2.onDestroy;
-      var type = op.type,
-          rawInput = op.input,
-          path = op.path,
-          id = op.id;
-      var input = rt.transformer.serialize(rawInput);
-      var isDone = false;
-      var unsub = client.request({
-        type: type,
-        path: path,
-        input: input,
-        id: id
-      }, {
-        onNext: function onNext(result) {
-          if (isDone) {
-            return;
-          }
-
-          if ('data' in result) {
-            var data = rt.transformer.deserialize(result.data);
-            prev({
-              type: 'data',
-              data: data
-            });
-          } else {
-            prev(result);
-          }
-
-          if (op.type !== 'subscription') {
-            // if it isn't a subscription we don't care about next response
+      var op = _ref2.op;
+      return observable.observable(function (observer) {
+        var type = op.type,
+            input = op.input,
+            path = op.path,
+            id = op.id,
+            context = op.context;
+        var isDone = false;
+        var unsub = client.request({
+          type: type,
+          path: path,
+          input: input,
+          id: id,
+          context: context
+        }, {
+          error: function error(err) {
             isDone = true;
+            observer.error(err);
             unsub();
+          },
+          complete: function complete() {
+            if (!isDone) {
+              isDone = true;
+              observer.error(TRPCClientError.TRPCClientError.from(new TRPCSubscriptionEndedError('Operation ended prematurely')));
+            } else {
+              observer.complete();
+            }
+          },
+          next: function next(result) {
+            observer.next(result);
+
+            if (op.type !== 'subscription') {
+              // if it isn't a subscription we don't care about next response
+              isDone = true;
+              unsub();
+              observer.complete();
+            }
           }
-        },
-        onError: function onError(err) {
-          if (isDone) {
-            return;
-          }
-
-          prev(err instanceof Error ? err : TRPCClientError.TRPCClientError.from(_objectSpread(_objectSpread({}, err), {}, {
-            error: rt.transformer.deserialize(err.error)
-          })));
-        },
-        onDone: function onDone() {
-          if (isDone) {
-            return;
-          }
-
-          var result = new TRPCSubscriptionEndedError('Operation ended prematurely');
-          prev(TRPCClientError.TRPCClientError.from(result, {
-            isDone: true
-          }));
+        });
+        return function () {
           isDone = true;
-        }
-      });
-      onDestroy(function () {
-        isDone = true;
-        unsub();
+          unsub();
+        };
       });
     };
   };