Use existing Subscribable

statelyai · Feb 20, 2025 · c2263f8 · c2263f8
1 parent 2a16c31
commit c2263f8
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/packages/xstate-store/src/select.ts b/packages/xstate-store/src/select.ts
@@ -1,11 +1,11 @@
+import { toObserver } from './toObserver';
 import type {
   Store,
   StoreContext,
   EventObject,
   Selector,
   Selection
 } from './types';
-
 export function select<
   TContext extends StoreContext,
   TEvent extends EventObject,
@@ -17,14 +17,15 @@ export function select<
   equalityFn: (a: TSelected, b: TSelected) => boolean = Object.is
 ): Selection<TSelected> {
   return {
-    subscribe: (callback: (selected: TSelected) => void) => {
+    subscribe: (observerOrFn) => {
+      const observer = toObserver(observerOrFn);
       let previousSelected = selector(store.getSnapshot().context);
 
       return store.subscribe((snapshot) => {
         const nextSelected = selector(snapshot.context);
         if (!equalityFn(previousSelected, nextSelected)) {
           previousSelected = nextSelected;
-          callback(nextSelected);
+          observer.next?.(nextSelected);
         }
       });
     },

diff --git a/packages/xstate-store/src/store.ts b/packages/xstate-store/src/store.ts
@@ -1,3 +1,4 @@
+import { toObserver } from './toObserver';
 import {
   EnqueueObject,
   EventObject,
@@ -19,23 +20,6 @@ const symbolObservable: typeof Symbol.observable = (() =>
   (typeof Symbol === 'function' && Symbol.observable) ||
   '@@observable')() as any;
 
-function toObserver<T>(
-  nextHandler?: Observer<T> | ((value: T) => void),
-  errorHandler?: (error: any) => void,
-  completionHandler?: () => void
-): Observer<T> {
-  const isObserver = typeof nextHandler === 'object';
-  const self = isObserver ? nextHandler : undefined;
-
-  return {
-    next: (isObserver ? nextHandler.next : nextHandler)?.bind(self),
-    error: (isObserver ? nextHandler.error : errorHandler)?.bind(self),
-    complete: (isObserver ? nextHandler.complete : completionHandler)?.bind(
-      self
-    )
-  };
-}
-
 /**
  * Updates a context object using a recipe function.
  *

diff --git a/packages/xstate-store/src/toObserver.ts b/packages/xstate-store/src/toObserver.ts
@@ -0,0 +1,18 @@
+import { Observer } from './types';
+
+export function toObserver<T>(
+  nextHandler?: Observer<T> | ((value: T) => void),
+  errorHandler?: (error: any) => void,
+  completionHandler?: () => void
+): Observer<T> {
+  const isObserver = typeof nextHandler === 'object';
+  const self = isObserver ? nextHandler : undefined;
+
+  return {
+    next: (isObserver ? nextHandler.next : nextHandler)?.bind(self),
+    error: (isObserver ? nextHandler.error : errorHandler)?.bind(self),
+    complete: (isObserver ? nextHandler.complete : completionHandler)?.bind(
+      self
+    )
+  };
+}
diff --git a/packages/xstate-store/src/types.ts b/packages/xstate-store/src/types.ts
@@ -315,9 +315,6 @@ export type EventMap<TEvent extends EventObject> = {
 
 export type Selector<TContext, TSelected> = (context: TContext) => TSelected;
 
-export interface Selection<TSelected> {
-  subscribe: (callback: (selected: TSelected) => void) => {
-    unsubscribe: () => void;
-  };
+export interface Selection<TSelected> extends Subscribable<TSelected> {
   get: () => TSelected;
 }