pagy 5.7.3 → 5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b065a7027d07b5bc504cbd2b80389a2e25168a075a7485d6a0155bd54b36bf4
-  data.tar.gz: 345c15d964cf6511adcbdf60514f605c64b83e51dd172849f98d337fcff67696
+  metadata.gz: c55fcd46b6bf57b7c531075a1425bdd6b130fae3d63d4effbf969ac3eb82dea1
+  data.tar.gz: b0790efbc7565e69cc1c18b4bbeeedafd4b9dbdd7703e823e2fa0e8191fb7004
 SHA512:
-  metadata.gz: 16b5e3b3cee1cde9f609260324ad045e45b97ecbb457eb648044b726fcc0735dd16f7909f49066ae21c01589e3dafdf303be19a865d0d71fcebe3e9b325e9fe1
-  data.tar.gz: df2a7604efbd881c69977e05a23b4b4125eaf0660410d619dbeafbfed7f42de2f4382f01b91f591bd66a6a799c8f5970deb782ea6ca48e9cb8fe95c018428feb
+  metadata.gz: 4c0334914b4748a423b46776822359c234c0b8af531d92a289f037189638d6abe92dbebdfffe53316872d4af3a34032ec9742de21509d856e75010a1fa0e4936
+  data.tar.gz: 308b3a243a6398abd0d7de7acdfcbd095f600dabff402575b4ff793af53a67622c14ddf7a02c88c69b5250392d019a0b59868535fbd523eae8a7d4f7e9ef4b29

data/lib/config/pagy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (5.7.3)
+# Pagy initializer file (5.8.0)
 # Customize only what you really need and notice that the core Pagy works also without any of the following lines.
 # Should you just cherry pick part of this file, please maintain the require-order of the extras
 

data/lib/javascripts/pagy-dev.js

@@ -1,37 +1,36 @@
-// The Pagy object
+"use strict";
 const Pagy = {
-    version: "5.7.3",
-    // Scan for "data-pagy-json" elements, parse their JSON content and call their init functions
+    version: "5.8.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-json]");
-        const warn = (el, err) => console.warn("Pagy.init() skipped element: %o\n%s", el, err);
-        for (const element of elements) {
-            const json = element.getAttribute("data-pagy-json");
+        const elements = target.querySelectorAll("[data-pagy]");
+        for (const el of elements) {
             try {
-                const [keyword, ...args] = JSON.parse(json);
+                const [keyword, ...args] = JSON.parse(atob(el.getAttribute("data-pagy"))); // base64 JSON -> Array
                 if (keyword === "nav") {
-                    Pagy.initNav(element, args);
+                    Pagy.initNav(el, args);
                 }
                 else if (keyword === "combo") {
-                    Pagy.initCombo(element, args);
+                    Pagy.initCombo(el, args);
                 }
                 else if (keyword === "selector") {
-                    Pagy.initSelector(element, args);
+                    Pagy.initSelector(el, args);
                 }
                 else {
-                    warn(element, `Illegal PagyJSON keyword: expected "nav"|"combo"|"selector", got "${keyword}"`);
+                    Pagy.initWarn(el, `Illegal PagyJSON keyword: expected "nav"|"combo"|"selector", got "${keyword}"`);
                 }
             }
             catch (err) {
-                warn(element, err);
+                Pagy.initWarn(el, err);
             }
         }
     },
+    initWarn(el, err) { console.warn("Pagy.init() skipped element: %o\n%s", el, err); },
     // Init the *_nav_js helpers
     initNav(el, [tags, sequels, labelSequels, trimParam]) {
         const container = el.parentElement ?? el;
-        const widths = Object.getOwnPropertyNames(sequels).map(w => parseInt(w)).sort((a, b) => b - a);
+        const widths = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);
         let lastWidth = -1;
         const fillIn = (link, page, label) => link.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);
         (el.pagyRender = function () {
@@ -69,9 +68,7 @@ const Pagy = {
     },
     // The observer instance for responsive navs
     rjsObserver: new ResizeObserver(entries => {
-        entries.filter(e => e.contentBoxSize)
-            .forEach(e => e.target.querySelectorAll(".pagy-rjs")
-            .forEach(rjs => rjs.pagyRender()));
+        entries.forEach(e => e.target.querySelectorAll(".pagy-rjs").forEach(el => el.pagyRender()));
     }),
     // Init the *_combo_nav_js helpers
     initCombo(el, [link, trimParam]) {
@@ -115,3 +112,4 @@ const Pagy = {
     // Trim the ${page-param}=1 params in links
     trim: (link, param) => link.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "")
 };
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pagy.js","sourceRoot":"","sources":["pagy.ts"],"names":[],"mappings":"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","sourcesContent":["type NavArgs      = readonly [Tags, Sequels, null|LabelSequels, string?]\ntype ComboArgs    = readonly [string, string?]\ntype SelectorArgs = readonly [number, string, string?]\ninterface Tags {\n    readonly before: string\n    readonly link:   string\n    readonly active: string\n    readonly gap:    string\n    readonly after:  string\n}\ninterface Sequels      { readonly [width:string]: (string|number|\"gap\")[] }\ninterface LabelSequels { readonly [width:string]: string[] }\ninterface NavElement extends Element { pagyRender(): void }\n\nconst Pagy = {\n    version: \"5.8.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 [keyword, ...args] = JSON.parse(atob(el.getAttribute(\"data-pagy\") as string)); // base64 JSON -> Array\n                if (keyword === \"nav\") {\n                    Pagy.initNav(el as NavElement, args as NavArgs);\n                } else if (keyword === \"combo\") {\n                    Pagy.initCombo(el, args as ComboArgs);\n                } else if (keyword === \"selector\") {\n                    Pagy.initSelector(el, args as SelectorArgs);\n                } else {\n                    Pagy.initWarn(el, `Illegal PagyJSON keyword: expected \"nav\"|\"combo\"|\"selector\", got \"${keyword}\"`);\n                }\n            } catch (err) { Pagy.initWarn(el, err) }\n        }\n    },\n\n    initWarn(el:Element, err:unknown) { console.warn(\"Pagy.init() skipped element: %o\\n%s\", el, err) },\n\n    // Init the *_nav_js helpers\n    initNav(el:NavElement, [tags, 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    = (link:string, page:string, label:string):string =>\n                              link.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     = tags.before;\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                if (typeof trimParam === \"string\" && item === 1) {\n                    html += Pagy.trim(fillIn(tags.link, item.toString(), label), trimParam);\n                } else if (typeof item === \"number\") {\n                    html += fillIn(tags.link, item.toString(), label);\n                } else if (item === \"gap\") {\n                    html += tags.gap;\n                } else { // active page\n                    html += fillIn(tags.active, item, label);\n                }\n            }\n            html += tags.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\")) { Pagy.rjsObserver.observe(container) }\n    },\n\n    // The observer instance for responsive navs\n    rjsObserver: new ResizeObserver(entries => {\n        entries.forEach(e => e.target.querySelectorAll<NavElement>(\".pagy-rjs\").forEach(el => el.pagyRender()));\n    }),\n\n    // Init the *_combo_nav_js helpers\n    initCombo(el:Element, [link, trimParam]:ComboArgs) {\n        Pagy.initInput(el, inputValue => [inputValue, link.replace(/__pagy_page__/, inputValue)], trimParam);\n    },\n\n    // Init the items_selector_js helper\n    initSelector(el:Element, [from, link, trimParam]:SelectorArgs) {\n        Pagy.initInput(el, inputValue => {\n            const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();\n            const html = link.replace(/__pagy_page__/, page).replace(/__pagy_items__/, inputValue);\n            return [page, html];\n        }, trimParam);\n    },\n\n    // Init the input element\n    initInput(el:Element, getVars:(v:string)=>[string, string], trimParam?:string) {\n        const input   = el.querySelector(\"input\") as HTMLInputElement;\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, html] = getVars(input.value);   // eslint-disable-line prefer-const\n            if (typeof trimParam === \"string\" && page === \"1\") { html = Pagy.trim(html, trimParam) }\n            el.insertAdjacentHTML(\"afterbegin\", html);\n            (el.querySelector(\"a\") as HTMLAnchorElement).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    trim: (link:string, param:string) => link.replace(new RegExp(`[?&]${param}=1\\\\b(?!&)|\\\\b${param}=1&`), \"\")\n};\n"]}

data/lib/javascripts/pagy-module.d.ts

@@ -0,0 +1,31 @@
+declare type NavArgs = readonly [Tags, Sequels, null | LabelSequels, string?];
+declare type ComboArgs = readonly [string, string?];
+declare type SelectorArgs = readonly [number, string, string?];
+interface Tags {
+    readonly before: string;
+    readonly link: string;
+    readonly active: string;
+    readonly gap: string;
+    readonly after: string;
+}
+interface Sequels {
+    readonly [width: string]: (string | number | "gap")[];
+}
+interface LabelSequels {
+    readonly [width: string]: string[];
+}
+interface NavElement extends Element {
+    pagyRender(): void;
+}
+declare const Pagy: {
+    version: string;
+    init(arg?: Element | never): void;
+    initWarn(el: Element, err: unknown): void;
+    initNav(el: NavElement, [tags, sequels, labelSequels, trimParam]: NavArgs): void;
+    rjsObserver: ResizeObserver;
+    initCombo(el: Element, [link, trimParam]: ComboArgs): void;
+    initSelector(el: Element, [from, link, trimParam]: SelectorArgs): void;
+    initInput(el: Element, getVars: (v: string) => [string, string], trimParam?: string): void;
+    trim: (link: string, param: string) => string;
+};
+export default Pagy;

data/lib/javascripts/{pagy.mjs → pagy-module.js}

@@ -1,37 +1,35 @@
-// The Pagy object
 const Pagy = {
-    version: "5.7.3",
-    // Scan for "data-pagy-json" elements, parse their JSON content and call their init functions
+    version: "5.8.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-json]");
-        const warn = (el, err) => console.warn("Pagy.init() skipped element: %o\n%s", el, err);
-        for (const element of elements) {
-            const json = element.getAttribute("data-pagy-json");
+        const elements = target.querySelectorAll("[data-pagy]");
+        for (const el of elements) {
             try {
-                const [keyword, ...args] = JSON.parse(json);
+                const [keyword, ...args] = JSON.parse(atob(el.getAttribute("data-pagy"))); // base64 JSON -> Array
                 if (keyword === "nav") {
-                    Pagy.initNav(element, args);
+                    Pagy.initNav(el, args);
                 }
                 else if (keyword === "combo") {
-                    Pagy.initCombo(element, args);
+                    Pagy.initCombo(el, args);
                 }
                 else if (keyword === "selector") {
-                    Pagy.initSelector(element, args);
+                    Pagy.initSelector(el, args);
                 }
                 else {
-                    warn(element, `Illegal PagyJSON keyword: expected "nav"|"combo"|"selector", got "${keyword}"`);
+                    Pagy.initWarn(el, `Illegal PagyJSON keyword: expected "nav"|"combo"|"selector", got "${keyword}"`);
                 }
             }
             catch (err) {
-                warn(element, err);
+                Pagy.initWarn(el, err);
             }
         }
     },
+    initWarn(el, err) { console.warn("Pagy.init() skipped element: %o\n%s", el, err); },
     // Init the *_nav_js helpers
     initNav(el, [tags, sequels, labelSequels, trimParam]) {
         const container = el.parentElement ?? el;
-        const widths = Object.getOwnPropertyNames(sequels).map(w => parseInt(w)).sort((a, b) => b - a);
+        const widths = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);
         let lastWidth = -1;
         const fillIn = (link, page, label) => link.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);
         (el.pagyRender = function () {
@@ -69,9 +67,7 @@ const Pagy = {
     },
     // The observer instance for responsive navs
     rjsObserver: new ResizeObserver(entries => {
-        entries.filter(e => e.contentBoxSize)
-            .forEach(e => e.target.querySelectorAll(".pagy-rjs")
-            .forEach(rjs => rjs.pagyRender()));
+        entries.forEach(e => e.target.querySelectorAll(".pagy-rjs").forEach(el => el.pagyRender()));
     }),
     // Init the *_combo_nav_js helpers
     initCombo(el, [link, trimParam]) {

data/lib/javascripts/pagy.js

@@ -1 +1 @@
-!function(){function t(t){if(Array.isArray(t))return t}function n(t){if(Symbol.iterator in Object(t)||"[object Arguments]"===Object.prototype.toString.call(t))return Array.from(t)}function e(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}function r(r,i){return t(r)||n(r)||e()}var i={version:"5.7.3",init:function(r){var a,o=(r instanceof Element?r:document).querySelectorAll("[data-pagy-json]"),c=function(t,n){return console.warn("Pagy.init() skipped element: %o\n%s",t,n)},u=!0,l=!1,f=void 0;try{for(var p,s=o[Symbol.iterator]();!(u=(p=s.next()).done);u=!0){var v=p.value,g=v.getAttribute("data-pagy-json");try{var y=t(a=JSON.parse(g))||n(a)||e(),d=y[0],m=y.slice(1);"nav"===d?i.initNav(v,m):"combo"===d?i.initCombo(v,m):"selector"===d?i.initSelector(v,m):c(v,'Illegal PagyJSON keyword: expected "nav"|"combo"|"selector", got "'.concat(d,'"'))}catch(t){c(v,t)}}}catch(t){l=!0,f=t}finally{try{u||null==s.return||s.return()}finally{if(l)throw f}}},initNav:function(t,n){var e,a=r(n),o=a[0],c=a[1],u=a[2],l=a[3],f=null!==(e=t.parentElement)&&void 0!==e?e:t,p=Object.getOwnPropertyNames(c).map((function(t){return parseInt(t)})).sort((function(t,n){return n-t})),s=-1,v=function(t,n,e){return t.replace(/__pagy_page__/g,n).replace(/__pagy_label__/g,e)};(t.pagyRender=function(){var n=p.find((function(t){return t<f.clientWidth}))||0;if(n!==s){var e,r=o.before,a=c[n.toString()],g=null!==(e=null==u?void 0:u[n.toString()])&&void 0!==e?e:a.map((function(t){return t.toString()}));for(var y in a){var d=a[y],m=g[y];r+="string"==typeof l&&1===d?i.trim(v(o.link,d.toString(),m),l):"number"==typeof d?v(o.link,d.toString(),m):"gap"===d?o.gap:v(o.active,d,m)}r+=o.after,t.innerHTML="",t.insertAdjacentHTML("afterbegin",r),s=n}})(),t.classList.contains("pagy-rjs")&&i.rjsObserver.observe(f)},rjsObserver:new ResizeObserver((function(t){t.filter((function(t){return t.contentBoxSize})).forEach((function(t){return t.target.querySelectorAll(".pagy-rjs").forEach((function(t){return t.pagyRender()}))}))})),initCombo:function(t,n){var e=r(n),a=e[0],o=e[1];i.initInput(t,(function(t){return[t,a.replace(/__pagy_page__/,t)]}),o)},initSelector:function(t,n){var e=r(n),a=e[0],o=e[1],c=e[2];i.initInput(t,(function(t){var n=Math.max(Math.ceil(a/parseInt(t)),1).toString();return[n,o.replace(/__pagy_page__/,n).replace(/__pagy_items__/,t)]}),c)},initInput:function(t,n,e){var a=t.querySelector("input"),o=a.value,c=function(){if(a.value!==o){var c=r([a.min,a.value,a.max].map((function(t){return parseInt(t)||0}))),u=c[0],l=c[1],f=c[2];if(l<u||l>f)return a.value=o,void a.select();var p=r(n(a.value)),s=p[0],v=p[1];"string"==typeof e&&"1"===s&&(v=i.trim(v,e)),t.insertAdjacentHTML("afterbegin",v),t.querySelector("a").click()}};["change","focus"].forEach((function(t){return a.addEventListener(t,a.select)})),a.addEventListener("focusout",c),a.addEventListener("keypress",(function(t){"Enter"===t.key&&c()}))},trim:function(t,n){return t.replace(new RegExp("[?&]".concat(n,"=1\\b(?!&)|\\b").concat(n,"=1&")),"")}},a=i;window.Pagy=a}();
+!function(){function t(t){if(Array.isArray(t))return t}function n(t){if(Symbol.iterator in Object(t)||"[object Arguments]"===Object.prototype.toString.call(t))return Array.from(t)}function e(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}function r(r,i){return t(r)||n(r)||e()}var i={version:"5.8.0",init:function(r){var a,o=(r instanceof Element?r:document).querySelectorAll("[data-pagy]"),c=!0,u=!1,l=void 0;try{for(var f,p=o[Symbol.iterator]();!(c=(f=p.next()).done);c=!0){var s=f.value;try{var v=t(a=JSON.parse(atob(s.getAttribute("data-pagy"))))||n(a)||e(),g=v[0],y=v.slice(1);"nav"===g?i.initNav(s,y):"combo"===g?i.initCombo(s,y):"selector"===g?i.initSelector(s,y):i.initWarn(s,'Illegal PagyJSON keyword: expected "nav"|"combo"|"selector", got "'.concat(g,'"'))}catch(t){i.initWarn(s,t)}}}catch(t){u=!0,l=t}finally{try{c||null==p.return||p.return()}finally{if(u)throw l}}},initWarn:function(t,n){console.warn("Pagy.init() skipped element: %o\n%s",t,n)},initNav:function(t,n){var e,a=r(n),o=a[0],c=a[1],u=a[2],l=a[3],f=null!==(e=t.parentElement)&&void 0!==e?e:t,p=Object.keys(c).map((function(t){return parseInt(t)})).sort((function(t,n){return n-t})),s=-1,v=function(t,n,e){return t.replace(/__pagy_page__/g,n).replace(/__pagy_label__/g,e)};(t.pagyRender=function(){var n=p.find((function(t){return t<f.clientWidth}))||0;if(n!==s){var e,r=o.before,a=c[n.toString()],g=null!==(e=null==u?void 0:u[n.toString()])&&void 0!==e?e:a.map((function(t){return t.toString()}));for(var y in a){var d=a[y],_=g[y];r+="string"==typeof l&&1===d?i.trim(v(o.link,d.toString(),_),l):"number"==typeof d?v(o.link,d.toString(),_):"gap"===d?o.gap:v(o.active,d,_)}r+=o.after,t.innerHTML="",t.insertAdjacentHTML("afterbegin",r),s=n}})(),t.classList.contains("pagy-rjs")&&i.rjsObserver.observe(f)},rjsObserver:new ResizeObserver((function(t){t.forEach((function(t){return t.target.querySelectorAll(".pagy-rjs").forEach((function(t){return t.pagyRender()}))}))})),initCombo:function(t,n){var e=r(n),a=e[0],o=e[1];i.initInput(t,(function(t){return[t,a.replace(/__pagy_page__/,t)]}),o)},initSelector:function(t,n){var e=r(n),a=e[0],o=e[1],c=e[2];i.initInput(t,(function(t){var n=Math.max(Math.ceil(a/parseInt(t)),1).toString();return[n,o.replace(/__pagy_page__/,n).replace(/__pagy_items__/,t)]}),c)},initInput:function(t,n,e){var a=t.querySelector("input"),o=a.value,c=function(){if(a.value!==o){var c=r([a.min,a.value,a.max].map((function(t){return parseInt(t)||0}))),u=c[0],l=c[1],f=c[2];if(l<u||l>f)return a.value=o,void a.select();var p=r(n(a.value)),s=p[0],v=p[1];"string"==typeof e&&"1"===s&&(v=i.trim(v,e)),t.insertAdjacentHTML("afterbegin",v),t.querySelector("a").click()}};["change","focus"].forEach((function(t){return a.addEventListener(t,a.select)})),a.addEventListener("focusout",c),a.addEventListener("keypress",(function(t){"Enter"===t.key&&c()}))},trim:function(t,n){return t.replace(new RegExp("[?&]".concat(n,"=1\\b(?!&)|\\b").concat(n,"=1&")),"")}},a=i;window.Pagy=a}();

data/lib/pagy/extras/bootstrap.rb

@@ -41,7 +41,7 @@ class Pagy # :nodoc:
                'after'  => %(#{pagy_bootstrap_next_html pagy, link}</ul>) }
 
       %(<nav#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-bootstrap-nav-js" aria-label="pager" #{
-        pagy_json_attr(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></nav>)
+        pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></nav>)
     end
 
     # Javascript combo pagination for bootstrap: it returns a nav and a JSON tag used by the pagy.js file
@@ -55,7 +55,7 @@ class Pagy # :nodoc:
                     p_pages.to_s.length + 1}rem;">)
 
       %(<nav#{p_id} class="pagy-bootstrap-combo-nav-js pagination" aria-label="pager"><div class="btn-group" role="group" #{
-          pagy_json_attr pagy, :combo, pagy_marked_link(link)}>#{
+          pagy_data(pagy, :combo, pagy_marked_link(link))}>#{
           if (p_prev = pagy.prev)
             link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous" class="prev btn btn-primary"'
           else

data/lib/pagy/extras/bulma.rb

@@ -45,7 +45,7 @@ class Pagy # :nodoc:
                'after'  => '</ul>' }
 
       %(<nav#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-bulma-nav-js pagination is-centered" aria-label="pagination" #{
-        pagy_json_attr(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></nav>)
+        pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></nav>)
     end
 
     # Javascript combo pagination for bulma: it returns a nav and a JSON tag used by the pagy.js file
@@ -59,7 +59,7 @@ class Pagy # :nodoc:
 
       html = %(<nav#{p_id} class="pagy-bulma-combo-nav-js" aria-label="pagination">)
       %(#{html}<div class="field is-grouped is-grouped-centered" role="group" #{
-          pagy_json_attr pagy, :combo, pagy_marked_link(link)}>#{
+          pagy_data(pagy, :combo, pagy_marked_link(link))}>#{
           if (p_prev  = pagy.prev)
             %(<p class="control">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'class="button" aria-label="previous page"'}</p>)
           else

data/lib/pagy/extras/foundation.rb

@@ -38,7 +38,7 @@ class Pagy # :nodoc:
                'after'  => %(#{pagy_foundation_next_html pagy, link}</ul>) }
 
       %(<nav#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-foundation-nav-js" aria-label="Pagination" #{
-        pagy_json_attr(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></nav>)
+        pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></nav>)
     end
 
     # Javascript combo pagination for Foundation: it returns a nav and a JSON tag used by the pagy.js file
@@ -52,7 +52,7 @@ class Pagy # :nodoc:
                     p_pages.to_s.length + 1}rem; padding: 0 0.3rem; margin: 0 0.3rem;">)
 
       %(<nav#{p_id} class="pagy-foundation-combo-nav-js" aria-label="Pagination"><div class="input-group" #{
-          pagy_json_attr pagy, :combo, pagy_marked_link(link)}>#{
+          pagy_data(pagy, :combo, pagy_marked_link(link))}>#{
           if (p_prev  = pagy.prev)
             link.call p_prev, pagy_t('pagy.nav.prev'),
                       'style="margin-bottom: 0" aria-label="previous" class="prev button primary"'

data/lib/pagy/extras/frontend_helpers.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'digest'
+require 'base64'
 
 class Pagy # :nodoc:
   DEFAULT[:steps] = false # default false will use {0 => @vars[:size]}
@@ -44,17 +44,19 @@ class Pagy # :nodoc:
     # Additions for the Frontend
     module Frontend
       if defined?(Oj)
-        # Return a script tag with the JSON-serialized args generated with the faster oj gem
-        def pagy_json_attr(pagy, *args)
+        # Return a data tag with the base64 encoded JSON-serialized args generated with the faster oj gem
+        # Base64 encoded JSON is smaller than HTML escaped JSON
+        def pagy_data(pagy, *args)
           args << pagy.vars[:page_param] if pagy.vars[:trim_extra]
-          %(data-pagy-json="#{Oj.dump(args, mode: :strict).gsub('"', '&quot;')}")
+          %(data-pagy="#{Base64.strict_encode64(Oj.dump(args, mode: :strict))}")
         end
       else
         require 'json'
-        # Return a script tag with the JSON-serialized args generated with the slower to_json
-        def pagy_json_attr(pagy, *args)
+        # Return a data tag with the base64 encoded JSON-serialized args generated with the slower to_json
+        # Base64 encoded JSON is smaller than HTML escaped JSON
+        def pagy_data(pagy, *args)
           args << pagy.vars[:page_param] if pagy.vars[:trim_extra]
-          %(data-pagy-json="#{args.to_json.gsub('"', '&quot;')}")
+          %(data-pagy="#{Base64.strict_encode64(args.to_json)}")
         end
       end
 

data/lib/pagy/extras/items.rb

@@ -39,7 +39,7 @@ class Pagy # :nodoc:
         link           = pagy_marked_link(pagy_link_proc(pagy, link_extra: link_extra))
         p_vars[:items] = p_items # restore the items
 
-        html  = +%(<span#{p_id} class="pagy-items-selector-js" #{pagy_json_attr pagy, :selector, pagy.from, link}>)
+        html  = +%(<span#{p_id} class="pagy-items-selector-js" #{pagy_data(pagy, :selector, pagy.from, link)}>)
         input = %(<input type="number" min="1" max="#{p_vars[:max_items]}" value="#{
                     p_items}" style="padding: 0; text-align: center; width: #{p_items.to_s.length + 1}rem;">)
         html << pagy_t('pagy.items_selector_js', item_name: item_name || pagy_t(i18n_key || p_vars[:i18n_key], count: p_items),

data/lib/pagy/extras/materialize.rb

@@ -39,7 +39,7 @@ class Pagy # :nodoc:
                'after'  => %(#{pagy_materialize_next_html pagy, link}</ul>) }
 
       %(<div#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-materialize-nav-js" role="navigation" aria-label="pager" #{
-        pagy_json_attr(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></div>)
+        pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></div>)
     end
 
     # Javascript combo pagination for materialize: it returns a nav and a JSON tag used by the pagy.js file
@@ -54,7 +54,7 @@ class Pagy # :nodoc:
 
       html = %(<ul#{p_id} class="pagy-materialize-combo-nav-js pagination chip" role="navigation")
       %(#{html} aria-label="pager" style="padding-right: 0" #{
-          pagy_json_attr pagy, :combo, pagy_marked_link(link)}>#{
+          pagy_data(pagy, :combo, pagy_marked_link(link))}>#{
           pagy_materialize_prev_html pagy, link, style}<li class="pagy-combo-input">#{
           pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages}</li>#{
           pagy_materialize_next_html pagy, link, style}</ul>)

data/lib/pagy/extras/navs.rb

@@ -19,7 +19,7 @@ class Pagy # :nodoc:
                'after'  => pagy_nav_next_html(pagy, link) }
 
       %(<nav#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-nav-js pagination" aria-label="pager" #{
-        pagy_json_attr(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></nav>)
+        pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></nav>)
     end
 
     # Javascript combo pagination: it returns a nav and a JSON tag used by the pagy.js file
@@ -32,7 +32,7 @@ class Pagy # :nodoc:
                     p_page}" style="padding: 0; text-align: center; width: #{p_pages.to_s.length + 1}rem;">)
 
       %(<nav#{p_id} class="pagy-combo-nav-js pagination" aria-label="pager" #{
-          pagy_json_attr pagy, :combo, pagy_marked_link(link)}>#{
+          pagy_data(pagy, :combo, pagy_marked_link(link))}>#{
           pagy_nav_prev_html pagy, link
         }<span class="pagy-combo-input" style="margin: 0 0.6rem;">#{
           pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages

data/lib/pagy/extras/semantic.rb

@@ -38,7 +38,7 @@ class Pagy # :nodoc:
                'after'  => pagy_semantic_next_html(pagy, link) }
 
       %(<div#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-semantic-nav-js ui pagination menu" role="navigation" #{
-        pagy_json_attr(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></div>)
+        pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></div>)
     end
 
     # Combo pagination for semantic: it returns a nav and a JSON tag used by the pagy.js file
@@ -51,7 +51,7 @@ class Pagy # :nodoc:
                     p_page}" style="padding: 0; text-align: center; width: #{p_pages.to_s.length + 1}rem; margin: 0 0.3rem">)
 
       %(<div#{p_id} class="pagy-semantic-combo-nav-js ui compact menu" role="navigation" #{
-          pagy_json_attr pagy, :combo, pagy_marked_link(link)}>#{
+          pagy_data(pagy, :combo, pagy_marked_link(link))}>#{
           pagy_semantic_prev_html pagy, link
         }<div class="pagy-combo-input item">#{
           pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages

data/lib/pagy/extras/uikit.rb

@@ -37,7 +37,7 @@ class Pagy # :nodoc:
                'after'  => pagy_uikit_next_html(pagy, link) }
 
       %(<ul#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-uikit-nav-js uk-pagination uk-flex-center" #{
-        pagy_json_attr(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></ul>)
+        pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></ul>)
     end
 
     # Javascript combo pagination for uikit: it returns a nav and a JSON tag used by the pagy.js file
@@ -50,7 +50,7 @@ class Pagy # :nodoc:
                     p_page}" style="text-align: center; width: #{p_pages.to_s.length + 1}rem;">)
 
       %(<ul#{p_id} class="pagy-uikit-combo-nav-js uk-button-group uk-pagination uk-flex-center" #{
-          pagy_json_attr pagy, :combo, pagy_marked_link(link)
+          pagy_data(pagy, :combo, pagy_marked_link(link))
         }>#{
           pagy_uikit_prev_html pagy, link
         }<li>#{

data/lib/pagy.rb

@@ -5,7 +5,7 @@ require 'pathname'
 
 # Core class
 class Pagy
-  VERSION = '5.7.3'
+  VERSION = '5.8.0'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 5.7.3
+  version: 5.8.0
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-01-16 00:00:00.000000000 Z
 dependencies: []
 description: Agnostic pagination in plain ruby. It does it all. Better.
 email:
@@ -20,8 +20,9 @@ files:
 - LICENSE.txt
 - lib/config/pagy.rb
 - lib/javascripts/pagy-dev.js
+- lib/javascripts/pagy-module.d.ts
+- lib/javascripts/pagy-module.js
 - lib/javascripts/pagy.js
-- lib/javascripts/pagy.mjs
 - lib/locales/ar.yml
 - lib/locales/bg.yml
 - lib/locales/bs.yml