@oimdb/react 1.2.2 → 2.0.0

package/dist/index.js

@@ -8,31 +8,24 @@ var useSelectPksByIndexKeysSetBased = (reactiveIndex, keys) => {
   if (!keysAreEqual) {
     prevKeysRef.current = keys;
   }
+  const stableKeys = keysAreEqual ? prevKeysRef.current ?? keys : keys;
   const snapshotValueRef = useRef();
   const subscribe = useMemo(() => {
-    snapshotValueRef.current = keys.map((key) => Array.from(reactiveIndex.getPksByKey(key))).flat();
+    snapshotValueRef.current = stableKeys.map((key) => Array.from(reactiveIndex.getPksByKey(key))).flat();
     return (onStoreChange) => {
-      const prevKeys = prevKeysRef.current;
-      if (!prevKeys) {
-        return () => {
-        };
-      }
       const updateSnapshot = () => {
-        snapshotValueRef.current = keys.map((key) => Array.from(reactiveIndex.getPksByKey(key))).flat();
+        snapshotValueRef.current = stableKeys.map((key) => Array.from(reactiveIndex.getPksByKey(key))).flat();
         onStoreChange();
       };
-      reactiveIndex.updateEventEmitter.subscribeOnKeys(
-        prevKeys,
+      const unsubscribe = reactiveIndex.subscribeOnKeys(
+        stableKeys,
         updateSnapshot
       );
       return () => {
-        reactiveIndex.updateEventEmitter.unsubscribeFromKeys(
-          prevKeys,
-          updateSnapshot
-        );
+        unsubscribe();
       };
     };
-  }, [prevKeysRef.current, reactiveIndex.updateEventEmitter]);
+  }, [reactiveIndex, stableKeys]);
   const getSnapshot = useMemo(() => {
     return () => {
       return snapshotValueRef.current;
@@ -42,22 +35,22 @@ var useSelectPksByIndexKeysSetBased = (reactiveIndex, keys) => {
   return snapshot;
 };
 var useSelectPksByIndexKeySetBased = (reactiveIndex, key) => {
-  const getSnapshot = useMemo(() => {
-    return () => {
-      return reactiveIndex.getPksByKey(key);
-    };
-  }, [key, reactiveIndex]);
+  const snapshotValueRef = useRef();
   const subscribe = useMemo(() => {
+    snapshotValueRef.current = reactiveIndex.getPksByKey(key);
     return (onStoreChange) => {
-      reactiveIndex.updateEventEmitter.subscribeOnKey(key, onStoreChange);
-      return () => {
-        reactiveIndex.updateEventEmitter.unsubscribeFromKey(
-          key,
-          onStoreChange
-        );
+      const updateSnapshot = () => {
+        snapshotValueRef.current = reactiveIndex.getPksByKey(key);
+        onStoreChange();
       };
+      return reactiveIndex.subscribeOnKey(key, updateSnapshot);
+    };
+  }, [key, reactiveIndex]);
+  const getSnapshot = useMemo(() => {
+    return () => {
+      return snapshotValueRef.current;
     };
-  }, [key, reactiveIndex.updateEventEmitter]);
+  }, []);
   const snapshot = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
   return snapshot;
 };
@@ -67,31 +60,24 @@ var useSelectPksByIndexKeysArrayBased = (reactiveIndex, keys) => {
   if (!keysAreEqual) {
     prevKeysRef.current = keys;
   }
+  const stableKeys = keysAreEqual ? prevKeysRef.current ?? keys : keys;
   const snapshotValueRef = useRef();
   const subscribe = useMemo(() => {
-    snapshotValueRef.current = keys.map((key) => reactiveIndex.getPksByKey(key)).flat();
+    snapshotValueRef.current = stableKeys.map((key) => reactiveIndex.getPksByKey(key)).flat();
     return (onStoreChange) => {
-      const prevKeys = prevKeysRef.current;
-      if (!prevKeys) {
-        return () => {
-        };
-      }
       const updateSnapshot = () => {
-        snapshotValueRef.current = keys.map((key) => reactiveIndex.getPksByKey(key)).flat();
+        snapshotValueRef.current = stableKeys.map((key) => reactiveIndex.getPksByKey(key)).flat();
         onStoreChange();
       };
-      reactiveIndex.updateEventEmitter.subscribeOnKeys(
-        prevKeys,
+      const unsubscribe = reactiveIndex.subscribeOnKeys(
+        stableKeys,
         updateSnapshot
       );
       return () => {
-        reactiveIndex.updateEventEmitter.unsubscribeFromKeys(
-          prevKeys,
-          updateSnapshot
-        );
+        unsubscribe();
       };
     };
-  }, [prevKeysRef.current, reactiveIndex.updateEventEmitter]);
+  }, [reactiveIndex, stableKeys]);
   const getSnapshot = useMemo(() => {
     return () => {
       return snapshotValueRef.current;
@@ -119,18 +105,15 @@ var useSelectPksByIndexKeyArrayBased = (reactiveIndex, key) => {
         snapshotValueRef.current = reactiveIndex.getPksByKey(prevKey);
         onStoreChange();
       };
-      reactiveIndex.updateEventEmitter.subscribeOnKey(
+      const unsubscribe = reactiveIndex.subscribeOnKey(
         prevKey,
         updateSnapshot
       );
       return () => {
-        reactiveIndex.updateEventEmitter.unsubscribeFromKey(
-          prevKey,
-          updateSnapshot
-        );
+        unsubscribe();
       };
     };
-  }, [key, reactiveIndex.updateEventEmitter]);
+  }, [key, reactiveIndex]);
   const getSnapshot = useMemo(() => {
     return () => {
       return snapshotValueRef.current;
@@ -146,18 +129,9 @@ var useSelectEntityByPk = (reactiveCollection, pk) => {
   );
   const subscribe = useMemo(() => {
     return (onStoreChange) => {
-      reactiveCollection.updateEventEmitter.subscribeOnKey(
-        pk,
-        onStoreChange
-      );
-      return () => {
-        reactiveCollection.updateEventEmitter.unsubscribeFromKey(
-          pk,
-          onStoreChange
-        );
-      };
+      return reactiveCollection.subscribeOnKey(pk, onStoreChange);
     };
-  }, [pk, reactiveCollection.updateEventEmitter]);
+  }, [pk, reactiveCollection]);
   const snapshot = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
   return snapshot;
 };
@@ -168,18 +142,9 @@ var useSelectValueByObjectKey = (reactiveObject, key) => {
   );
   const subscribe = useMemo(() => {
     return (onStoreChange) => {
-      reactiveObject.updateEventEmitter.subscribeOnKey(
-        key,
-        onStoreChange
-      );
-      return () => {
-        reactiveObject.updateEventEmitter.unsubscribeFromKey(
-          key,
-          onStoreChange
-        );
-      };
+      return reactiveObject.subscribeOnKey(key, onStoreChange);
     };
-  }, [key, reactiveObject.updateEventEmitter]);
+  }, [key, reactiveObject]);
   const snapshot = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
   return snapshot;
 };
@@ -189,33 +154,26 @@ var useSelectValuesByObjectKeys = (reactiveObject, keys) => {
   if (!keysAreEqual) {
     prevKeysRef.current = keys;
   }
+  const stableKeys = keysAreEqual ? prevKeysRef.current ?? keys : keys;
   const snapshotRef = useRef();
   const subscribe = useMemo(() => {
-    snapshotRef.current = keys.map((key) => reactiveObject.get(key));
+    snapshotRef.current = stableKeys.map((key) => reactiveObject.get(key));
     return (onStoreChange) => {
-      const prevKeys = prevKeysRef.current;
-      if (!prevKeys) {
-        return () => {
-        };
-      }
       const updateSnapshot = () => {
-        snapshotRef.current = prevKeys.map(
+        snapshotRef.current = stableKeys.map(
           (key) => reactiveObject.get(key)
         );
         onStoreChange();
       };
-      reactiveObject.updateEventEmitter.subscribeOnKeys(
-        prevKeys,
+      const unsubscribe = reactiveObject.subscribeOnKeys(
+        stableKeys,
         updateSnapshot
       );
       return () => {
-        reactiveObject.updateEventEmitter.unsubscribeFromKeys(
-          prevKeys,
-          updateSnapshot
-        );
+        unsubscribe();
       };
     };
-  }, [prevKeysRef.current, reactiveObject.updateEventEmitter]);
+  }, [reactiveObject, stableKeys]);
   const getSnapshot = useMemo(() => {
     return () => {
       return snapshotRef.current;
@@ -238,33 +196,28 @@ var useSelectEntitiesByPks = (reactiveCollection, pks) => {
   if (!pksAreEqual) {
     prevPksRef.current = pks;
   }
+  const stablePks = pksAreEqual ? prevPksRef.current ?? pks : pks;
   const snapshotRef = useRef();
   const subscribe = useMemo(() => {
-    snapshotRef.current = pks.map((pk) => reactiveCollection.getOneByPk(pk));
+    snapshotRef.current = stablePks.map(
+      (pk) => reactiveCollection.getOneByPk(pk)
+    );
     return (onStoreChange) => {
-      const prevPks = prevPksRef.current;
-      if (!prevPks) {
-        return () => {
-        };
-      }
       const updateSnapshot = () => {
-        snapshotRef.current = prevPks.map(
+        snapshotRef.current = stablePks.map(
           (pk) => reactiveCollection.getOneByPk(pk)
         );
         onStoreChange();
       };
-      reactiveCollection.updateEventEmitter.subscribeOnKeys(
-        prevPks,
+      const unsubscribe = reactiveCollection.subscribeOnKeys(
+        stablePks,
         updateSnapshot
       );
       return () => {
-        reactiveCollection.updateEventEmitter.unsubscribeFromKeys(
-          prevPks,
-          updateSnapshot
-        );
+        unsubscribe();
       };
     };
-  }, [prevPksRef.current, reactiveCollection.updateEventEmitter]);
+  }, [reactiveCollection, stablePks]);
   const getSnapshot = useMemo(() => {
     return () => {
       return snapshotRef.current;
@@ -274,59 +227,195 @@ var useSelectEntitiesByPks = (reactiveCollection, pks) => {
   return snapshot;
 };
 var useSelectEntitiesByIndexKeySetBased = (reactiveCollection, reactiveIndex, key) => {
-  const pks = useSelectPksByIndexKeySetBased(reactiveIndex, key);
-  const pksArray = useMemo(
-    () => pks ? Array.from(pks) : EMPTY_ARRAY,
-    [pks]
-  );
-  return useSelectEntitiesByPks(reactiveCollection, pksArray);
+  const snapshotRef = useRef();
+  const subscribe = useMemo(() => {
+    const readSnapshot = () => Array.from(
+      reactiveIndex.getPksByKey(key),
+      (pk) => reactiveCollection.getOneByPk(pk)
+    );
+    const readPks = () => Array.from(reactiveIndex.getPksByKey(key));
+    snapshotRef.current = readSnapshot();
+    return (onStoreChange) => {
+      let unsubscribeFromCollection = reactiveCollection.subscribeOnKeys(readPks(), () => {
+        snapshotRef.current = readSnapshot();
+        onStoreChange();
+      });
+      const resubscribeCollection = () => {
+        unsubscribeFromCollection();
+        unsubscribeFromCollection = reactiveCollection.subscribeOnKeys(
+          readPks(),
+          () => {
+            snapshotRef.current = readSnapshot();
+            onStoreChange();
+          }
+        );
+      };
+      const unsubscribeFromIndex = reactiveIndex.subscribeOnKey(key, () => {
+        resubscribeCollection();
+        snapshotRef.current = readSnapshot();
+        onStoreChange();
+      });
+      return () => {
+        unsubscribeFromIndex();
+        unsubscribeFromCollection();
+      };
+    };
+  }, [key, reactiveCollection, reactiveIndex]);
+  const getSnapshot = useMemo(() => () => snapshotRef.current, []);
+  return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
 };
 var useSelectEntitiesByIndexKeysSetBased = (reactiveCollection, reactiveIndex, keys) => {
-  const pks = useSelectPksByIndexKeysSetBased(reactiveIndex, keys);
-  const pksArray = useMemo(
-    () => pks ? Array.from(pks) : EMPTY_ARRAY,
-    [pks]
-  );
-  return useSelectEntitiesByPks(reactiveCollection, pksArray);
+  const prevKeysRef = useRef();
+  const keysAreEqual = arraysEqual(prevKeysRef.current || EMPTY_ARRAY, keys);
+  if (!keysAreEqual) {
+    prevKeysRef.current = keys;
+  }
+  const stableKeys = keysAreEqual ? prevKeysRef.current ?? keys : keys;
+  const snapshotRef = useRef();
+  const subscribe = useMemo(() => {
+    const readPks = () => stableKeys.flatMap(
+      (key) => Array.from(reactiveIndex.getPksByKey(key))
+    );
+    const readSnapshot = () => readPks().map((pk) => reactiveCollection.getOneByPk(pk));
+    snapshotRef.current = readSnapshot();
+    return (onStoreChange) => {
+      let unsubscribeFromCollection = reactiveCollection.subscribeOnKeys(readPks(), () => {
+        snapshotRef.current = readSnapshot();
+        onStoreChange();
+      });
+      const resubscribeCollection = () => {
+        unsubscribeFromCollection();
+        unsubscribeFromCollection = reactiveCollection.subscribeOnKeys(
+          readPks(),
+          () => {
+            snapshotRef.current = readSnapshot();
+            onStoreChange();
+          }
+        );
+      };
+      const unsubscribeFromIndex = reactiveIndex.subscribeOnKeys(
+        stableKeys,
+        () => {
+          resubscribeCollection();
+          snapshotRef.current = readSnapshot();
+          onStoreChange();
+        }
+      );
+      return () => {
+        unsubscribeFromIndex();
+        unsubscribeFromCollection();
+      };
+    };
+  }, [reactiveCollection, reactiveIndex, stableKeys]);
+  const getSnapshot = useMemo(() => () => snapshotRef.current, []);
+  return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
 };
 var useSelectEntitiesByIndexKeyArrayBased = (reactiveCollection, reactiveIndex, key) => {
-  const pks = useSelectPksByIndexKeyArrayBased(reactiveIndex, key);
-  return useSelectEntitiesByPks(
-    reactiveCollection,
-    pks || EMPTY_ARRAY
-  );
+  const snapshotRef = useRef();
+  const subscribe = useMemo(() => {
+    const readSnapshot = () => reactiveIndex.getPksByKey(key).map((pk) => reactiveCollection.getOneByPk(pk));
+    const readPks = () => reactiveIndex.getPksByKey(key);
+    snapshotRef.current = readSnapshot();
+    return (onStoreChange) => {
+      let unsubscribeFromCollection = reactiveCollection.subscribeOnKeys(readPks(), () => {
+        snapshotRef.current = readSnapshot();
+        onStoreChange();
+      });
+      const resubscribeCollection = () => {
+        unsubscribeFromCollection();
+        unsubscribeFromCollection = reactiveCollection.subscribeOnKeys(
+          readPks(),
+          () => {
+            snapshotRef.current = readSnapshot();
+            onStoreChange();
+          }
+        );
+      };
+      const unsubscribeFromIndex = reactiveIndex.subscribeOnKey(key, () => {
+        resubscribeCollection();
+        snapshotRef.current = readSnapshot();
+        onStoreChange();
+      });
+      return () => {
+        unsubscribeFromIndex();
+        unsubscribeFromCollection();
+      };
+    };
+  }, [key, reactiveCollection, reactiveIndex]);
+  const getSnapshot = useMemo(() => () => snapshotRef.current, []);
+  return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
 };
 var useSelectEntitiesByIndexKeysArrayBased = (reactiveCollection, reactiveIndex, keys) => {
-  const pks = useSelectPksByIndexKeysArrayBased(reactiveIndex, keys) || EMPTY_ARRAY;
-  return useSelectEntitiesByPks(reactiveCollection, pks);
+  const prevKeysRef = useRef();
+  const keysAreEqual = arraysEqual(prevKeysRef.current || EMPTY_ARRAY, keys);
+  if (!keysAreEqual) {
+    prevKeysRef.current = keys;
+  }
+  const stableKeys = keysAreEqual ? prevKeysRef.current ?? keys : keys;
+  const snapshotRef = useRef();
+  const subscribe = useMemo(() => {
+    const readPks = () => stableKeys.flatMap((key) => reactiveIndex.getPksByKey(key));
+    const readSnapshot = () => readPks().map((pk) => reactiveCollection.getOneByPk(pk));
+    snapshotRef.current = readSnapshot();
+    return (onStoreChange) => {
+      let unsubscribeFromCollection = reactiveCollection.subscribeOnKeys(readPks(), () => {
+        snapshotRef.current = readSnapshot();
+        onStoreChange();
+      });
+      const resubscribeCollection = () => {
+        unsubscribeFromCollection();
+        unsubscribeFromCollection = reactiveCollection.subscribeOnKeys(
+          readPks(),
+          () => {
+            snapshotRef.current = readSnapshot();
+            onStoreChange();
+          }
+        );
+      };
+      const unsubscribeFromIndex = reactiveIndex.subscribeOnKeys(
+        stableKeys,
+        () => {
+          resubscribeCollection();
+          snapshotRef.current = readSnapshot();
+          onStoreChange();
+        }
+      );
+      return () => {
+        unsubscribeFromIndex();
+        unsubscribeFromCollection();
+      };
+    };
+  }, [reactiveCollection, reactiveIndex, stableKeys]);
+  const getSnapshot = useMemo(() => () => snapshotRef.current, []);
+  return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
 };
 
 // src/context/index.tsx
 import { createContext, useContext } from "react";
 import { jsx } from "react/jsx-runtime";
-var OIMRICollectionsContext = createContext(
+var OIMCollectionsContext = createContext(
   {}
 );
 function createOIMCollectionsContext() {
   return createContext({});
 }
-function OIMRICollectionsProvider({ collections, children, context }) {
-  const ContextToUse = context || OIMRICollectionsContext;
+function OIMCollectionsProvider({ collections, children, context }) {
+  const ContextToUse = context || OIMCollectionsContext;
   return /* @__PURE__ */ jsx(ContextToUse.Provider, { value: collections, children });
 }
 function useOIMCollectionsContext(context) {
-  const contextToUse = context || OIMRICollectionsContext;
+  const contextToUse = context || OIMCollectionsContext;
   const collections = useContext(contextToUse);
   if (!collections || Object.keys(collections).length === 0) {
     throw new Error(
-      "useOIMCollectionsContext must be used within an OIMRICollectionsProvider"
+      "useOIMCollectionsContext must be used within an OIMCollectionsProvider"
     );
   }
   return collections;
 }
 export {
-  OIMRICollectionsContext,
-  OIMRICollectionsProvider,
+  OIMCollectionsContext,
+  OIMCollectionsProvider,
   createOIMCollectionsContext,
   useOIMCollectionsContext,
   useSelectEntitiesByIndexKeyArrayBased,

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "@oimdb/react",
-  "version": "1.2.2",
+  "version": "2.0.0",
   "description": "React integration for OIMDB - Hooks for selection and subscription with external storage",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "sideEffects": false,
+  "publishConfig": {
+    "access": "public"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/abaikov/oimdb.git"
@@ -23,7 +26,7 @@
     }
   },
   "scripts": {
-    "build": "tsup src/index.ts --dts --format esm,cjs",
+    "build": "tsup --config tsup.config.ts --tsconfig tsconfig.build.json",
     "test": "jest",
     "type-check": "tsc --noEmit",
     "clean": "rimraf dist",
@@ -33,8 +36,8 @@
     "dist"
   ],
   "peerDependencies": {
-    "@oimdb/core": "^1.4.0",
-    "react": "^18.0.0"
+    "@oimdb/core": "^2.0.0",
+    "react": "^18.0.0 || ^19.0.0"
   },
   "devDependencies": {
     "@testing-library/react": "^14.3.1",