@trpc/client 10.0.0-alpha.10 → 10.0.0-alpha.11

package/dist/index.js

@@ -8,7 +8,6 @@ var links_httpBatchLink = require('./links/httpBatchLink.js');
 var createChain = require('./createChain-3b458753.js');
 var TRPCClientError = require('./TRPCClientError-ec6bd2ca.js');
 var rx = require('./rx.js');
-var operators = require('rxjs/operators');
 require('rxjs');
 require('./httpUtils-1f9e4e3c.js');
 require('@babel/runtime/helpers/defineProperty');
@@ -137,7 +136,7 @@ var TRPCClient = /*#__PURE__*/function () {
           context: context
         }
       });
-      return chain$.pipe(operators.share());
+      return chain$.pipe(rx.share());
     }
   }, {
     key: "requestAsPromise",

package/dist/index.mjs

@@ -4,8 +4,7 @@ import { httpBatchLink } from './links/httpBatchLink.mjs';
 import { c as createChain } from './createChain-b7cb1f5a.mjs';
 import { T as TRPCClientError } from './TRPCClientError-17b117e1.mjs';
 export { T as TRPCClientError } from './TRPCClientError-17b117e1.mjs';
-import { observableToPromise } from './rx.mjs';
-import { share } from 'rxjs/operators';
+import { share, observableToPromise } from './rx.mjs';
 import 'rxjs';
 import './httpUtils-c09d7b79.mjs';
 import '@babel/runtime/helpers/defineProperty';

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

@@ -1 +1 @@
-{"version":3,"file":"TRPCClient.d.ts","sourceRoot":"","sources":["../../src/internals/TRPCClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TRPCClient.d.ts","sourceRoot":"","sources":["../../src/internals/TRPCClient.ts"],"names":[],"mappings":"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"}

package/dist/links/dedupeLink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dedupeLink.d.ts","sourceRoot":"","sources":["../../src/links/dedupeLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,OAAO,EAAmB,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEpD,wBAAgB,UAAU,CACxB,OAAO,SAAS,SAAS,GAAG,SAAS,KAClC,QAAQ,CAAC,OAAO,CAAC,CA8CrB"}
+{"version":3,"file":"dedupeLink.d.ts","sourceRoot":"","sources":["../../src/links/dedupeLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,OAAO,EAAmB,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEpD,wBAAgB,UAAU,CACxB,OAAO,SAAS,SAAS,GAAG,SAAS,KAClC,QAAQ,CAAC,OAAO,CAAC,CA4CrB"}

package/dist/rx.d.ts

@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs';
+import { MonoTypeOperatorFunction, Observable } from 'rxjs';
 export declare type inferObservableValue<TObservable extends Observable<any>> = TObservable extends Observable<infer TValue> ? TValue : never;
 export declare class ObservableAbortError extends Error {
     constructor(message: string);
@@ -8,4 +8,5 @@ export declare function observableToPromise<TValue>(observable: Observable<TValu
     promise: Promise<TValue>;
     abort: () => void;
 };
+export declare function share<T>(): MonoTypeOperatorFunction<T>;
 //# sourceMappingURL=rx.d.ts.map

package/dist/rx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rx.d.ts","sourceRoot":"","sources":["../src/rx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAElC,oBAAY,oBAAoB,CAAC,WAAW,SAAS,UAAU,CAAC,GAAG,CAAC,IAClE,WAAW,SAAS,UAAU,CAAC,MAAM,MAAM,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC;AAEhE,qBAAa,oBAAqB,SAAQ,KAAK;gBACjC,OAAO,EAAE,MAAM;CAK5B;AAED,gBAAgB;AAChB,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC;;iBACvD,IAAI;EAkCtB"}
+{"version":3,"file":"rx.d.ts","sourceRoot":"","sources":["../src/rx.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,UAAU,EAGX,MAAM,MAAM,CAAC;AAEd,oBAAY,oBAAoB,CAAC,WAAW,SAAS,UAAU,CAAC,GAAG,CAAC,IAClE,WAAW,SAAS,UAAU,CAAC,MAAM,MAAM,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC;AAEhE,qBAAa,oBAAqB,SAAQ,KAAK;gBACjC,OAAO,EAAE,MAAM;CAK5B;AAED,gBAAgB;AAChB,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC;;iBACvD,IAAI;EAkCtB;AAED,wBAAgB,KAAK,CAAC,CAAC,KAAK,wBAAwB,CAAC,CAAC,CAAC,CAyBtD"}

package/dist/rx.js

@@ -9,6 +9,7 @@ var _inherits = require('@babel/runtime/helpers/inherits');
 var _possibleConstructorReturn = require('@babel/runtime/helpers/possibleConstructorReturn');
 var _getPrototypeOf = require('@babel/runtime/helpers/getPrototypeOf');
 var _wrapNativeSuper = require('@babel/runtime/helpers/wrapNativeSuper');
+var rxjs = require('rxjs');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -23,7 +24,6 @@ var _wrapNativeSuper__default = /*#__PURE__*/_interopDefaultLegacy(_wrapNativeSu
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf__default["default"](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default["default"](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default["default"](this, result); }; }
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
 var ObservableAbortError = /*#__PURE__*/function (_Error) {
   _inherits__default["default"](ObservableAbortError, _Error);
 
@@ -83,6 +83,48 @@ function observableToPromise(observable) {
     abort: abort
   };
 }
+function share() {
+  var subscribers = new Set();
+  var connection = null;
+  return function (source) {
+    return new rxjs.Observable(function (subscriber) {
+      subscribers.add(subscriber);
+      subscriber.add(function () {
+        subscribers.delete(subscriber);
+
+        if (subscribers.size === 0) {
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          connection.unsubscribe();
+          connection = null;
+        }
+      });
+
+      if (!connection) {
+        connection = source.subscribe({
+          next: function next(value) {
+            return subscribers.forEach(function (s) {
+              return s.next(value);
+            });
+          },
+          error: function error(_error) {
+            return subscribers.forEach(function (s) {
+              return s.error(_error);
+            });
+          },
+          complete: function complete() {
+            return subscribers.forEach(function (s) {
+              return s.complete();
+            });
+          }
+        });
+        connection.add(function () {
+          return subscribers.clear();
+        });
+      }
+    });
+  };
+}
 
 exports.ObservableAbortError = ObservableAbortError;
 exports.observableToPromise = observableToPromise;
+exports.share = share;

package/dist/rx.mjs

@@ -5,11 +5,11 @@ import _inherits from '@babel/runtime/helpers/inherits';
 import _possibleConstructorReturn from '@babel/runtime/helpers/possibleConstructorReturn';
 import _getPrototypeOf from '@babel/runtime/helpers/getPrototypeOf';
 import _wrapNativeSuper from '@babel/runtime/helpers/wrapNativeSuper';
+import { Observable } from 'rxjs';
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
 var ObservableAbortError = /*#__PURE__*/function (_Error) {
   _inherits(ObservableAbortError, _Error);
 
@@ -69,5 +69,46 @@ function observableToPromise(observable) {
     abort: abort
   };
 }
+function share() {
+  var subscribers = new Set();
+  var connection = null;
+  return function (source) {
+    return new Observable(function (subscriber) {
+      subscribers.add(subscriber);
+      subscriber.add(function () {
+        subscribers.delete(subscriber);
+
+        if (subscribers.size === 0) {
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          connection.unsubscribe();
+          connection = null;
+        }
+      });
+
+      if (!connection) {
+        connection = source.subscribe({
+          next: function next(value) {
+            return subscribers.forEach(function (s) {
+              return s.next(value);
+            });
+          },
+          error: function error(_error) {
+            return subscribers.forEach(function (s) {
+              return s.error(_error);
+            });
+          },
+          complete: function complete() {
+            return subscribers.forEach(function (s) {
+              return s.complete();
+            });
+          }
+        });
+        connection.add(function () {
+          return subscribers.clear();
+        });
+      }
+    });
+  };
+}
 
-export { ObservableAbortError, observableToPromise };
+export { ObservableAbortError, observableToPromise, share };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "10.0.0-alpha.10",
+  "version": "10.0.0-alpha.11",
   "description": "tRPC Client lib",
   "author": "KATT",
   "license": "MIT",
@@ -66,16 +66,16 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.9.0",
-    "rxjs": "^7.0.0"
+    "rxjs": "^7.5.4"
   },
   "peerDependencies": {
-    "@trpc/server": "10.0.0-alpha.10"
+    "@trpc/server": "10.0.0-alpha.11"
   },
   "devDependencies": {
-    "@trpc/server": "10.0.0-alpha.10"
+    "@trpc/server": "10.0.0-alpha.11"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a1de7cd99bc36e26da285ed1cfdf8cb24dd5fd0b"
+  "gitHead": "a330502ab8d9aeb1f8f01d9a0711aab849d3a938"
 }

package/src/internals/TRPCClient.ts

@@ -18,8 +18,7 @@ import {
   OperationLink,
   TRPCLink,
 } from '../links/types';
-import { inferObservableValue, observableToPromise } from '../rx';
-import { share } from 'rxjs/operators';
+import { inferObservableValue, observableToPromise, share } from '../rx';
 import { Observer, Subscription } from 'rxjs';
 import { TRPCClientError } from '../TRPCClientError';
 import { getAbortController } from './fetchHelpers';

package/src/links/dedupeLink.ts

@@ -1,6 +1,6 @@
 import { AnyRouter } from '@trpc/server';
 import { Observable } from 'rxjs';
-import { share } from 'rxjs';
+import { share } from '../rx';
 import { OperationResult, TRPCLink } from './types';
 
 export function dedupeLink<
@@ -33,11 +33,9 @@ export function dedupeLink<
               observer.next(v);
             },
             error(e) {
-              reset();
               observer.error(e);
             },
             complete() {
-              reset();
               observer.complete();
             },
           });

package/src/rx.ts

@@ -1,4 +1,9 @@
-import { Observable } from 'rxjs';
+import {
+  MonoTypeOperatorFunction,
+  Observable,
+  Subscriber,
+  Subscription,
+} from 'rxjs';
 
 export type inferObservableValue<TObservable extends Observable<any>> =
   TObservable extends Observable<infer TValue> ? TValue : never;
@@ -48,3 +53,30 @@ export function observableToPromise<TValue>(observable: Observable<TValue>) {
     abort: abort!,
   };
 }
+
+export function share<T>(): MonoTypeOperatorFunction<T> {
+  const subscribers = new Set<Subscriber<T>>();
+  let connection: Subscription | null = null;
+
+  return (source) =>
+    new Observable((subscriber) => {
+      subscribers.add(subscriber);
+      subscriber.add(() => {
+        subscribers.delete(subscriber);
+        if (subscribers.size === 0) {
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          connection!.unsubscribe();
+          connection = null;
+        }
+      });
+
+      if (!connection) {
+        connection = source.subscribe({
+          next: (value) => subscribers.forEach((s) => s.next(value)),
+          error: (error) => subscribers.forEach((s) => s.error(error)),
+          complete: () => subscribers.forEach((s) => s.complete()),
+        });
+        connection.add(() => subscribers.clear());
+      }
+    });
+}