@fncts/observable 0.0.25 → 0.0.27

package/_cjs/Observable/api.cjs

@@ -121,33 +121,33 @@ 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 _util = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/observable/internal/util"));
+var tsplus_module_1 = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("@fncts/base/data/Cause/api"));
+var _util = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("@fncts/observable/internal/util"));
 var tsplus_module_2 = _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 _Scheduler = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/observable/Scheduler"));
+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 _Scheduler = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("@fncts/observable/Scheduler"));
 var tsplus_module_7 = _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 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(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const fileName_1 = "(@fncts/observable) src/Observable/api.ts";
 const defer = exports.defer = defer_1;
 const empty = exports.empty = empty_1;
@@ -270,7 +270,7 @@ function from_1(input) {
 }
 function fromArrayLike(input) {
   return new _definition2.Observable(s => {
-    for (let i = 0; i < input.length && !s.closed; i++) {
+    for (let i = 0; i < input.length && !s._closed; i++) {
       s.next(input[i]);
     }
     s.complete();
@@ -285,7 +285,7 @@ function fromIterable(iterable) {
   return new _definition2.Observable(s => {
     for (const value of iterable) {
       s.next(value);
-      if (s.closed) {
+      if (s._closed) {
         return;
       }
     }
@@ -295,7 +295,7 @@ function fromIterable(iterable) {
 function fromPromise(promise) {
   return new _definition2.Observable(s => {
     promise.then(value => {
-      if (!s.closed) {
+      if (!s._closed) {
         s.next(value);
         s.complete();
       }
@@ -338,7 +338,7 @@ function iterate(options) {
 async function process(asyncIterable, subscriber) {
   for await (const value of asyncIterable) {
     subscriber.next(value);
-    if (subscriber.closed) {
+    if (subscriber._closed) {
       return;
     }
   }
@@ -349,7 +349,6 @@ async function process(asyncIterable, subscriber) {
  */
 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);
@@ -405,7 +404,7 @@ function scheduleArray(input, scheduler) {
         s.complete();
       } else {
         s.next(input[i++]);
-        if (!s.closed) {
+        if (!s._closed) {
           this.schedule();
         }
       }
@@ -491,7 +490,6 @@ function timer_1(time = 0, intervalOrScheduler, scheduler = tsplus_module_5.asyn
   let intervalDuration = -1;
   if (intervalOrScheduler != null) {
     if (tsplus_module_7.isScheduler(intervalOrScheduler)) {
-      // eslint-disable-next-line no-param-reassign
       scheduler = intervalOrScheduler;
     } else {
       intervalDuration = intervalOrScheduler;
@@ -504,7 +502,7 @@ function timer_1(time = 0, intervalOrScheduler, scheduler = tsplus_module_5.asyn
     }
     let n = 0;
     return scheduler.schedule(function () {
-      if (!s.closed) {
+      if (!s._closed) {
         s.next(n++);
         if (0 <= intervalDuration) {
           this.schedule(undefined, intervalDuration);
@@ -525,7 +523,7 @@ function makeZip(...sources) {
     subscriber.add(() => {
       buffers = completed = null;
     });
-    for (let sourceIndex = 0; !subscriber.closed && sourceIndex < sources.length; sourceIndex++) {
+    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);
@@ -555,9 +553,9 @@ 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 = tsplus_module_10.unsafeRunFiber(tsplus_module_9.provideEnvironment(env, fileName_1 + ":487:36")(io), fileName_1 + ":487:56");
       fiber.addObserver(exit => {
-        if (!s.closed) {
+        if (!s._closed) {
           tsplus_module_11.match(cause => s.error(cause), a => s.next(a))(exit);
           s.complete();
         }
@@ -565,7 +563,7 @@ function fromIO_1(io, scheduler = tsplus_module_5.asyncScheduler) {
     });
     return () => {
       scheduled.unsubscribe();
-      fiber && tsplus_module_10.unsafeRunFiber(tsplus_module_12.interrupt(fiber), fileName_1 + ":502:46");
+      fiber && tsplus_module_10.unsafeRunFiber(tsplus_module_12.interrupt(fiber), fileName_1 + ":500:46");
     };
   });
 }
@@ -602,14 +600,14 @@ function ap(fa) {
  */
 function mapWithIndex_1(f) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((destination, environment) => {
       let i = 0;
-      source.provideEnvironment(environment).subscribe(new tsplus_module_8.OperatorSubscriber(subscriber, {
+      return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
-          subscriber.next(f(i++, value));
+          destination.next(f(i++, value));
         }
-      }));
-    })(fa);
+      })(destination));
+    });
   };
 }
 /**
@@ -633,21 +631,21 @@ function as_1(b) {
  */
 function mapError(f) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
-      source.provideEnvironment(environment).subscribe(new tsplus_module_8.OperatorSubscriber(subscriber, {
+    return new _definition2.Observable((subscriber, environment) => {
+      return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         error: err => {
           subscriber.error(tsplus_module_1.map(f)(err));
         }
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 /**
  * @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, {
+  return new _definition2.Observable((subscriber, environment) => {
+    return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
       next: value => {
         subscriber.error(tsplus_module_1.fail(value));
       },
@@ -658,17 +656,17 @@ function swap(fa) {
           subscriber.error(cause);
         })(tsplus_module_1.failureOrCause(err));
       }
-    }));
-  })(fa);
+    })(subscriber));
+  });
 }
 function filterWithIndex_1(predicate) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((subscriber, environment) => {
       let index = 0;
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => predicate(index++, value) && subscriber.next(value)
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 function filter(predicate) {
@@ -681,12 +679,12 @@ function filter(predicate) {
  */
 function filterMapWithIndex_1(f) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((subscriber, environment) => {
       let index = 0;
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => tsplus_module_15.match(() => tsplus_module_2.noop, b => subscriber.next(b))(f(index++, value))
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 /**
@@ -712,21 +710,21 @@ function partition(predicate) {
  */
 function partitionMapWithIndex_1(f) {
   return fa => {
-    return [tsplus_module_8.operate_((source, subscriber, environment) => {
+    return [new _definition2.Observable((subscriber, environment) => {
       let index = 0;
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
           tsplus_module_14.match(b => subscriber.next(b), tsplus_module_2.noop)(f(index++, value));
         }
-      }));
-    })(fa), tsplus_module_8.operate_((source, subscriber, environment) => {
+      })(subscriber));
+    }), new _definition2.Observable((subscriber, environment) => {
       let index = 0;
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
           tsplus_module_14.match(tsplus_module_2.noop, c => subscriber.next(c))(f(index++, value));
         }
-      }));
-    })(fa)];
+      })(subscriber));
+    })];
   };
 }
 /**
@@ -750,7 +748,9 @@ function provideService(service, /** @tsplus auto */tag) {
  */
 function mergeMapWithIndex_1(f, concurrent = Infinity) {
   return ma => {
-    return tsplus_module_8.operate_((source, sub, environment) => mergeInternal(source, sub, environment, f, concurrent))(ma);
+    return new _definition2.Observable((subscriber, environment) => {
+      return mergeInternal(ma, subscriber, environment, f, concurrent);
+    });
   };
 }
 /**
@@ -796,7 +796,9 @@ function flatten(mma) {
  */
 function foldLeftWithIndex_1(initial, f) {
   return fa => {
-    return tsplus_module_8.operate_(scanInternal(f, initial, true, false, true))(fa);
+    return new _definition2.Observable((subscriber, environment) => {
+      return scanInternal(fa, subscriber, environment, f, initial, true, false, true);
+    });
   };
 }
 /**
@@ -812,7 +814,7 @@ function foldLeft_1(initial, f) {
  */
 function at(index) {
   return fa => {
-    return onEmpty_1(() => tsplus_module_17.nothing(fileName_1 + ":841:29"))(map_1(tsplus_module_17.just)(take_1(1)(filterWithIndex_1(i => i === index)(fa))));
+    return onEmpty_1(() => tsplus_module_17.nothing(fileName_1 + ":843:29"))(map_1(tsplus_module_17.just)(take_1(1)(filterWithIndex_1(i => i === index)(fa))));
   };
 }
 /**
@@ -820,8 +822,8 @@ function at(index) {
  */
 function audit_1(durationSelector) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
-      let lastValue = tsplus_module_17.nothing(fileName_1 + ":851:40");
+    return new _definition2.Observable((subscriber, environment) => {
+      let lastValue = tsplus_module_17.nothing(fileName_1 + ":853:40");
       let durationSubscriber = null;
       let isComplete = false;
       const endDuration = () => {
@@ -831,7 +833,7 @@ function audit_1(durationSelector) {
           const {
             value
           } = lastValue;
-          lastValue = tsplus_module_17.nothing(fileName_1 + ":859:36");
+          lastValue = tsplus_module_17.nothing(fileName_1 + ":861:36");
           subscriber.next(value);
         }
         isComplete && subscriber.complete();
@@ -840,9 +842,9 @@ function audit_1(durationSelector) {
         durationSubscriber = null;
         isComplete && subscriber.complete();
       };
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
         next: value => {
-          lastValue = tsplus_module_17.just(value, fileName_1 + ":871:29");
+          lastValue = tsplus_module_17.just(value, fileName_1 + ":873:29");
           if (!durationSubscriber) {
             from_1(durationSelector(value)).provideEnvironment(environment).subscribe(durationSubscriber = tsplus_module_8.operatorSubscriber(subscriber, {
               next: endDuration,
@@ -852,10 +854,10 @@ function audit_1(durationSelector) {
         },
         complete: () => {
           isComplete = true;
-          (tsplus_module_18.isNothing(lastValue) || !durationSubscriber || durationSubscriber.closed) && subscriber.complete();
+          (tsplus_module_18.isNothing(lastValue) || !durationSubscriber || durationSubscriber._closed) && subscriber.complete();
         }
       }));
-    })(fa);
+    });
   };
 }
 /**
@@ -871,27 +873,27 @@ function auditTime(duration, scheduler = tsplus_module_5.asyncScheduler) {
  */
 function buffer(closingNotifier) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((subscriber, environment) => {
       let buffer = [];
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => buffer.push(value),
         complete: () => {
           subscriber.next(buffer);
           subscriber.complete();
         }
-      }));
-      closingNotifier.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      })(subscriber));
+      closingNotifier.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: () => {
           const b = buffer;
           buffer = [];
           subscriber.next(b);
         },
         complete: tsplus_module_2.noop
-      }));
+      })(subscriber));
       return () => {
         buffer = null;
       };
-    })(fa);
+    });
   };
 }
 /**
@@ -899,12 +901,11 @@ function buffer(closingNotifier) {
  */
 function bufferCount(bufferSize, startBufferEvery) {
   return fa => {
-    // eslint-disable-next-line no-param-reassign
     startBufferEvery = startBufferEvery ?? bufferSize;
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((subscriber, environment) => {
       let buffers = [];
       let count = 0;
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
           let toEmit = null;
           if (count++ % startBufferEvery === 0) {
@@ -929,11 +930,12 @@ function bufferCount(bufferSize, startBufferEvery) {
             subscriber.next(buffer);
           }
           subscriber.complete();
+        },
+        finalize: () => {
+          buffers = null;
         }
-      }, () => {
-        buffers = null;
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 /**
@@ -947,7 +949,7 @@ function bufferTime(config) {
       maxBufferSize = Infinity,
       scheduler = tsplus_module_5.asyncScheduler
     } = config;
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((subscriber, environment) => {
       let bufferRecords = [];
       let restartOnEmit = true;
       const emit = record => {
@@ -975,10 +977,10 @@ function bufferTime(config) {
       };
       bufferCreationInterval !== null && bufferCreationInterval >= 0 ? subscriber.add(scheduler.schedule(function () {
         startBuffer();
-        !this.closed && subscriber.add(this.schedule(null, bufferCreationInterval));
+        !this._closed && subscriber.add(this.schedule(null, bufferCreationInterval));
       }, bufferCreationInterval)) : restartOnEmit = true;
       startBuffer();
-      const bufferTimeSubscriber = tsplus_module_8.operatorSubscriber(subscriber, {
+      const bufferTimeSubscriber = tsplus_module_8.operate_({
         next: value => {
           const recordsCopy = bufferRecords.slice();
           for (const record of recordsCopy) {
@@ -996,10 +998,13 @@ function bufferTime(config) {
           bufferTimeSubscriber?.unsubscribe();
           subscriber.complete();
           subscriber.unsubscribe();
+        },
+        finalize: () => {
+          bufferRecords = null;
         }
-      }, () => bufferRecords = null);
-      source.provideEnvironment(environment).subscribe(bufferTimeSubscriber);
-    })(fa);
+      })(subscriber);
+      return fa.provideEnvironment(environment).subscribe(bufferTimeSubscriber);
+    });
   };
 }
 /**
@@ -1007,7 +1012,7 @@ function bufferTime(config) {
  */
 function bufferToggle(openings, closingSelector) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((subscriber, environment) => {
       const buffers = [];
       from_1(openings).provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
         next: openValue => {
@@ -1026,7 +1031,7 @@ function bufferToggle(openings, closingSelector) {
         },
         complete: tsplus_module_2.noop
       }));
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
           for (const buffer of buffers) {
             buffer.push(value);
@@ -1038,8 +1043,8 @@ function bufferToggle(openings, closingSelector) {
           }
           subscriber.complete();
         }
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 /**
@@ -1047,7 +1052,7 @@ function bufferToggle(openings, closingSelector) {
  */
 function bufferWhen(closingSelector) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((subscriber, environment) => {
       let buffer = null;
       let closingSubscriber = null;
       const openBuffer = () => {
@@ -1061,14 +1066,15 @@ function bufferWhen(closingSelector) {
         }));
       };
       openBuffer();
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => buffer?.push(value),
         complete: () => {
           buffer && subscriber.next(buffer);
           subscriber.complete();
-        }
-      }, () => buffer = closingSubscriber = null));
-    })(fa);
+        },
+        finalize: () => buffer = closingSubscriber = null
+      })(subscriber));
+    });
   };
 }
 /**
@@ -1076,13 +1082,13 @@ function bufferWhen(closingSelector) {
  */
 function catchAllCause_1(f) {
   return self => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((subscriber, environment) => {
       let innerSub = null;
       let syncUnsub = false;
       let handledResult;
-      innerSub = source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      innerSub = self.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         error: cause => {
-          handledResult = from_1(f(cause, catchAllCause_1(f)(source)));
+          handledResult = from_1(f(cause, catchAllCause_1(f)(self)));
           if (innerSub) {
             innerSub.unsubscribe();
             innerSub = null;
@@ -1091,13 +1097,13 @@ function catchAllCause_1(f) {
             syncUnsub = true;
           }
         }
-      }));
+      })(subscriber));
       if (syncUnsub) {
         innerSub.unsubscribe();
         innerSub = null;
         handledResult.provideEnvironment(environment).subscribe(subscriber);
       }
-    })(self);
+    });
   };
 }
 /**
@@ -1111,9 +1117,9 @@ function concatAll_1(ffa) {
  */
 function concat_1(...sources) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
-      concatAll_1(fromArrayLike([source, ...sources])).provideEnvironment(environment).subscribe(subscriber);
-    })(fa);
+    return new _definition2.Observable((subscriber, environment) => {
+      return concatAll_1(fromArrayLike([fa, ...sources])).provideEnvironment(environment).subscribe(subscriber);
+    });
   };
 }
 /**
@@ -1150,11 +1156,11 @@ function combineLatestAll(fa) {
 function zipLatest_1(...sources) {
   return self => {
     if (!sources.length) {
-      return from_1(self).unsafeCoerce();
+      return from_1(self);
     }
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
-      combineLatestInternal(subscriber, environment, [source, ...sources]);
-    })(from_1(self));
+    return new _definition2.Observable((subscriber, environment) => {
+      return combineLatestInternal(subscriber, environment, [self, ...sources]);
+    });
   };
 }
 /**
@@ -1170,8 +1176,8 @@ function zipWithLatest(that, f) {
  */
 function debounceWith(durationSelector) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
-      let lastValue = tsplus_module_17.nothing(fileName_1 + ":1290:40");
+    return new _definition2.Observable((subscriber, environment) => {
+      let lastValue = tsplus_module_17.nothing(fileName_1 + ":1288:40");
       let durationSubscriber = null;
       const emit = () => {
         durationSubscriber?.unsubscribe();
@@ -1180,28 +1186,29 @@ function debounceWith(durationSelector) {
           const {
             value
           } = lastValue;
-          lastValue = tsplus_module_17.nothing(fileName_1 + ":1297:36");
+          lastValue = tsplus_module_17.nothing(fileName_1 + ":1295:36");
           subscriber.next(value);
         }
       };
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
           durationSubscriber?.unsubscribe();
-          lastValue = tsplus_module_17.just(value, fileName_1 + ":1307:40");
-          durationSubscriber = tsplus_module_8.operatorSubscriber(subscriber, {
+          lastValue = tsplus_module_17.just(value, fileName_1 + ":1303:38");
+          durationSubscriber = tsplus_module_8.operate_({
             next: emit,
             complete: tsplus_module_2.noop
-          });
+          })(subscriber);
           from_1(durationSelector(value)).provideEnvironment(environment).subscribe(durationSubscriber);
         },
         complete: () => {
           emit();
           subscriber.complete();
+        },
+        finalize: () => {
+          lastValue = durationSubscriber = null;
         }
-      }, () => {
-        lastValue = durationSubscriber = null;
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 /**
@@ -1209,7 +1216,7 @@ function debounceWith(durationSelector) {
  */
 function debounce(dueTime, scheduler = tsplus_module_5.asyncScheduler) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((subscriber, environment) => {
       let activeTask = null;
       let lastValue = null;
       let lastTime = null;
@@ -1232,7 +1239,7 @@ function debounce(dueTime, scheduler = tsplus_module_5.asyncScheduler) {
         }
         emit();
       }
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
           lastValue = value;
           lastTime = scheduler.now();
@@ -1244,27 +1251,28 @@ function debounce(dueTime, scheduler = tsplus_module_5.asyncScheduler) {
         complete: () => {
           emit();
           subscriber.complete();
+        },
+        finalize: () => {
+          lastValue = activeTask = null;
         }
-      }, () => {
-        lastValue = activeTask = null;
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 /**
  * @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, {
+  return new _definition2.Observable((subscriber, environment) => {
+    return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
       next: value => {
-        subscriber.next(tsplus_module_19.right(value, fileName_1 + ":1387:39"));
+        subscriber.next(tsplus_module_19.right(value, fileName_1 + ":1379:39"));
       },
       error: error => {
-        tsplus_module_14.match(e => subscriber.next(tsplus_module_19.left(e, fileName_1 + ":1391:47")), cause => subscriber.error(cause))(tsplus_module_1.failureOrCause(error));
+        tsplus_module_14.match(e => subscriber.next(tsplus_module_19.left(e, fileName_1 + ":1383:47")), cause => subscriber.error(cause))(tsplus_module_1.failureOrCause(error));
       }
-    }));
-  })(fa);
+    })(subscriber));
+  });
 }
 /**
  * @tsplus pipeable fncts.observable.Observable delayWithIndex
@@ -1295,39 +1303,39 @@ 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, {
+  return new _definition2.Observable((subscriber, environment) => {
+    return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
       next: notification => tsplus_module_20.observe(subscriber)(notification)
-    }));
-  })(fa);
+    })(subscriber));
+  });
 }
 /**
  * @tsplus pipeable fncts.observable.Observable ensuring
  */
 function ensuring(finalizer) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
-      source.provideEnvironment(environment).subscribe(subscriber);
+    return new _definition2.Observable((subscriber, environment) => {
       subscriber.add(finalizer);
-    })(fa);
+      return fa.provideEnvironment(environment).subscribe(subscriber);
+    });
   };
 }
 /**
  * @tsplus getter fncts.observable.Observable exhaustAll
  */
 function exhaustAll(ffa) {
-  return tsplus_module_8.operate_((source, subscriber, environment) => {
+  return new _definition2.Observable((subscriber, environment) => {
     let isComplete = false;
     let innerSub = null;
-    source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+    return ffa.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
       next: inner => {
         if (!innerSub) {
-          innerSub = from_1(inner).provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+          innerSub = from_1(inner).provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
             complete: () => {
               innerSub = null;
               isComplete && subscriber.complete();
             }
-          }));
+          })(subscriber));
         }
       },
       complete: () => {
@@ -1335,26 +1343,26 @@ function exhaustAll(ffa) {
         !innerSub && subscriber.complete();
       }
     }));
-  })(ffa);
+  });
 }
 /**
  * @tsplus pipeable fncts.observable.Observable exhaustMapWithIndex
  */
 function exhaustMapWithIndex_1(f) {
   return self => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((subscriber, environment) => {
       let index = 0;
       let innerSub = null;
       let isComplete = false;
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      self.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: outerValue => {
           if (!innerSub) {
-            innerSub = tsplus_module_8.operatorSubscriber(subscriber, {
+            innerSub = tsplus_module_8.operate_({
               complete: () => {
                 innerSub = null;
                 isComplete && subscriber.complete();
               }
-            });
+            })(subscriber);
             from_1(f(index++, outerValue)).provideEnvironment(environment).subscribe(innerSub);
           }
         },
@@ -1362,8 +1370,8 @@ function exhaustMapWithIndex_1(f) {
           isComplete = true;
           !innerSub && subscriber.complete();
         }
-      }));
-    })(self);
+      })(subscriber));
+    });
   };
 }
 /**
@@ -1380,7 +1388,9 @@ function exhaustMap(f) {
 function expandWithIndex_1(f, concurrent = Infinity) {
   return fa => {
     concurrent = (concurrent || 0) < 1 ? Infinity : concurrent;
-    return tsplus_module_8.operate_((source, subscriber, environment) => mergeInternal(source, subscriber, environment, f, concurrent, undefined, true))(fa);
+    return new _definition2.Observable((subscriber, environment) => {
+      return mergeInternal(fa, subscriber, environment, f, concurrent, undefined, true);
+    });
   };
 }
 /**
@@ -1393,7 +1403,7 @@ function expand(f, concurrent = Infinity) {
 }
 function findWithIndex_1(predicate) {
   return fa => {
-    return tsplus_module_8.operate_(findInternal(predicate, "value"))(fa);
+    return new _definition2.Observable(findInternal(fa, predicate, "value"));
   };
 }
 function find(predicate) {
@@ -1403,7 +1413,7 @@ function find(predicate) {
 }
 function findIndexWithIndex_1(predicate) {
   return fa => {
-    return tsplus_module_8.operate_(findInternal(predicate, "index"))(fa);
+    return new _definition2.Observable(findInternal(fa, predicate, "index"));
   };
 }
 function findIndex(predicate) {
@@ -1416,7 +1426,7 @@ function forkJoin(...args) {
     args: sources,
     keys
   } = (0, _util.arrayOrObject)(args);
-  return new _definition2.Observable(s => {
+  return new _definition2.Observable((s, environment) => {
     const length = sources.length;
     if (!length) {
       s.complete();
@@ -1427,7 +1437,7 @@ function forkJoin(...args) {
     let remainingEmissions = length;
     for (let sourceIndex = 0; sourceIndex < length; sourceIndex++) {
       let hasValue = false;
-      from_1(sources[sourceIndex]).subscribe(tsplus_module_8.operatorSubscriber(s, {
+      from_1(sources[sourceIndex]).provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
           if (!hasValue) {
             hasValue = true;
@@ -1447,7 +1457,7 @@ function forkJoin(...args) {
             s.complete();
           }
         }
-      }));
+      })(s));
     }
   });
 }
@@ -1455,18 +1465,18 @@ 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, {
+  return new _definition2.Observable((subscriber, environment) => {
+    return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
       next: tsplus_module_2.noop
-    }));
-  })(fa);
+    })(subscriber));
+  });
 }
 /**
  * @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, {
+  return new _definition2.Observable((subscriber, environment) => {
+    return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
       next: () => {
         subscriber.next(false);
         subscriber.complete();
@@ -1475,15 +1485,15 @@ function isEmpty(fa) {
         subscriber.next(true);
         subscriber.complete();
       }
-    }));
-  })(fa);
+    })(subscriber));
+  });
 }
 /**
  * @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, {
+  return new _definition2.Observable((subscriber, environment) => {
+    return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
       next: value => {
         subscriber.next(tsplus_module_20.next(value));
       },
@@ -1493,8 +1503,8 @@ function materialize(fa) {
       complete: () => {
         subscriber.next(tsplus_module_20.complete());
       }
-    }));
-  })(fa);
+    })(subscriber));
+  });
 }
 /**
  * @tsplus pipeable fncts.observable.Observable mergeAll
@@ -1509,12 +1519,12 @@ function mergeAll_1(concurrent = Infinity) {
  */
 function mergeScanWithIndex_1(initial, f, concurrent = Infinity) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((subscriber, environment) => {
       let state = initial;
-      return mergeInternal(source, subscriber, environment, (index, value) => f(index, state, value), concurrent, value => {
+      return mergeInternal(fa, subscriber, environment, (index, value) => f(index, state, value), concurrent, value => {
         state = value;
       }, false, undefined, () => state = null);
-    })(fa);
+    });
   };
 }
 /**
@@ -1526,10 +1536,10 @@ function mergeScan(initial, f, concurrent = Infinity) {
   };
 }
 function onErrorResumeNext(fa, ...sources) {
-  return tsplus_module_8.operate_((source, subscriber, environment) => {
-    const remaining = [source, ...sources];
+  return new _definition2.Observable((subscriber, environment) => {
+    const remaining = [fa, ...sources];
     const subscribeNext = () => {
-      if (!subscriber.closed) {
+      if (!subscriber._closed) {
         if (remaining.length > 0) {
           let nextSource;
           try {
@@ -1538,10 +1548,10 @@ function onErrorResumeNext(fa, ...sources) {
             subscribeNext();
             return;
           }
-          const innerSub = tsplus_module_8.operatorSubscriber(subscriber, {
+          const innerSub = tsplus_module_8.operate_({
             error: tsplus_module_2.noop,
             complete: tsplus_module_2.noop
-          });
+          })(subscriber);
           subscriber.add(nextSource.provideEnvironment(environment).subscribe(innerSub));
           innerSub.add(subscribeNext);
         } else {
@@ -1550,16 +1560,16 @@ 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) => {
+    return new _definition2.Observable((subscriber, environment) => {
       let hasValue = false;
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
           hasValue = true;
           subscriber.next(value);
@@ -1570,8 +1580,8 @@ function onEmpty_1(f) {
           }
           subscriber.complete();
         }
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 /**
@@ -1579,12 +1589,12 @@ function onEmpty_1(f) {
  */
 function repeat(count = Infinity) {
   return fa => {
-    return count <= 0 ? empty_1() : tsplus_module_8.operate_((source, subscriber, environment) => {
+    return count <= 0 ? empty_1() : new _definition2.Observable((subscriber, environment) => {
       let repeats = 0;
       let innerSub;
       const loop = () => {
         let syncUnsub = false;
-        innerSub = source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+        innerSub = fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
           complete: () => {
             if (++repeats < count) {
               if (innerSub) {
@@ -1598,7 +1608,7 @@ function repeat(count = Infinity) {
               subscriber.complete;
             }
           }
-        }));
+        })(subscriber));
         if (syncUnsub) {
           innerSub.unsubscribe();
           innerSub = null;
@@ -1606,7 +1616,7 @@ function repeat(count = Infinity) {
         }
       };
       loop();
-    })(fa);
+    });
   };
 }
 function retry(configOrCount = Infinity) {
@@ -1623,12 +1633,12 @@ function retry(configOrCount = Infinity) {
       count,
       resetOnSuccess = false
     } = config;
-    return count <= 0 ? fa : tsplus_module_8.operate_((source, subscriber, environment) => {
+    return count <= 0 ? fa : new _definition2.Observable((subscriber, environment) => {
       let retries = 0;
       let innerSub;
       const loop = () => {
         let syncUnsub = false;
-        innerSub = source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+        innerSub = fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
           next: value => {
             if (resetOnSuccess) {
               retries = 0;
@@ -1648,7 +1658,7 @@ function retry(configOrCount = Infinity) {
               subscriber.error(err);
             }
           }
-        }));
+        })(subscriber));
         if (syncUnsub) {
           innerSub.unsubscribe();
           innerSub = null;
@@ -1656,7 +1666,7 @@ function retry(configOrCount = Infinity) {
         }
       };
       loop();
-    })(fa);
+    });
   };
 }
 /**
@@ -1664,15 +1674,15 @@ function retry(configOrCount = Infinity) {
  */
 function sample_1(notifier) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((subscriber, environment) => {
       let hasValue = false;
       let lastValue = null;
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
           hasValue = true;
           lastValue = value;
         }
-      }));
+      })(subscriber));
       const emit = () => {
         if (hasValue) {
           hasValue = false;
@@ -1681,11 +1691,11 @@ function sample_1(notifier) {
           subscriber.next(value);
         }
       };
-      notifier.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      notifier.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: emit,
         complete: tsplus_module_2.noop
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 /**
@@ -1701,7 +1711,7 @@ function sampleTime(period, scheduler = tsplus_module_5.asyncScheduler) {
  */
 function scanLeftWithIndex_1(initial, f) {
   return fa => {
-    return tsplus_module_8.operate_(scanInternal(f, initial, true, true))(fa);
+    return new _definition2.Observable((subscriber, environment) => scanInternal(fa, subscriber, environment, f, initial, true, true));
   };
 }
 /**
@@ -1715,7 +1725,7 @@ 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);
 }
 /**
@@ -1743,10 +1753,10 @@ function skip(count) {
  */
 function skipLast(skipCount) {
   return fa => {
-    return skipCount <= 0 ? fa : tsplus_module_8.operate_((source, subscriber, environment) => {
+    return skipCount <= 0 ? fa : new _definition2.Observable((subscriber, environment) => {
       let ring = new Array(skipCount);
       let seen = 0;
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
           const valueIndex = seen++;
           if (valueIndex < skipCount) {
@@ -1758,11 +1768,11 @@ function skipLast(skipCount) {
             subscriber.next(oldValue);
           }
         }
-      }));
+      })(subscriber));
       return () => {
         ring = null;
       };
-    })(fa);
+    });
   };
 }
 /**
@@ -1770,20 +1780,20 @@ function skipLast(skipCount) {
  */
 function skipUntil(notifier) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((subscriber, environment) => {
       let taking = false;
-      const skipSubscriber = tsplus_module_8.operatorSubscriber(subscriber, {
+      const skipSubscriber = tsplus_module_8.operate_({
         next: () => {
           skipSubscriber?.unsubscribe();
           taking = true;
         },
         complete: tsplus_module_2.noop
-      });
+      })(subscriber);
       from_1(notifier).provideEnvironment(environment).subscribe(skipSubscriber);
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => taking && subscriber.next(value)
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 /**
@@ -1791,13 +1801,13 @@ function skipUntil(notifier) {
  */
 function skipWhile(predicate) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((subscriber, environment) => {
       let taking = false;
       let index = 0;
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => (taking || (taking = !predicate(index++, value))) && subscriber.next(value)
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 /**
@@ -1805,10 +1815,10 @@ function skipWhile(predicate) {
  */
 function startWith(...values) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber) => {
+    return new _definition2.Observable((subscriber, environment) => {
       // @ts-expect-error
-      concat_1(values)(source).subscribe(subscriber);
-    })(fa);
+      return concat_1(values)(fa).provideEnvironment(environment).subscribe(subscriber);
+    });
   };
 }
 /**
@@ -1816,9 +1826,9 @@ function startWith(...values) {
  */
 function subscribeOn(scheduler, delay = 0) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
-      subscriber.add(scheduler.schedule(() => source.provideEnvironment(environment).subscribe(subscriber), delay));
-    })(fa);
+    return new _definition2.Observable((subscriber, environment) => {
+      subscriber.add(scheduler.schedule(() => fa.provideEnvironment(environment).subscribe(subscriber), delay));
+    });
   };
 }
 /**
@@ -1832,28 +1842,29 @@ function switchAll(ffa) {
  */
 function switchMapWithIndex_1(f) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((destination, 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, {
+      const checkComplete = () => isComplete && !innerSubscriber && destination.complete();
+      fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
           innerSubscriber?.unsubscribe();
           const outerIndex = index++;
-          from_1(f(outerIndex, value)).provideEnvironment(environment).subscribe(innerSubscriber = tsplus_module_8.operatorSubscriber(subscriber, {
-            next: innerValue => subscriber.next(innerValue),
+          from_1(f(outerIndex, value)).provideEnvironment(environment).subscribe(innerSubscriber = tsplus_module_8.operate_({
+            next: innerValue => destination.next(innerValue),
             complete: () => {
               innerSubscriber = null;
               checkComplete();
             }
-          }));
+          })(destination));
+        },
+        complete: () => {
+          isComplete = true;
+          checkComplete();
         }
-      }, () => {
-        isComplete = true;
-        checkComplete();
-      }));
-    })(fa);
+      })(destination));
+    });
   };
 }
 /**
@@ -1869,13 +1880,13 @@ function switchMap_1(f) {
  */
 function switchScanWithIndex_1(initial, f) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((subscriber, environment) => {
       let state = initial;
-      switchMapWithIndex_1((index, value) => map_1(b => (state = b, b))(from_1(f(index, state, value))))(source).provideEnvironment(environment).subscribe(subscriber);
+      switchMapWithIndex_1((index, value) => map_1(b => (state = b, b))(from_1(f(index, state, value))))(fa).provideEnvironment(environment).subscribe(subscriber);
       return () => {
         state = null;
       };
-    })(fa);
+    });
   };
 }
 /**
@@ -1891,9 +1902,9 @@ function switchScan(initial, f) {
  */
 function take_1(count) {
   return fa => {
-    return count <= 0 ? empty_1() : tsplus_module_8.operate_((source, sub, environment) => {
+    return count <= 0 ? empty_1() : new _definition2.Observable((sub, environment) => {
       let seen = 0;
-      source.provideEnvironment(environment).subscribe(new tsplus_module_8.OperatorSubscriber(sub, {
+      fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
           if (++seen <= count) {
             sub.next(value);
@@ -1902,8 +1913,8 @@ function take_1(count) {
             }
           }
         }
-      }));
-    })(fa);
+      })(sub));
+    });
   };
 }
 /**
@@ -1911,9 +1922,9 @@ function take_1(count) {
  */
 function takeLast(count) {
   return fa => {
-    return count <= 0 ? empty_1() : tsplus_module_8.operate_((source, subscriber, environment) => {
+    return count <= 0 ? empty_1() : new _definition2.Observable((subscriber, environment) => {
       let buffer = [];
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
           buffer.push(value);
           count < buffer.length && buffer.shift();
@@ -1923,11 +1934,12 @@ function takeLast(count) {
             subscriber.next(value);
           }
           subscriber.complete();
+        },
+        finalize: () => {
+          buffer = null;
         }
-      }, () => {
-        buffer = null;
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 /**
@@ -1935,27 +1947,27 @@ function takeLast(count) {
  */
 function takeUntil(notifier) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
-      from_1(notifier).provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+    return new _definition2.Observable((subscriber, environment) => {
+      from_1(notifier).provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: () => subscriber.complete(),
         complete: tsplus_module_2.noop
-      }));
-      !subscriber.closed && source.provideEnvironment(environment).subscribe(subscriber);
-    })(fa);
+      })(subscriber));
+      !subscriber._closed && fa.provideEnvironment(environment).subscribe(subscriber);
+    });
   };
 }
 function takeWhileWithIndex_1(predicate, inclusive) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((subscriber, environment) => {
       let index = 0;
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
           const result = predicate(index++, value);
           (result || inclusive) && subscriber.next(value);
           !result && subscriber.complete();
         }
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 function takeWhile(predicate, inclusive) {
@@ -1968,8 +1980,8 @@ function takeWhile(predicate, inclusive) {
  */
 function tap(observer) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+    return new _definition2.Observable((subscriber, environment) => {
+      fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
           observer.next?.(value);
           subscriber.next(value);
@@ -1982,8 +1994,8 @@ function tap(observer) {
           observer.complete?.();
           subscriber.complete();
         }
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 const defaultThrottleConfig = exports.defaultThrottleConfig = {
@@ -1998,8 +2010,8 @@ function throttle_1(durationSelector, {
   trailing
 } = defaultThrottleConfig) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
-      let sendValue = tsplus_module_17.nothing(fileName_1 + ":2375:51");
+    return new _definition2.Observable((subscriber, environment) => {
+      let sendValue = tsplus_module_17.nothing(fileName_1 + ":2363:51");
       let throttled = null;
       let isComplete = false;
       const endThrottling = () => {
@@ -2014,31 +2026,31 @@ function throttle_1(durationSelector, {
         throttled = null;
         isComplete && subscriber.complete();
       };
-      const startThrottling = value => throttled = from_1(durationSelector(value)).provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      const startThrottling = value => throttled = from_1(durationSelector(value)).provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: endThrottling,
         complete: cleanupThrottling
-      }));
+      })(subscriber));
       const send = () => {
         if (tsplus_module_18.isJust(sendValue)) {
           const {
             value
           } = sendValue;
-          sendValue = tsplus_module_17.nothing(fileName_1 + ":2397:36");
+          sendValue = tsplus_module_17.nothing(fileName_1 + ":2385:36");
           subscriber.next(value);
           !isComplete && startThrottling(value);
         }
       };
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
-          sendValue = tsplus_module_17.just(value, fileName_1 + ":2405:29");
-          !(throttled && !throttled.closed) && (leading ? send() : startThrottling(value));
+          sendValue = tsplus_module_17.just(value, fileName_1 + ":2393:29");
+          !(throttled && !throttled._closed) && (leading ? send() : startThrottling(value));
         },
         complete: () => {
           isComplete = true;
-          !(trailing && tsplus_module_18.isJust(sendValue) && throttled && !throttled.closed) && subscriber.complete();
+          !(trailing && tsplus_module_18.isJust(sendValue) && throttled && !throttled._closed) && subscriber.complete();
         }
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 /**
@@ -2067,11 +2079,11 @@ function timeout(config) {
       scheduler = tsplus_module_5.asyncScheduler,
       meta = null
     } = config;
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((subscriber, environment) => {
       // eslint-disable-next-line prefer-const
       let originalSourceSubscription;
       let timerSubscription;
-      let lastValue = tsplus_module_17.nothing(fileName_1 + ":2486:40");
+      let lastValue = tsplus_module_17.nothing(fileName_1 + ":2474:40");
       let seen = 0;
       const startTimer = delay => {
         timerSubscription = (0, _Scheduler.caughtSchedule)(subscriber, scheduler, () => {
@@ -2083,22 +2095,23 @@ function timeout(config) {
           })).provideEnvironment(environment).subscribe(subscriber);
         }, delay);
       };
-      originalSourceSubscription = source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      originalSourceSubscription = fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
           timerSubscription?.unsubscribe();
           seen++;
-          lastValue = tsplus_module_17.just(value, fileName_1 + ":2514:31");
+          lastValue = tsplus_module_17.just(value, fileName_1 + ":2500:29");
           subscriber.next(value);
           each > 0 && startTimer(each);
+        },
+        finalize: () => {
+          if (!timerSubscription?._closed) {
+            timerSubscription?.unsubscribe();
+          }
+          lastValue = tsplus_module_17.nothing(fileName_1 + ":2508:32");
         }
-      }, () => {
-        if (!timerSubscription?.closed) {
-          timerSubscription?.unsubscribe();
-        }
-        lastValue = tsplus_module_17.nothing(fileName_1 + ":2523:32");
-      }));
+      })(subscriber));
       startTimer(first != null ? typeof first === "number" ? first : +first - scheduler.now() : each);
-    })(fa);
+    });
   };
 }
 function timeoutError(info) {
@@ -2111,18 +2124,18 @@ function toArrayAccumulator(arr, value) {
  * @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);
-  })(fa);
+  return new _definition2.Observable((subscriber, environment) => {
+    foldLeft_1([], toArrayAccumulator)(fa).provideEnvironment(environment).subscribe(subscriber);
+  });
 }
 /**
  * @tsplus pipeable fncts.observable.Observable unique
  */
 function unique(toKey, flushes) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((subscriber, environment) => {
       let distinctKeys = tsplus_module_21.empty();
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
           const key = toKey ? toKey(value) : value;
           if (!tsplus_module_21.has(key)(distinctKeys)) {
@@ -2130,21 +2143,21 @@ function unique(toKey, flushes) {
             subscriber.next(value);
           }
         }
-      }));
-      flushes?.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      })(subscriber));
+      flushes?.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: () => distinctKeys = tsplus_module_21.empty(),
         complete: tsplus_module_2.noop
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 function uniqueUntilChanged_1(E, keySelector = tsplus_module_13.identity) {
   return fa => {
     const compare = "equals" in E ? E.equals : E;
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new _definition2.Observable((subscriber, environment) => {
       let previousKey;
       let first = true;
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+      fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
           const currentKey = keySelector(value);
           if (first || !compare(previousKey, currentKey)) {
@@ -2153,8 +2166,8 @@ function uniqueUntilChanged_1(E, keySelector = tsplus_module_13.identity) {
             subscriber.next(value);
           }
         }
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 function uniqueUntilKeyChanged(key, equals) {
@@ -2176,7 +2189,7 @@ function combineLatestInternal(subscriber, environment, observables, scheduler,
       maybeSchedule(subscriber, scheduler, () => {
         const source = scheduler ? scheduled_1(scheduler)(observables[i]) : from_1(observables[i]);
         let hasFirstValue = false;
-        source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+        source.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
           next: value => {
             values[i] = value;
             if (!hasFirstValue) {
@@ -2192,28 +2205,28 @@ function combineLatestInternal(subscriber, environment, observables, scheduler,
               subscriber.complete();
             }
           }
-        }));
+        })(subscriber));
       });
     }
   });
 }
-function findInternal(predicate, emit) {
+function findInternal(source, predicate, emit) {
   const findIndex = emit === "index";
-  return (source, subscriber, environment) => {
+  return (subscriber, environment) => {
     let index = 0;
-    source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+    source.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
       next: value => {
         const i = index++;
         if (predicate(index++, value)) {
-          subscriber.next(findIndex ? i : tsplus_module_17.just(value, fileName_1 + ":2693:49"));
+          subscriber.next(findIndex ? i : tsplus_module_17.just(value, fileName_1 + ":2678:49"));
           subscriber.complete();
         }
       },
       complete: () => {
-        subscriber.next(findIndex ? -1 : tsplus_module_17.nothing(fileName_1 + ":2698:51"));
+        subscriber.next(findIndex ? -1 : tsplus_module_17.nothing(fileName_1 + ":2683:51"));
         subscriber.complete();
       }
-    }));
+    })(subscriber));
   };
 }
 function joinAllInternal(fa, joiner) {
@@ -2279,22 +2292,20 @@ function mergeInternal(source, subscriber, environment, f, concurrent, onBeforeN
     additionalTeardown?.();
   };
 }
-function scanInternal(f, initial, hasInitial, emitOnNext, emitBeforeComplete) {
-  return (source, subscriber, environment) => {
-    let hasState = hasInitial;
-    let state = initial;
-    let index = 0;
-    source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
-      next: value => {
-        const i = index++;
-        state = hasState ? f(i, state, value) : (hasState = true, value);
-        emitOnNext && subscriber.next(state);
-      },
-      complete: emitBeforeComplete && (() => {
-        hasState && subscriber.next(state);
-        subscriber.complete();
-      })
-    }));
-  };
+function scanInternal(source, subscriber, environment, f, initial, hasInitial, emitOnNext, emitBeforeComplete) {
+  let hasState = hasInitial;
+  let state = initial;
+  let index = 0;
+  return source.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
+    next: value => {
+      const i = index++;
+      state = hasState ? f(i, state, value) : (hasState = true, value);
+      emitOnNext && subscriber.next(state);
+    },
+    complete: emitBeforeComplete && (() => {
+      hasState && subscriber.next(state);
+      subscriber.complete();
+    })
+  })(subscriber));
 }
 //# sourceMappingURL=api.cjs.map