test: add missing tests

crimx · crimx · commit 7f3b8f94ca94 · 2025-11-05T17:04:42.000+08:00
diff --git a/src/collections/reactiveArray.ts b/src/collections/reactiveArray.ts
@@ -1,7 +1,7 @@
 import { batchFlush, batchStart, batchTasks } from "../batch";
 import { type RemoveListener } from "../event";
+import { type ReadableProvider, type OwnedWritable, type Readable } from "../interface";
 import { writable } from "../readable";
-import { type ReadableProvider, type OwnedWritable, type Readable } from "../typings";
 import { strictEqual } from "../utils";
 import { onDisposeValue, type OnDisposeValue } from "./utils";
 
diff --git a/src/collections/reactiveMap.ts b/src/collections/reactiveMap.ts
@@ -1,7 +1,7 @@
 import { batchFlush, batchStart, type BatchTask, batchTasks } from "../batch";
 import { type EventObject, on, type RemoveListener, send, size } from "../event";
+import { type ReadableProvider, type OwnedWritable, type Readable } from "../interface";
 import { writable } from "../readable";
-import { type ReadableProvider, type OwnedWritable, type Readable } from "../typings";
 import { strictEqual } from "../utils";
 import { onDisposeValue, type OnDisposeValue } from "./utils";
 
@@ -37,6 +37,7 @@ export class OwnedReactiveMap<K, V> extends Map<K, V> implements ReadableProvide
         batchTask_: () => {
           if (this._onChanged_ && size(this._onChanged_)) {
             const { upsert_, delete_ } = this._onChanged_;
+            /** c8 ignore else -- @preserve */
             if (upsert_.size > 0 || delete_.size > 0) {
               const changedData = {
                 upsert: [...upsert_],
@@ -141,17 +142,17 @@ export class OwnedReactiveMap<K, V> extends Map<K, V> implements ReadableProvide
   public override clear(): void {
     if (this.size) {
       const isBatchTop = batchStart();
-      if (this.onDisposeValue_ || this._onChanged_) {
-        for (const [key, value] of this) {
-          if (this.onDisposeValue_) {
-            this.onDisposeValue_.delete_.add(value);
-            batchTasks.add(this.onDisposeValue_);
-          }
-          if (this._onChanged_) {
-            this._onChanged_.delete_.add(key);
-            this._onChanged_.upsert_.delete(key);
-            batchTasks.add(this._onChanged_);
-          }
+      if (this.onDisposeValue_) {
+        for (const value of this.values()) {
+          this.onDisposeValue_.delete_.add(value);
+          batchTasks.add(this.onDisposeValue_);
+        }
+      }
+      if (this._onChanged_) {
+        for (const key of this.keys()) {
+          this._onChanged_.delete_.add(key);
+          this._onChanged_.upsert_.delete(key);
+          batchTasks.add(this._onChanged_);
         }
       }
       super.clear();
diff --git a/src/collections/reactiveSet.ts b/src/collections/reactiveSet.ts
@@ -1,7 +1,7 @@
 import { batchFlush, batchStart, type BatchTask, batchTasks } from "../batch";
 import { type EventObject, on, type RemoveListener, send, size } from "../event";
+import { type ReadableProvider, type OwnedWritable, type Readable } from "../interface";
 import { writable } from "../readable";
-import { type ReadableProvider, type OwnedWritable, type Readable } from "../typings";
 import { onDisposeValue, type OnDisposeValue } from "./utils";
 
 export interface ReactiveSetChanged<V> {
@@ -36,6 +36,7 @@ export class OwnedReactiveSet<V> extends Set<V> implements ReadableProvider<Read
         batchTask_: () => {
           if (this._onChanged_ && size(this._onChanged_)) {
             const { upsert_, delete_ } = this._onChanged_;
+            /** c8 ignore else -- @preserve */
             if (upsert_.size > 0 || delete_.size > 0) {
               const changedData = {
                 upsert: [...upsert_],
@@ -136,17 +137,17 @@ export class OwnedReactiveSet<V> extends Set<V> implements ReadableProvider<Read
   public override clear(): void {
     if (this.size) {
       const isBatchTop = batchStart();
-      if (this.onDisposeValue_ || this._onChanged_) {
+      if (this.onDisposeValue_) {
         for (const value of this) {
-          if (this.onDisposeValue_) {
-            this.onDisposeValue_.delete_.add(value);
-            batchTasks.add(this.onDisposeValue_);
-          }
-          if (this._onChanged_) {
-            this._onChanged_.delete_.add(value);
-            this._onChanged_.upsert_.delete(value);
-            batchTasks.add(this._onChanged_);
-          }
+          this.onDisposeValue_.delete_.add(value);
+          batchTasks.add(this.onDisposeValue_);
+        }
+      }
+      if (this._onChanged_) {
+        for (const value of this) {
+          this._onChanged_.delete_.add(value);
+          this._onChanged_.upsert_.delete(value);
+          batchTasks.add(this._onChanged_);
         }
       }
       super.clear();
diff --git a/src/combine.ts b/src/combine.ts
@@ -1,5 +1,5 @@
 import { compute } from "./compute";
-import { type Config, type OwnedReadable, type ReadableLike } from "./typings";
+import { type Config, type OwnedReadable, type ReadableLike } from "./interface";
 
 export type MapReadablesToValues<TDepValues extends readonly ReadableLike[]> = {
   [K in keyof TDepValues]: TDepValues[K] extends ReadableLike<infer V> ? V : never;
diff --git a/src/compute.ts b/src/compute.ts
@@ -1,5 +1,5 @@
+import { type ReadableLike, type Config, type Get, type OwnedReadable } from "./interface";
 import { ReadableImpl } from "./readable";
-import { type ReadableLike, type Config, type Get, type OwnedReadable } from "./typings";
 import { getReadable } from "./utils";
 
 export interface ComputeFn<TValue = any> {
@@ -49,6 +49,7 @@ export const compute = <TValue>(fn: ComputeFn<TValue>, config?: Config<TValue>):
     try {
       return fn(get);
     } finally {
+      /** c8 ignore else -- @preserve */
       if (isFirst) {
         running = false;
       }
diff --git a/src/debug/trace.ts b/src/debug/trace.ts
@@ -1,5 +1,5 @@
 import { type ComputeFn } from "../compute";
-import { type ReadableProvider, type Get, type Readable } from "../typings";
+import { type ReadableProvider, type Get, type Readable } from "../interface";
 import { isReadable, isWritable } from "../utils";
 import { type WatchEffect } from "../watch";
 
diff --git a/src/derive.ts b/src/derive.ts
@@ -1,5 +1,5 @@
 import { compute } from "./compute";
-import { type ReadableLike, type Config, type OwnedReadable } from "./typings";
+import { type ReadableLike, type Config, type OwnedReadable } from "./interface";
 
 export interface Derive {
   /**
@@ -29,7 +29,7 @@ export interface Derive {
  * which makes it easier to reuse functions that are not aware of the reactive system.
  *
  * @param dep - The {@link ReadableLike} to derive from.
- * @param transform - A pure function that takes an input value and returns a new value.
+ * @param transform - Optional pure function that takes an input value and returns a new value.
  * @param config - Optional custom {@link Config}.
  * @returns A {@link OwnedReadable} with transformed value from the given {@link ReadableLike}.
  */
diff --git a/src/index.ts b/src/index.ts
@@ -15,7 +15,7 @@ export type {
   SetValue,
   Version,
   Unwrap,
-} from "./typings";
+} from "./interface";
 
 export { type Listener, type RemoveListener } from "./event";
 
@@ -66,6 +66,7 @@ export {
   type ReadonlyReactiveArray,
 } from "./collections/reactiveArray";
 
+/** c8 ignore else -- @preserve */
 if (process.env.NODE_ENV !== "production") {
   /* @__PURE__ */ customFormatter();
 }
diff --git a/src/interface.ts b/src/interface.ts
@@ -53,6 +53,10 @@ export interface Readable<TValue = any> {
    * @internal
    */
   deps_?: Map<Readable, Version>;
+  /**
+   * Indicates whether the Readable has been disposed.
+   */
+  readonly disposed: boolean;
   /**
    * Current value of the $.
    */
diff --git a/src/react/useDerive.ts b/src/react/useDerive.ts
@@ -30,8 +30,8 @@ export interface UseDerive {
   /**
    * Derive a new {@link Readable} with transformed value from the given {@link ReadableLike}.
    * @param dep - The {@link ReadableLike} to derive from.
-   * @param transform A pure function that takes an input value and returns a new value.
-   * @param config custom config for the derived {@link Readable}.
+   * @param transform - A pure function that takes an input value and returns a new value.
+   * @param config - Optional custom {@link Config}.
    * @returns A {@link Readable} with transformed value from the given {@link ReadableLike}.
    */
   <TDepValue, TValue>(
@@ -42,8 +42,8 @@ export interface UseDerive {
   /**
    * Derive a new {@link Readable} with transformed value from the given {@link ReadableLike}.
    * @param dep - The {@link ReadableLike} to derive from, or a non-Readable value that will be returned as-is.
-   * @param transform A pure function that takes an input value and returns a new value.
-   * @param config custom config for the derived {@link Readable}.
+   * @param transform - A pure function that takes an input value and returns a new value.
+   * @param config - Optional custom {@link Config}.
    * @returns A {@link Readable} with transformed value from the given {@link ReadableLike}, or `dep` itself if `dep` is not a {@link ReadableLike}.
    */
   <TDepValue, TValue, U>(
@@ -57,7 +57,11 @@ export interface UseDerive {
  * Derive a new {@link Readable} from the given {@link ReadableLike}.
  *
  * Note that changes to `transform` and `config` will not trigger re-derivation, and `useDerive` always uses the latest `transform` and `config` in the derivation.
- * In other words, no extra care is needed to use this in React components. All args will be updated properly.
+ *
+ * @param dep - The {@link ReadableLike} to derive from, or a non-Readable value that will be returned as-is.
+ * @param transform - Optional pure function that takes an input value and returns a new value.
+ * @param config - Optional custom {@link Config}.
+ * @returns A {@link Readable} with transformed value from the given {@link ReadableLike}, or `dep` itself if `dep` is not a {@link ReadableLike}.
  *
  * @example
  * ```tsx
diff --git a/src/react/useDerived.ts b/src/react/useDerived.ts
@@ -12,8 +12,8 @@ export interface UseDerived {
   /**
    * Derive a new {@link Readable} with transformed value from the given {@link ReadableLike}.
    * @param dep - The {@link ReadableLike} to derive from.
-   * @param transform A pure function that takes an input value and returns a new value.
-   * @param config custom config for the derived {@link Readable}.
+   * @param transform - A pure function that takes an input value and returns a new value.
+   * @param config - Optional custom {@link Config}.
    * @returns Transformed value from the given {@link ReadableLike}.
    */
   <TDepValue, TValue>(
@@ -25,7 +25,7 @@ export interface UseDerived {
    * Derive a new {@link Readable} with transformed value from the given {@link ReadableLike}.
    * @param dep - The {@link ReadableLike} to derive from, or a non-Readable value that will be returned as-is.
    * @param transform A pure function that takes an input value and returns a new value.
-   * @param config custom config for the derived {@link Readable}.
+   * @param config - Optional custom {@link Config}.
    * @returns Transformed value from the given {@link ReadableLike}, or `dep` itself if `dep` is not a {@link ReadableLike}.
    */
   <TDepValue, TValue, U>(
@@ -39,7 +39,11 @@ export interface UseDerived {
  * Derive a new {@link Readable} from the given {@link ReadableLike}.
  *
  * Note that changes to `transform` and `config` will not trigger re-derivation, and `useDerive` always uses the latest `transform` and `config` in the derivation.
- * In other words, no extra care is needed to use this in React components. All args will be updated properly.
+ *
+ * @param dep - The {@link ReadableLike} to derive from, or a non-Readable value that will be returned as-is.
+ * @param transform Optional pure function that takes an input value and returns a new value.
+ * @param config - Optional custom {@link Config}.
+ * @returns Transformed value from the given {@link ReadableLike}, or `dep` itself if `dep` is not a {@link ReadableLike}.
  *
  * @example
  * ```tsx
diff --git a/src/react/utils.ts b/src/react/utils.ts
@@ -1,5 +1,5 @@
 import { useLayoutEffect, useEffect } from "react";
 
-/* c8 ignore next 2 */
+/* c8 ignore next 2 -- @preserve */
 export const useIsomorphicLayoutEffect = /* @__PURE__ */ (() =>
   typeof document !== "undefined" ? useLayoutEffect : useEffect)();
diff --git a/src/readable.ts b/src/readable.ts
@@ -1,6 +1,5 @@
 import { batchFlush, batchStart, type BatchTask, batchTasks } from "./batch";
 import { type EventObject, off, on, send, size } from "./event";
-import { SyncScheduler, type Scheduler } from "./schedulers";
 import {
   type OwnedReadable,
   type OwnedWritable,
@@ -11,7 +10,8 @@ import {
   type Subscriber,
   type Version,
   type Writable,
-} from "./typings";
+} from "./interface";
+import { SyncScheduler, type Scheduler } from "./schedulers";
 import { BRAND, strictEqual, UNIQUE_VALUE } from "./utils";
 
 interface Subs<TValue> extends EventObject<TValue> {
@@ -99,6 +99,10 @@ export class ReadableImpl<TValue = any> implements BatchTask {
     this.set?.(value);
   }
 
+  public get disposed(): boolean {
+    return !!this.disposed_;
+  }
+
   /** @internal */
   private disposed_?: Error | true;
 
@@ -174,6 +178,7 @@ export class ReadableImpl<TValue = any> implements BatchTask {
     this.dependents_ = this.subs_ = undefined;
     if (this.deps_) {
       registry.unregister(this.deps_);
+      /** c8 ignore else -- @preserve */
       if (this.weakRefSelf_) {
         for (const dep of this.deps_.keys()) {
           dep.dependents_?.delete(this.weakRefSelf_);
@@ -276,6 +281,7 @@ export class ReadableImpl<TValue = any> implements BatchTask {
   /** @internal */
   public removeDep_(dep: ReadableImpl): void {
     this.deps_?.delete(dep);
+    /** c8 ignore else -- @preserve */
     if (this.weakRefSelf_) {
       dep.dependents_?.delete(this.weakRefSelf_);
     }
diff --git a/src/utils.ts b/src/utils.ts
@@ -1,4 +1,4 @@
-import { type Writable, type Readable, type ReadableLike } from "./typings";
+import { type Writable, type Readable, type ReadableLike } from "./interface";
 
 export const BRAND = /* @__PURE__ */ Symbol.for("@embra/reactivity");
 export type BRAND = typeof BRAND;
diff --git a/src/watch.ts b/src/watch.ts
@@ -1,5 +1,5 @@
 import { batch, batchFlush, batchStart, batchTasks } from "./batch";
-import { type Disposer, type Get, type Readable, type ReadableLike } from "./typings";
+import { type Disposer, type Get, type Readable, type ReadableLike } from "./interface";
 import { getReadable, unsubscribe } from "./utils";
 
 export interface WatchEffect {
@@ -45,6 +45,7 @@ export const watch = (effect: WatchEffect): Disposer => {
   };
 
   const subscription = () => {
+    /** c8 ignore else -- @preserve */
     if (!running) {
       unsubscribe(collectedDeps, subscription);
       collectedDeps?.clear();
@@ -92,6 +93,7 @@ export const watch = (effect: WatchEffect): Disposer => {
         dispose();
       }
 
+      /** c8 ignore else -- @preserve */
       if (isTopRunner) {
         running = false;
       }
diff --git a/test/batch.test.ts b/test/batch.test.ts
@@ -0,0 +1,14 @@
+import { describe, expect, it } from "vitest";
+
+import { batchFlush } from "../src";
+import { batchTasks } from "../src/batch";
+
+describe("batch", () => {
+  describe("batchFlush", () => {
+    it("should do nothing when not in a batch", () => {
+      expect(batchTasks).toHaveLength(0);
+      batchFlush();
+      expect(batchTasks).toHaveLength(0);
+    });
+  });
+});
diff --git a/test/collections/reactiveArray.test.ts b/test/collections/reactiveArray.test.ts
@@ -751,6 +751,14 @@ describe("ReactiveArray", () => {
       arr.dispose();
       expect(listener).toHaveBeenCalledTimes(0);
     });
+
+    it("should do nothing on empty array", () => {
+      const arr = reactiveArray();
+      const listener = vi.fn();
+      arr.onDisposeValue(listener);
+      arr.dispose();
+      expect(listener).toHaveBeenCalledTimes(0);
+    });
   });
 
   describe("$ (reactive property)", () => {
diff --git a/test/collections/reactiveMap.test.ts b/test/collections/reactiveMap.test.ts
@@ -640,5 +640,13 @@ describe("ReactiveMap", () => {
       map.delete("bar");
       expect(listener).toHaveBeenCalledTimes(0);
     });
+
+    it("should do nothing on empty map", () => {
+      const map = reactiveMap();
+      const listener = vi.fn();
+      map.onDisposeValue(listener);
+      map.dispose();
+      expect(listener).toHaveBeenCalledTimes(0);
+    });
   });
 });
diff --git a/test/collections/reactiveSet.test.ts b/test/collections/reactiveSet.test.ts
@@ -550,5 +550,13 @@ describe("ReactiveSet", () => {
       set.delete(2);
       expect(listener).toHaveBeenCalledTimes(0);
     });
+
+    it("should do nothing on empty set", () => {
+      const set = reactiveSet();
+      const listener = vi.fn();
+      set.onDisposeValue(listener);
+      set.dispose();
+      expect(listener).toHaveBeenCalledTimes(0);
+    });
   });
 });
diff --git a/test/readable.test.ts b/test/readable.test.ts
