svelte-common 4.18.0 → 4.18.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-common",
-  "version": "4.18.0",
+  "version": "4.18.3",
   "publishConfig": {
     "access": "public"
   },
@@ -42,7 +42,7 @@
     "@sveltejs/vite-plugin-svelte": "^1.0.3",
     "ava": "^4.3.3",
     "documentation": "^14.0.0",
-    "mf-styling": "^1.7.6",
+    "mf-styling": "^1.7.7",
     "npm-pkgbuild": "^10.14.8",
     "semantic-release": "^19.0.5",
     "stylelint": "^14.11.0",

package/src/util.mjs

@@ -96,7 +96,7 @@ function liveDuration(seconds) {
 */
 
 /**
- * Create a store where al the object keys are prefixed
+ * Create a store where all the object keys are prefixed.
  * @param {WriteableStore} store
  * @param {string} prefix
  * @returns {WriteableStore}
@@ -104,28 +104,46 @@ function liveDuration(seconds) {
 export function keyPrefixStore(store, prefix) {
   const subscriptions = new Set();
 
-  store.subscribe(prefixedKeyObject => {
-    const object = Object.fromEntries(
-      Object.entries(prefixedKeyObject).map(([k, v]) => [
-        k.substring(prefix.length),
-        v
-      ])
-    );
-
-    subscriptions.forEach(subscription => subscription(object));
-  });
+  let forwardSubscription;
+  let forwardObject;
 
   return {
-    set: object => {
-      const prefixedKeyObject = Object.fromEntries(
-        Object.entries(object).map(([k, v]) => [prefix + k, v])
-      );
-      store.set(prefixedKeyObject);
-    },
+    set: object =>
+      store.set(
+        Object.assign(
+          forwardObject,
+          Object.fromEntries(
+            Object.entries(object).map(([k, v]) => [prefix + k, v])
+          )
+        )
+      ),
 
     subscribe: s => {
       subscriptions.add(s);
-      return () => subscriptions.delete(s);
+
+      if (!forwardSubscription) {
+        forwardSubscription = store.subscribe(o => {
+          forwardObject = o;
+          const object =
+            forwardObject === undefined
+              ? {}
+              : Object.fromEntries(
+                  Object.entries(forwardObject)
+                    .filter(([k, v]) => k.startsWith(prefix))
+                    .map(([k, v]) => [k.substring(prefix.length), v])
+                );
+
+          subscriptions.forEach(subscription => subscription(object));
+        });
+      }
+
+      return () => {
+        subscriptions.delete(s);
+        if (subscriptions.size === 0) {
+          forwardSubscription();
+          forwardSubscription = undefined;
+        }
+      };
     }
   };
 }