svelte-common 6.13.1 → 6.15.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-common",
-  "version": "6.13.1",
+  "version": "6.15.0",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -50,12 +50,12 @@
   "dependencies": {
     "pacc": "^3.1.8",
     "svelte-command": "^3.0.2",
-    "svelte-entitlement": "^2.0.0"
+    "svelte-entitlement": "^2.0.1"
   },
   "devDependencies": {
     "@semantic-release/commit-analyzer": "^13.0.0",
     "@semantic-release/exec": "^6.0.3",
-    "@semantic-release/github": "^10.1.3",
+    "@semantic-release/github": "^10.1.5",
     "@semantic-release/release-notes-generator": "^14.0.1",
     "@sveltejs/vite-plugin-svelte": "^3.1.1",
     "ava": "^6.1.3",
@@ -66,11 +66,11 @@
     "semantic-release": "^24.0.0",
     "stylelint": "^16.8.1",
     "stylelint-config-standard": "^36.0.1",
-    "svelte": "^5.0.0-next.210",
+    "svelte": "^5.0.0-next.222",
     "testcafe": "^3.6.2",
     "typescript": "^5.5.4",
     "vite": "^5.4.0",
-    "vite-plugin-compression2": "^1.1.3"
+    "vite-plugin-compression2": "^1.2.0"
   },
   "peerDependencies": {
     "svelte": "^5.0.0-next.0"

package/src/pagination.mjs

@@ -15,11 +15,13 @@ export class Pagination {
   #data;
   #unsubscribeData;
   #filter;
+  #unsubscribeFilter;
   #sorter;
+  #unsubscribeSorter;
   #itemsPerPage = 20;
   #page = 1;
 
-  constructor(data=[], options) {
+  constructor(data = [], options) {
     this.data = data;
 
     Object.assign(this, options);
@@ -30,9 +32,22 @@ export class Pagination {
   }
 
   set filter(filter) {
-    this.#filter = filter;
-    this.recalibrateCurrentPage();
-    this.fireSubscriptions();
+    if (this.#unsubscribeFilter) {
+      this.#unsubscribeFilter();
+      this.#unsubscribeFilter = undefined;
+    }
+
+    const applyFilter = filter => {
+      this.#filter = filter;
+      this.recalibrateCurrentPage();
+      this.fireSubscriptions();
+    };
+
+    if (filter?.subscribe) {
+      this.#unsubscribeFilter = filter.subscribe(applyFilter);
+    } else {
+      applyFilter(filter);
+    }
   }
 
   get filter() {
@@ -40,8 +55,21 @@ export class Pagination {
   }
 
   set sorter(sorter) {
-    this.#sorter = sorter;
-    this.fireSubscriptions();
+    if (this.#unsubscribeSorter) {
+      this.#unsubscribeSorter();
+      this.#unsubscribeSorter = undefined;
+    }
+
+    const applySorter = sorter => {
+      this.#sorter = sorter;
+      this.fireSubscriptions();
+      };
+
+    if (sorter?.subscribe) {
+      this.#unsubscribeFilter = sorter.subscribe(applySorter);
+    } else {
+      applySorter(sorter);
+    }
   }
 
   get sorter() {
@@ -153,8 +181,19 @@ export class Pagination {
     return this.#itemsPerPage;
   }
 
+  get filteredItems()
+  {
+    let items = Array.isArray(this.#data) ? this.#data : [...this.#data.values()];
+
+    if (this.filter) {
+      return items.filter(this.filter);
+    }
+
+    return items;
+  }
+
   *[Symbol.iterator]() {
-    let data = Array.isArray(this.data) ? this.#data : [...this.#data.values()];
+    let data = Array.isArray(this.#data) ? this.#data : [...this.#data.values()];
 
     if (this.filter) {
       data = data.filter(this.filter);

package/types/pagination.d.mts

@@ -56,11 +56,12 @@ export class Pagination {
      * @return {number}
      */
     get length(): number;
+    get filteredItems(): any[];
     /**
      * @see https://getbootstrap.com/docs/4.0/components/pagination
      * @see https://a11y-style-guide.com/style-guide/section-navigation.html#kssref-navigation-pagination
      */
     get pageNavigationElement(): HTMLElement;
-    [Symbol.iterator](): Generator<any, void, any>;
+    [Symbol.iterator](): Generator<any, void, undefined>;
     #private;
 }