svelte-common 6.15.0 → 6.15.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-common",
-  "version": "6.15.0",
+  "version": "6.15.2",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -55,7 +55,7 @@
   "devDependencies": {
     "@semantic-release/commit-analyzer": "^13.0.0",
     "@semantic-release/exec": "^6.0.3",
-    "@semantic-release/github": "^10.1.5",
+    "@semantic-release/github": "^10.1.6",
     "@semantic-release/release-notes-generator": "^14.0.1",
     "@sveltejs/vite-plugin-svelte": "^3.1.1",
     "ava": "^6.1.3",
@@ -63,13 +63,13 @@
     "documentation": "^14.0.3",
     "mf-styling": "^3.1.8",
     "npm-pkgbuild": "^15.3.29",
-    "semantic-release": "^24.0.0",
-    "stylelint": "^16.8.1",
+    "semantic-release": "^24.1.0",
+    "stylelint": "^16.8.2",
     "stylelint-config-standard": "^36.0.1",
-    "svelte": "^5.0.0-next.222",
+    "svelte": "^5.0.0-next.225",
     "testcafe": "^3.6.2",
     "typescript": "^5.5.4",
-    "vite": "^5.4.0",
+    "vite": "^5.4.1",
     "vite-plugin-compression2": "^1.2.0"
   },
   "peerDependencies": {

package/src/pagination.mjs

@@ -6,7 +6,7 @@ import { readable } from "svelte/store";
  * @param {Map|Set|Array|readable} data
  * @param {Object} options
  * @param {number} [options.itemsPerPage]
- * @param {number} [options.page]
+ * @param {number} [options.page] current page
  * @param {Function} [options.sorter]
  * @param {Function} [options.filter]
  */
@@ -63,7 +63,7 @@ export class Pagination {
     const applySorter = sorter => {
       this.#sorter = sorter;
       this.fireSubscriptions();
-      };
+    };
 
     if (sorter?.subscribe) {
       this.#unsubscribeFilter = sorter.subscribe(applySorter);
@@ -165,6 +165,15 @@ export class Pagination {
     return Array.isArray(this.#data) ? this.#data.length : this.#data.size;
   }
 
+  /**
+   *
+   * @param {number} page 1...
+   * @returns {[number,number]}
+   */
+  itemRangeOnPage(page) {
+    return [(this.page - 1) * this.itemsPerPage, this.page * this.itemsPerPage];
+  }
+
   /**
    * @return {number}
    */
@@ -181,9 +190,10 @@ export class Pagination {
     return this.#itemsPerPage;
   }
 
-  get filteredItems()
-  {
-    let items = Array.isArray(this.#data) ? this.#data : [...this.#data.values()];
+  get filteredItems() {
+    let items = Array.isArray(this.#data)
+      ? this.#data
+      : [...this.#data.values()];
 
     if (this.filter) {
       return items.filter(this.filter);
@@ -193,21 +203,13 @@ export class Pagination {
   }
 
   *[Symbol.iterator]() {
-    let data = Array.isArray(this.#data) ? this.#data : [...this.#data.values()];
-
-    if (this.filter) {
-      data = data.filter(this.filter);
-    }
+    let data = this.filteredItems;
 
     if (this.sorter) {
       data = data.sort(this.sorter);
     }
 
-    const n = this.page - 1;
-
-    yield* data
-      .slice(n * this.itemsPerPage, (n + 1) * this.itemsPerPage)
-      [Symbol.iterator]();
+    yield* data.slice(...this.itemRangeOnPage(this.page))[Symbol.iterator]();
   }
 
   /**

package/types/pagination.d.mts

@@ -13,7 +13,7 @@ export function navigationItems(numberOfPages: number, currentPage: number, numb
  * @param {Map|Set|Array|readable} data
  * @param {Object} options
  * @param {number} [options.itemsPerPage]
- * @param {number} [options.page]
+ * @param {number} [options.page] current page
  * @param {Function} [options.sorter]
  * @param {Function} [options.filter]
  */
@@ -46,6 +46,12 @@ export class Pagination {
      * @return {number}
      */
     get numberOfItems(): number;
+    /**
+     *
+     * @param {number} page 1...
+     * @returns {[number,number]}
+     */
+    itemRangeOnPage(page: number): [number, number];
     /**
      * @return {number}
      */