@fncts/observable 0.0.26 → 0.0.28

package/_mjs/Observable/api.mjs

@@ -145,7 +145,7 @@ function from_1(input) {
 }
 export function fromArrayLike(input) {
   return new 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();
@@ -160,7 +160,7 @@ export function fromIterable(iterable) {
   return new Observable(s => {
     for (const value of iterable) {
       s.next(value);
-      if (s.closed) {
+      if (s._closed) {
         return;
       }
     }
@@ -170,7 +170,7 @@ export function fromIterable(iterable) {
 export function fromPromise(promise) {
   return new Observable(s => {
     promise.then(value => {
-      if (!s.closed) {
+      if (!s._closed) {
         s.next(value);
         s.complete();
       }
@@ -214,7 +214,7 @@ export function iterate(options) {
 async function process(asyncIterable, subscriber) {
   for await (const value of asyncIterable) {
     subscriber.next(value);
-    if (subscriber.closed) {
+    if (subscriber._closed) {
       return;
     }
   }
@@ -280,7 +280,7 @@ export function scheduleArray(input, scheduler) {
         s.complete();
       } else {
         s.next(input[i++]);
-        if (!s.closed) {
+        if (!s._closed) {
           this.schedule();
         }
       }
@@ -378,7 +378,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);
@@ -399,7 +399,7 @@ export 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);
@@ -431,7 +431,7 @@ function fromIO_1(io, scheduler = tsplus_module_5.asyncScheduler) {
     const scheduled = scheduler.schedule(() => {
       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();
         }
@@ -476,14 +476,14 @@ export function ap(fa) {
  */
 function mapWithIndex_1(f) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new 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));
+    });
   };
 }
 /**
@@ -507,21 +507,21 @@ function as_1(b) {
  */
 export 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 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
  */
 export function swap(fa) {
-  return tsplus_module_8.operate_((source, subscriber, environment) => {
-    source.provideEnvironment(environment).subscribe(new tsplus_module_8.OperatorSubscriber(subscriber, {
+  return new Observable((subscriber, environment) => {
+    return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
       next: value => {
         subscriber.error(tsplus_module_1.fail(value));
       },
@@ -532,17 +532,17 @@ export 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 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));
+    });
   };
 }
 export function filter(predicate) {
@@ -555,12 +555,12 @@ export function filter(predicate) {
  */
 function filterMapWithIndex_1(f) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new 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));
+    });
   };
 }
 /**
@@ -586,21 +586,21 @@ export function partition(predicate) {
  */
 function partitionMapWithIndex_1(f) {
   return fa => {
-    return [tsplus_module_8.operate_((source, subscriber, environment) => {
+    return [new 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 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));
+    })];
   };
 }
 /**
@@ -624,7 +624,9 @@ export 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 Observable((subscriber, environment) => {
+      return mergeInternal(ma, subscriber, environment, f, concurrent);
+    });
   };
 }
 /**
@@ -670,7 +672,9 @@ export function flatten(mma) {
  */
 function foldLeftWithIndex_1(initial, f) {
   return fa => {
-    return tsplus_module_8.operate_(scanInternal(f, initial, true, false, true))(fa);
+    return new Observable((subscriber, environment) => {
+      return scanInternal(fa, subscriber, environment, f, initial, true, false, true);
+    });
   };
 }
 /**
@@ -686,7 +690,7 @@ function foldLeft_1(initial, f) {
  */
 export function at(index) {
   return fa => {
-    return onEmpty_1(() => tsplus_module_17.nothing(fileName_1 + ":839: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))));
   };
 }
 /**
@@ -694,8 +698,8 @@ export 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 + ":849:40");
+    return new Observable((subscriber, environment) => {
+      let lastValue = tsplus_module_17.nothing(fileName_1 + ":853:40");
       let durationSubscriber = null;
       let isComplete = false;
       const endDuration = () => {
@@ -705,7 +709,7 @@ function audit_1(durationSelector) {
           const {
             value
           } = lastValue;
-          lastValue = tsplus_module_17.nothing(fileName_1 + ":857:36");
+          lastValue = tsplus_module_17.nothing(fileName_1 + ":861:36");
           subscriber.next(value);
         }
         isComplete && subscriber.complete();
@@ -714,9 +718,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 + ":869: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,
@@ -726,10 +730,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);
+    });
   };
 }
 /**
@@ -745,27 +749,27 @@ export function auditTime(duration, scheduler = tsplus_module_5.asyncScheduler)
  */
 export function buffer(closingNotifier) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new 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);
+    });
   };
 }
 /**
@@ -774,10 +778,10 @@ export function buffer(closingNotifier) {
 export function bufferCount(bufferSize, startBufferEvery) {
   return fa => {
     startBufferEvery = startBufferEvery ?? bufferSize;
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new 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) {
@@ -802,11 +806,12 @@ export function bufferCount(bufferSize, startBufferEvery) {
             subscriber.next(buffer);
           }
           subscriber.complete();
+        },
+        finalize: () => {
+          buffers = null;
         }
-      }, () => {
-        buffers = null;
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 /**
@@ -820,7 +825,7 @@ export function bufferTime(config) {
       maxBufferSize = Infinity,
       scheduler = tsplus_module_5.asyncScheduler
     } = config;
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new Observable((subscriber, environment) => {
       let bufferRecords = [];
       let restartOnEmit = true;
       const emit = record => {
@@ -848,10 +853,10 @@ export 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) {
@@ -869,10 +874,13 @@ export 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);
+    });
   };
 }
 /**
@@ -880,7 +888,7 @@ export function bufferTime(config) {
  */
 export function bufferToggle(openings, closingSelector) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new Observable((subscriber, environment) => {
       const buffers = [];
       from_1(openings).provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
         next: openValue => {
@@ -899,7 +907,7 @@ export 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);
@@ -911,8 +919,8 @@ export function bufferToggle(openings, closingSelector) {
           }
           subscriber.complete();
         }
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 /**
@@ -920,7 +928,7 @@ export function bufferToggle(openings, closingSelector) {
  */
 export function bufferWhen(closingSelector) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new Observable((subscriber, environment) => {
       let buffer = null;
       let closingSubscriber = null;
       const openBuffer = () => {
@@ -934,14 +942,15 @@ export 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));
+    });
   };
 }
 /**
@@ -949,13 +958,13 @@ export function bufferWhen(closingSelector) {
  */
 function catchAllCause_1(f) {
   return self => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new 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;
@@ -964,13 +973,13 @@ function catchAllCause_1(f) {
             syncUnsub = true;
           }
         }
-      }));
+      })(subscriber));
       if (syncUnsub) {
         innerSub.unsubscribe();
         innerSub = null;
         handledResult.provideEnvironment(environment).subscribe(subscriber);
       }
-    })(self);
+    });
   };
 }
 /**
@@ -984,9 +993,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 Observable((subscriber, environment) => {
+      return concatAll_1(fromArrayLike([fa, ...sources])).provideEnvironment(environment).subscribe(subscriber);
+    });
   };
 }
 /**
@@ -1023,11 +1032,11 @@ export 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 Observable((subscriber, environment) => {
+      return combineLatestInternal(subscriber, environment, [self, ...sources]);
+    });
   };
 }
 /**
@@ -1043,8 +1052,8 @@ export function zipWithLatest(that, f) {
  */
 export function debounceWith(durationSelector) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
-      let lastValue = tsplus_module_17.nothing(fileName_1 + ":1287:40");
+    return new Observable((subscriber, environment) => {
+      let lastValue = tsplus_module_17.nothing(fileName_1 + ":1288:40");
       let durationSubscriber = null;
       const emit = () => {
         durationSubscriber?.unsubscribe();
@@ -1053,28 +1062,29 @@ export function debounceWith(durationSelector) {
           const {
             value
           } = lastValue;
-          lastValue = tsplus_module_17.nothing(fileName_1 + ":1294: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 + ":1304: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));
+    });
   };
 }
 /**
@@ -1082,7 +1092,7 @@ export function debounceWith(durationSelector) {
  */
 export function debounce(dueTime, scheduler = tsplus_module_5.asyncScheduler) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new Observable((subscriber, environment) => {
       let activeTask = null;
       let lastValue = null;
       let lastTime = null;
@@ -1105,7 +1115,7 @@ export 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();
@@ -1117,27 +1127,28 @@ export 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
  */
 export function either(fa) {
-  return tsplus_module_8.operate_((source, subscriber, environment) => {
-    source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+  return new Observable((subscriber, environment) => {
+    return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
       next: value => {
-        subscriber.next(tsplus_module_19.right(value, fileName_1 + ":1384: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 + ":1388: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
@@ -1168,39 +1179,39 @@ export function delay(due, scheduler = tsplus_module_5.asyncScheduler) {
  * @tsplus getter fncts.observable.Observable dematerialize
  */
 export function dematerialize(fa) {
-  return tsplus_module_8.operate_((source, subscriber, environment) => {
-    source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+  return new 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
  */
 export function ensuring(finalizer) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
-      source.provideEnvironment(environment).subscribe(subscriber);
+    return new Observable((subscriber, environment) => {
       subscriber.add(finalizer);
-    })(fa);
+      return fa.provideEnvironment(environment).subscribe(subscriber);
+    });
   };
 }
 /**
  * @tsplus getter fncts.observable.Observable exhaustAll
  */
 export function exhaustAll(ffa) {
-  return tsplus_module_8.operate_((source, subscriber, environment) => {
+  return new 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: () => {
@@ -1208,26 +1219,26 @@ export 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 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);
           }
         },
@@ -1235,8 +1246,8 @@ function exhaustMapWithIndex_1(f) {
           isComplete = true;
           !innerSub && subscriber.complete();
         }
-      }));
-    })(self);
+      })(subscriber));
+    });
   };
 }
 /**
@@ -1253,7 +1264,9 @@ export 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 Observable((subscriber, environment) => {
+      return mergeInternal(fa, subscriber, environment, f, concurrent, undefined, true);
+    });
   };
 }
 /**
@@ -1266,7 +1279,7 @@ export function expand(f, concurrent = Infinity) {
 }
 function findWithIndex_1(predicate) {
   return fa => {
-    return tsplus_module_8.operate_(findInternal(predicate, "value"))(fa);
+    return new Observable(findInternal(fa, predicate, "value"));
   };
 }
 export function find(predicate) {
@@ -1276,7 +1289,7 @@ export function find(predicate) {
 }
 function findIndexWithIndex_1(predicate) {
   return fa => {
-    return tsplus_module_8.operate_(findInternal(predicate, "index"))(fa);
+    return new Observable(findInternal(fa, predicate, "index"));
   };
 }
 export function findIndex(predicate) {
@@ -1289,7 +1302,7 @@ export function forkJoin(...args) {
     args: sources,
     keys
   } = arrayOrObject(args);
-  return new Observable(s => {
+  return new Observable((s, environment) => {
     const length = sources.length;
     if (!length) {
       s.complete();
@@ -1300,7 +1313,7 @@ export 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;
@@ -1320,7 +1333,7 @@ export function forkJoin(...args) {
             s.complete();
           }
         }
-      }));
+      })(s));
     }
   });
 }
@@ -1328,18 +1341,18 @@ export function forkJoin(...args) {
  * @tsplus getter fncts.observable.Observable ignore
  */
 export function ignore(fa) {
-  return tsplus_module_8.operate_((source, subscriber, environment) => {
-    source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+  return new 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
  */
 export function isEmpty(fa) {
-  return tsplus_module_8.operate_((source, subscriber, environment) => {
-    source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+  return new Observable((subscriber, environment) => {
+    return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
       next: () => {
         subscriber.next(false);
         subscriber.complete();
@@ -1348,15 +1361,15 @@ export function isEmpty(fa) {
         subscriber.next(true);
         subscriber.complete();
       }
-    }));
-  })(fa);
+    })(subscriber));
+  });
 }
 /**
  * @tsplus getter fncts.observable.Observable materialize
  */
 export function materialize(fa) {
-  return tsplus_module_8.operate_((source, subscriber, environment) => {
-    source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+  return new Observable((subscriber, environment) => {
+    return fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
       next: value => {
         subscriber.next(tsplus_module_20.next(value));
       },
@@ -1366,8 +1379,8 @@ export function materialize(fa) {
       complete: () => {
         subscriber.next(tsplus_module_20.complete());
       }
-    }));
-  })(fa);
+    })(subscriber));
+  });
 }
 /**
  * @tsplus pipeable fncts.observable.Observable mergeAll
@@ -1382,12 +1395,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 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);
+    });
   };
 }
 /**
@@ -1399,10 +1412,10 @@ export function mergeScan(initial, f, concurrent = Infinity) {
   };
 }
 export function onErrorResumeNext(fa, ...sources) {
-  return tsplus_module_8.operate_((source, subscriber, environment) => {
-    const remaining = [source, ...sources];
+  return new Observable((subscriber, environment) => {
+    const remaining = [fa, ...sources];
     const subscribeNext = () => {
-      if (!subscriber.closed) {
+      if (!subscriber._closed) {
         if (remaining.length > 0) {
           let nextSource;
           try {
@@ -1411,10 +1424,10 @@ export 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 {
@@ -1423,16 +1436,16 @@ export 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 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);
@@ -1443,8 +1456,8 @@ function onEmpty_1(f) {
           }
           subscriber.complete();
         }
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 /**
@@ -1452,12 +1465,12 @@ function onEmpty_1(f) {
  */
 export function repeat(count = Infinity) {
   return fa => {
-    return count <= 0 ? empty_1() : tsplus_module_8.operate_((source, subscriber, environment) => {
+    return count <= 0 ? empty_1() : new 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) {
@@ -1471,7 +1484,7 @@ export function repeat(count = Infinity) {
               subscriber.complete;
             }
           }
-        }));
+        })(subscriber));
         if (syncUnsub) {
           innerSub.unsubscribe();
           innerSub = null;
@@ -1479,7 +1492,7 @@ export function repeat(count = Infinity) {
         }
       };
       loop();
-    })(fa);
+    });
   };
 }
 export function retry(configOrCount = Infinity) {
@@ -1496,12 +1509,12 @@ export function retry(configOrCount = Infinity) {
       count,
       resetOnSuccess = false
     } = config;
-    return count <= 0 ? fa : tsplus_module_8.operate_((source, subscriber, environment) => {
+    return count <= 0 ? fa : new 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;
@@ -1521,7 +1534,7 @@ export function retry(configOrCount = Infinity) {
               subscriber.error(err);
             }
           }
-        }));
+        })(subscriber));
         if (syncUnsub) {
           innerSub.unsubscribe();
           innerSub = null;
@@ -1529,7 +1542,7 @@ export function retry(configOrCount = Infinity) {
         }
       };
       loop();
-    })(fa);
+    });
   };
 }
 /**
@@ -1537,15 +1550,15 @@ export function retry(configOrCount = Infinity) {
  */
 function sample_1(notifier) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new 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;
@@ -1554,11 +1567,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));
+    });
   };
 }
 /**
@@ -1574,7 +1587,7 @@ export 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 Observable((subscriber, environment) => scanInternal(fa, subscriber, environment, f, initial, true, true));
   };
 }
 /**
@@ -1588,7 +1601,7 @@ export function scanLeft(initial, f) {
 /**
  * @tsplus static fncts.observable.ObservableOps service
  */
-export function service( /** @tsplus auto */tag) {
+export function service(/** @tsplus auto */tag) {
   return serviceWithObservable_1(service => of_1(service), tag);
 }
 /**
@@ -1616,10 +1629,10 @@ export function skip(count) {
  */
 export function skipLast(skipCount) {
   return fa => {
-    return skipCount <= 0 ? fa : tsplus_module_8.operate_((source, subscriber, environment) => {
+    return skipCount <= 0 ? fa : new 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) {
@@ -1631,11 +1644,11 @@ export function skipLast(skipCount) {
             subscriber.next(oldValue);
           }
         }
-      }));
+      })(subscriber));
       return () => {
         ring = null;
       };
-    })(fa);
+    });
   };
 }
 /**
@@ -1643,20 +1656,20 @@ export function skipLast(skipCount) {
  */
 export function skipUntil(notifier) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new 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));
+    });
   };
 }
 /**
@@ -1664,13 +1677,13 @@ export function skipUntil(notifier) {
  */
 export function skipWhile(predicate) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new 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));
+    });
   };
 }
 /**
@@ -1678,10 +1691,10 @@ export function skipWhile(predicate) {
  */
 export function startWith(...values) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber) => {
+    return new Observable((subscriber, environment) => {
       // @ts-expect-error
-      concat_1(values)(source).subscribe(subscriber);
-    })(fa);
+      return concat_1(values)(fa).provideEnvironment(environment).subscribe(subscriber);
+    });
   };
 }
 /**
@@ -1689,9 +1702,9 @@ export function startWith(...values) {
  */
 export 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 Observable((subscriber, environment) => {
+      subscriber.add(scheduler.schedule(() => fa.provideEnvironment(environment).subscribe(subscriber), delay));
+    });
   };
 }
 /**
@@ -1705,28 +1718,29 @@ export function switchAll(ffa) {
  */
 function switchMapWithIndex_1(f) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new 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));
+    });
   };
 }
 /**
@@ -1742,13 +1756,13 @@ function switchMap_1(f) {
  */
 function switchScanWithIndex_1(initial, f) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new 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);
+    });
   };
 }
 /**
@@ -1764,9 +1778,9 @@ export 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 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);
@@ -1775,8 +1789,8 @@ function take_1(count) {
             }
           }
         }
-      }));
-    })(fa);
+      })(sub));
+    });
   };
 }
 /**
@@ -1784,9 +1798,9 @@ function take_1(count) {
  */
 export function takeLast(count) {
   return fa => {
-    return count <= 0 ? empty_1() : tsplus_module_8.operate_((source, subscriber, environment) => {
+    return count <= 0 ? empty_1() : new 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();
@@ -1796,11 +1810,12 @@ export function takeLast(count) {
             subscriber.next(value);
           }
           subscriber.complete();
+        },
+        finalize: () => {
+          buffer = null;
         }
-      }, () => {
-        buffer = null;
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 /**
@@ -1808,27 +1823,27 @@ export function takeLast(count) {
  */
 export 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 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 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));
+    });
   };
 }
 export function takeWhile(predicate, inclusive) {
@@ -1841,8 +1856,8 @@ export function takeWhile(predicate, inclusive) {
  */
 export function tap(observer) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
-      source.provideEnvironment(environment).subscribe(tsplus_module_8.operatorSubscriber(subscriber, {
+    return new Observable((subscriber, environment) => {
+      fa.provideEnvironment(environment).subscribe(tsplus_module_8.operate_({
         next: value => {
           observer.next?.(value);
           subscriber.next(value);
@@ -1855,8 +1870,8 @@ export function tap(observer) {
           observer.complete?.();
           subscriber.complete();
         }
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 export const defaultThrottleConfig = {
@@ -1871,8 +1886,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 + ":2372:51");
+    return new Observable((subscriber, environment) => {
+      let sendValue = tsplus_module_17.nothing(fileName_1 + ":2363:51");
       let throttled = null;
       let isComplete = false;
       const endThrottling = () => {
@@ -1887,31 +1902,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 + ":2394: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 + ":2402: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));
+    });
   };
 }
 /**
@@ -1939,11 +1954,11 @@ export function timeout(config) {
       scheduler = tsplus_module_5.asyncScheduler,
       meta = null
     } = config;
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new Observable((subscriber, environment) => {
       // eslint-disable-next-line prefer-const
       let originalSourceSubscription;
       let timerSubscription;
-      let lastValue = tsplus_module_17.nothing(fileName_1 + ":2483:40");
+      let lastValue = tsplus_module_17.nothing(fileName_1 + ":2474:40");
       let seen = 0;
       const startTimer = delay => {
         timerSubscription = caughtSchedule(subscriber, scheduler, () => {
@@ -1955,22 +1970,23 @@ export 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 + ":2511: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 + ":2520:32");
-      }));
+      })(subscriber));
       startTimer(first != null ? typeof first === "number" ? first : +first - scheduler.now() : each);
-    })(fa);
+    });
   };
 }
 function timeoutError(info) {
@@ -1983,18 +1999,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 Observable((subscriber, environment) => {
+    foldLeft_1([], toArrayAccumulator)(fa).provideEnvironment(environment).subscribe(subscriber);
+  });
 }
 /**
  * @tsplus pipeable fncts.observable.Observable unique
  */
 export function unique(toKey, flushes) {
   return fa => {
-    return tsplus_module_8.operate_((source, subscriber, environment) => {
+    return new 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)) {
@@ -2002,21 +2018,21 @@ export 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 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)) {
@@ -2025,8 +2041,8 @@ function uniqueUntilChanged_1(E, keySelector = tsplus_module_13.identity) {
             subscriber.next(value);
           }
         }
-      }));
-    })(fa);
+      })(subscriber));
+    });
   };
 }
 export function uniqueUntilKeyChanged(key, equals) {
@@ -2048,7 +2064,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) {
@@ -2064,28 +2080,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 + ":2690: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 + ":2695:51"));
+        subscriber.next(findIndex ? -1 : tsplus_module_17.nothing(fileName_1 + ":2683:51"));
         subscriber.complete();
       }
-    }));
+    })(subscriber));
   };
 }
 export function joinAllInternal(fa, joiner) {
@@ -2151,22 +2167,20 @@ function mergeInternal(source, subscriber, environment, f, concurrent, onBeforeN
     additionalTeardown?.();
   };
 }
-export 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();
-      })
-    }));
-  };
+export 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.mjs.map