svelte-common 4.18.1 → 4.19.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-common",
-  "version": "4.18.1",
+  "version": "4.19.0",
   "publishConfig": {
     "access": "public"
   },

package/src/sorting.mjs

@@ -53,7 +53,11 @@ export function sortable(th, store) {
           }
         }
 
-        orderBy[peer.id] = sort;
+        if (sort == SORT_NONE) {
+          delete orderBy[peer.id];
+        } else {
+          orderBy[peer.id] = sort;
+        }
       }
     }
     store.set(orderBy);

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,30 +104,46 @@ function liveDuration(seconds) {
 export function keyPrefixStore(store, prefix) {
   const subscriptions = new Set();
 
-  store.subscribe(prefixedKeyObject => {
-    const object =
-      prefixedKeyObject === undefined
-        ? {}
-        : Object.fromEntries(
-            Object.entries(prefixedKeyObject)
-              .filter(([k, v]) => k.startsWith(prefix))
-              .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;
+        }
+      };
     }
   };
 }