svelte-common 6.15.64 → 6.17.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-common",
-  "version": "6.15.64",
+  "version": "6.17.0",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -48,28 +48,28 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "pacc": "^3.1.9",
-    "svelte-command": "^3.0.20",
-    "svelte-entitlement": "^2.0.27"
+    "pacc": "^3.3.0",
+    "svelte-command": "^3.0.22",
+    "svelte-entitlement": "^2.0.31"
   },
   "devDependencies": {
     "@semantic-release/commit-analyzer": "^13.0.1",
-    "@semantic-release/exec": "^6.0.3",
+    "@semantic-release/exec": "^7.0.3",
     "@semantic-release/github": "^11.0.1",
     "@semantic-release/release-notes-generator": "^14.0.3",
     "@sveltejs/vite-plugin-svelte": "^5.0.3",
     "ava": "^6.2.0",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
-    "mf-styling": "^3.2.7",
+    "mf-styling": "^3.2.11",
     "npm-pkgbuild": "^15.6.11",
-    "semantic-release": "^24.2.1",
+    "semantic-release": "^24.2.2",
     "stylelint": "^16.14.1",
     "stylelint-config-standard": "^37.0.0",
-    "svelte": "^5.19.4",
+    "svelte": "^5.19.10",
     "testcafe": "^3.7.1",
     "typescript": "^5.7.3",
-    "vite": "^6.0.11",
+    "vite": "^6.1.0",
     "vite-plugin-compression2": "^1.3.3"
   },
   "peerDependencies": {
@@ -77,7 +77,7 @@
   },
   "optionalDependencies": {
     "mf-hosting-cloudflare": "^1.0.7",
-    "mf-hosting-frontend": "^3.8.4"
+    "mf-hosting-frontend": "^3.9.1"
   },
   "repository": {
     "type": "git",

package/src/pagination.mjs

@@ -219,7 +219,7 @@ export class Pagination {
    * @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() {
+  pageNavigationElement(options) {
     const nav = document.createElement("nav");
     nav.setAttribute("tabindex", "0");
     nav.setAttribute("aria-label", "pagination");
@@ -287,35 +287,56 @@ export class Pagination {
 }
 
 export function pageNavigation(elem, pg) {
-  elem.replaceChildren(pg.pageNavigationElement);
+  elem.replaceChildren(pg.pageNavigationElement());
 
   // TODO destroy
 }
 
+export const defaultNavigationItemOptions = {
+  numberOfItems: 7,
+  spreads: [[0], [1, 5, 25, 125, 625, 3125, 15625], [2, 3, 4, 10, 50, 100, 500]]
+};
+
 /**
- * Generade actual sequence of page numbers to navigate to.
+ * Generate actual sequence of page numbers to navigate to.
  * @param {number} numberOfPages
  * @param {number} currentPage
- * @param {number} numberOfItems
+ * @param {Object} options
+ * @param {Number} options.numberOfItems
+ * @param {Number[][]} options.spreads
  * @return {Iterable<number>}
  */
-export function* navigationItems(
+export function navigationItems(
   numberOfPages,
   currentPage,
-  numberOfItems = 7
+  options = defaultNavigationItemOptions
 ) {
-  const edge = 2;
-  const side = 1;
-  const step = numberOfPages >= 80 ? Math.floor(numberOfPages / 10) : undefined;
-
-  for (let n = 1; n <= numberOfPages; n++) {
-    if (
-      n <= edge ||
-      n > numberOfPages - edge ||
-      n % step === 0 ||
-      (n < currentPage + side && n > currentPage - side)
-    ) {
-      yield n;
+  if (numberOfPages === 0) {
+    return [];
+  }
+
+  const items = new Set();
+
+  const spread = (n, sides) => {
+    for (const side of sides) {
+      if (items.size === options.numberOfItems) {
+        return true;
+      }
+      if (n - side >= 1) {
+        items.add(n - side);
+      }
+      if (n + side <= numberOfPages) {
+        items.add(n + side);
+      }
+    }
+    return false;
+  };
+
+  for (const s of options.spreads) {
+    if (spread(currentPage, s) || spread(1, s) || spread(numberOfPages, s)) {
+      break;
     }
   }
+
+  return [...items].sort((a, b) => (a > b ? 1 : a < b ? -1 : 0));
 }

package/types/pagination.d.mts

@@ -1,12 +1,17 @@
 export function pageNavigation(elem: any, pg: any): void;
 /**
- * Generade actual sequence of page numbers to navigate to.
+ * Generate actual sequence of page numbers to navigate to.
  * @param {number} numberOfPages
  * @param {number} currentPage
- * @param {number} numberOfItems
+ * @param {Object} options
+ * @param {Number} options.numberOfItems
+ * @param {Number[][]} options.spreads
  * @return {Iterable<number>}
  */
-export function navigationItems(numberOfPages: number, currentPage: number, numberOfItems?: number): Iterable<number>;
+export function navigationItems(numberOfPages: number, currentPage: number, options?: {
+    numberOfItems: number;
+    spreads: number[][];
+}): Iterable<number>;
 /**
  * Pagination support store.
  * Pages go from 1 ... numberOfPages
@@ -68,7 +73,11 @@ export class Pagination {
      * @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;
+    pageNavigationElement(options: any): HTMLElement;
     [Symbol.iterator](): Generator<any, void, unknown>;
     #private;
 }
+export namespace defaultNavigationItemOptions {
+    let numberOfItems: number;
+    let spreads: number[][];
+}