@oimdb/react 3.0.0 → 3.1.0

package/dist/index.js

@@ -31,12 +31,12 @@ var OIMSnapshotVersion = class {
     this.version = 0;
     this.getVersion = () => this.version;
   }
-  subscribeEffect(channelMap, sourceSlots, sourceComputeds, onStoreChange) {
+  subscribeEffect(channelMap, onStoreChange, sourceSlots, sourceComputeds) {
     this.version++;
-    return OIMEffectService.INSTANCE.subscribeEffect(channelMap, sourceSlots, sourceComputeds, () => {
+    return OIMEffectService.INSTANCE.subscribeEffect(channelMap, () => {
       this.version++;
       onStoreChange();
-    });
+    }, sourceSlots, sourceComputeds);
   }
 };
 
@@ -56,9 +56,9 @@ function useOIMValue(binding) {
       snapshotVersion,
       subscribe: (onStoreChange) => snapshotVersion.subscribeEffect(
         db,
+        onStoreChange,
         binding.sourceSlots ?? OIM_FROZEN_EMPTY_SLOTS,
-        sourceComputeds,
-        onStoreChange
+        sourceComputeds
       )
     };
   }, [db, binding, sourceComputeds]);
@@ -83,13 +83,23 @@ import { OIM_FROZEN_EMPTY_SLOTS as OIM_FROZEN_EMPTY_SLOTS2 } from "@oimdb/core";
 
 // src/oimAssertOneChannel.ts
 function oimAssertOneChannel(channelMap, slot, door) {
-  const storeSlot = slot.storeSlot;
-  if (storeSlot === void 0 || storeSlot.channelSlot === channelMap.defaultChannelSlot) return;
+  if (slot.storeSlot.channelSlot === channelMap.defaultChannelSlot) return;
   throw new Error(
     `${door}: the slot was filed on another OIMDB than the one <OIMDBProvider> was given, so a write would never wake this component. Build the services and their store slots on the one OIMDB the provider holds.`
   );
 }
 
+// src/oimSubscribeHeldSlot.ts
+function oimSubscribeHeldSlot(channelMap, hookName, snapshotVersion, holdingSlot, sourcesOfSlot, onStoreChange) {
+  try {
+    oimAssertOneChannel(channelMap, holdingSlot, hookName);
+    const [sourceSlots, sourceComputeds] = sourcesOfSlot(holdingSlot);
+    return snapshotVersion.subscribeEffect(channelMap, onStoreChange, sourceSlots, sourceComputeds);
+  } finally {
+    holdingSlot.owner.unholdSlot(holdingSlot);
+  }
+}
+
 // src/useOIMSlotByKey.ts
 var sourcesOfRootSlot = (rootSlot) => [[rootSlot], OIM_FROZEN_EMPTY_SLOTS2];
 function useOIMSlotByKey(hookName, slotCollectionService, storeSlot, key, sourcesOfSlot = sourcesOfRootSlot) {
@@ -110,18 +120,12 @@ function useOIMSlotByKey(hookName, slotCollectionService, storeSlot, key, source
       snapshotVersion,
       subscribe: (onStoreChange) => {
         const holdingSlot = slotCollectionService.holdSlotByKey(storeSlot, settledKey);
-        try {
-          oimAssertOneChannel(db, holdingSlot, hookName);
-          const [sourceSlots, sourceComputeds] = sourcesOfSlot(holdingSlot);
-          const disposeEffect = snapshotVersion.subscribeEffect(db, sourceSlots, sourceComputeds, onStoreChange);
-          subscribedSlot = holdingSlot;
-          return () => {
-            subscribedSlot = void 0;
-            disposeEffect();
-          };
-        } finally {
-          holdingSlot.owner.unholdSlot(holdingSlot);
-        }
+        const effectDisposer = oimSubscribeHeldSlot(db, hookName, snapshotVersion, holdingSlot, sourcesOfSlot, onStoreChange);
+        subscribedSlot = holdingSlot;
+        return () => {
+          subscribedSlot = void 0;
+          effectDisposer();
+        };
       },
       getSlot: () => subscribedSlot ?? slotCollectionService.getSlotByKey(storeSlot, settledKey)
     };
@@ -137,7 +141,9 @@ function useOIMEntity(entityCollectionService, entityStoreSlot, key) {
 
 // src/useOIMSingleSlot.ts
 import { useMemo as useMemo4 } from "react";
-function useOIMSingleSlot(hookName, singleSlotService, singleSlotStoreSlot) {
+import { OIM_FROZEN_EMPTY_SLOTS as OIM_FROZEN_EMPTY_SLOTS3 } from "@oimdb/core";
+var sourcesOfRootSlot2 = (rootSlot) => [[rootSlot], OIM_FROZEN_EMPTY_SLOTS3];
+function useOIMSingleSlot(hookName, singleSlotService, singleSlotStoreSlot, sourcesOfSlot = sourcesOfRootSlot2) {
   const db = useOIMDB();
   const store = useMemo4(() => {
     const snapshotVersion = new OIMSnapshotVersion();
@@ -146,21 +152,16 @@ function useOIMSingleSlot(hookName, singleSlotService, singleSlotStoreSlot) {
       snapshotVersion,
       subscribe: (onStoreChange) => {
         const holdingSlot = singleSlotService.holdSingleSlot(singleSlotStoreSlot);
-        try {
-          oimAssertOneChannel(db, holdingSlot, hookName);
-          const disposeEffect = snapshotVersion.subscribeEffect(db, [holdingSlot], [], onStoreChange);
-          subscribedSlot = holdingSlot;
-          return () => {
-            subscribedSlot = void 0;
-            disposeEffect();
-          };
-        } finally {
-          holdingSlot.owner.unholdSlot(holdingSlot);
-        }
+        const effectDisposer = oimSubscribeHeldSlot(db, hookName, snapshotVersion, holdingSlot, sourcesOfSlot, onStoreChange);
+        subscribedSlot = holdingSlot;
+        return () => {
+          subscribedSlot = void 0;
+          effectDisposer();
+        };
       },
       getSlot: () => subscribedSlot ?? singleSlotService.getSingleSlot(singleSlotStoreSlot)
     };
-  }, [hookName, db, singleSlotService, singleSlotStoreSlot]);
+  }, [hookName, db, singleSlotService, singleSlotStoreSlot, sourcesOfSlot]);
   useOIMSnapshotVersion(store.snapshotVersion, store.subscribe);
   return store.getSlot();
 }
@@ -213,9 +214,8 @@ function useOIMField(entityCollectionService, slot, name) {
       snapshotVersion,
       subscribe: (onStoreChange) => holdWhileSubscribed(holds, () => snapshotVersion.subscribeEffect(
         db,
-        [entityCollectionService.getColumn(slot, name)],
-        [],
-        onStoreChange
+        onStoreChange,
+        [entityCollectionService.columnSlotService.getColumn(slot, name)]
       ))
     };
   }, [db, entityCollectionService, slot, name]);
@@ -293,8 +293,8 @@ function useOIMSlotsByKeys(slotCollectionService, storeSlot, keys) {
 }
 
 // src/useOIMComputedValueByKey.ts
-import { OIM_FROZEN_EMPTY_SLOTS as OIM_FROZEN_EMPTY_SLOTS3 } from "@oimdb/core";
-var sourcesOfComputedSlot = (computedSlot) => [OIM_FROZEN_EMPTY_SLOTS3, [computedSlot]];
+import { OIM_FROZEN_EMPTY_SLOTS as OIM_FROZEN_EMPTY_SLOTS4 } from "@oimdb/core";
+var sourcesOfComputedSlot = (computedSlot) => [OIM_FROZEN_EMPTY_SLOTS4, [computedSlot]];
 function useOIMComputedValueByKey(computedCollectionService, computedStoreSlot, key) {
   const computedSlot = useOIMSlotByKey(
     "useOIMComputedValueByKey",
@@ -308,6 +308,8 @@ function useOIMComputedValueByKey(computedCollectionService, computedStoreSlot,
 
 // src/useOIMSingleComputedValue.ts
 import { useMemo as useMemo7 } from "react";
+import { OIM_FROZEN_EMPTY_SLOTS as OIM_FROZEN_EMPTY_SLOTS5 } from "@oimdb/core";
+var sourcesOfComputedSlot2 = (computedSlot) => [OIM_FROZEN_EMPTY_SLOTS5, [computedSlot]];
 function useOIMSingleComputedValue(computedService, derive, createSources, dependencyList) {
   const db = useOIMDB();
   const computedStoreSlot = useMemo7(
@@ -315,11 +317,13 @@ function useOIMSingleComputedValue(computedService, derive, createSources, depen
     // eslint-disable-next-line react-hooks/exhaustive-deps -- the caller's list is checked at the call site
     [db, computedService, ...dependencyList]
   );
-  return useOIMComputedValueByKey(
-    computedService.computedCollectionService,
+  const computedSlot = useOIMSingleSlot(
+    "useOIMSingleComputedValue",
+    computedService.computedSingleSlotService,
     computedStoreSlot,
-    void 0
+    sourcesOfComputedSlot2
   );
+  return computedSlot.computedValueService.getValueForSlot(computedSlot);
 }
 
 // src/useOIMComputedCollection.ts