pagy 8.4.0 → 9.0.0

data/locales/pl.yml

@@ -1,4 +1,4 @@
-# :polish pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :polish pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 pl:
   pagy:
     aria_label:
@@ -22,4 +22,4 @@ pl:
       single_page: "Wyświetlono %{count} %{item_name}"
       multiple_pages: "Wyświetlono %{item_name} %{from}-%{to} z wszystkich %{count}"
     combo_nav_js: "Strona %{page_input} z %{pages}"
-    items_selector_js: "Pokaż %{items_input} %{item_name} na stronie"
+    limit_selector_js: "Pokaż %{limit_input} %{item_name} na stronie"

data/locales/pt-BR.yml

@@ -1,4 +1,4 @@
-# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 pt-BR:
   pagy:
     aria_label:
@@ -18,4 +18,4 @@ pt-BR:
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} do total de %{count}"
     combo_nav_js: "Página %{page_input} de %{pages}"
-    items_selector_js: "Mostrar %{items_input} %{item_name} por página"
+    limit_selector_js: "Mostrar %{limit_input} %{item_name} por página"

data/locales/pt.yml

@@ -1,4 +1,4 @@
-# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 pt:
   pagy:
     aria_label:
@@ -18,4 +18,4 @@ pt:
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} de um total de %{count}"
     combo_nav_js: "Página %{page_input} de %{pages}"
-    items_selector_js: "Mostrar %{items_input} %{item_name} por página"
+    limit_selector_js: "Mostrar %{limit_input} %{item_name} por página"

data/locales/ru.yml

@@ -1,4 +1,4 @@
-# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 ru:
   pagy:
     aria_label:
@@ -22,4 +22,4 @@ ru:
       single_page: "%{count} %{item_name}"
       multiple_pages: "Всего %{count} %{item_name}, показаны с %{from} по %{to}"
     combo_nav_js: "Страница %{page_input} из %{pages}"
-    items_selector_js: "Показать %{items_input} %{item_name} на странице"
+    limit_selector_js: "Показать %{limit_input} %{item_name} на странице"

data/locales/sr.yml

@@ -1,4 +1,4 @@
-# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 sr:
   pagy:
     aria_label:
@@ -22,4 +22,4 @@ sr:
       single_page: "Приказује се %{count} %{item_name}"
       multiple_pages: "Приказ %{item_name} %{from}-%{to} од %{count} укупно"
     combo_nav_js: "Страниca %{page_input} од %{pages}"
-    items_selector_js: "Прикажи %{items_input} %{item_name} по страниcи"
+    limit_selector_js: "Прикажи %{limit_input} %{item_name} по страниcи"

data/locales/sv-SE.yml

@@ -1,4 +1,4 @@
-# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 sv-SE:
   pagy:
     aria_label:
@@ -18,4 +18,4 @@ sv-SE:
       single_page: "Visar %{count} %{item_name}"
       multiple_pages: "Visar %{item_name} %{from}-%{to} av %{count} totalt"
     combo_nav_js: "Sida %{page_input} av %{pages}"
-    items_selector_js: "Visa %{items_input} %{item_name} per sida"
+    limit_selector_js: "Visa %{limit_input} %{item_name} per sida"

data/locales/sv.yml

@@ -1,4 +1,4 @@
-# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 sv:
   pagy:
     aria_label:
@@ -18,4 +18,4 @@ sv:
       single_page: "Visar %{count} %{item_name}"
       multiple_pages: "Visar %{item_name} %{from}-%{to} av %{count} totalt"
     combo_nav_js: "Sida %{page_input} av %{pages}"
-    items_selector_js: "Visa %{items_input} %{item_name} per sida"
+    limit_selector_js: "Visa %{limit_input} %{item_name} per sida"

data/locales/sw.yml

@@ -1,4 +1,4 @@
-# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 sw:
   pagy:
     # please add a comment in the https://github.com/ddnexus/pagy/issues/603
@@ -20,4 +20,4 @@ sw:
       single_page: "Inaonyesha %{item_name} %{count}"
       multiple_pages: "Inaonyesha %{item_name} %{from}-%{to} ya %{count} kwa jumla"
     combo_nav_js: "Kurasa %{page_input} ya %{pages}"
-    items_selector_js: "Onyesha %{items_input} %{item_name} kwa kila ukurasa"
+    limit_selector_js: "Onyesha %{limit_input} %{item_name} kwa kila ukurasa"

data/locales/ta.yml

@@ -1,4 +1,4 @@
-# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 ta:
   pagy:
     aria_label:
@@ -20,4 +20,4 @@ ta:
       single_page: "%{count} %{item_name} காட்டப்படுகின்றது"
       multiple_pages: "மொத்தம் %{count} %{item_name}, காட்டப்படுபவை %{from}-%{to}"
     combo_nav_js: "%{pages}-இல் %{page_input}-வது பக்கம்"
-    items_selector_js: "ஒரு பக்கத்திற்கு %{items_input} %{item_name} காட்டு"
+    limit_selector_js: "ஒரு பக்கத்திற்கு %{limit_input} %{item_name} காட்டு"

data/locales/tr.yml

@@ -1,4 +1,4 @@
-# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 tr:
   pagy:
     aria_label:
@@ -16,4 +16,4 @@ tr:
       single_page: "Toplam %{count} %{item_name} gösteriliyor"
       multiple_pages: "%{count} %{item_name} içerisinden %{from}-%{to} kadarı gösteriliyor"
     combo_nav_js: "Sayfa %{page_input} / %{pages}"
-    items_selector_js: "Sayfada %{items_input} %{item_name} göster"
+    limit_selector_js: "Sayfada %{limit_input} %{item_name} göster"

data/locales/uk.yml

@@ -1,4 +1,4 @@
-# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 uk:
   pagy:
     aria_label:
@@ -22,4 +22,4 @@ uk:
       single_page: "%{count} %{item_name}"
       multiple_pages: "Загалом %{count} %{item_name}, показані з %{from} по %{to}"
     combo_nav_js: "Сторінка %{page_input} з %{pages}"
-    items_selector_js: "Показати %{items_input} %{item_name} на сторінці"
+    limit_selector_js: "Показати %{limit_input} %{item_name} на сторінці"

data/locales/vi.yml

@@ -1,4 +1,4 @@
-# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 vi:
   pagy:
     aria_label:
@@ -14,4 +14,4 @@ vi:
       single_page: "%{count} %{item_name}"
       multiple_pages: "Đang hiển thị %{from}-%{to} trong tổng số %{count} %{item_name}"
     combo_nav_js: "Trang %{page_input} trên %{pages}"
-    items_selector_js: "Hiển thị %{items_input} %{item_name} mỗi trang"
+    limit_selector_js: "Hiển thị %{limit_input} %{item_name} mỗi trang"

data/locales/zh-CN.yml

@@ -1,4 +1,4 @@
-# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 zh-CN:
   pagy:
     aria_label:
@@ -16,4 +16,4 @@ zh-CN:
       single_page: "显示%{count} 项%{item_name}"
       multiple_pages: "共 %{count} 项%{item_name}，显示 %{from}-%{to}"
     combo_nav_js: "第 %{page_input} / %{pages} 页"
-    items_selector_js: "每页显示 %{items_input} 条%"
+    limit_selector_js: "每页显示 %{limit_input} 条%"

data/locales/zh-HK.yml

@@ -1,4 +1,4 @@
-# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 zh-HK:
   pagy:
     aria_label:
@@ -16,4 +16,4 @@ zh-HK:
       single_page: "顯示 %{count} %{item_name}"
       multiple_pages: "共 %{count}  %{item_name}，顯示 %{from}-%{to}"
     combo_nav_js: "第 %{page_input} / %{pages} 頁"
-    items_selector_js: "每頁顯示 %{items_input} 記錄"
+    limit_selector_js: "每頁顯示 %{limit_input} 記錄"

data/locales/zh-TW.yml

@@ -1,4 +1,4 @@
-# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 zh-TW:
   pagy:
     aria_label:
@@ -16,4 +16,4 @@ zh-TW:
       single_page: "顯示 %{count} 項%{item_name}"
       multiple_pages: "共 %{count} 項%{item_name}，顯示 %{from}-%{to}"
     combo_nav_js: "第 %{page_input} / %{pages} 頁"
-    items_selector_js: "每頁顯示 %{items_input} 項%{item_name}"
+    limit_selector_js: "每頁顯示 %{limit_input} 項%{item_name}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 8.4.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-06 00:00:00.000000000 Z
+date: 2024-07-18 00:00:00.000000000 Z
 dependencies: []
 description: Agnostic pagination in plain ruby. It does it all. Better.
 email:
@@ -21,22 +21,35 @@ files:
 - LICENSE.txt
 - apps/calendar.ru
 - apps/demo.ru
+- apps/keyset_ar.ru
+- apps/keyset_s.ru
 - apps/rails.ru
 - apps/repro.ru
+- apps/tmp/calendar.sqlite3
+- apps/tmp/calendar.sqlite3-shm
+- apps/tmp/calendar.sqlite3-wal
+- apps/tmp/local_secret.txt
+- apps/tmp/pagy-keyset-ar.sqlite3
+- apps/tmp/pagy-keyset-ar.sqlite3-shm
+- apps/tmp/pagy-keyset-ar.sqlite3-wal
+- apps/tmp/pagy-keyset-s.sqlite3
 - bin/pagy
 - config/pagy.rb
-- javascripts/pagy-dev.js
-- javascripts/pagy-module.d.ts
 - javascripts/pagy-module.js
+- javascripts/pagy.d.ts
 - javascripts/pagy.js
+- javascripts/pagy.min.js
+- javascripts/pagy.min.js.map
+- javascripts/pagy.mjs
 - lib/optimist.rb
 - lib/pagy.rb
+- lib/pagy/b64.rb
 - lib/pagy/backend.rb
 - lib/pagy/calendar.rb
 - lib/pagy/calendar/day.rb
-- lib/pagy/calendar/helper.rb
 - lib/pagy/calendar/month.rb
 - lib/pagy/calendar/quarter.rb
+- lib/pagy/calendar/unit.rb
 - lib/pagy/calendar/week.rb
 - lib/pagy/calendar/year.rb
 - lib/pagy/console.rb
@@ -49,25 +62,26 @@ files:
 - lib/pagy/extras/calendar.rb
 - lib/pagy/extras/countless.rb
 - lib/pagy/extras/elasticsearch_rails.rb
-- lib/pagy/extras/foundation.rb
 - lib/pagy/extras/gearbox.rb
 - lib/pagy/extras/headers.rb
 - lib/pagy/extras/i18n.rb
-- lib/pagy/extras/items.rb
 - lib/pagy/extras/js_tools.rb
 - lib/pagy/extras/jsonapi.rb
-- lib/pagy/extras/materialize.rb
+- lib/pagy/extras/keyset.rb
+- lib/pagy/extras/limit.rb
 - lib/pagy/extras/meilisearch.rb
 - lib/pagy/extras/metadata.rb
 - lib/pagy/extras/overflow.rb
 - lib/pagy/extras/pagy.rb
 - lib/pagy/extras/searchkick.rb
-- lib/pagy/extras/semantic.rb
+- lib/pagy/extras/size.rb
 - lib/pagy/extras/standalone.rb
 - lib/pagy/extras/trim.rb
-- lib/pagy/extras/uikit.rb
 - lib/pagy/frontend.rb
 - lib/pagy/i18n.rb
+- lib/pagy/keyset.rb
+- lib/pagy/keyset/active_record.rb
+- lib/pagy/keyset/sequel.rb
 - lib/pagy/url_helpers.rb
 - locales/ar.yml
 - locales/be.yml
@@ -105,6 +119,7 @@ files:
 - locales/zh-CN.yml
 - locales/zh-HK.yml
 - locales/zh-TW.yml
+- pkg/pagy-9.0.0.gem
 - stylesheets/pagy.css
 - stylesheets/pagy.scss
 - stylesheets/pagy.tailwind.css
@@ -118,12 +133,7 @@ metadata:
   bug_tracker_uri: https://github.com/ddnexus/pagy/issues
   changelog_uri: https://github.com/ddnexus/pagy/blob/master/CHANGELOG.md
   support: https://github.com/ddnexus/pagy/discussions/categories/q-a
-post_install_message: |
-  *********************** PAGY WARNING! ***********************
-   The foundation, materialize, semantic and uikit CSS extras
-        have been discontinued and will be removed in v9
-         https://github.com/ddnexus/pagy/discussions/672
-  *************************************************************
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: The best pagination ruby gem

data/javascripts/pagy-dev.js

@@ -1,114 +0,0 @@
-"use strict";
-window.Pagy = (() => {
-    // The observer instance for responsive navs
-    const rjsObserver = new ResizeObserver(entries => entries.forEach(e => e.target.querySelectorAll(".pagy-rjs").forEach(el => el.pagyRender())));
-    // Init the *_nav_js helpers
-    const initNav = (el, [tokens, sequels, labelSequels, trimParam]) => {
-        const container = el.parentElement ?? el;
-        const widths = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);
-        let lastWidth = -1;
-        const fillIn = (a, page, label) => a.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);
-        (el.pagyRender = function () {
-            const width = widths.find(w => w < container.clientWidth) || 0;
-            if (width === lastWidth) {
-                return;
-            } // no change: abort
-            let html = tokens.before; // already trimmed in html
-            const series = sequels[width.toString()];
-            const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());
-            for (const i in series) {
-                const item = series[i];
-                const label = labels[i];
-                let filled;
-                if (typeof item === "number") {
-                    filled = fillIn(tokens.a, item.toString(), label);
-                }
-                else if (item === "gap") {
-                    filled = tokens.gap;
-                }
-                else { // active page
-                    filled = fillIn(tokens.current, item, label);
-                }
-                html += (typeof trimParam === "string" && item == 1) ? trim(filled, trimParam) : filled;
-            }
-            html += tokens.after; // eslint-disable-line align-assignments/align-assignments
-            el.innerHTML = "";
-            el.insertAdjacentHTML("afterbegin", html);
-            lastWidth = width;
-        })();
-        if (el.classList.contains("pagy-rjs")) {
-            rjsObserver.observe(container);
-        }
-    };
-    // Init the *_combo_nav_js helpers
-    const initCombo = (el, [url_token, trimParam]) => initInput(el, inputValue => [inputValue, url_token.replace(/__pagy_page__/, inputValue)], trimParam);
-    // Init the items_selector_js helper
-    const initSelector = (el, [from, url_token, trimParam]) => {
-        initInput(el, inputValue => {
-            const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();
-            const url = url_token.replace(/__pagy_page__/, page).replace(/__pagy_items__/, inputValue);
-            return [page, url];
-        }, trimParam);
-    };
-    // Init the input element
-    const initInput = (el, getVars, trimParam) => {
-        const input = el.querySelector("input");
-        const link = el.querySelector("a");
-        const initial = input.value;
-        const action = function () {
-            if (input.value === initial) {
-                return;
-            } // not changed
-            const [min, val, max] = [input.min, input.value, input.max].map(n => parseInt(n) || 0);
-            if (val < min || val > max) { // reset invalid/out-of-range
-                input.value = initial;
-                input.select();
-                return;
-            }
-            let [page, url] = getVars(input.value); // eslint-disable-line prefer-const
-            if (typeof trimParam === "string" && page === "1") {
-                url = trim(url, trimParam);
-            }
-            link.href = url;
-            link.click();
-        };
-        ["change", "focus"].forEach(e => input.addEventListener(e, input.select)); // auto-select
-        input.addEventListener("focusout", action); // trigger action
-        input.addEventListener("keypress", e => { if (e.key === "Enter") {
-            action();
-        } }); // trigger action
-    };
-    // Trim the ${page-param}=1 params in links
-    const trim = (a, param) => a.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "");
-    // Public interface
-    return {
-        version: "8.4.0",
-        // Scan for elements with a "data-pagy" attribute and call their init functions with the decoded args
-        init(arg) {
-            const target = arg instanceof Element ? arg : document;
-            const elements = target.querySelectorAll("[data-pagy]");
-            for (const el of elements) {
-                try {
-                    const uint8array = Uint8Array.from(atob(el.getAttribute("data-pagy")), c => c.charCodeAt(0));
-                    const [keyword, ...args] = JSON.parse((new TextDecoder()).decode(uint8array)); // base64-utf8 -> JSON -> Array
-                    if (keyword === "nav") {
-                        initNav(el, args);
-                    }
-                    else if (keyword === "combo") {
-                        initCombo(el, args);
-                    }
-                    else if (keyword === "selector") {
-                        initSelector(el, args);
-                    }
-                    else {
-                        console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'", el, keyword);
-                    }
-                }
-                catch (err) {
-                    console.warn("Skipped Pagy.init() for: %o\n%s", el, err);
-                }
-            }
-        }
-    };
-})();
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pagy.js","sourceRoot":"","sources":["pagy.ts"],"names":[],"mappings":"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","sourcesContent":["type NavArgs = readonly [Tokens, Sequels, null | LabelSequels, string?]\ntype ComboArgs = readonly [string, string?]\ntype SelectorArgs = readonly [number, string, string?]\n\ninterface Tokens {\n    readonly before:string\n    readonly a:string\n    readonly current:string\n    readonly gap:string\n    readonly after:string\n}\n\ninterface Sequels {readonly [width:string]:(string | number)[]}\n\ninterface LabelSequels {readonly [width:string]:string[]}\n\ninterface NavElement extends Element {pagyRender():void}\n\nconst Pagy = (() => {\n    // The observer instance for responsive navs\n    const rjsObserver = new ResizeObserver(entries =>\n                                               entries.forEach(e => e.target.querySelectorAll<NavElement>(\".pagy-rjs\").forEach(\n                                                   el => el.pagyRender())));\n\n    // Init the *_nav_js helpers\n    const initNav = (el:NavElement, [tokens, sequels, labelSequels, trimParam]:NavArgs) => {\n        const container = el.parentElement ?? el;\n        const widths = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);\n        let lastWidth = -1;\n        const fillIn = (a:string, page:string, label:string):string =>\n            a.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);\n        (el.pagyRender = function () {\n            const width = widths.find(w => w < container.clientWidth) || 0;\n            if (width === lastWidth) { return } // no change: abort\n            let html = tokens.before;  // already trimmed in html\n            const series = sequels[width.toString()];\n            const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());\n            for (const i in series) {\n                const item = series[i];\n                const label = labels[i];\n                let filled;\n                if (typeof item === \"number\") {\n                    filled = fillIn(tokens.a, item.toString(), label);\n                } else if (item === \"gap\") {\n                    filled = tokens.gap;\n                } else { // active page\n                    filled = fillIn(tokens.current, item, label);\n                }\n                html += (typeof trimParam === \"string\" && item == 1) ? trim(filled, trimParam) : filled;\n            }\n            html += tokens.after;   // eslint-disable-line align-assignments/align-assignments\n            el.innerHTML = \"\";\n            el.insertAdjacentHTML(\"afterbegin\", html);\n            lastWidth = width;\n        })();\n        if (el.classList.contains(\"pagy-rjs\")) { rjsObserver.observe(container) }\n    };\n\n    // Init the *_combo_nav_js helpers\n    const initCombo = (el:Element, [url_token, trimParam]:ComboArgs) =>\n        initInput(el, inputValue => [inputValue, url_token.replace(/__pagy_page__/, inputValue)], trimParam);\n\n    // Init the items_selector_js helper\n    const initSelector = (el:Element, [from, url_token, trimParam]:SelectorArgs) => {\n        initInput(el, inputValue => {\n            const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();\n            const url = url_token.replace(/__pagy_page__/, page).replace(/__pagy_items__/, inputValue);\n            return [page, url];\n        }, trimParam);\n    };\n\n    // Init the input element\n    const initInput = (el:Element, getVars:(v:string) => [string, string], trimParam?:string) => {\n        const input = el.querySelector(\"input\") as HTMLInputElement;\n        const link = el.querySelector(\"a\") as HTMLAnchorElement;\n        const initial = input.value;\n        const action = function () {\n            if (input.value === initial) { return }  // not changed\n            const [min, val, max] = [input.min, input.value, input.max].map(n => parseInt(n) || 0);\n            if (val < min || val > max) {  // reset invalid/out-of-range\n                input.value = initial;\n                input.select();\n                return;\n            }\n            let [page, url] = getVars(input.value);   // eslint-disable-line prefer-const\n            if (typeof trimParam === \"string\" && page === \"1\") { url = trim(url, trimParam) }\n            link.href = url;\n            link.click();\n        };\n        [\"change\", \"focus\"].forEach(e => input.addEventListener(e, input.select));        // auto-select\n        input.addEventListener(\"focusout\", action);                                       // trigger action\n        input.addEventListener(\"keypress\", e => { if (e.key === \"Enter\") { action() } }); // trigger action\n    };\n\n    // Trim the ${page-param}=1 params in links\n    const trim = (a:string, param:string) =>\n        a.replace(new RegExp(`[?&]${param}=1\\\\b(?!&)|\\\\b${param}=1&`), \"\");\n\n    // Public interface\n    return {\n        version: \"8.4.0\",\n\n        // Scan for elements with a \"data-pagy\" attribute and call their init functions with the decoded args\n        init(arg?:Element | never) {\n            const target = arg instanceof Element ? arg : document;\n            const elements = target.querySelectorAll(\"[data-pagy]\");\n            for (const el of elements) {\n                try {\n                    const uint8array = Uint8Array.from(atob(el.getAttribute(\"data-pagy\") as string), c => c.charCodeAt(0));\n                    const [keyword, ...args] = JSON.parse((new TextDecoder()).decode(uint8array)); // base64-utf8 -> JSON -> Array\n                    if (keyword === \"nav\") {\n                        initNav(el as NavElement, args as NavArgs);\n                    } else if (keyword === \"combo\") {\n                        initCombo(el, args as ComboArgs);\n                    } else if (keyword === \"selector\") {\n                        initSelector(el, args as SelectorArgs);\n                    } else {\n                        console.warn(\"Skipped Pagy.init() for: %o\\nUnknown keyword '%s'\", el, keyword);\n                    }\n                } catch (err) { console.warn(\"Skipped Pagy.init() for: %o\\n%s\", el, err) }\n            }\n        }\n    };\n})();\n"]}

data/lib/pagy/calendar/helper.rb

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-class Pagy # :nodoc:
-  class Calendar # :nodoc:
-    # Initializes the calendar objects, reducing complexity in the extra
-    # The returned calendar is a simple hash of units/objects
-    class Helper < Hash
-      class << self
-        private
-
-        def init(conf, period, params)
-          new.send(:init, conf, period, params)
-        end
-      end
-
-      private
-
-      # Create the calendar
-      def init(conf, period, params)
-        @conf  = Marshal.load(Marshal.dump(conf))  # store a copy
-        @units = Calendar::UNITS & @conf.keys # get the units in time length desc order
-        raise ArgumentError, 'no calendar unit found in pagy_calendar @configuration' if @units.empty?
-
-        @period     = period
-        @params     = params
-        @page_param = conf[:pagy][:page_param] || DEFAULT[:page_param]
-        @units.each do |unit|  # set all the :page_param vars for later deletion
-          unit_page_param         = :"#{unit}_#{@page_param}"
-          conf[unit][:page_param] = unit_page_param
-          conf[unit][:page]       = @params[unit_page_param]
-        end
-        calendar = {}
-        object   = nil
-        @units.each_with_index do |unit, index|
-          params_to_delete    = @units[(index + 1), @units.size].map { |sub| conf[sub][:page_param] } + [@page_param]
-          conf[unit][:params] = lambda { |up| up.except(*params_to_delete.map(&:to_s)) } # rubocop:disable Style/Lambda
-          conf[unit][:period] = object&.send(:active_period) || @period
-          calendar[unit]      = object = Calendar.send(:create, unit, conf[unit])
-        end
-        [replace(calendar), object.from, object.to]
-      end
-
-      # Return the calendar object at time
-      def calendar_at(time, **opts)
-        conf        = Marshal.load(Marshal.dump(@conf))
-        page_params = {}
-        @units.inject(nil) do |object, unit|
-          conf[unit][:period] = object&.send(:active_period) || @period
-          conf[unit][:page]   = page_params[:"#{unit}_#{@page_param}"] \
-                              = Calendar.send(:create, unit, conf[unit]).send(:page_at, time, **opts)
-          conf[unit][:params] ||= {}
-          conf[unit][:params].merge!(page_params)
-          Calendar.send(:create, unit, conf[unit])
-        end
-      end
-
-      public
-
-      # Return the current time of the smallest time unit shown
-      def showtime
-        self[@units.last].from
-      end
-    end
-  end
-end

data/lib/pagy/extras/foundation.rb

@@ -1,95 +0,0 @@
-# frozen_string_literal: true
-
-warn '[PAGY WARNING] The foundation extra has been discontinued and it will be removed in v9 ' \
-     '(https://github.com/ddnexus/pagy/discussions/672#discussioncomment-9212328)'
-
-require_relative 'js_tools'
-
-class Pagy # :nodoc:
-  # Frontend modules are specially optimized for performance.
-  # The resulting code may not look very elegant, but produces the best benchmarks
-  module FoundationExtra
-    # Pagination for Foundation: it returns the html with the series of links to the pages
-    def pagy_foundation_nav(pagy, id: nil, aria_label: nil, **vars)
-      id = %( id="#{id}") if id
-      a  = pagy_anchor(pagy)
-
-      html = +%(<nav#{id} class="pagy-foundation-nav" #{
-                  nav_aria_label(pagy, aria_label:)}><ul class="pagination"> #{
-                  foundation_prev_html(pagy, a)})
-      pagy.series(**vars).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
-        html << case item
-                when Integer
-                  %(<li>#{a.(item)}</li>)
-                when String
-                  %(<li class="current" role="link" aria-current="page" aria-disabled="true">#{pagy.label_for(item)}</li>)
-                when :gap
-                  %(<li class="ellipsis gap"></li>)
-                else
-                  raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
-                end
-      end
-      html << %(#{foundation_next_html(pagy, a)}</ul></nav>)
-    end
-
-    # Javascript pagination for foundation: it returns a nav with a data-pagy attribute used by the pagy.js file
-    def pagy_foundation_nav_js(pagy, id: nil, aria_label: nil, **vars)
-      sequels = pagy.sequels(**vars)
-      id      = %( id="#{id}") if id
-      a       = pagy_anchor(pagy)
-      tokens  = { 'before'  => %(<ul class="pagination">#{foundation_prev_html pagy, a}),
-                  'a'       => %(<li>#{a.(PAGE_TOKEN, LABEL_TOKEN)}</li>),
-                  'current' => %(<li class="current" role="link" aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</li>),
-                  'gap'     => %(<li class="ellipsis gap"></li>),
-                  'after'   => %(#{foundation_next_html pagy, a}</ul>) }
-
-      %(<nav#{id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-foundation-nav-js" #{
-          nav_aria_label(pagy, aria_label:)} #{
-          pagy_data(pagy, :nav, tokens, sequels, pagy.label_sequels(sequels))
-        }></nav>)
-    end
-
-    # Javascript combo pagination for Foundation: it returns a nav with a data-pagy attribute used by the pagy.js file
-    def pagy_foundation_combo_nav_js(pagy, id: nil, aria_label: nil)
-      id    = %( id="#{id}") if id
-      a     = pagy_anchor(pagy)
-      pages = pagy.pages
-
-      page_input = %(<input name="page" type="number" min="1" max="#{pages}" value="#{pagy.page}" aria-current="page" ) <<
-                   %(style="text-align: center; width: #{pages.to_s.length + 1}rem; ) <<
-                   %(height: 1.5rem; padding: .5rem; margin: 0 .4rem; font-size: .875rem;" class="current">#{JSTools::A_TAG})
-
-      %(<nav#{id} class="pagy-foundation-combo-nav-js" #{
-          nav_aria_label(pagy, aria_label:)} #{
-          pagy_data(pagy, :combo, pagy_url_for(pagy, PAGE_TOKEN))
-        }><ul class="pagination">#{
-          foundation_prev_html(pagy, a)
-        }<li style="padding: 0 .3rem"><label style="display: flex; align-items: center; white-space: nowrap">#{
-          pagy_t('pagy.combo_nav_js', page_input:, pages:)
-        }</label></li>#{
-          foundation_next_html(pagy, a)
-        }</ul></nav>)
-    end
-
-    private
-
-    def foundation_prev_html(pagy, a)
-      if (p_prev = pagy.prev)
-        %(<li class="prev">#{a.(p_prev, pagy_t('pagy.prev'), aria_label: pagy_t('pagy.aria_label.prev'))}</li>)
-      else
-        %(<li class="prev disabled" role="link" aria-disabled="true" aria-label="#{
-            pagy_t('pagy.aria_label.prev')}">#{pagy_t('pagy.prev')}</li>)
-      end
-    end
-
-    def foundation_next_html(pagy, a)
-      if (p_next = pagy.next)
-        %(<li class="next">#{a.(p_next, pagy_t('pagy.next'), aria_label: pagy_t('pagy.aria_label.next'))}</li>)
-      else
-        %(<li class="next disabled" role="link" aria-disabled="true" aria-label="#{
-             pagy_t('pagy.aria_label.next')}">#{pagy_t('pagy.next')}</li>)
-      end
-    end
-  end
-  Frontend.prepend FoundationExtra
-end