feat: experimental interoperability implementation

Author: divdavem

src/index.spec.ts

@@ -3,7 +3,7 @@ import { Component, Injectable, inject } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { BehaviorSubject, from } from 'rxjs';
 import { writable as svelteWritable } from 'svelte/store';
-import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
+import { afterAll, afterEach, beforeAll, describe, expect, it, test, vi } from 'vitest';
 import type {
   OnUseArgument,
   Readable,
@@ -30,10 +30,11 @@ import {
   untrack,
   writable,
 } from './index';
-import { rawStoreSymbol } from './internal/exposeRawStores';
-import { RawStoreFlags } from './internal/store';
 import { flushUnused } from './internal/asyncFlush';
+import { RawStoreFlags, rawStoreSymbol } from './internal/store';
 import type { RawStoreWritable } from './internal/storeWritable';
+import { setActiveConsumer, type Signal, type Watcher } from './interop';
+import * as mySample from './sample';
 
 const expectCorrectlyCleanedUp = <T>(store: StoreInput<T>) => {
   const rawStore = (store as any)[rawStoreSymbol] as RawStoreWritable<T>;
@@ -3565,4 +3566,301 @@ describe('stores', () => {
       expectCorrectlyCleanedUp(doubleDoubleDoubleStore);
     });
   });
+
+  describe('watch', () => {
+    it('should work', () => {
+      const onUseCalls: { onUnused: number }[] = [];
+      const store = writable(0, {
+        onUse: () => {
+          const call = { onUnused: 0 };
+          onUseCalls.push(call);
+          return () => {
+            call.onUnused++;
+          };
+        },
+      });
+      const notify = vi.fn();
+      const watcher = store.watchSignal(notify);
+      watcher.start();
+      expect(watcher.isUpToDate()).toBe(false);
+      expect(onUseCalls.length).toBe(0);
+      expect(watcher.update()).toBe(true);
+      expect(onUseCalls.length).toBe(1);
+      expect(onUseCalls[0].onUnused).toBe(0);
+      expect(watcher.isUpToDate()).toBe(true);
+      expect(watcher.get()).toBe(0);
+      expect(notify).not.toHaveBeenCalled();
+      store.set(1);
+      expect(notify).toHaveBeenCalledOnce();
+      notify.mockClear();
+      expect(watcher.isUpToDate()).toBe(false);
+      store.set(2);
+      expect(notify).not.toHaveBeenCalled();
+      expect(watcher.update()).toBe(true);
+      expect(watcher.isUpToDate()).toBe(true);
+      expect(watcher.get()).toBe(2);
+      expect(notify).not.toHaveBeenCalled();
+      store.set(3);
+      expect(notify).toHaveBeenCalledOnce();
+      expect(watcher.isUpToDate()).toBe(false);
+      notify.mockClear();
+      store.set(4);
+      store.set(2);
+      expect(notify).not.toHaveBeenCalled();
+      expect(watcher.update()).toBe(false);
+      expect(watcher.isUpToDate()).toBe(true);
+      expect(watcher.update()).toBe(false);
+      expect(watcher.get()).toBe(2);
+      watcher.stop();
+      expect(() => watcher.get()).toThrowError('invalid watcher state');
+    });
+  });
+
+  describe('fromWatch', () => {
+    it('should work', () => {
+      let notify: () => void;
+      let isUpdated = true;
+      let value = 0;
+      const watcher = {
+        isUpToDate: vi.fn(() => {
+          throw new Error('unexpected call to isUpToDate');
+        }),
+        isStarted: vi.fn(() => {
+          throw new Error('unexpected call to isStarted');
+        }),
+        update: vi.fn(() => isUpdated),
+        get: vi.fn(() => value),
+        start: vi.fn(),
+        stop: vi.fn(),
+      } satisfies Watcher<number>;
+      const watchFn = vi.fn((notifyFn: () => void) => {
+        notify = notifyFn;
+        return watcher;
+      }) satisfies (notify: () => void) => Watcher<number>;
+      const clearMocks = () => {
+        watchFn.mockClear();
+        watcher.update.mockClear();
+        watcher.get.mockClear();
+        watcher.stop.mockClear();
+      };
+      const store = asReadable({ watchSignal: watchFn });
+      expect(watchFn).toHaveBeenCalledOnce();
+      expect(store.get()).toBe(0);
+      expect(watchFn).toHaveBeenCalledOnce();
+      expect(watcher.update).toHaveBeenCalledOnce();
+      expect(watcher.get).toHaveBeenCalledOnce();
+      expect(watcher.stop).toHaveBeenCalledOnce();
+      clearMocks();
+      const values: number[] = [];
+      const unsubscribe = store.subscribe((value) => {
+        values.push(value);
+      });
+      expect(values).toEqual([0]);
+      expect(watcher.update).toHaveBeenCalledOnce();
+      expect(watcher.get).toHaveBeenCalledOnce();
+      expect(watchFn).not.toHaveBeenCalled();
+      expect(watcher.stop).not.toHaveBeenCalled();
+      clearMocks();
+      isUpdated = false;
+      batch(() => {
+        notify!();
+      });
+      expect(watcher.update).toHaveBeenCalledOnce();
+      expect(watchFn).not.toHaveBeenCalled();
+      expect(watcher.get).not.toHaveBeenCalled();
+      expect(watcher.stop).not.toHaveBeenCalled();
+      clearMocks();
+      expect(values).toEqual([0]);
+      isUpdated = true;
+      value = 2;
+      batch(() => {
+        notify!();
+      });
+      expect(watcher.update).toHaveBeenCalledOnce();
+      expect(watcher.get).toHaveBeenCalledOnce();
+      expect(watcher.stop).not.toHaveBeenCalled();
+      expect(watchFn).not.toHaveBeenCalled();
+      clearMocks();
+      expect(values).toEqual([0, 2]);
+      isUpdated = true;
+      watcher.get.mockImplementation(() => {
+        throw new Error('myerror');
+      });
+      expect(() => {
+        batch(() => {
+          notify!();
+        });
+      }).toThrowError('myerror');
+      expect(watcher.update).toHaveBeenCalledOnce();
+      expect(watcher.get).toHaveBeenCalledOnce();
+      expect(watcher.stop).not.toHaveBeenCalled();
+      expect(watchFn).not.toHaveBeenCalled();
+      clearMocks();
+      expect(() => {
+        store.get();
+      }).toThrowError('myerror');
+      expect(values).toEqual([0, 2]);
+      expect(watcher.update).not.toHaveBeenCalled();
+      expect(watcher.get).not.toHaveBeenCalled();
+      expect(watcher.stop).not.toHaveBeenCalled();
+      expect(watchFn).not.toHaveBeenCalled();
+      unsubscribe();
+      expect(watcher.stop).toHaveBeenCalledOnce();
+      expect(watcher.update).not.toHaveBeenCalled();
+      expect(watcher.get).not.toHaveBeenCalled();
+      expect(watchFn).not.toHaveBeenCalled();
+      expect(watcher.isUpToDate).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('watch / fromWatch', () => {
+    it('should work to convert back and forth a basic writable', () => {
+      const store = writable(0);
+      const otherStore = asReadable({ watchSignal: (notify) => store.watchSignal(notify) });
+      expect(otherStore()).toBe(0);
+      store.set(1);
+      expect(otherStore()).toBe(1);
+      store.set(2);
+      expect(otherStore()).toBe(2);
+
+      const values: number[] = [];
+      const unsubscribe = otherStore.subscribe((value) => {
+        values.push(value);
+      });
+      expect(values).toEqual([2]);
+      store.set(3);
+      expect(values).toEqual([2, 3]);
+      expect(otherStore()).toBe(3);
+      batch(() => {
+        store.set(4);
+        expect(otherStore()).toBe(4);
+        store.set(5);
+        store.set(3);
+      });
+      expect(values).toEqual([2, 3]);
+      unsubscribe();
+    });
+
+    it('should work to convert back and forth a basic Store', () => {
+      class MyStore extends Store<number> {
+        increase() {
+          this.update((value) => value + 1);
+        }
+      }
+      const store = new MyStore(0);
+
+      const otherStore = asReadable({ watchSignal: (notify) => store.watchSignal(notify) });
+      expect(otherStore()).toBe(0);
+      store.increase();
+      expect(otherStore()).toBe(1);
+      store.increase();
+      expect(otherStore()).toBe(2);
+
+      const values: number[] = [];
+      const unsubscribe = otherStore.subscribe((value) => {
+        values.push(value);
+      });
+      expect(values).toEqual([2]);
+      store.increase();
+      expect(values).toEqual([2, 3]);
+      expect(otherStore()).toBe(3);
+      batch(() => {
+        store.increase();
+        expect(otherStore()).toBe(4);
+        store.increase();
+        store.increase();
+      });
+      expect(values).toEqual([2, 3, 6]);
+      unsubscribe();
+    });
+
+    it('should work to convert back and forth a computed', () => {
+      const store = writable(0);
+      const doubleStore = computed(() => store() * 2);
+      const otherStore = asReadable({
+        watchSignal: (notify) => doubleStore.watchSignal(notify),
+      });
+      expect(otherStore()).toBe(0);
+      store.set(1);
+      expect(otherStore()).toBe(2);
+      store.set(2);
+      expect(otherStore()).toBe(4);
+
+      const values: number[] = [];
+      const unsubscribe = otherStore.subscribe((value) => {
+        values.push(value);
+      });
+      expect(values).toEqual([4]);
+      store.set(3);
+      expect(values).toEqual([4, 6]);
+      expect(otherStore()).toBe(6);
+      batch(() => {
+        store.set(4);
+        expect(otherStore()).toBe(8);
+        store.set(5);
+        store.set(3);
+      });
+      expect(values).toEqual([4, 6]);
+      unsubscribe();
+    });
+  });
+
+  describe('interop computed', () => {
+    test('should work with a computed from another library', () => {
+      const a = writable(0);
+      const notify = vi.fn();
+      const watchers: Watcher<any>[] = [];
+      const consumer = {
+        addProducer: vi.fn(<T>(signal: Signal<T>) => {
+          const watcher = signal.watchSignal(notify);
+          watchers.push(watcher);
+          watcher.start();
+          watcher.update();
+        }),
+      };
+      const computeValue = () => {
+        const prevConsumer = setActiveConsumer(consumer);
+        try {
+          return 2 * a();
+        } finally {
+          setActiveConsumer(prevConsumer);
+        }
+      };
+      expect(computeValue()).toBe(0);
+      expect(consumer.addProducer).toHaveBeenCalledOnce();
+      expect(notify).not.toHaveBeenCalled();
+      a.set(1);
+      expect(notify).toHaveBeenCalledOnce();
+      expect(watchers).toHaveLength(1);
+    });
+
+    test('should work with a store from another library', () => {
+      const a = mySample.signal(0);
+      const myComputed = computed(() => a.get());
+      console.log('before myComputed()');
+      expect(myComputed()).toBe(0);
+      console.log('before a.set(1)');
+      a.set(1);
+      console.log('before myComputed()');
+      expect(myComputed()).toBe(1);
+    });
+
+    test('should work with a store from another library (live)', () => {
+      const a = mySample.signal(0);
+      const myComputed = computed(() => a.get());
+      const values: number[] = [];
+      console.log('before subscribe()');
+      myComputed.subscribe((value) => {
+        values.push(value);
+      });
+      expect(values).toEqual([0]);
+      console.log('before myComputed()');
+      expect(myComputed()).toBe(0);
+      console.log('before a.set(1)');
+      a.set(1);
+      expect(values).toEqual([0, 1]);
+      console.log('before myComputed()');
+      expect(myComputed()).toBe(1);
+    });
+  });
 });

src/index.ts

@@ -6,12 +6,7 @@
  */
 
 import { equal } from './internal/equal';
-import {
-  exposeRawStore,
-  getRawStore,
-  rawStoreSymbol,
-  symbolObservable,
-} from './internal/exposeRawStores';
+import { exposeRawStore, getRawStore, symbolObservable } from './internal/exposeRawStores';
 import { RawStoreComputed } from './internal/storeComputed';
 import { RawStoreConst } from './internal/storeConst';
 import {
@@ -24,6 +19,7 @@ import { RawStoreWithOnUse } from './internal/storeWithOnUse';
 import { RawStoreWritable } from './internal/storeWritable';
 import { noop } from './internal/subscribeConsumer';
 import { untrack } from './internal/untrack';
+import { watchRawStore } from './internal/watch';
 import type {
   AsyncDeriveFn,
   AsyncDeriveOptions,
@@ -45,6 +41,9 @@ import type {
   WritableSignal,
 } from './types';
 
+import { rawStoreSymbol } from './internal/store';
+import { type Watcher } from './interop';
+
 export { batch } from './internal/batch';
 export { equal } from './internal/equal';
 export { symbolObservable } from './internal/exposeRawStores';
@@ -303,6 +302,10 @@ export abstract class Store<T> implements Readable<T> {
   [symbolObservable](): this {
     return this;
   }
+
+  watchSignal(notify: () => void): Watcher<T> {
+    return watchRawStore(this[rawStoreSymbol], notify);
+  }
 }
 
 const createStoreWithOnUse = <T>(initValue: T, onUse: OnUseFn<T>) => {