svelte-common 6.5.3 → 6.5.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-common",
-  "version": "6.5.3",
+  "version": "6.5.5",
   "publishConfig": {
     "access": "public"
   },
@@ -48,18 +48,18 @@
     "@semantic-release/commit-analyzer": "^10.0.1",
     "@semantic-release/exec": "^6.0.3",
     "@semantic-release/release-notes-generator": "^11.0.4",
-    "@sveltejs/vite-plugin-svelte": "^2.4.3",
+    "@sveltejs/vite-plugin-svelte": "^2.4.5",
     "ava": "^5.3.1",
     "c8": "^8.0.1",
     "documentation": "^14.0.2",
     "mf-styling": "^3.0.2",
-    "npm-pkgbuild": "^11.10.7",
+    "npm-pkgbuild": "^11.10.11",
     "semantic-release": "^21.0.7",
     "stylelint": "^15.10.2",
     "stylelint-config-standard": "^34.0.0",
-    "svelte": "^4.1.2",
+    "svelte": "^4.2.0",
     "testcafe": "^3.1.0",
-    "vite": "^4.4.8",
+    "vite": "^4.4.9",
     "vite-plugin-compression2": "^0.10.3"
   },
   "optionalDependencies": {
@@ -137,7 +137,7 @@
       "arlac77/template-ava-coverage",
       "arlac77/template-cloudflare",
       "arlac77/template-css",
-      "arlac77/template-pacman",
+      "arlac77/template-npm-pkgbuild",
       "arlac77/template-svelte-component"
     ]
   }

package/src/filter.mjs

@@ -70,6 +70,14 @@ function allOp(value, against, op) {
           if (against instanceof RegExp) {
             return against.test(value);
           }
+
+          if (Array.isArray(against) || against instanceof Set) {
+            for (const i of against) {
+              if (value.match(i)) {
+                return true;
+              }
+            }
+          }
       }
 
       return value.match(against);
@@ -78,6 +86,15 @@ function allOp(value, against, op) {
       if (against instanceof RegExp) {
         return against.test(value);
       }
+
+      if (Array.isArray(against) || against instanceof Set) {
+        for (const i of against) {
+          if (numberOp(value, i, op)) {
+            return true;
+          }
+        }
+      }
+
       return numberOp(value, against, op);
     case "boolean":
       return value == against;

package/src/pagination.mjs

@@ -22,10 +22,13 @@ export class Pagination {
     Object.assign(this, options);
   }
 
+  fireSubscriptions() {
+    this.#subscriptions.forEach(subscription => subscription(this));
+  }
+
   set filter(filter) {
     this.#filter = filter;
-
-    this.#subscriptions.forEach(subscription => subscription(this));
+    this.fireSubscriptions();
   }
 
   get filter() {
@@ -34,8 +37,7 @@ export class Pagination {
 
   set sorter(sorter) {
     this.#sorter = sorter;
-
-    this.#subscriptions.forEach(subscription => subscription(this));
+    this.fireSubscriptions();
   }
 
   get sorter() {
@@ -56,7 +58,7 @@ export class Pagination {
       this.#data = data;
     }
 
-    this.#subscriptions.forEach(subscription => subscription(this));
+    this.fireSubscriptions();
   }
 
   get itemsPerPage() {
@@ -65,7 +67,7 @@ export class Pagination {
 
   set itemsPerPage(n) {
     this.#itemsPerPage = n;
-    this.#subscriptions.forEach(subscription => subscription(this));
+    this.fireSubscriptions();
   }
 
   /**
@@ -73,14 +75,14 @@ export class Pagination {
    * @param {number} n
    */
   set page(n) {
-    if(n < 0) {
+    if (n < 0) {
       n = this.numberOfPages + n + 1;
     }
 
     if (this.#page !== n) {
       if (n >= 1 && n <= this.numberOfPages) {
         this.#page = n;
-        this.#subscriptions.forEach(subscription => subscription(this));
+        this.fireSubscriptions();
       }
     }
   }
@@ -151,11 +153,13 @@ export class Pagination {
     nav.setAttribute("aria-label", "pagination");
 
     nav.onkeyup = event => {
-      switch(event.key) {
-        case 'ArrowLeft': this.page = this.page - 1;
-        break;
-        case 'ArrowRight': this.page = this.page + 1;
-        break;
+      switch (event.key) {
+        case "ArrowLeft":
+          this.page = this.page - 1;
+          break;
+        case "ArrowRight":
+          this.page = this.page + 1;
+          break;
       }
     };
 
@@ -173,7 +177,7 @@ export class Pagination {
 
         if (targetPage < 1 || targetPage > np) {
           a.setAttribute("aria-disabled", "true");
-          a.tabIndex=-1;
+          a.tabIndex = -1;
         } else {
           if (targetPage === this.page) {
             a.classList.add("active");
@@ -214,12 +218,17 @@ export function pageNavigation(elem, pg) {
 }
 
 /**
- * Generade actual sequence of page numbers to navigate to
- * @param {number} nunmberOfPages
+ * Generade actual sequence of page numbers to navigate to.
+ * @param {number} numberOfPages
  * @param {number} currentPage
+ * @param {number} numberOfItems
  * @return {Iterator<number>}
  */
-export function* navigationItems(nunmberOfPages, currentPage) {
+export function* navigationItems(
+  numberOfPages,
+  currentPage,
+  numberOfItems = 7
+) {
   const pageJumps = [
     { maxPages: 10, side: 1, edge: 2 },
     { maxPages: 100, side: 1, edge: 2, step: 10 },
@@ -231,11 +240,11 @@ export function* navigationItems(nunmberOfPages, currentPage) {
   ];
 
   for (const j of pageJumps) {
-    if (nunmberOfPages <= j.maxPages) {
-      for (let n = 1; n <= nunmberOfPages; n++) {
+    if (numberOfPages <= j.maxPages) {
+      for (let n = 1; n <= numberOfPages; n++) {
         if (
           n <= j.edge ||
-          n > nunmberOfPages - j.edge ||
+          n > numberOfPages - j.edge ||
           n % j.step === 0 ||
           (n < currentPage + j.side && n > currentPage - j.side)
         ) {
@@ -245,4 +254,30 @@ export function* navigationItems(nunmberOfPages, currentPage) {
       break;
     }
   }
+  
+/*
+  const pageJumps = [
+    { maxPages: 10, stepping: [1] },
+    { maxPages: 100, stepping: [1, 10] },
+    { maxPages: 1000, stepping: [1, 10, 100] },
+    { maxPages: 10000, stepping: [1, 100, 1000] },
+    { maxPages: 100000, stepping: [1, 1000, 10000] }
+  ];
+
+  for (const j of pageJumps) {
+    if (numberOfPages <= j.maxPages) {
+      yield 1;
+      for (const s of j.stepping) {
+        for (let n = currentPage - s; n < currentPage + s; n++) {
+          yield n;
+        }
+        yield currentPage;
+      }
+
+      yield numberOfPages;
+
+      break;
+    }
+  }
+  */
 }