@fncts/observable 0.0.10 → 0.0.11

package/_cjs/Observable/api.cjs

@@ -121,57 +121,31 @@ exports.unit = void 0;
 exports.zip = zip;
 exports.zipWith = exports.zipLatest = void 0;
 exports.zipWithLatest = zipWithLatest;
-
 var tsplus_module_1 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Cause/api"));
-
 var tsplus_module_2 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/observable/internal/util"));
-
 var tsplus_module_3 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/util/predicates"));
-
 var tsplus_module_4 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/IO"));
-
 var tsplus_module_5 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/observable/AsyncScheduler"));
-
 var tsplus_module_6 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/observable/Subscription"));
-
 var tsplus_module_7 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/observable/Scheduler"));
-
 var tsplus_module_8 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/observable/Operator"));
-
 var tsplus_module_9 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/IO/api/environment"));
-
 var tsplus_module_10 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/IO/runtime"));
-
 var tsplus_module_11 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Exit/api"));
-
 var tsplus_module_12 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/Fiber/api/interrupt"));
-
 var tsplus_module_13 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/function/api"));
-
 var tsplus_module_14 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Either/destructors"));
-
 var tsplus_module_15 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Maybe/destructors"));
-
 var tsplus_module_16 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Environment/api"));
-
 var tsplus_module_17 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Maybe/constructors"));
-
 var tsplus_module_18 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Maybe/definition"));
-
 var tsplus_module_19 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Either/constructors"));
-
 var tsplus_module_20 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/observable/Notification"));
-
 var tsplus_module_21 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/collection/immutable/HashSet/api"));
-
 var _args = /*#__PURE__*/require("@fncts/observable/internal/args");
-
 var _definition2 = /*#__PURE__*/require("@fncts/observable/Observable/definition");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 const fileName_1 = "(@fncts/observable) src/Observable/api.ts";
 const defer = defer_1;
 exports.defer = defer;
@@ -275,7 +249,6 @@ const toArray = toArray_1;
 exports.toArray = toArray;
 const uniqueUntilChanged = uniqueUntilChanged_1;
 exports.uniqueUntilChanged = uniqueUntilChanged;
-
 /**
  * @tsplus static fncts.observable.ObservableOps halt
  */
@@ -285,8 +258,6 @@ function halt(defect) {
 /**
  * @tsplus static fncts.observable.ObservableOps defer
  */
-
-
 function defer_1(observable) {
   return new _definition2.Observable((s, environment) => {
     from_1(observable()).provideEnvironment(environment).subscribe(s);
@@ -295,106 +266,81 @@ function defer_1(observable) {
 /**
  * @tsplus static fncts.observable.ObservableOps empty
  */
-
-
 function empty_1() {
   return _definition2.EMPTY;
 }
 /**
  * @tsplus static fncts.observable.ObservableOps environmentWithObservable
  */
-
-
 function environmentWithObservable_1(f) {
   return new _definition2.EnvironmentWith(f);
 }
 /**
  * @tsplus static fncts.observable.ObservableOps failCause
  */
-
-
 function failCause(cause) {
   return new _definition2.Observable(s => s.error(cause));
 }
 /**
  * @tsplus static fncts.observable.ObservableOps fail
  */
-
-
 function fail_1(e) {
   return new _definition2.Observable(s => s.error(tsplus_module_1.fail(e)));
 }
 /**
  * @tsplus static fncts.observable.ObservableOps from
  */
-
-
 function from_1(input) {
   if (input instanceof _definition2.Observable) {
     return input;
   }
-
   if (tsplus_module_2.isArrayLike(input)) {
     return fromArrayLike(input);
   }
-
   if (tsplus_module_2.isPromiseLike(input)) {
     return fromPromise(input);
   }
-
   if (tsplus_module_2.isAsyncIterable(input)) {
     return fromAsyncIterable(input);
   }
-
   if (tsplus_module_3.isIterable(input)) {
     return fromIterable(input);
   }
-
   if (tsplus_module_2.isReadableStream(input)) {
     return fromReadableStreamLike(input);
   }
-
   if (tsplus_module_4.isIO(input)) {
     return fromIO_1(input);
   }
-
   if ("subscribe" in input) {
     return fromSubscribable_1(input);
   }
-
   throw new TypeError("Invalid Observable input");
 }
-
 function fromArrayLike(input) {
   return new _definition2.Observable(s => {
     for (let i = 0; i < input.length && !s.closed; i++) {
       s.next(input[i]);
     }
-
     s.complete();
   });
 }
-
 function fromAsyncIterable(asyncIterable) {
   return new _definition2.Observable(s => {
     process(asyncIterable, s).catch(err => s.error(tsplus_module_1.halt(err)));
   });
 }
-
 function fromIterable(iterable) {
   return new _definition2.Observable(s => {
     for (const value of iterable) {
       s.next(value);
-
       if (s.closed) {
         return;
       }
     }
-
     s.complete();
   });
 }
-
 function fromPromise(promise) {
   return new _definition2.Observable(s => {
     promise.then(value => {
@@ -405,19 +351,15 @@ function fromPromise(promise) {
     }, err => s.error(tsplus_module_1.halt(err))).then(null, tsplus_module_2.reportUnhandledError);
   });
 }
-
 function fromReadableStreamLike(readableStream) {
   return fromAsyncIterable((0, tsplus_module_2.readableStreamToAsyncGenerator)(readableStream));
 }
 /**
  * @tsplus static fncts.observable.ObservableOps fromSubscribable
  */
-
-
 function fromSubscribable_1(subscribable) {
   return new _definition2.Observable(subscriber => subscribable.subscribe(subscriber));
 }
-
 function fromInterop(subscribable) {
   return new _definition2.Observable(subscriber => subscribable.subscribe({
     next: value => subscriber.next(value),
@@ -425,11 +367,9 @@ function fromInterop(subscribable) {
     complete: () => subscriber.complete()
   }));
 }
-
 function _if(condition, onTrue, onFalse) {
   return defer_1(() => condition() ? onTrue : onFalse);
 }
-
 function iterate(options) {
   const {
     initialState,
@@ -437,41 +377,32 @@ function iterate(options) {
     iterate,
     scheduler
   } = options;
-
   function* gen() {
     for (let state = initialState; !cont || cont(state); state = iterate(state)) {
       yield state;
     }
   }
-
   return defer_1(scheduler ? () => scheduleIterable(gen(), scheduler) : gen);
 }
-
 async function process(asyncIterable, subscriber) {
   for await (const value of asyncIterable) {
     subscriber.next(value);
-
     if (subscriber.closed) {
       return;
     }
   }
-
   subscriber.complete();
 }
 /**
  * @tsplus static fncts.obervable.ObservableOps interval
  */
-
-
 function interval_1(period = 0, scheduler = tsplus_module_5.asyncScheduler) {
   if (period < 0) {
     // eslint-disable-next-line no-param-reassign
     period = 0;
   }
-
   return timer_1(period, period, scheduler);
 }
-
 function merge(...sources) {
   const concurrency = (0, _args.popNumber)(sources, Infinity);
   return !sources.length ? empty_1() : sources.length === 1 ? from_1(sources[0]) : mergeAll_1(concurrency)(fromArrayLike(sources));
@@ -479,16 +410,12 @@ function merge(...sources) {
 /**
  * @tsplus static fncts.observable.ObservableOps of
  */
-
-
 function of_1(...items) {
   return fromArrayLike(items);
 }
 /**
  * @tsplus static fncts.observable.ObservableOps single
  */
-
-
 function single_1(a) {
   return new _definition2.Observable(s => {
     s.next(a);
@@ -499,34 +426,26 @@ function single_1(a) {
  * @tsplus pipeable fncts.observable.Observable scheduled
  * @tsplus static fncts.observable.ObservableOps scheduled
  */
-
-
 function scheduled_1(scheduler) {
   return input => {
     if (tsplus_module_2.isArrayLike(input)) {
       return scheduleArray(input, scheduler);
     }
-
     if (tsplus_module_2.isPromiseLike(input)) {
       return schedulePromise(input, scheduler);
     }
-
     if (tsplus_module_3.isIterable(input)) {
       return scheduleIterable(input, scheduler);
     }
-
     if (tsplus_module_2.isAsyncIterable(input)) {
       return scheduleAsyncIterable(input, scheduler);
     }
-
     if (tsplus_module_2.isReadableStream(input)) {
       return scheduleReadableStreamLike(input, scheduler);
     }
-
     return scheduleObservable(from_1(input), scheduler);
   };
 }
-
 function scheduleArray(input, scheduler) {
   return new _definition2.Observable(s => {
     let i = 0;
@@ -535,7 +454,6 @@ function scheduleArray(input, scheduler) {
         s.complete();
       } else {
         s.next(input[i++]);
-
         if (!s.closed) {
           this.schedule();
         }
@@ -543,7 +461,6 @@ function scheduleArray(input, scheduler) {
     });
   });
 }
-
 function scheduleAsyncIterable(input, scheduler) {
   return new _definition2.Observable(subscriber => {
     const sub = new tsplus_module_6.Subscription();
@@ -563,7 +480,6 @@ function scheduleAsyncIterable(input, scheduler) {
     return sub;
   });
 }
-
 function scheduleIterable(input, scheduler) {
   return new _definition2.Observable(s => {
     let iterator;
@@ -574,7 +490,6 @@ function scheduleIterable(input, scheduler) {
           value,
           done
         } = iterator.next();
-
         if (done) {
           s.complete();
         } else {
@@ -586,7 +501,6 @@ function scheduleIterable(input, scheduler) {
     return () => tsplus_module_3.isFunction(iterator?.return) && iterator.return();
   });
 }
-
 function scheduleObservable(input, scheduler) {
   return new _definition2.Observable((subscriber, environment) => {
     const sub = new tsplus_module_6.Subscription();
@@ -605,7 +519,6 @@ function scheduleObservable(input, scheduler) {
     }));
   });
 }
-
 function schedulePromise(input, scheduler) {
   return new _definition2.Observable(subscriber => {
     return scheduler.schedule(() => {
@@ -620,14 +533,11 @@ function schedulePromise(input, scheduler) {
     });
   });
 }
-
 function scheduleReadableStreamLike(input, scheduler) {
   return scheduleAsyncIterable((0, tsplus_module_2.readableStreamToAsyncGenerator)(input), scheduler);
 }
-
 function timer_1(time = 0, intervalOrScheduler, scheduler = tsplus_module_5.asyncScheduler) {
   let intervalDuration = -1;
-
   if (intervalOrScheduler != null) {
     if (tsplus_module_7.isScheduler(intervalOrScheduler)) {
       // eslint-disable-next-line no-param-reassign
@@ -636,19 +546,15 @@ function timer_1(time = 0, intervalOrScheduler, scheduler = tsplus_module_5.asyn
       intervalDuration = intervalOrScheduler;
     }
   }
-
   return new _definition2.Observable(s => {
     let due = tsplus_module_2.isValidDate(time) ? +time - scheduler.now() : time;
-
     if (due < 0) {
       due = 0;
     }
-
     let n = 0;
     return scheduler.schedule(function () {
       if (!s.closed) {
         s.next(n++);
-
         if (0 <= intervalDuration) {
           this.schedule(undefined, intervalDuration);
         } else {
@@ -661,8 +567,6 @@ function timer_1(time = 0, intervalOrScheduler, scheduler = tsplus_module_5.asyn
 /**
  * @tsplus static fncts.observable.ObservableOps zip
  */
-
-
 function makeZip(...sources) {
   return sources.length ? new _definition2.Observable((subscriber, environment) => {
     let buffers = sources.map(() => []);
@@ -670,16 +574,13 @@ function makeZip(...sources) {
     subscriber.add(() => {
       buffers = completed = null;
     });
-
     for (let sourceIndex = 0; !subscriber.closed && sourceIndex < sources.length; sourceIndex++) {
       from_1(sources[sourceIndex]).provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
         next: value => {
           buffers[sourceIndex].push(value);
-
           if (buffers.every(buffer => buffer.length)) {
             const result = buffers.map(buffer => buffer.shift());
             subscriber.next(result);
-
             if (buffers.some((buffer, i) => !buffer.length && completed[i])) {
               subscriber.complete();
             }
@@ -691,7 +592,6 @@ function makeZip(...sources) {
         }
       }));
     }
-
     return () => {
       buffers = completed = null;
     };
@@ -700,38 +600,32 @@ function makeZip(...sources) {
 /**
  * @tsplus static fncts.observable.ObservableOps fromIO
  */
-
-
 function fromIO_1(io, scheduler = tsplus_module_5.asyncScheduler) {
   return new _definition2.Observable((s, env) => {
     let fiber;
     const scheduled = scheduler.schedule(() => {
       fiber = tsplus_module_10.unsafeRunFiber(tsplus_module_9.provideEnvironment(env, fileName_1 + ":489:36")(io), fileName_1 + ":489:56");
-      fiber.unsafeOnDone(exit => {
+      fiber.addObserver(exit => {
         if (!s.closed) {
-          tsplus_module_11.match(cause => s.error(cause), a => s.next(a))(tsplus_module_11.flatten(exit));
+          tsplus_module_11.match(cause => s.error(cause), a => s.next(a))(exit);
           s.complete();
         }
       });
     });
     return () => {
       scheduled.unsubscribe();
-      fiber && tsplus_module_10.unsafeRunAsync(tsplus_module_12.interrupt(fiber, fileName_1 + ":502:21"), fileName_1 + ":502:46");
+      fiber && tsplus_module_10.unsafeRunAsync(tsplus_module_12.interrupt(fiber), fileName_1 + ":502:46");
     };
   });
 }
 /**
  * @tsplus static fncts.observable.ObservableOps unit
  */
-
-
 const unit = /*#__PURE__*/single_1(undefined);
 /**
  * @tsplus pipeable fncts.observable.Observable zipWith
  */
-
 exports.unit = unit;
-
 function zipWith_1(fb, f) {
   return fa => {
     return mergeMap_1(a => map_1(b => f(a, b))(fb))(fa);
@@ -740,8 +634,6 @@ function zipWith_1(fb, f) {
 /**
  * @tsplus pipeable fncts.observable.Observable zip
  */
-
-
 function zip(fb) {
   return fa => {
     return zipWith_1(fb, tsplus_module_13.tuple)(fa);
@@ -750,8 +642,6 @@ function zip(fb) {
 /**
  * @tsplus pipeable fncts.observable.Observable ap
  */
-
-
 function ap(fa) {
   return fab => {
     return zipWith_1(fa, (f, a) => f(a))(fab);
@@ -760,8 +650,6 @@ function ap(fa) {
 /**
  * @tsplus pipeable fncts.observable.Observable mapWithIndex
  */
-
-
 function mapWithIndex_1(f) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -777,8 +665,6 @@ function mapWithIndex_1(f) {
 /**
  * @tsplus pipeable fncts.observable.Observable map
  */
-
-
 function map_1(f) {
   return fa => {
     return mapWithIndex_1((_, a) => f(a))(fa);
@@ -787,8 +673,6 @@ function map_1(f) {
 /**
  * @tsplus pipeable fncts.observable.Observable as
  */
-
-
 function as_1(b) {
   return fa => {
     return map_1(b)(fa);
@@ -797,8 +681,6 @@ function as_1(b) {
 /**
  * @tsplus pipeable fncts.observable.Observable mapError
  */
-
-
 function mapError(f) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -813,8 +695,6 @@ function mapError(f) {
 /**
  * @tsplus getter fncts.observable.Observable swap
  */
-
-
 function swap(fa) {
   return tsplus_module_8.operate_((source, subscriber, environment) => {
     source.provideEnvironment(environment).subscribe(new tsplus_module_8.OperatorSubscriber(subscriber, {
@@ -831,7 +711,6 @@ function swap(fa) {
     }));
   })(fa);
 }
-
 function filterWithIndex_1(predicate) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -842,7 +721,6 @@ function filterWithIndex_1(predicate) {
     })(fa);
   };
 }
-
 function filter(predicate) {
   return fa => {
     return filterWithIndex_1((_, a) => predicate(a))(fa);
@@ -851,8 +729,6 @@ function filter(predicate) {
 /**
  * @tsplus pipeable fncts.observable.Observable filterMapWithIndex
  */
-
-
 function filterMapWithIndex_1(f) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -866,20 +742,16 @@ function filterMapWithIndex_1(f) {
 /**
  * @tsplus pipeable fncts.observable.Observable filterMap
  */
-
-
 function filterMap(f) {
   return fa => {
     return filterMapWithIndex_1((_, a) => f(a))(fa);
   };
 }
-
 function partitionWithIndex_1(predicate) {
   return fa => {
     return [filterWithIndex_1((i, a) => !predicate(i, a))(fa), filterWithIndex_1(predicate)(fa)];
   };
 }
-
 function partition(predicate) {
   return fa => {
     return partitionWithIndex_1((_, a) => predicate(a))(fa);
@@ -888,8 +760,6 @@ function partition(predicate) {
 /**
  * @tsplus pipeable fncts.observable.Observable partitionMapWithIndex
  */
-
-
 function partitionMapWithIndex_1(f) {
   return fa => {
     return [tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -912,8 +782,6 @@ function partitionMapWithIndex_1(f) {
 /**
  * @tsplus pipeable fncts.observable.Observable partitionMap
  */
-
-
 function partitionMap(f) {
   return fa => {
     return partitionMapWithIndex_1((_, a) => f(a))(fa);
@@ -922,11 +790,7 @@ function partitionMap(f) {
 /**
  * @tsplus pipeable fncts.observable.Observable provideService
  */
-
-
-function provideService(service,
-/** @tsplus auto */
-tag) {
+function provideService(service, /** @tsplus auto */tag) {
   return self => {
     return contramapEnvironment_1(environment => tsplus_module_16.add(service, tag)(environment))(self);
   };
@@ -934,8 +798,6 @@ tag) {
 /**
  * @tsplus pipeable fncts.observable.Observable mergeMapWithIndex
  */
-
-
 function mergeMapWithIndex_1(f, concurrent = Infinity) {
   return ma => {
     return tsplus_module_8.operate_((source, sub, environment) => mergeInternal(source, sub, environment, f, concurrent))(ma);
@@ -944,8 +806,6 @@ function mergeMapWithIndex_1(f, concurrent = Infinity) {
 /**
  * @tsplus pipeable fncts.observable.Observable mergeMap
  */
-
-
 function mergeMap_1(f, concurrent = Infinity) {
   return ma => {
     return mergeMapWithIndex_1((_, a) => f(a), concurrent)(ma);
@@ -954,8 +814,6 @@ function mergeMap_1(f, concurrent = Infinity) {
 /**
  * @tsplus pipeable fncts.observable.Observable concatMapWithIndex
  */
-
-
 function concatMapWithIndex(f) {
   return ma => {
     return mergeMapWithIndex_1(f, 1)(ma);
@@ -964,8 +822,6 @@ function concatMapWithIndex(f) {
 /**
  * @tsplus pipeable fncts.observable.Observable concatMap
  */
-
-
 function concatMap(f) {
   return ma => {
     return mergeMapWithIndex_1((_, a) => f(a), 1)(ma);
@@ -974,8 +830,6 @@ function concatMap(f) {
 /**
  * @tsplus pipeable fncts.observable.Observable contramapEnvironment
  */
-
-
 function contramapEnvironment_1(f) {
   return self => {
     return environmentWithObservable_1(environment => self.provideEnvironment(f(environment)));
@@ -984,16 +838,12 @@ function contramapEnvironment_1(f) {
 /**
  * @tsplus getter fncts.observable.Observable flatten
  */
-
-
 function flatten(mma) {
   return concatAll_1(mma);
 }
 /**
  * @tsplus pipeable fncts.observable.Observable foldLeftWithIndex
  */
-
-
 function foldLeftWithIndex_1(initial, f) {
   return fa => {
     return tsplus_module_8.operate_(scanInternal(f, initial, true, false, true))(fa);
@@ -1002,8 +852,6 @@ function foldLeftWithIndex_1(initial, f) {
 /**
  * @tsplus pipeable fncts.observable.Observable foldLeft
  */
-
-
 function foldLeft_1(initial, f) {
   return fa => {
     return foldLeftWithIndex_1(initial, (_, b, a) => f(b, a))(fa);
@@ -1012,8 +860,6 @@ function foldLeft_1(initial, f) {
 /**
  * @tsplus pipeable fncts.observable.Observable at
  */
-
-
 function at(index) {
   return fa => {
     return onEmpty_1(() => tsplus_module_17.nothing())(map_1(tsplus_module_17.just)(take_1(1)(filterWithIndex_1(i => i === index)(fa))));
@@ -1022,19 +868,15 @@ function at(index) {
 /**
  * @tsplus pipeable fncts.observable.Observable audit
  */
-
-
 function audit_1(durationSelector) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
       let lastValue = tsplus_module_17.nothing();
       let durationSubscriber = null;
       let isComplete = false;
-
       const endDuration = () => {
         durationSubscriber?.unsubscribe();
         durationSubscriber = null;
-
         if (tsplus_module_18.isJust(lastValue)) {
           const {
             value
@@ -1042,19 +884,15 @@ function audit_1(durationSelector) {
           lastValue = tsplus_module_17.nothing();
           subscriber.next(value);
         }
-
         isComplete && subscriber.complete();
       };
-
       const cleanupDuration = () => {
         durationSubscriber = null;
         isComplete && subscriber.complete();
       };
-
       source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
         next: value => {
           lastValue = tsplus_module_17.just(value);
-
           if (!durationSubscriber) {
             from_1(durationSelector(value)).provideEnvironment(environment).subscribe(durationSubscriber = tsplus_module_8.operatorSubscriber(subscriber, {
               next: endDuration,
@@ -1073,8 +911,6 @@ function audit_1(durationSelector) {
 /**
  * @tsplus pipeable fncts.observable.Observable auditTime
  */
-
-
 function auditTime(duration, scheduler = tsplus_module_5.asyncScheduler) {
   return fa => {
     return audit_1(() => timer_1(duration, scheduler))(fa);
@@ -1083,8 +919,6 @@ function auditTime(duration, scheduler = tsplus_module_5.asyncScheduler) {
 /**
  * @tsplus pipeable fncts.observable.Observable buffer
  */
-
-
 function buffer(closingNotifier) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -1113,8 +947,6 @@ function buffer(closingNotifier) {
 /**
  * @tsplus pipeable fncts.observable.Observable bufferCount
  */
-
-
 function bufferCount(bufferSize, startBufferEvery) {
   return fa => {
     // eslint-disable-next-line no-param-reassign
@@ -1125,20 +957,16 @@ function bufferCount(bufferSize, startBufferEvery) {
       source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
         next: value => {
           let toEmit = null;
-
           if (count++ % startBufferEvery === 0) {
             buffers.push([]);
           }
-
           for (const buffer of buffers) {
             buffer.push(value);
-
             if (bufferSize <= buffer.length) {
               toEmit = toEmit ?? [];
               toEmit.push(buffer);
             }
           }
-
           if (toEmit) {
             for (const buffer of toEmit) {
               (0, tsplus_module_2.arrayRemove)(buffers, buffer);
@@ -1150,7 +978,6 @@ function bufferCount(bufferSize, startBufferEvery) {
           for (const buffer of buffers) {
             subscriber.next(buffer);
           }
-
           subscriber.complete();
         }
       }, () => {
@@ -1162,8 +989,6 @@ function bufferCount(bufferSize, startBufferEvery) {
 /**
  * @tsplus pipeable fncts.observable.Observable bufferTime
  */
-
-
 function bufferTime(config) {
   return fa => {
     const {
@@ -1175,7 +1000,6 @@ function bufferTime(config) {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
       let bufferRecords = [];
       let restartOnEmit = true;
-
       const emit = record => {
         const {
           buffer,
@@ -1186,7 +1010,6 @@ function bufferTime(config) {
         subscriber.next(buffer);
         restartOnEmit && startBuffer();
       };
-
       const startBuffer = () => {
         if (bufferRecords) {
           const subs = new tsplus_module_6.Subscription();
@@ -1200,7 +1023,6 @@ function bufferTime(config) {
           subs.add(scheduler.schedule(() => emit(record), bufferTimeSpan));
         }
       };
-
       bufferCreationInterval !== null && bufferCreationInterval >= 0 ? subscriber.add(scheduler.schedule(function () {
         startBuffer();
         !this.closed && subscriber.add(this.schedule(null, bufferCreationInterval));
@@ -1209,7 +1031,6 @@ function bufferTime(config) {
       const bufferTimeSubscriber = tsplus_module_8.operatorSubscriber(subscriber, {
         next: value => {
           const recordsCopy = bufferRecords.slice();
-
           for (const record of recordsCopy) {
             const {
               buffer
@@ -1222,7 +1043,6 @@ function bufferTime(config) {
           while (bufferRecords?.length) {
             subscriber.next(bufferRecords.shift().buffer);
           }
-
           bufferTimeSubscriber?.unsubscribe();
           subscriber.complete();
           subscriber.unsubscribe();
@@ -1235,8 +1055,6 @@ function bufferTime(config) {
 /**
  * @tsplus pipeable fncts.observable.Observable bufferToggle
  */
-
-
 function bufferToggle(openings, closingSelector) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -1246,13 +1064,11 @@ function bufferToggle(openings, closingSelector) {
           const buffer = [];
           buffers.push(buffer);
           const closingSubscription = new tsplus_module_6.Subscription();
-
           const emitBuffer = () => {
             (0, tsplus_module_2.arrayRemove)(buffers, buffer);
             subscriber.next(buffer);
             closingSubscription.unsubscribe();
           };
-
           closingSubscription.add(from_1(closingSelector(openValue)).provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
             next: emitBuffer,
             complete: tsplus_module_2.noop
@@ -1270,7 +1086,6 @@ function bufferToggle(openings, closingSelector) {
           while (buffers.length > 0) {
             subscriber.next(buffers.shift());
           }
-
           subscriber.complete();
         }
       }));
@@ -1280,14 +1095,11 @@ function bufferToggle(openings, closingSelector) {
 /**
  * @tsplus pipeable fncts.observable.Observable bufferWhen
  */
-
-
 function bufferWhen(closingSelector) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
       let buffer = null;
       let closingSubscriber = null;
-
       const openBuffer = () => {
         closingSubscriber?.unsubscribe();
         const b = buffer;
@@ -1298,7 +1110,6 @@ function bufferWhen(closingSelector) {
           complete: tsplus_module_2.noop
         }));
       };
-
       openBuffer();
       source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
         next: value => buffer?.push(value),
@@ -1313,8 +1124,6 @@ function bufferWhen(closingSelector) {
 /**
  * @tsplus pipeable fncts.observable.Observable catchAllCause
  */
-
-
 function catchAllCause_1(f) {
   return self => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -1324,7 +1133,6 @@ function catchAllCause_1(f) {
       innerSub = source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
         error: cause => {
           handledResult = from_1(f(cause, catchAllCause_1(f)(source)));
-
           if (innerSub) {
             innerSub.unsubscribe();
             innerSub = null;
@@ -1334,7 +1142,6 @@ function catchAllCause_1(f) {
           }
         }
       }));
-
       if (syncUnsub) {
         innerSub.unsubscribe();
         innerSub = null;
@@ -1346,16 +1153,12 @@ function catchAllCause_1(f) {
 /**
  * @tsplus getter fncts.observable.Observable concatAll
  */
-
-
 function concatAll_1(ffa) {
   return mergeAll_1(1)(ffa);
 }
 /**
  * @tsplus pipeable fncts.observable.Observable concat
  */
-
-
 function concat_1(...sources) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -1366,16 +1169,12 @@ function concat_1(...sources) {
 /**
  * @tsplus getter fncts.observable.Observable count
  */
-
-
 function count(fa) {
   return foldLeft_1(0, (total, _) => total + 1)(fa);
 }
 /**
  * @tsplus pipeable fncts.observable.Observable countWithIndex
  */
-
-
 function countWithIndex_1(predicate) {
   return fa => {
     return foldLeftWithIndex_1(0, (i, total, v) => predicate(i, v) ? total + 1 : total)(fa);
@@ -1384,8 +1183,6 @@ function countWithIndex_1(predicate) {
 /**
  * @tsplus pipeable fncts.observable.Observable countWith
  */
-
-
 function countWith(predicate) {
   return fa => {
     return countWithIndex_1((_, a) => predicate(a))(fa);
@@ -1394,22 +1191,17 @@ function countWith(predicate) {
 /**
  * @tsplus getter fncts.observable.Observable combineLatestAll
  */
-
-
 function combineLatestAll(fa) {
   return joinAllInternal(fa, sources => !sources.length ? empty_1() : zipLatest_1(sources[0], ...sources.slice(1)));
 }
 /**
  * @tsplus pipeable fncts.observable.Observable zipLatest
  */
-
-
 function zipLatest_1(...sources) {
   return self => {
     if (!sources.length) {
       return from_1(self).unsafeCoerce();
     }
-
     return tsplus_module_8.operate_((source, subscriber, environment) => {
       combineLatestInternal(subscriber, environment, [source, ...sources]);
     })(from_1(self));
@@ -1418,8 +1210,6 @@ function zipLatest_1(...sources) {
 /**
  * @tsplus pipeable fncts.observable.Observable zipWithLatest
  */
-
-
 function zipWithLatest(that, f) {
   return self => {
     return map_1(tsplus_module_13.tupled(f))(zipLatest_1(from_1(that))(self));
@@ -1428,18 +1218,14 @@ function zipWithLatest(that, f) {
 /**
  * @tsplus pipeable fncts.observable.Observable debounceWith
  */
-
-
 function debounceWith(durationSelector) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
       let lastValue = tsplus_module_17.nothing();
       let durationSubscriber = null;
-
       const emit = () => {
         durationSubscriber?.unsubscribe();
         durationSubscriber = null;
-
         if (tsplus_module_18.isJust(lastValue)) {
           const {
             value
@@ -1448,7 +1234,6 @@ function debounceWith(durationSelector) {
           subscriber.next(value);
         }
       };
-
       source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
         next: value => {
           durationSubscriber?.unsubscribe();
@@ -1472,15 +1257,12 @@ function debounceWith(durationSelector) {
 /**
  * @tsplus pipeable fncts.observable.Observable debounce
  */
-
-
 function debounce(dueTime, scheduler = tsplus_module_5.asyncScheduler) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
       let activeTask = null;
       let lastValue = null;
       let lastTime = null;
-
       const emit = () => {
         if (activeTask) {
           activeTask.unsubscribe();
@@ -1490,25 +1272,20 @@ function debounce(dueTime, scheduler = tsplus_module_5.asyncScheduler) {
           subscriber.next(value);
         }
       };
-
       function emitWhenIdle() {
         const targetTime = lastTime + dueTime;
         const now = scheduler.now();
-
         if (now < targetTime) {
           activeTask = this.schedule(undefined, targetTime - now);
           subscriber.add(activeTask);
           return;
         }
-
         emit();
       }
-
       source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
         next: value => {
           lastValue = value;
           lastTime = scheduler.now();
-
           if (!activeTask) {
             activeTask = scheduler.schedule(emitWhenIdle, dueTime);
             subscriber.add(activeTask);
@@ -1527,8 +1304,6 @@ function debounce(dueTime, scheduler = tsplus_module_5.asyncScheduler) {
 /**
  * @tsplus getter fncts.observable.Observable either
  */
-
-
 function either(fa) {
   return tsplus_module_8.operate_((source, subscriber, environment) => {
     source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
@@ -1544,8 +1319,6 @@ function either(fa) {
 /**
  * @tsplus pipeable fncts.observable.Observable delayWithIndex
  */
-
-
 function delayWithIndex_1(f) {
   return fa => {
     return mergeMapWithIndex_1((i, a) => as_1(() => a)(take_1(1)(f(i, a))))(fa);
@@ -1554,8 +1327,6 @@ function delayWithIndex_1(f) {
 /**
  * @tsplus pipeable fncts.observable.Observable delayWith
  */
-
-
 function delayWith_1(f) {
   return fa => {
     return delayWithIndex_1((_, a) => f(a))(fa);
@@ -1564,8 +1335,6 @@ function delayWith_1(f) {
 /**
  * @tsplus pipeable fncts.observable.Observable delay
  */
-
-
 function delay(due, scheduler = tsplus_module_5.asyncScheduler) {
   return fa => {
     const duration = timer_1(due, scheduler);
@@ -1575,8 +1344,6 @@ function delay(due, scheduler = tsplus_module_5.asyncScheduler) {
 /**
  * @tsplus getter fncts.observable.Observable dematerialize
  */
-
-
 function dematerialize(fa) {
   return tsplus_module_8.operate_((source, subscriber, environment) => {
     source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
@@ -1587,8 +1354,6 @@ function dematerialize(fa) {
 /**
  * @tsplus pipeable fncts.observable.Observable ensuring
  */
-
-
 function ensuring(finalizer) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -1600,8 +1365,6 @@ function ensuring(finalizer) {
 /**
  * @tsplus getter fncts.observable.Observable exhaustAll
  */
-
-
 function exhaustAll(ffa) {
   return tsplus_module_8.operate_((source, subscriber, environment) => {
     let isComplete = false;
@@ -1627,8 +1390,6 @@ function exhaustAll(ffa) {
 /**
  * @tsplus pipeable fncts.observable.Observable exhaustMapWithIndex
  */
-
-
 function exhaustMapWithIndex_1(f) {
   return self => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -1658,8 +1419,6 @@ function exhaustMapWithIndex_1(f) {
 /**
  * @tsplus pipeable fncts.observable.Observable exhaustMap
  */
-
-
 function exhaustMap(f) {
   return self => {
     return exhaustMapWithIndex_1((_, a) => f(a))(self);
@@ -1668,8 +1427,6 @@ function exhaustMap(f) {
 /**
  * @tsplus pipeable fncts.observable.Observable expandWithIndex
  */
-
-
 function expandWithIndex_1(f, concurrent = Infinity) {
   return fa => {
     concurrent = (concurrent || 0) < 1 ? Infinity : concurrent;
@@ -1679,38 +1436,31 @@ function expandWithIndex_1(f, concurrent = Infinity) {
 /**
  * @tsplus pipeable fncts.observable.Observable expand
  */
-
-
 function expand(f, concurrent = Infinity) {
   return fa => {
     return expandWithIndex_1((_, a) => f(a), concurrent)(fa);
   };
 }
-
 function findWithIndex_1(predicate) {
   return fa => {
     return tsplus_module_8.operate_(findInternal(predicate, "value"))(fa);
   };
 }
-
 function find(predicate) {
   return fa => {
     return findWithIndex_1((_, a) => predicate(a))(fa);
   };
 }
-
 function findIndexWithIndex_1(predicate) {
   return fa => {
     return tsplus_module_8.operate_(findInternal(predicate, "index"))(fa);
   };
 }
-
 function findIndex(predicate) {
   return fa => {
     return findIndexWithIndex_1((_, a) => predicate(a))(fa);
   };
 }
-
 function forkJoin(...args) {
   const {
     args: sources,
@@ -1718,16 +1468,13 @@ function forkJoin(...args) {
   } = (0, tsplus_module_2.arrayOrObject)(args);
   return new _definition2.Observable(s => {
     const length = sources.length;
-
     if (!length) {
       s.complete();
       return;
     }
-
     const values = new Array(length);
     let remainingCompletions = length;
     let remainingEmissions = length;
-
     for (let sourceIndex = 0; sourceIndex < length; sourceIndex++) {
       let hasValue = false;
       from_1(sources[sourceIndex]).subscribe(tsplus_module_8.operatorSubscriber(s, {
@@ -1736,7 +1483,6 @@ function forkJoin(...args) {
             hasValue = true;
             remainingEmissions--;
           }
-
           values[sourceIndex] = value;
         },
         complete: () => {
@@ -1747,7 +1493,6 @@ function forkJoin(...args) {
                 return b;
               }, {}) : values);
             }
-
             s.complete();
           }
         }
@@ -1758,8 +1503,6 @@ function forkJoin(...args) {
 /**
  * @tsplus getter fncts.observable.Observable ignore
  */
-
-
 function ignore(fa) {
   return tsplus_module_8.operate_((source, subscriber, environment) => {
     source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
@@ -1770,8 +1513,6 @@ function ignore(fa) {
 /**
  * @tsplus getter fncts.observable.Observable isEmpty
  */
-
-
 function isEmpty(fa) {
   return tsplus_module_8.operate_((source, subscriber, environment) => {
     source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
@@ -1789,8 +1530,6 @@ function isEmpty(fa) {
 /**
  * @tsplus getter fncts.observable.Observable materialize
  */
-
-
 function materialize(fa) {
   return tsplus_module_8.operate_((source, subscriber, environment) => {
     source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
@@ -1809,8 +1548,6 @@ function materialize(fa) {
 /**
  * @tsplus pipeable fncts.observable.Observable mergeAll
  */
-
-
 function mergeAll_1(concurrent = Infinity) {
   return self => {
     return mergeMap_1(tsplus_module_13.identity, concurrent)(self);
@@ -1819,8 +1556,6 @@ function mergeAll_1(concurrent = Infinity) {
 /**
  * @tsplus pipeable fncts.observable.Observable mergeScanWithIndex
  */
-
-
 function mergeScanWithIndex_1(initial, f, concurrent = Infinity) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -1834,30 +1569,24 @@ function mergeScanWithIndex_1(initial, f, concurrent = Infinity) {
 /**
  * @tsplus pipeable fncts.observable.Observable mergeScan
  */
-
-
 function mergeScan(initial, f, concurrent = Infinity) {
   return fa => {
     return mergeScanWithIndex_1(initial, (_, b, a) => f(b, a), concurrent)(fa);
   };
 }
-
 function onErrorResumeNext(fa, ...sources) {
   return tsplus_module_8.operate_((source, subscriber, environment) => {
     const remaining = [source, ...sources];
-
     const subscribeNext = () => {
       if (!subscriber.closed) {
         if (remaining.length > 0) {
           let nextSource;
-
           try {
             nextSource = from_1(remaining.shift());
           } catch (err) {
             subscribeNext();
             return;
           }
-
           const innerSub = tsplus_module_8.operatorSubscriber(subscriber, {
             error: tsplus_module_2.noop,
             complete: tsplus_module_2.noop
@@ -1869,15 +1598,12 @@ function onErrorResumeNext(fa, ...sources) {
         }
       }
     };
-
     subscribeNext();
   })(fa);
 }
 /**
  * @tsplus pipeable fncts.observable.Observable onEmpty
  */
-
-
 function onEmpty_1(f) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -1891,7 +1617,6 @@ function onEmpty_1(f) {
           if (!hasValue) {
             subscriber.next(f());
           }
-
           subscriber.complete();
         }
       }));
@@ -1901,14 +1626,11 @@ function onEmpty_1(f) {
 /**
  * @tsplus pipeable fncts.observable.Observable repeat
  */
-
-
 function repeat(count = Infinity) {
   return fa => {
     return count <= 0 ? empty_1() : tsplus_module_8.operate_((source, subscriber, environment) => {
       let repeats = 0;
       let innerSub;
-
       const loop = () => {
         let syncUnsub = false;
         innerSub = source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
@@ -1926,23 +1648,19 @@ function repeat(count = Infinity) {
             }
           }
         }));
-
         if (syncUnsub) {
           innerSub.unsubscribe();
           innerSub = null;
           loop();
         }
       };
-
       loop();
     })(fa);
   };
 }
-
 function retry(configOrCount = Infinity) {
   return fa => {
     let config;
-
     if (configOrCount && typeof configOrCount === "object") {
       config = configOrCount;
     } else {
@@ -1950,7 +1668,6 @@ function retry(configOrCount = Infinity) {
         count: configOrCount
       };
     }
-
     const {
       count,
       resetOnSuccess = false
@@ -1958,7 +1675,6 @@ function retry(configOrCount = Infinity) {
     return count <= 0 ? fa : tsplus_module_8.operate_((source, subscriber, environment) => {
       let retries = 0;
       let innerSub;
-
       const loop = () => {
         let syncUnsub = false;
         innerSub = source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
@@ -1966,7 +1682,6 @@ function retry(configOrCount = Infinity) {
             if (resetOnSuccess) {
               retries = 0;
             }
-
             subscriber.next(value);
           },
           error: err => {
@@ -1983,14 +1698,12 @@ function retry(configOrCount = Infinity) {
             }
           }
         }));
-
         if (syncUnsub) {
           innerSub.unsubscribe();
           innerSub = null;
           loop();
         }
       };
-
       loop();
     })(fa);
   };
@@ -1998,8 +1711,6 @@ function retry(configOrCount = Infinity) {
 /**
  * @tsplus pipeable fncts.observable.Observable sample
  */
-
-
 function sample_1(notifier) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -2011,7 +1722,6 @@ function sample_1(notifier) {
           lastValue = value;
         }
       }));
-
       const emit = () => {
         if (hasValue) {
           hasValue = false;
@@ -2020,7 +1730,6 @@ function sample_1(notifier) {
           subscriber.next(value);
         }
       };
-
       notifier.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
         next: emit,
         complete: tsplus_module_2.noop
@@ -2031,8 +1740,6 @@ function sample_1(notifier) {
 /**
  * @tsplus pipeable fncts.observable.Observable sampleTime
  */
-
-
 function sampleTime(period, scheduler = tsplus_module_5.asyncScheduler) {
   return fa => {
     return sample_1(interval_1(period, scheduler))(fa);
@@ -2041,8 +1748,6 @@ function sampleTime(period, scheduler = tsplus_module_5.asyncScheduler) {
 /**
  * @tsplus pipeable fncts.observable.Observable scanLeftWithIndex
  */
-
-
 function scanLeftWithIndex_1(initial, f) {
   return fa => {
     return tsplus_module_8.operate_(scanInternal(f, initial, true, true))(fa);
@@ -2051,8 +1756,6 @@ function scanLeftWithIndex_1(initial, f) {
 /**
  * @tsplus pipeable fncts.observable.Observable scanLeft
  */
-
-
 function scanLeft(initial, f) {
   return fa => {
     return scanLeftWithIndex_1(initial, (_, b, a) => f(b, a))(fa);
@@ -2061,38 +1764,24 @@ function scanLeft(initial, f) {
 /**
  * @tsplus static fncts.observable.ObservableOps service
  */
-
-
-function service(
-/** @tsplus auto */
-tag) {
+function service( /** @tsplus auto */tag) {
   return serviceWithObservable_1(service => of_1(service), tag);
 }
 /**
  * @tsplus static fncts.observable.ObservableOps serviceWith
  */
-
-
-function serviceWith(f,
-/** @tsplus auto */
-tag) {
+function serviceWith(f, /** @tsplus auto */tag) {
   return serviceWithObservable_1(service => of_1(f(service)), tag);
 }
 /**
  * @tsplus static fncts.observable.ObservableOps serviceWithObservable
  */
-
-
-function serviceWithObservable_1(f,
-/** @tsplus auto */
-tag) {
+function serviceWithObservable_1(f, /** @tsplus auto */tag) {
   return environmentWithObservable_1(environment => f(tsplus_module_16.unsafeGet(tag)(environment)));
 }
 /**
  * @tsplus pipeable fncts.observable.Observable skip
  */
-
-
 function skip(count) {
   return fa => {
     return filterWithIndex_1((index, _) => count <= index)(fa);
@@ -2101,8 +1790,6 @@ function skip(count) {
 /**
  * @tsplus pipeable fncts.observable.Observable skipLast
  */
-
-
 function skipLast(skipCount) {
   return fa => {
     return skipCount <= 0 ? fa : tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -2111,7 +1798,6 @@ function skipLast(skipCount) {
       source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
         next: value => {
           const valueIndex = seen++;
-
           if (valueIndex < skipCount) {
             ring[valueIndex] = value;
           } else {
@@ -2131,8 +1817,6 @@ function skipLast(skipCount) {
 /**
  * @tsplus pipeable fncts.observable.Observable skipUntil
  */
-
-
 function skipUntil(notifier) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -2154,8 +1838,6 @@ function skipUntil(notifier) {
 /**
  * @tsplus pipeable fncts.observable.Observable skipWhile
  */
-
-
 function skipWhile(predicate) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -2170,8 +1852,6 @@ function skipWhile(predicate) {
 /**
  * @tsplus pipeable fncts.observable.Observable startWith
  */
-
-
 function startWith(...values) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber) => {
@@ -2183,8 +1863,6 @@ function startWith(...values) {
 /**
  * @tsplus pipeable fncts.observable.Observable subscribeOn
  */
-
-
 function subscribeOn(scheduler, delay = 0) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -2195,25 +1873,19 @@ function subscribeOn(scheduler, delay = 0) {
 /**
  * @tsplus getter fncts.observable.Observable switchAll
  */
-
-
 function switchAll(ffa) {
   return switchMap_1(tsplus_module_13.identity)(ffa);
 }
 /**
  * @tsplus pipeable fncts.observable.Observable switchMapWithIndex
  */
-
-
 function switchMapWithIndex_1(f) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
       let innerSubscriber = null;
       let index = 0;
       let isComplete = false;
-
       const checkComplete = () => isComplete && !innerSubscriber && subscriber.complete();
-
       source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
         next: value => {
           innerSubscriber?.unsubscribe();
@@ -2236,8 +1908,6 @@ function switchMapWithIndex_1(f) {
 /**
  * @tsplus pipeable fncts.observable.Observable switchMap
  */
-
-
 function switchMap_1(f) {
   return fa => {
     return switchMapWithIndex_1((_, a) => f(a))(fa);
@@ -2246,8 +1916,6 @@ function switchMap_1(f) {
 /**
  * @tsplus pipeable fncts.observable.Observable switchScanWithIndex
  */
-
-
 function switchScanWithIndex_1(initial, f) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -2262,8 +1930,6 @@ function switchScanWithIndex_1(initial, f) {
 /**
  * @tsplus pipeable fncts.observable.Observable switchScan
  */
-
-
 function switchScan(initial, f) {
   return fa => {
     return switchScanWithIndex_1(initial, (_, b, a) => f(b, a))(fa);
@@ -2272,8 +1938,6 @@ function switchScan(initial, f) {
 /**
  * @tsplus pipeable fncts.observable.Observable take
  */
-
-
 function take_1(count) {
   return fa => {
     return count <= 0 ? empty_1() : tsplus_module_8.operate_((source, sub, environment) => {
@@ -2282,7 +1946,6 @@ function take_1(count) {
         next: value => {
           if (++seen <= count) {
             sub.next(value);
-
             if (count <= seen) {
               sub.complete();
             }
@@ -2295,8 +1958,6 @@ function take_1(count) {
 /**
  * @tsplus pipeable fncts.observable.Observable takeLast
  */
-
-
 function takeLast(count) {
   return fa => {
     return count <= 0 ? empty_1() : tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -2310,7 +1971,6 @@ function takeLast(count) {
           for (const value of buffer) {
             subscriber.next(value);
           }
-
           subscriber.complete();
         }
       }, () => {
@@ -2322,8 +1982,6 @@ function takeLast(count) {
 /**
  * @tsplus pipeable fncts.observable.Observable takeUntil
  */
-
-
 function takeUntil(notifier) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -2335,7 +1993,6 @@ function takeUntil(notifier) {
     })(fa);
   };
 }
-
 function takeWhileWithIndex_1(predicate, inclusive) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -2350,7 +2007,6 @@ function takeWhileWithIndex_1(predicate, inclusive) {
     })(fa);
   };
 }
-
 function takeWhile(predicate, inclusive) {
   return fa => {
     return takeWhileWithIndex_1((_, a) => predicate(a), inclusive)(fa);
@@ -2359,8 +2015,6 @@ function takeWhile(predicate, inclusive) {
 /**
  * @tsplus pipeable fncts.observable.Observable tap
  */
-
-
 function tap(observer) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
@@ -2381,7 +2035,6 @@ function tap(observer) {
     })(fa);
   };
 }
-
 const defaultThrottleConfig = {
   leading: true,
   trailing: false
@@ -2389,9 +2042,7 @@ const defaultThrottleConfig = {
 /**
  * @tsplus pipeable fncts.observable.Observable throttle
  */
-
 exports.defaultThrottleConfig = defaultThrottleConfig;
-
 function throttle_1(durationSelector, {
   leading,
   trailing
@@ -2401,27 +2052,22 @@ function throttle_1(durationSelector, {
       let sendValue = tsplus_module_17.nothing();
       let throttled = null;
       let isComplete = false;
-
       const endThrottling = () => {
         throttled?.unsubscribe();
         throttled = null;
-
         if (trailing) {
           send();
           isComplete && subscriber.complete();
         }
       };
-
       const cleanupThrottling = () => {
         throttled = null;
         isComplete && subscriber.complete();
       };
-
       const startThrottling = value => throttled = from_1(durationSelector(value)).provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
         next: endThrottling,
         complete: cleanupThrottling
       }));
-
       const send = () => {
         if (tsplus_module_18.isJust(sendValue)) {
           const {
@@ -2432,7 +2078,6 @@ function throttle_1(durationSelector, {
           !isComplete && startThrottling(value);
         }
       };
-
       source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
         next: value => {
           sendValue = tsplus_module_17.just(value);
@@ -2449,26 +2094,20 @@ function throttle_1(durationSelector, {
 /**
  * @tsplus pipeable fncts.observable.Observable throttleTime
  */
-
-
 function throttleTime(duration, scheduler = tsplus_module_5.asyncScheduler, config = defaultThrottleConfig) {
   return fa => {
     const duration$ = timer_1(duration, scheduler);
     return throttle_1(() => duration$, config)(fa);
   };
 }
-
 class TimeoutError extends Error {
   constructor(info) {
     super("Timeout has occurred");
     this.info = info;
     this.name = "TimeoutError";
   }
-
 }
-
 exports.TimeoutError = TimeoutError;
-
 function timeout(config) {
   return fa => {
     const {
@@ -2484,7 +2123,6 @@ function timeout(config) {
       let timerSubscription;
       let lastValue = tsplus_module_17.nothing();
       let seen = 0;
-
       const startTimer = delay => {
         timerSubscription = (0, tsplus_module_7.caughtSchedule)(subscriber, scheduler, () => {
           originalSourceSubscription.unsubscribe();
@@ -2495,7 +2133,6 @@ function timeout(config) {
           })).provideEnvironment(environment).subscribe(subscriber);
         }, delay);
       };
-
       originalSourceSubscription = source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
         next: value => {
           timerSubscription?.unsubscribe();
@@ -2508,26 +2145,21 @@ function timeout(config) {
         if (!timerSubscription?.closed) {
           timerSubscription?.unsubscribe();
         }
-
         lastValue = tsplus_module_17.nothing();
       }));
       startTimer(first != null ? typeof first === "number" ? first : +first - scheduler.now() : each);
     })(fa);
   };
 }
-
 function timeoutError(info) {
   return fail_1(new TimeoutError(info));
 }
-
 function toArrayAccumulator(arr, value) {
   return arr.push(value), arr;
 }
 /**
  * @tsplus getter fncts.observable.Observable toArray
  */
-
-
 function toArray_1(fa) {
   return tsplus_module_8.operate_((source, subscriber, environment) => {
     foldLeft_1([], toArrayAccumulator)(source).provideEnvironment(environment).subscribe(subscriber);
@@ -2536,16 +2168,13 @@ function toArray_1(fa) {
 /**
  * @tsplus pipeable fncts.observable.Observable unique
  */
-
-
 function unique(toKey, flushes) {
   return fa => {
     return tsplus_module_8.operate_((source, subscriber, environment) => {
-      let distinctKeys = tsplus_module_21.makeDefault();
+      let distinctKeys = tsplus_module_21.empty();
       source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
         next: value => {
           const key = toKey ? toKey(value) : value;
-
           if (!tsplus_module_21.has(key)(distinctKeys)) {
             tsplus_module_21.add(key)(distinctKeys);
             subscriber.next(value);
@@ -2553,13 +2182,12 @@ function unique(toKey, flushes) {
         }
       }));
       flushes?.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
-        next: () => distinctKeys = tsplus_module_21.makeDefault(),
+        next: () => distinctKeys = tsplus_module_21.empty(),
         complete: tsplus_module_2.noop
       }));
     })(fa);
   };
 }
-
 function uniqueUntilChanged_1(E, keySelector = tsplus_module_13.identity) {
   return fa => {
     const compare = "equals" in E ? E.equals : E;
@@ -2569,7 +2197,6 @@ function uniqueUntilChanged_1(E, keySelector = tsplus_module_13.identity) {
       source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
         next: value => {
           const currentKey = keySelector(value);
-
           if (first || !compare(previousKey, currentKey)) {
             first = false;
             previousKey = currentKey;
@@ -2580,14 +2207,13 @@ function uniqueUntilChanged_1(E, keySelector = tsplus_module_13.identity) {
     })(fa);
   };
 }
-
 function uniqueUntilKeyChanged(key, equals) {
-  return fa => {
-    const compare = "equals" in equals ? equals.equals : equals;
-    return uniqueUntilChanged_1((x, y) => compare(x[key], y[key]))(fa);
-  };
+  if ("equals" in equals) {
+    return fa => uniqueUntilChanged_1((x, y) => equals.equals(y[key])(x[key]))(fa);
+  } else {
+    return fa => uniqueUntilChanged_1((x, y) => equals(x[key], y[key]))(fa);
+  }
 }
-
 function combineLatestInternal(subscriber, environment, observables, scheduler, valueTransform = tsplus_module_13.identity) {
   return maybeSchedule(subscriber, scheduler, () => {
     const {
@@ -2596,7 +2222,6 @@ function combineLatestInternal(subscriber, environment, observables, scheduler,
     const values = new Array(length);
     let active = length;
     let remainingFirstValues = length;
-
     for (let i = 0; i < length; i++) {
       maybeSchedule(subscriber, scheduler, () => {
         const source = scheduler ? scheduled_1(scheduler)(observables[i]) : from_1(observables[i]);
@@ -2604,12 +2229,10 @@ function combineLatestInternal(subscriber, environment, observables, scheduler,
         source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
           next: value => {
             values[i] = value;
-
             if (!hasFirstValue) {
               hasFirstValue = true;
               remainingFirstValues--;
             }
-
             if (!remainingFirstValues) {
               subscriber.next(valueTransform(values.slice()));
             }
@@ -2624,7 +2247,6 @@ function combineLatestInternal(subscriber, environment, observables, scheduler,
     }
   });
 }
-
 function findInternal(predicate, emit) {
   const findIndex = emit === "index";
   return (source, subscriber, environment) => {
@@ -2632,7 +2254,6 @@ function findInternal(predicate, emit) {
     source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
       next: value => {
         const i = index++;
-
         if (predicate(index++, value)) {
           subscriber.next(findIndex ? i : tsplus_module_17.just(value));
           subscriber.complete();
@@ -2645,11 +2266,9 @@ function findInternal(predicate, emit) {
     }));
   };
 }
-
 function joinAllInternal(fa, joiner) {
   return mergeMap_1(joiner)(toArray_1(fa));
 }
-
 function maybeSchedule(subscription, scheduler, execute) {
   if (scheduler) {
     subscription.add(scheduler.schedule(execute));
@@ -2657,21 +2276,17 @@ function maybeSchedule(subscription, scheduler, execute) {
     execute();
   }
 }
-
 function mergeInternal(source, subscriber, environment, f, concurrent, onBeforeNext, expand, innerSubScheduler, additionalTeardown) {
   const buffer = [];
   let active = 0;
   let index = 0;
   let isComplete = false;
-
   const checkComplete = () => {
     if (isComplete && !buffer.length && !active) {
       subscriber.complete();
     }
   };
-
   const outerNext = a => active < concurrent ? doInnerSub(a) : buffer.push(a);
-
   const doInnerSub = a => {
     expand && subscriber.next(a);
     active++;
@@ -2679,7 +2294,6 @@ function mergeInternal(source, subscriber, environment, f, concurrent, onBeforeN
     from_1(f(index++, a)).provideEnvironment(environment).subscribe(new tsplus_module_8.OperatorSubscriber(subscriber, {
       next: b => {
         onBeforeNext?.(b);
-
         if (expand) {
           outerNext(b);
         } else {
@@ -2693,12 +2307,10 @@ function mergeInternal(source, subscriber, environment, f, concurrent, onBeforeN
       if (innerComplete) {
         try {
           active--;
-
           while (buffer.length && active < concurrent) {
             const bufferedValue = buffer.shift();
             innerSubScheduler ? subscriber.add(innerSubScheduler.schedule(() => doInnerSub(bufferedValue))) : doInnerSub(bufferedValue);
           }
-
           checkComplete();
         } catch (err) {
           subscriber.error(tsplus_module_1.halt(err));
@@ -2706,7 +2318,6 @@ function mergeInternal(source, subscriber, environment, f, concurrent, onBeforeN
       }
     }));
   };
-
   source.provideEnvironment(environment).subscribe(new tsplus_module_8.OperatorSubscriber(subscriber, {
     next: outerNext,
     complete: () => {
@@ -2718,7 +2329,6 @@ function mergeInternal(source, subscriber, environment, f, concurrent, onBeforeN
     additionalTeardown?.();
   };
 }
-
 function scanInternal(f, initial, hasInitial, emitOnNext, emitBeforeComplete) {
   return (source, subscriber, environment) => {
     let hasState = hasInitial;