svelte-common 4.17.3 → 4.17.6

package/package.json

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

package/src/filter.mjs

@@ -6,6 +6,8 @@ export function filter(filterBy, getters = {}) {
         const av = getter(a);
 
         switch (typeof av) {
+          case "object":
+            return av.toString().match(value);
           case "string":
             return av.match(value);
           case "number":

package/src/index.svelte

@@ -9,8 +9,6 @@
   import ServerDetails from "./components/ServerDetails.svelte";
   import ServiceWorkerDetails from "./components/ServiceWorkerDetails.svelte";
   import ServiceWorkerRegistrationDetails from "./components/ServiceWorkerRegistrationDetails.svelte";
-  import DataGrid from "./components/DataGrid.svelte";
-  import DataGridColumn from "./components/DataGridColumn.svelte";
   import TopNav from "./components/TopNav.svelte";
   import Menue from "./components/Menue.svelte";
   import Collapse from "./components/Collapse.svelte";
@@ -23,8 +21,6 @@
     Duration,
     TopNav,
     Menue,
-    DataGrid,
-    DataGridColumn,
     Collapse,
     Modal,
     Peer,
@@ -53,7 +49,6 @@
     SORT_ASCENDING,
     SORT_DESCENDING
   } from "./sorting.mjs";
-  export { filter } from "./filter.mjs";
-  
+  export { filter } from "./filter.mjs";  
   export { initializeServiceWorker } from "./service-worker.mjs";
 </script>

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;
           };
       }
     }

package/src/components/DataGrid.svelte

@@ -1,28 +0,0 @@
-<script>
-  import { setContext } from "svelte";
-  import { DataGrid, DATA_GRID} from "../data-grid.mjs";
-
-  export let source = { entries: [] };
-
-  const dataGrid = new DataGrid();
-  setContext(DATA_GRID, dataGrid);
-</script>
-
-<table>
-  <!--<slot/>-->
-  <thead>
-    {#each dataGrid.columns as column}
-     {column.id} {column.headerComponent}
-      <svelte:component this={column.headerComponent} />
-    {/each}
-  </thead>
-  <tbody>
-    {#each source.entries as entry}
-      <tr>
-        {#each dataGrid.columns as column}
-          <td>{entry[column.id]}</td>
-        {/each}
-      </tr>
-    {/each}
-  </tbody>
-</table>

package/src/components/DataGridColumn.svelte

@@ -1,18 +0,0 @@
-<script>
-  import { getContext } from "svelte";
-  import { DATA_GRID} from "../data-grid.mjs";
-
-  export let id;
-
-  const dataGrid = getContext(DATA_GRID);
-
-  let headerComponent;
-
-  dataGrid.addColumn({ id, headerComponent });
-</script>
-
-<th {id} bind:this={headerComponent}>
-  <slot name="header">
-    {id}
-  </slot>
-</th>

package/src/data-grid.mjs

@@ -1,10 +0,0 @@
-
-export const DATA_GRID = "DATA_GRID";
-
-export class DataGrid {
-  columns = [];
-
-  addColumn(c) {
-    this.columns.push(c);
-  }
-}