pagy 8.4.0 → 8.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bd45a13dbe1431d3fecb72e84e4892d1a84ed6d6169ea30bafbe5568e5e2ee3
-  data.tar.gz: 28f7ac75c345a8dc8328b8774cb3d336d32bb59a698ce71874f98c1c3ff6eb5b
+  metadata.gz: d283e0b1a2f28d6e05156089b3284b22c3e488626d5501093fdee506260a9825
+  data.tar.gz: c426766d510f8f229da57fedf0866b9ce9c2b213467a6548fbc760568b3ba973
 SHA512:
-  metadata.gz: ed47bfd55f842bedc38a39d8ed23c1a76a08497415d6d63b8cbc4ceab7933edeae7e32657d917f9dc1ace9997a0f023b752aa7c130bb1cf94361b78346556d36
-  data.tar.gz: 6136dbb153691f177af64d95476dca0fe4a8b2adc69c93a2e906d0296a299d9604db958d7e81d06b4a6e6d5c239b9f0cb4c1f8337101e61a3ebd7a2f0fe2ae61
+  metadata.gz: a7009de54deb7819bee599dc5a621f15e12c5de9a1e56c68a4136fb486d5214201f0ad626ec3bf979f3ba0eaadf267f902cc90da67214768a591b53b597ab931
+  data.tar.gz: fbfc64b79436c808b218166d0efd5448f0ec8d66446091dc6d5a9e70872ae37868dabb92d67224224d2fa41e7c0f87ad294c6bfd67c34c97c492e947a480a562

data/apps/calendar.ru

@@ -18,7 +18,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#4-calendar-app
 
-VERSION = '8.4.0'
+VERSION = '8.4.2'
 
 require 'bundler/inline'
 require 'bundler'

data/apps/demo.ru

@@ -18,7 +18,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#3-demo-app
 
-VERSION = '8.4.0'
+VERSION = '8.4.2'
 
 require 'bundler/inline'
 require 'bundler'

data/apps/rails.ru

@@ -15,7 +15,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#2-rails-app
 
-VERSION = '8.4.0'
+VERSION = '8.4.2'
 
 # Gemfile
 require 'bundler/inline'

data/apps/repro.ru

@@ -15,7 +15,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#1-repro-app
 
-VERSION = '8.4.0'
+VERSION = '8.4.2'
 
 require 'bundler/inline'
 require 'bundler'

data/bin/pagy

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-VERSION = '8.4.0'
+VERSION = '8.4.2'
 APPS    = %w[repro rails demo calendar].freeze
+LINUX   = RbConfig::CONFIG['host_os'].include?('linux')
 
 require_relative '../lib/optimist'
 opts = Optimist.options do
@@ -28,9 +29,11 @@ opts = Optimist.options do
   opt :host,    'Host', default: '0.0.0.0', short: :o
   opt :port,    'Port', default: 8000
   opt :install, 'Install bundle for users', default: true
-  text 'Rerun options'
-  opt :rerun,   'Enable rerun for development', default: true
-  opt :clear,   'Clear screen before each rerun'
+  if LINUX
+    text 'Rerun options'
+    opt :rerun,   'Enable rerun for development', default: true
+    opt :clear,   'Clear screen before each rerun'
+  end
   text 'Other options'
   opt :quiet,   'Quiet mode for development'
   version VERSION
@@ -48,7 +51,7 @@ Bundler.configure
 gemfile(opts[:install]) do
   source 'https://rubygems.org'
   gem 'rackup'
-  gem 'rerun'
+  gem 'rerun' if LINUX
 end
 
 path = ->(app) { File.expand_path("../apps/#{app}.ru", __dir__) }

data/config/pagy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (8.4.0)
+# Pagy initializer file (8.4.2)
 # 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
 
@@ -90,8 +90,8 @@
 
 # Metadata extra: Provides the pagination metadata to Javascript frameworks like Vue.js, react.js, etc.
 # See https://ddnexus.github.io/pagy/docs/extras/metadata
-# you must require the frontend helpers internal extra (BEFORE the metadata extra) ONLY if you need also the :sequels
-# require 'pagy/extras/frontend_helpers'
+# you must require the JS Tools internal extra (BEFORE the metadata extra) ONLY if you need also the :sequels
+# require 'pagy/extras/js_tools'
 # require 'pagy/extras/metadata'
 # For performance reasons, you should explicitly set ONLY the metadata you use in the frontend
 # Pagy::DEFAULT[:metadata] = %i[scaffold_url page prev next last]   # example

data/javascripts/pagy-dev.js

@@ -1,114 +1,104 @@
-"use strict";
+// pagy.ts
 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);
+  const rjsObserver = new ResizeObserver((entries) => entries.forEach((e) => e.target.querySelectorAll(".pagy-rjs").forEach((el) => el.pagyRender())));
+  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;
+      }
+      let html = tokens.before;
+      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 {
+          filled = fillIn(tokens.current, item, label);
         }
+        html += typeof trimParam === "string" && item == 1 ? trim(filled, trimParam) : filled;
+      }
+      html += tokens.after;
+      el.innerHTML = "";
+      el.insertAdjacentHTML("afterbegin", html);
+      lastWidth = width;
+    })();
+    if (el.classList.contains("pagy-rjs")) {
+      rjsObserver.observe(container);
+    }
+  };
+  const initCombo = (el, [url_token, trimParam]) => initInput(el, (inputValue) => [inputValue, url_token.replace(/__pagy_page__/, inputValue)], trimParam);
+  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);
+  };
+  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;
+      }
+      const [min, val, max] = [input.min, input.value, input.max].map((n) => parseInt(n) || 0);
+      if (val < min || val > max) {
+        input.value = initial;
+        input.select();
+        return;
+      }
+      let [page, url] = getVars(input.value);
+      if (typeof trimParam === "string" && page === "1") {
+        url = trim(url, trimParam);
+      }
+      link.href = url;
+      link.click();
     };
-    // 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);
-                }
-            }
+    ["change", "focus"].forEach((e) => input.addEventListener(e, input.select));
+    input.addEventListener("focusout", action);
+    input.addEventListener("keypress", (e) => {
+      if (e.key === "Enter") {
+        action();
+      }
+    });
+  };
+  const trim = (a, param) => a.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "");
+  return {
+    version: "8.4.2",
+    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));
+          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"]}
+
+//# debugId=22425B3DDA38810464756e2164756e21
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["pagy.ts"],
  "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.2\",\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\nexport default Pagy;\n"
  ],
  "mappings": "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",
  "debugId": "22425B3DDA38810464756e2164756e21",
  "names": []
}

data/javascripts/pagy-module.js

@@ -1,113 +1,101 @@
 const 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);
+  const rjsObserver = new ResizeObserver((entries) => entries.forEach((e) => e.target.querySelectorAll(".pagy-rjs").forEach((el) => el.pagyRender())));
+  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;
+      }
+      let html = tokens.before;
+      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 {
+          filled = fillIn(tokens.current, item, label);
         }
+        html += typeof trimParam === "string" && item == 1 ? trim(filled, trimParam) : filled;
+      }
+      html += tokens.after;
+      el.innerHTML = "";
+      el.insertAdjacentHTML("afterbegin", html);
+      lastWidth = width;
+    })();
+    if (el.classList.contains("pagy-rjs")) {
+      rjsObserver.observe(container);
+    }
+  };
+  const initCombo = (el, [url_token, trimParam]) => initInput(el, (inputValue) => [inputValue, url_token.replace(/__pagy_page__/, inputValue)], trimParam);
+  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);
+  };
+  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;
+      }
+      const [min, val, max] = [input.min, input.value, input.max].map((n) => parseInt(n) || 0);
+      if (val < min || val > max) {
+        input.value = initial;
+        input.select();
+        return;
+      }
+      let [page, url] = getVars(input.value);
+      if (typeof trimParam === "string" && page === "1") {
+        url = trim(url, trimParam);
+      }
+      link.href = url;
+      link.click();
     };
-    // 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);
-                }
-            }
+    ["change", "focus"].forEach((e) => input.addEventListener(e, input.select));
+    input.addEventListener("focusout", action);
+    input.addEventListener("keypress", (e) => {
+      if (e.key === "Enter") {
+        action();
+      }
+    });
+  };
+  const trim = (a, param) => a.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "");
+  return {
+    version: "8.4.2",
+    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));
+          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);
         }
-    };
+      }
+    }
+  };
 })();
 export default Pagy;

data/javascripts/pagy.js

@@ -1 +1 @@
-!function(){let e=(()=>{let e=new ResizeObserver(e=>e.forEach(e=>e.target.querySelectorAll(".pagy-rjs").forEach(e=>e.pagyRender()))),t=(t,[r,a,n,l])=>{let i=t.parentElement??t,c=Object.keys(a).map(e=>parseInt(e)).sort((e,t)=>t-e),p=-1,s=(e,t,r)=>e.replace(/__pagy_page__/g,t).replace(/__pagy_label__/g,r);(t.pagyRender=function(){let e=c.find(e=>e<i.clientWidth)||0;if(e===p)return;let g=r.before,y=a[e.toString()],f=n?.[e.toString()]??y.map(e=>e.toString());for(let e in y){let t;let a=y[e],n=f[e];t="number"==typeof a?s(r.a,a.toString(),n):"gap"===a?r.gap:s(r.current,a,n),g+="string"==typeof l&&1==a?o(t,l):t}g+=r.after,t.innerHTML="",t.insertAdjacentHTML("afterbegin",g),p=e})(),t.classList.contains("pagy-rjs")&&e.observe(i)},r=(e,[t,r])=>n(e,e=>[e,t.replace(/__pagy_page__/,e)],r),a=(e,[t,r,a])=>{n(e,e=>{let a=Math.max(Math.ceil(t/parseInt(e)),1).toString(),n=r.replace(/__pagy_page__/,a).replace(/__pagy_items__/,e);return[a,n]},a)},n=(e,t,r)=>{let a=e.querySelector("input"),n=e.querySelector("a"),l=a.value,i=function(){if(a.value===l)return;let[e,i,c]=[a.min,a.value,a.max].map(e=>parseInt(e)||0);if(i<e||i>c){a.value=l,a.select();return}let[p,s]=t(a.value);"string"==typeof r&&"1"===p&&(s=o(s,r)),n.href=s,n.click()};["change","focus"].forEach(e=>a.addEventListener(e,a.select)),a.addEventListener("focusout",i),a.addEventListener("keypress",e=>{"Enter"===e.key&&i()})},o=(e,t)=>e.replace(RegExp(`[?&]${t}=1\\b(?!&)|\\b${t}=1&`),"");return{version:"8.4.0",init(e){for(let n of(e instanceof Element?e:document).querySelectorAll("[data-pagy]"))try{let e=Uint8Array.from(atob(n.getAttribute("data-pagy")),e=>e.charCodeAt(0)),[o,...l]=JSON.parse(new TextDecoder().decode(e));"nav"===o?t(n,l):"combo"===o?r(n,l):"selector"===o?a(n,l):console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",n,o)}catch(e){console.warn("Skipped Pagy.init() for: %o\n%s",n,e)}}}})();window.Pagy=e}();
+window.Pagy=(()=>{const x=new ResizeObserver((B)=>B.forEach((D)=>D.target.querySelectorAll(".pagy-rjs").forEach((E)=>E.pagyRender()))),A=(B,[D,E,z,G])=>{const F=B.parentElement??B,K=Object.keys(E).map((H)=>parseInt(H)).sort((H,M)=>M-H);let L=-1;const T=(H,M,Q)=>H.replace(/__pagy_page__/g,M).replace(/__pagy_label__/g,Q);if((B.pagyRender=function(){const H=K.find((R)=>R<F.clientWidth)||0;if(H===L)return;let M=D.before;const Q=E[H.toString()],Y=z?.[H.toString()]??Q.map((R)=>R.toString());for(let R in Q){const U=Q[R],j=Y[R];let X;if(typeof U==="number")X=T(D.a,U.toString(),j);else if(U==="gap")X=D.gap;else X=T(D.current,U,j);M+=typeof G==="string"&&U==1?$(X,G):X}M+=D.after,B.innerHTML="",B.insertAdjacentHTML("afterbegin",M),L=H})(),B.classList.contains("pagy-rjs"))x.observe(F)},C=(B,[D,E])=>Z(B,(z)=>[z,D.replace(/__pagy_page__/,z)],E),J=(B,[D,E,z])=>{Z(B,(G)=>{const F=Math.max(Math.ceil(D/parseInt(G)),1).toString(),K=E.replace(/__pagy_page__/,F).replace(/__pagy_items__/,G);return[F,K]},z)},Z=(B,D,E)=>{const z=B.querySelector("input"),G=B.querySelector("a"),F=z.value,K=function(){if(z.value===F)return;const[L,T,H]=[z.min,z.value,z.max].map((Y)=>parseInt(Y)||0);if(T<L||T>H){z.value=F,z.select();return}let[M,Q]=D(z.value);if(typeof E==="string"&&M==="1")Q=$(Q,E);G.href=Q,G.click()};["change","focus"].forEach((L)=>z.addEventListener(L,z.select)),z.addEventListener("focusout",K),z.addEventListener("keypress",(L)=>{if(L.key==="Enter")K()})},$=(B,D)=>B.replace(new RegExp(`[?&]${D}=1\\b(?!&)|\\b${D}=1&`),"");return{version:"8.4.2",init(B){const E=(B instanceof Element?B:document).querySelectorAll("[data-pagy]");for(let z of E)try{const G=Uint8Array.from(atob(z.getAttribute("data-pagy")),(L)=>L.charCodeAt(0)),[F,...K]=JSON.parse((new TextDecoder()).decode(G));if(F==="nav")A(z,K);else if(F==="combo")C(z,K);else if(F==="selector")J(z,K);else console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",z,F)}catch(G){console.warn("Skipped Pagy.init() for: %o\n%s",z,G)}}}})();

data/lib/pagy/backend.rb

@@ -38,7 +38,7 @@ class Pagy
     # Sub-method called only by #pagy: here for easy customization of record-extraction by overriding
     # You may need to override this method for collections without offset|limit
     def pagy_get_items(collection, pagy)
-      collection.offset(pagy.offset).limit(pagy.in)
+      collection.offset(pagy.offset).limit(pagy.items)
     end
   end
 end

data/lib/pagy/extras/pagy.rb

@@ -63,7 +63,7 @@ class Pagy # :nodoc:
     end
 
     # Return the enabled/disabled next page anchor tag
-    def pagy_next_a(pagy, text: pagy_t('pagy.next'), aria_label: pagy_t('pagy.aria_label.prev'))
+    def pagy_next_a(pagy, text: pagy_t('pagy.next'), aria_label: pagy_t('pagy.aria_label.next'))
       a = pagy_anchor(pagy)
       next_a(pagy, a, text:, aria_label:)
     end

data/lib/pagy/extras/trim.rb

@@ -9,7 +9,7 @@ class Pagy # :nodoc:
     # Override the original pagy_a_proc.
     # Call the pagy_trim method for page 1 if the trim_extra is enabled
     def pagy_anchor(pagy)
-      a_proc = super(pagy)
+      a_proc = super
       return a_proc unless pagy.vars[:trim_extra]
 
       lambda do |page, text = pagy.label_for(page), **opts|

data/lib/pagy/frontend.rb

@@ -90,7 +90,7 @@ class Pagy
       if (p_next = pagy.next)
         a.(p_next, text, aria_label:)
       else
-        %(<a role="link" aria-disabled="true" aria-label=#{aria_label}>#{text}</a>)
+        %(<a role="link" aria-disabled="true" aria-label="#{aria_label}">#{text}</a>)
       end
     end
   end

data/lib/pagy.rb

@@ -5,7 +5,7 @@ require 'pathname'
 
 # Core class
 class Pagy
-  VERSION = '8.4.0'
+  VERSION = '8.4.2'
 
   # Gem root pathname to get the path of Pagy files stylesheets, javascripts, apps, locales, etc.
   def self.root

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 8.4.0
+  version: 8.4.2
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-06 00:00:00.000000000 Z
+date: 2024-06-04 00:00:00.000000000 Z
 dependencies: []
 description: Agnostic pagination in plain ruby. It does it all. Better.
 email:
@@ -105,6 +105,7 @@ files:
 - locales/zh-CN.yml
 - locales/zh-HK.yml
 - locales/zh-TW.yml
+- pkg/pagy-8.4.2.gem
 - stylesheets/pagy.css
 - stylesheets/pagy.scss
 - stylesheets/pagy.tailwind.css
@@ -138,7 +139,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