svelte-common 4.17.2 → 4.17.5

package/README.md

@@ -59,12 +59,12 @@ Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 
 ## sortable
 
-Add sortable toggle to a node.
+Add sortable toggle button with img element to a node.
 Synchronizes store value with node "aria-sort" attribute.
 
 ### Parameters
 
-*   `node` **[Node](https://developer.mozilla.org/docs/Web/API/Node/nextSibling)** 
+*   `th` **[Node](https://developer.mozilla.org/docs/Web/API/Node/nextSibling)** header node
 *   `store`  
 *   `to` **WritableStore** keep in sync with sorting properties
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-common",
-  "version": "4.17.2",
+  "version": "4.17.5",
   "publishConfig": {
     "access": "public"
   },
@@ -42,7 +42,7 @@
     "@sveltejs/vite-plugin-svelte": "^1.0.2",
     "ava": "^4.3.3",
     "documentation": "^14.0.0",
-    "mf-styling": "^1.7.3",
+    "mf-styling": "^1.7.5",
     "npm-pkgbuild": "^10.14.8",
     "semantic-release": "^19.0.5",
     "stylelint": "^14.11.0",
@@ -52,7 +52,7 @@
     "vite": "^3.0.9"
   },
   "optionalDependencies": {
-    "mf-hosting": "^1.7.2"
+    "mf-hosting": "^1.7.3"
   },
   "repository": {
     "type": "git",

package/src/filter.mjs

@@ -4,8 +4,15 @@ export function filter(filterBy, getters = {}) {
       const getter = getters[key] || (object => object && object[key]);
       return a => {
         const av = getter(a);
-        if (typeof av === "string") {
-          return av.match(value);
+
+        switch (typeof av) {
+          case "object":
+            return av.toString().match(value);
+          case "string":
+            return av.match(value);
+          case "number":
+          case "boolean":
+            return av == value;
         }
         return false;
       };

package/src/sorting.mjs

@@ -26,13 +26,15 @@ export function toggleOrderBy(orderBy) {
  * @param {WritableStore} to keep in sync with sorting properties
  */
 export function sortable(th, store) {
-  
   store.subscribe(orderBy =>
     th.setAttribute("aria-sort", orderBy[th.id] || SORT_NONE)
   );
 
   const button = document.createElement("button");
+  button.setAttribute("aria-label", `sortable ${th.id}`);
   const img = document.createElement("img");
+  img.setAttribute("alt", "sorting order indicator");
+
   button.appendChild(img);
 
   button.onclick = () => {
@@ -71,51 +73,32 @@ export function sorter(sortBy, getters = {}) {
     for (const [key, value] of Object.entries(sortBy)) {
       const getter = getters[key] || (object => object[key]);
 
+      let rev = 1;
+
       switch (value) {
+        case SORT_DESCENDING: rev = -1;
+        
         case SORT_ASCENDING:
           return (a, b) => {
             const av = getter(a);
             const bv = getter(b);
             if (av === undefined) {
-              return -1;
-            }
-            if (bv === undefined) {
-              return 1;
-            }
-
-            if (typeof av === "string") {
-              return typeof bv === "string" ? av.localeCompare(bv) : 1;
-            }
-            if (av instanceof Date) {
-              const avt = av.getTime();
-              const bvt = bv.getTime();
-              return avt > bvt ? 1 : avt === bvt ? 0 : -1;
-            }
-
-            return av > bv ? 1 : av == bv ? 0 : -1;
-          };
-
-        case SORT_DESCENDING:
-          return (b, a) => {
-            const av = getter(a);
-            const bv = getter(b);
-            if (av === undefined) {
-              return -1;
+              return -rev;
             }
             if (bv === undefined) {
-              return 1;
+              return rev;
             }
 
             if (typeof av === "string") {
-              return typeof bv === "string" ? av.localeCompare(bv) : 1;
+              return typeof bv === "string" ? av.localeCompare(bv) : rev;
             }
             if (av instanceof Date) {
               const avt = av.getTime();
               const bvt = bv.getTime();
-              return avt > bvt ? 1 : avt === bvt ? 0 : -1;
+              return avt > bvt ? rev : avt === bvt ? 0 : -rev;
             }
 
-            return av > bv ? 1 : av == bv ? 0 : -1;
+            return av > bv ? rev : av == bv ? 0 : -rev;
           };
       }
     }