synstate 0.1.1 → 1.0.0

package/src/core/operators/skip-if-no-change.mts

@@ -4,7 +4,7 @@ import {
   type KeepInitialValueOperator,
   type Observable,
   type SkipIfNoChangeOperatorObservable,
-  type UpdaterSymbol,
+  type UpdateToken,
 } from '../types/index.mjs';
 
 /**
@@ -19,8 +19,8 @@ import {
  * ```ts
  * //  Timeline:
  * //
- * //  num$      1     1     2     2     2     3
- * //  distinct$ 1           2                 3
+ * //  num$      1     1     2     2     1     2     3     2
+ * //  distinct$ 1           2           1     2     3     2
  * //
  * //  Explanation:
  * //  - skipIfNoChange filters out consecutive duplicate values
@@ -31,29 +31,41 @@ import {
  *
  * const distinct$ = num$.pipe(skipIfNoChange());
  *
- * const mut_history: number[] = [];
+ * const valueHistory: number[] = [];
  *
  * distinct$.subscribe((x) => {
- *   mut_history.push(x);
+ *   valueHistory.push(x);
  * });
  *
  * num$.next(1); // logs: 1
  *
- * assert.deepStrictEqual(mut_history, [1]);
+ * assert.deepStrictEqual(valueHistory, [1]);
  *
  * num$.next(1); // nothing logged
  *
- * assert.deepStrictEqual(mut_history, [1]);
+ * assert.deepStrictEqual(valueHistory, [1]);
  *
  * num$.next(2); // logs: 2
  *
- * assert.deepStrictEqual(mut_history, [1, 2]);
+ * assert.deepStrictEqual(valueHistory, [1, 2]);
  *
  * num$.next(2); // nothing logged
  *
+ * num$.next(1); // logs: 1
+ *
+ * assert.deepStrictEqual(valueHistory, [1, 2, 1]);
+ *
+ * num$.next(2); // logs: 2
+ *
+ * assert.deepStrictEqual(valueHistory, [1, 2, 1, 2]);
+ *
  * num$.next(3); // logs: 3
  *
- * assert.deepStrictEqual(mut_history, [1, 2, 3]);
+ * assert.deepStrictEqual(valueHistory, [1, 2, 1, 2, 3]);
+ *
+ * num$.next(2); // logs: 2
+ *
+ * assert.deepStrictEqual(valueHistory, [1, 2, 1, 2, 3, 2]);
  * ```
  */
 export const skipIfNoChange = <A,>(
@@ -67,10 +79,10 @@ export const skipIfNoChange = <A,>(
     )) as KeepInitialValueOperator<A, A>;
 
 /**
- * Alias for `skipIfNoChange()`.
+ * Alias for `skipIfNoChange`.
  * @see skipIfNoChange
  */
-export const distinctUntilChanged = skipIfNoChange; // alias
+export const distinctUntilChanged = skipIfNoChange;
 
 class SkipIfNoChangeObservableClass<A>
   extends SyncChildObservableClass<A, readonly [A]>
@@ -92,12 +104,12 @@ class SkipIfNoChangeObservableClass<A>
     this.#eq = eq;
   }
 
-  override tryUpdate(updaterSymbol: UpdaterSymbol): void {
+  override tryUpdate(updateToken: UpdateToken): void {
     const par = this.parents[0];
 
     const sn = par.getSnapshot();
 
-    if (par.updaterSymbol !== updaterSymbol || Optional.isNone(sn)) {
+    if (par.updateToken !== updateToken || Optional.isNone(sn)) {
       return; // skip update
     }
 
@@ -109,7 +121,7 @@ class SkipIfNoChangeObservableClass<A>
     this.#mut_previousValue = sn;
 
     if (cond) {
-      this.setNext(sn.value, updaterSymbol);
+      this.setNext(sn.value, updateToken);
     }
   }
 }

package/src/core/operators/skip-until.mts

@@ -4,7 +4,7 @@ import {
   type DropInitialValueOperator,
   type Observable,
   type SkipUntilOperatorObservable,
-  type UpdaterSymbol,
+  type UpdateToken,
 } from '../types/index.mjs';
 
 /**
@@ -34,27 +34,27 @@ import {
  *
  * const skipped$ = num$.pipe(skipUntil(startNotifier));
  *
- * const mut_history: number[] = [];
+ * const valueHistory: number[] = [];
  *
  * skipped$.subscribe((x) => {
- *   mut_history.push(x);
+ *   valueHistory.push(x);
  * });
  *
  * num$.next(1); // nothing logged
  *
  * num$.next(2); // nothing logged
  *
- * assert.deepStrictEqual(mut_history, []);
+ * assert.deepStrictEqual(valueHistory, []);
  *
  * start_();
  *
  * num$.next(4); // logs: 4
  *
- * assert.deepStrictEqual(mut_history, [4]);
+ * assert.deepStrictEqual(valueHistory, [4]);
  *
  * num$.next(5); // logs: 5
  *
- * assert.deepStrictEqual(mut_history, [4, 5]);
+ * assert.deepStrictEqual(valueHistory, [4, 5]);
  * ```
  */
 export const skipUntil =
@@ -86,19 +86,19 @@ class SkipUntilObservableClass<A>
     );
   }
 
-  override tryUpdate(updaterSymbol: UpdaterSymbol): void {
+  override tryUpdate(updateToken: UpdateToken): void {
     const par = this.parents[0];
 
     const sn = par.getSnapshot();
 
     if (
-      par.updaterSymbol !== updaterSymbol ||
+      par.updateToken !== updateToken ||
       Optional.isNone(sn) ||
       this.#mut_isSkipping
     ) {
       return; // skip update
     }
 
-    this.setNext(sn.value, updaterSymbol);
+    this.setNext(sn.value, updateToken);
   }
 }

package/src/core/operators/skip-while.mts

@@ -1,16 +1,10 @@
-import {
-  Optional,
-  PositiveSafeInt,
-  SafeUint,
-  asSafeUint,
-  pipe,
-} from 'ts-data-forge';
+import { Optional, SafeUint, asSafeUint, pipe } from 'ts-data-forge';
 import { SyncChildObservableClass } from '../class/index.mjs';
 import {
   type DropInitialValueOperator,
   type Observable,
   type SkipWhileOperatorObservable,
-  type UpdaterSymbol,
+  type UpdateToken,
 } from '../types/index.mjs';
 
 /**
@@ -25,9 +19,9 @@ import {
  * ```ts
  * //  Timeline:
  * //
- * //  num$        1     2     3     4     5     6     7
- * //  skipped$                      5     6     7
- * //              |---- skip -----|
+ * //  num$        1     2     3     4     5     6     7     1     2
+ * //  skipped$                            5     6     7     1     2
+ * //              |-------- skip --------|
  * //
  * //  Explanation:
  * //  - skipWhile skips values while the predicate returns true
@@ -38,27 +32,37 @@ import {
  *
  * const skipped$ = num$.pipe(skipWhile((x) => x < 5));
  *
- * const mut_history: number[] = [];
+ * const valueHistory: number[] = [];
  *
  * skipped$.subscribe((x) => {
- *   mut_history.push(x);
+ *   valueHistory.push(x);
  * });
  *
  * num$.next(1); // nothing logged
  *
  * num$.next(2); // nothing logged
  *
+ * num$.next(3); // nothing logged
+ *
+ * num$.next(4); // nothing logged
+ *
  * num$.next(5); // logs: 5
  *
- * assert.deepStrictEqual(mut_history, [5]);
+ * assert.deepStrictEqual(valueHistory, [5]);
  *
  * num$.next(6); // logs: 6
  *
- * assert.deepStrictEqual(mut_history, [5, 6]);
+ * assert.deepStrictEqual(valueHistory, [5, 6]);
  *
  * num$.next(7); // logs: 7
  *
- * assert.deepStrictEqual(mut_history, [5, 6, 7]);
+ * assert.deepStrictEqual(valueHistory, [5, 6, 7]);
+ *
+ * num$.next(1); // logs: 1
+ *
+ * num$.next(2); // logs: 2
+ *
+ * assert.deepStrictEqual(valueHistory, [5, 6, 7, 1, 2]);
  * ```
  */
 export const skipWhile =
@@ -68,15 +72,6 @@ export const skipWhile =
   (parentObservable) =>
     new SkipWhileObservableClass(parentObservable, predicate);
 
-/* Specialized operators */
-
-export const skip = <A,>(
-  n: PositiveSafeIntWithSmallInt,
-): DropInitialValueOperator<A, A> =>
-  !PositiveSafeInt.is(n) ? idFn : skipWhile((_, index) => index + 1 <= n);
-
-const idFn = <T,>(value: T): T => value;
-
 /* implementation */
 
 class SkipWhileObservableClass<A>
@@ -85,6 +80,7 @@ class SkipWhileObservableClass<A>
 {
   readonly #predicate: (value: A, index: SafeUint | -1) => boolean;
   #mut_index: SafeUint | -1;
+  #mut_skipping: boolean;
 
   constructor(
     parentObservable: Observable<A>,
@@ -104,14 +100,16 @@ class SkipWhileObservableClass<A>
     this.#mut_index = -1;
 
     this.#predicate = predicate;
+
+    this.#mut_skipping = true;
   }
 
-  override tryUpdate(updaterSymbol: UpdaterSymbol): void {
+  override tryUpdate(updateToken: UpdateToken): void {
     const par = this.parents[0];
 
     const sn = par.getSnapshot();
 
-    if (par.updaterSymbol !== updaterSymbol || Optional.isNone(sn)) {
+    if (par.updateToken !== updateToken || Optional.isNone(sn)) {
       return; // skip update
     }
 
@@ -119,7 +117,11 @@ class SkipWhileObservableClass<A>
       this.#mut_index === -1 ? asSafeUint(0) : SafeUint.add(1, this.#mut_index);
 
     if (!this.#predicate(sn.value, this.#mut_index)) {
-      this.setNext(sn.value, updaterSymbol);
+      this.#mut_skipping = false;
+    }
+
+    if (!this.#mut_skipping) {
+      this.setNext(sn.value, updateToken);
     }
   }
 }

package/src/core/operators/switch-map.mts

@@ -5,7 +5,7 @@ import {
   type Observable,
   type Subscription,
   type SwitchMapOperatorObservable,
-  type UpdaterSymbol,
+  type UpdateToken,
 } from '../types/index.mjs';
 
 /**
@@ -21,50 +21,81 @@ import {
  * ```ts
  * //  Timeline:
  * //
- * //  searchQuery$  "a"       "ab"      "abc"
- * //  requests      fetch1    fetch2    fetch3
- * //  results$                cancel    cancel    result3
- * //                          fetch1    fetch2
+ * //  input$      A                          B              C
+ * //  inner A     A1    A2    A3
+ * //  inner B                                B1    B2      (switched!)
+ * //  inner C                                              C1    C2    C3
+ * //  result$     A1    A2    A3              B1    B2      C1    C2    C3
  * //
  * //  Explanation:
- * //  - switchMap cancels previous inner observables when a new value arrives
- * //  - Only the result from the latest search query is emitted
- * //  - Previous ongoing requests are cancelled
- * //  - Ideal for search-as-you-type scenarios
+ * //  - switchMap creates an inner observable for each source value
+ * //  - When a new source value arrives, the previous inner is unsubscribed
+ * //  - A's inner completes normally (all 3 values emitted)
+ * //  - B's inner is interrupted by C (only 2 values emitted)
+ * //  - C's inner completes normally (all 3 values emitted)
  *
- * const searchQuery$ = source<string>();
+ * const input$ = source<string>();
  *
- * const results$ = searchQuery$.pipe(
- *   switchMap((query) => {
- *     const result$ = source<string[]>();
+ * const result$ = input$.pipe(
+ *   switchMap((letter) => {
+ *     const inner$ = source<string>();
  *
  *     setTimeout(() => {
- *       result$.next([query]);
- *
- *       result$.complete();
+ *       inner$.next(`${letter}1`);
  *     }, 10);
  *
- *     return result$;
+ *     setTimeout(() => {
+ *       inner$.next(`${letter}2`);
+ *     }, 110);
+ *
+ *     setTimeout(() => {
+ *       inner$.next(`${letter}3`);
+ *     }, 210);
+ *
+ *     return inner$;
  *   }),
  * );
  *
- * const mut_history: string[][] = [];
+ * const valueHistory: string[] = [];
  *
- * results$.subscribe((value) => {
- *   mut_history.push(value);
+ * result$.subscribe((value) => {
+ *   valueHistory.push(value);
  * });
  *
- * searchQuery$.next('a');
+ * const sleep = (ms: number): Promise<void> =>
+ *   new Promise((resolve) => {
+ *     setTimeout(resolve, ms);
+ *   });
  *
- * searchQuery$.next('ab');
+ * // Emit A - inner emits A1, A2, A3 at 10ms, 110ms, 210ms
+ * input$.next('A');
  *
- * searchQuery$.next('abc');
+ * await sleep(250);
  *
- * await new Promise((resolve) => {
- *   setTimeout(resolve, 200);
- * });
+ * assert.deepStrictEqual(valueHistory, ['A1', 'A2', 'A3']);
+ *
+ * // Emit B - inner starts emitting B1, B2 at 10ms, 110ms
+ * input$.next('B');
+ *
+ * await sleep(150);
+ *
+ * assert.deepStrictEqual(valueHistory, ['A1', 'A2', 'A3', 'B1', 'B2']);
+ *
+ * // Emit C - switches away from B (B3 cancelled), C's inner starts
+ * input$.next('C');
+ *
+ * await sleep(250);
  *
- * assert.deepStrictEqual(mut_history, [['abc']]);
+ * assert.deepStrictEqual(valueHistory, [
+ *   'A1',
+ *   'A2',
+ *   'A3',
+ *   'B1',
+ *   'B2',
+ *   'C1',
+ *   'C2',
+ *   'C3',
+ * ]);
  * ```
  *
  * @note To improve code readability, consider using `createState` instead of `switchMap`,
@@ -101,12 +132,12 @@ class SwitchMapObservableClass<A, B>
     this.#mut_subscription = undefined;
   }
 
-  override tryUpdate(updaterSymbol: UpdaterSymbol): void {
+  override tryUpdate(updateToken: UpdateToken): void {
     const par = this.parents[0];
 
     const sn = par.getSnapshot();
 
-    if (par.updaterSymbol !== updaterSymbol || Optional.isNone(sn)) {
+    if (par.updateToken !== updateToken || Optional.isNone(sn)) {
       return; // skip update
     }
 

package/src/core/operators/take-until.mts

@@ -4,7 +4,7 @@ import {
   type KeepInitialValueOperator,
   type Observable,
   type TakeUntilOperatorObservable,
-  type UpdaterSymbol,
+  type UpdateToken,
 } from '../types/index.mjs';
 
 /**
@@ -34,25 +34,25 @@ import {
  *
  * const limited$ = num$.pipe(takeUntil(stopNotifier));
  *
- * const mut_history: number[] = [];
+ * const valueHistory: number[] = [];
  *
  * limited$.subscribe((x) => {
- *   mut_history.push(x);
+ *   valueHistory.push(x);
  * });
  *
  * num$.next(1); // logs: 1
  *
- * assert.deepStrictEqual(mut_history, [1]);
+ * assert.deepStrictEqual(valueHistory, [1]);
  *
  * num$.next(2); // logs: 2
  *
- * assert.deepStrictEqual(mut_history, [1, 2]);
+ * assert.deepStrictEqual(valueHistory, [1, 2]);
  *
  * stop_();
  *
  * num$.next(3); // nothing logged (completed)
  *
- * assert.deepStrictEqual(mut_history, [1, 2]);
+ * assert.deepStrictEqual(valueHistory, [1, 2]);
  * ```
  */
 export const takeUntil = <A,>(
@@ -85,15 +85,15 @@ class TakeUntilObservableClass<A>
     );
   }
 
-  override tryUpdate(updaterSymbol: UpdaterSymbol): void {
+  override tryUpdate(updateToken: UpdateToken): void {
     const par = this.parents[0];
 
     const sn = par.getSnapshot();
 
-    if (par.updaterSymbol !== updaterSymbol || Optional.isNone(sn)) {
+    if (par.updateToken !== updateToken || Optional.isNone(sn)) {
       return; // skip update
     }
 
-    this.setNext(sn.value, updaterSymbol);
+    this.setNext(sn.value, updateToken);
   }
 }

package/src/core/operators/take-while.mts

@@ -12,7 +12,7 @@ import {
   type InitializedObservable,
   type Observable,
   type TakeWhileOperatorObservable,
-  type UpdaterSymbol,
+  type UpdateToken,
 } from '../types/index.mjs';
 import { withInitialValue } from './with-initial-value.mjs';
 
@@ -28,7 +28,7 @@ import { withInitialValue } from './with-initial-value.mjs';
  * ```ts
  * //  Timeline:
  * //
- * //  num$      1     2     3     4     5     6 (ignored)
+ * //  num$      1     2     3     4     5     6     1     2 (ignored)
  * //  taken$    1     2     3     4     | (completes)
  * //
  * //  Explanation:
@@ -40,27 +40,35 @@ import { withInitialValue } from './with-initial-value.mjs';
  *
  * const taken$ = num$.pipe(takeWhile((x) => x < 5));
  *
- * const mut_history: number[] = [];
+ * const valueHistory: number[] = [];
  *
  * taken$.subscribe((x) => {
- *   mut_history.push(x);
+ *   valueHistory.push(x);
  * });
  *
  * num$.next(1); // logs: 1
  *
- * assert.deepStrictEqual(mut_history, [1]);
+ * assert.deepStrictEqual(valueHistory, [1]);
  *
  * num$.next(2); // logs: 2
  *
- * assert.deepStrictEqual(mut_history, [1, 2]);
+ * num$.next(3); // logs: 3
+ *
+ * num$.next(4); // logs: 4
+ *
+ * assert.deepStrictEqual(valueHistory, [1, 2, 3, 4]);
  *
  * num$.next(5); // nothing logged (completes)
  *
- * assert.deepStrictEqual(mut_history, [1, 2]);
+ * assert.deepStrictEqual(valueHistory, [1, 2, 3, 4]);
  *
  * num$.next(6); // nothing logged (already completed)
  *
- * assert.deepStrictEqual(mut_history, [1, 2]);
+ * assert.deepStrictEqual(valueHistory, [1, 2, 3, 4]);
+ *
+ * num$.next(1); // logs: 1
+ *
+ * assert.deepStrictEqual(valueHistory, [1, 2, 3, 4]);
  * ```
  */
 export const takeWhile =
@@ -70,12 +78,6 @@ export const takeWhile =
   (parentObservable) =>
     new TakeWhileObservableClass(parentObservable, predicate);
 
-/* Specialized operators */
-
-export const take = <A,>(
-  n: PositiveSafeIntWithSmallInt,
-): DropInitialValueOperator<A, A> => takeWhile((_, index) => index + 1 <= n);
-
 /* implementation */
 
 class TakeWhileObservableClass<A>
@@ -105,12 +107,12 @@ class TakeWhileObservableClass<A>
     this.#predicate = predicate;
   }
 
-  override tryUpdate(updaterSymbol: UpdaterSymbol): void {
+  override tryUpdate(updateToken: UpdateToken): void {
     const par = this.parents[0];
 
     const sn = par.getSnapshot();
 
-    if (par.updaterSymbol !== updaterSymbol || Optional.isNone(sn)) {
+    if (par.updateToken !== updateToken || Optional.isNone(sn)) {
       return; // skip update
     }
 
@@ -118,7 +120,7 @@ class TakeWhileObservableClass<A>
       this.#mut_index === -1 ? asSafeUint(0) : SafeUint.add(1, this.#mut_index);
 
     if (this.#predicate(sn.value, this.#mut_index)) {
-      this.setNext(sn.value, updaterSymbol);
+      this.setNext(sn.value, updateToken);
     } else {
       this.complete();
     }
@@ -133,7 +135,7 @@ if (import.meta.vitest !== undefined) {
   {
     const s: Observable<number> = source<number>();
 
-    const _d1 = s.pipe(take(3));
+    const _d1 = s.pipe(takeWhile((_, index) => index + 1 <= 3));
 
     expectType<typeof _d1, Observable<number>>('=');
   }
@@ -143,7 +145,7 @@ if (import.meta.vitest !== undefined) {
 
     const m: InitializedObservable<number> = s.pipe(withInitialValue(0));
 
-    const _d = m.pipe(take(3));
+    const _d = m.pipe(takeWhile((_, index) => index + 1 <= 3));
 
     expectType<typeof _d, Observable<number>>('=');
   }