@flexsurfer/reflex 0.1.23 → 0.1.24

package/dist/index.cjs

@@ -127,12 +127,16 @@ function clearHandlers(kind, id) {
     for (const k in kindToIdToHandler) {
       kindToIdToHandler[k] = {};
     }
+    clearRootSubSources();
   } else if (id == null) {
     if (!(kind in kindToIdToHandler)) {
       consoleLog("error", `[reflex] Unknown kind: ${kind}`);
       return;
     }
     kindToIdToHandler[kind] = {};
+    if (kind === "sub") {
+      clearRootSubSources();
+    }
   } else {
     if (kindToIdToHandler[kind][id]) {
       delete kindToIdToHandler[kind][id];
@@ -161,6 +165,16 @@ function clearReactions(id) {
     reactionsRegistry.delete(id);
   }
 }
+var rootSubIdBySource = /* @__PURE__ */ new Map();
+function setRootSubSource(subId, sourceKey) {
+  rootSubIdBySource.set(sourceKey, subId);
+}
+function getRootSubIdBySource(sourceKey) {
+  return rootSubIdBySource.get(sourceKey);
+}
+function clearRootSubSources() {
+  rootSubIdBySource.clear();
+}
 function clearSubs() {
   clearReactions();
   clearHandlers("sub");
@@ -230,7 +244,14 @@ function updateAppDbWithPatches(newDb, patches) {
       const pathSegments = patch.path;
       if (pathSegments.length > 0) {
         const rootKey = pathSegments[0];
-        const subVectorKey = JSON.stringify([rootKey]);
+        if (typeof rootKey !== "string") {
+          continue;
+        }
+        const subId = getRootSubIdBySource(rootKey);
+        if (!subId) {
+          continue;
+        }
+        const subVectorKey = JSON.stringify([subId]);
         const reaction = getReaction(subVectorKey);
         if (reaction) {
           if (!reaction.isRoot) {
@@ -1089,16 +1110,23 @@ var Reaction = class _Reaction {
 // src/subs.ts
 var KIND4 = "sub";
 var KIND_DEPS = "subDeps";
+function registerRootSub(id, sourceKey) {
+  const conflictingSubId = getRootSubIdBySource(sourceKey);
+  if (conflictingSubId && conflictingSubId !== id) {
+    consoleLog("error", `[reflex] Subscription with id '${id}' will be overridden. Root key '${sourceKey}' is already used by subscription '${conflictingSubId}'.`);
+  }
+  setRootSubSource(id, sourceKey);
+  registerHandler(KIND4, id, () => getAppDb()[sourceKey]);
+  registerHandler(KIND_DEPS, id, () => []);
+}
 function regSub(id, computeFn, depsFn, config) {
   if (hasHandler(KIND4, id)) {
     consoleLog("warn", `[reflex] Overriding. Subscription '${id}' already registered.`);
   }
   if (!computeFn) {
-    registerHandler(KIND4, id, () => getAppDb()[id]);
-    registerHandler(KIND_DEPS, id, () => []);
+    registerRootSub(id, id);
   } else if (typeof computeFn === "string") {
-    registerHandler(KIND4, id, () => getAppDb()[computeFn]);
-    registerHandler(KIND_DEPS, id, () => []);
+    registerRootSub(id, computeFn);
   } else {
     if (!depsFn) {
       consoleLog("error", `[reflex] Subscription '${id}' has computeFn but missing depsFn. Computed subscriptions must specify their dependencies.`);

package/dist/index.mjs

@@ -49,12 +49,16 @@ function clearHandlers(kind, id) {
     for (const k in kindToIdToHandler) {
       kindToIdToHandler[k] = {};
     }
+    clearRootSubSources();
   } else if (id == null) {
     if (!(kind in kindToIdToHandler)) {
       consoleLog("error", `[reflex] Unknown kind: ${kind}`);
       return;
     }
     kindToIdToHandler[kind] = {};
+    if (kind === "sub") {
+      clearRootSubSources();
+    }
   } else {
     if (kindToIdToHandler[kind][id]) {
       delete kindToIdToHandler[kind][id];
@@ -83,6 +87,16 @@ function clearReactions(id) {
     reactionsRegistry.delete(id);
   }
 }
+var rootSubIdBySource = /* @__PURE__ */ new Map();
+function setRootSubSource(subId, sourceKey) {
+  rootSubIdBySource.set(sourceKey, subId);
+}
+function getRootSubIdBySource(sourceKey) {
+  return rootSubIdBySource.get(sourceKey);
+}
+function clearRootSubSources() {
+  rootSubIdBySource.clear();
+}
 function clearSubs() {
   clearReactions();
   clearHandlers("sub");
@@ -152,7 +166,14 @@ function updateAppDbWithPatches(newDb, patches) {
       const pathSegments = patch.path;
       if (pathSegments.length > 0) {
         const rootKey = pathSegments[0];
-        const subVectorKey = JSON.stringify([rootKey]);
+        if (typeof rootKey !== "string") {
+          continue;
+        }
+        const subId = getRootSubIdBySource(rootKey);
+        if (!subId) {
+          continue;
+        }
+        const subVectorKey = JSON.stringify([subId]);
         const reaction = getReaction(subVectorKey);
         if (reaction) {
           if (!reaction.isRoot) {
@@ -1011,16 +1032,23 @@ var Reaction = class _Reaction {
 // src/subs.ts
 var KIND4 = "sub";
 var KIND_DEPS = "subDeps";
+function registerRootSub(id, sourceKey) {
+  const conflictingSubId = getRootSubIdBySource(sourceKey);
+  if (conflictingSubId && conflictingSubId !== id) {
+    consoleLog("error", `[reflex] Subscription with id '${id}' will be overridden. Root key '${sourceKey}' is already used by subscription '${conflictingSubId}'.`);
+  }
+  setRootSubSource(id, sourceKey);
+  registerHandler(KIND4, id, () => getAppDb()[sourceKey]);
+  registerHandler(KIND_DEPS, id, () => []);
+}
 function regSub(id, computeFn, depsFn, config) {
   if (hasHandler(KIND4, id)) {
     consoleLog("warn", `[reflex] Overriding. Subscription '${id}' already registered.`);
   }
   if (!computeFn) {
-    registerHandler(KIND4, id, () => getAppDb()[id]);
-    registerHandler(KIND_DEPS, id, () => []);
+    registerRootSub(id, id);
   } else if (typeof computeFn === "string") {
-    registerHandler(KIND4, id, () => getAppDb()[computeFn]);
-    registerHandler(KIND_DEPS, id, () => []);
+    registerRootSub(id, computeFn);
   } else {
     if (!depsFn) {
       consoleLog("error", `[reflex] Subscription '${id}' has computeFn but missing depsFn. Computed subscriptions must specify their dependencies.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flexsurfer/reflex",
-  "version": "0.1.23",
+  "version": "0.1.24",
   "license": "MIT",
   "repository": {
     "type": "git",