pagy 43.0.7 → 43.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e7fefb6090426f4176e075f28d0338c8e7d0e02f0261f77cfb292b8592d43ca
-  data.tar.gz: 5855eb37981912ca1d2bd9955674d7d20702547b1788aeeda1bf198525778939
+  metadata.gz: 81897225205a29f9ae8e98c57cddcc7c92a6bdbc3ce1cdd466f68ade1cf80785
+  data.tar.gz: e801dafc6c5acd601da4e88d68f21df621f6a0f01af19edbfa1df4d43d55fd54
 SHA512:
-  metadata.gz: 55463b5ae81ab94a293de8e4392f8507b520063d733c54861ec605ec85ac120ce412d5384cb795b3e2558440bde4d1273c224c0715e8fa907213f8ce9952c310
-  data.tar.gz: 7ae49f5008738375f6a0828ee6cdcee0581663e420a63d497b4da1b26f437139d055892b1d0d5597dd243561e880b5f224e933250a5fd286c044a96ac69188f4
+  metadata.gz: 74cab9eeb2eb7dd535daff6523c9ee9190856dee5be12bd96e274748897d39ccca6a9eea6cc9fd5394fbd164c4bfb48a499dadf28ff1fe8fb625113b239806b3
+  data.tar.gz: 06eb01e238504df2242a2c9a4b6855eab9bcf349ecd5a30487f89ce4491abfde2a06dcf4b453b745be8d5560b11eed5744426d22e91578d9ebe03c6517ed2531

data/apps/calendar.ru

@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.0.7'
+VERSION = '43.1.0'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")

data/apps/demo.ru

@@ -19,7 +19,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.0.7'
+VERSION = '43.1.0'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")

data/apps/keynav.ru

@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.0.7'
+VERSION = '43.1.0'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")

data/apps/keyset.ru

@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.0.7'
+VERSION = '43.1.0'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")

data/apps/keyset_sequel.ru

@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.0.7'
+VERSION = '43.1.0'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")

data/apps/rails.ru

@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.0.7'
+VERSION = '43.1.0'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")

data/apps/repro.ru

@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.0.7'
+VERSION = '43.1.0'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")

data/bin/pagy

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-VERSION = '43.0.7'
+VERSION = '43.1.0'
 LINUX   = RbConfig::CONFIG['host_os'].include?('linux')
 HOST    = 'localhost'
 PORT    = '8000'

data/config/pagy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (43.0.7)
+# Pagy initializer file (43.1.0)
 # See https://ddnexus.github.io/pagy/resources/initializer/
 
 ############ Global Options ################################################################

data/javascripts/ai_widget.js

@@ -68,7 +68,7 @@ const PagyAIWidget = {
     script.dataset.iconUrl     = this.ICON_URL;
     script.dataset.text        = 'Pagy AI';
     script.dataset.bgColor     = '#1f7a1f';
-    script.dataset.lightMode   = 'false';
+    script.dataset.lightMode   = 'auto';
     script.dataset.tooltipSide = 'bottom';
     document.head.appendChild(script);
   }

data/javascripts/pagy.js

@@ -124,7 +124,7 @@ window.Pagy = (() => {
     });
   };
   return {
-    version: "43.0.7",
+    version: "43.1.0",
     init(arg) {
       const target = arg instanceof HTMLElement ? arg : document, elements = target.querySelectorAll("[data-pagy]");
       for (const element of elements) {
@@ -147,5 +147,5 @@ window.Pagy = (() => {
   };
 })();
 
-//# debugId=340F68B25BC9072264756E2164756E21
+//# debugId=7F9EF7EF7A33670664756E2164756E21
 //# sourceMappingURL=pagy.js.map

data/javascripts/pagy.js.map

@@ -2,9 +2,9 @@
   "version": 3,
   "sources": ["../../src/pagy.ts"],
   "sourcesContent": [
-    "interface SyncData {\n  from?: number\n  to?:   number\n  key:   string\n  str?:  string\n}\ntype InitArgs = [\"k\",  KeynavArgs] |          // series_nav[_js] with keynav instance\n                [\"snj\", SeriesNavJsArgs] |    // series_nav_js\n                [\"inj\", InputNavJsArgs] |     // input_nav_js\n                [\"ltj\", LimitTagJsArgs]       // limit_tag_js\ntype AugmentKeynav = (nav:HTMLElement, keynavArgs:KeynavArgs) => Promise<((page: string) => string)>\ntype KeynavArgs = readonly [storageKey:  string | null,\n                            pageKey:     string,\n                            last:        number,\n                            spliceArgs?: SpliceArgs]\ntype SpliceArgs = readonly [start:       number,\n                            deleteCount: number,     // it would be optional, but ts complains\n                            ...items:    Cutoff[]]\ntype Cutoff = readonly (string | number | boolean)[]\ntype AugmentedPage = [browserId:   string,\n                      storageKey:  string,\n                      pageNumber:  number,\n                      pages:       number,\n                      priorCutoff: Cutoff | null,\n                      pageCutoff:  Cutoff | null]\ntype SeriesNavJsArgs = readonly [NavJsTokens, NavJsSeries, KeynavArgs?]\ntype NavJsSeries = readonly [widths: number[],\n                             series: (string | number)[][],\n                             labels: string[][] | null]\ntype InputNavJsArgs = readonly [urlToken: string, KeynavArgs?]\ntype LimitTagJsArgs = readonly [from:     number,\n                                urlToken: string]\ntype NavJsTokens = readonly [before:  string,\n                             anchor:  string,\n                             current: string,\n                             gap:     string,\n                             after:   string]\ninterface NavJsElement extends HTMLElement {\n  render(): void\n}\n\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nconst Pagy = (() => {\n  const storageSupport = 'sessionStorage' in window && 'BroadcastChannel' in window,\n        pageRe         = \"P \";  // shorten the compiled size\n  // eslint-disable-next-line prefer-const\n  let pagy = \"pagy\", storage: Storage, sync: BroadcastChannel, tabId: number;\n  if (storageSupport) {\n    storage = sessionStorage; // shorten the compiled size\n    sync    = new BroadcastChannel(pagy);\n    tabId   = Date.now();\n    // Sync the sessionStorage keys for the cutoffs opened in a new tab/window\n    sync.addEventListener(\"message\", (e:MessageEvent<SyncData>) => {\n      if (e.data.from) { // request cutoffs\n        const cutoffs = storage.getItem(e.data.key);\n        if (cutoffs) {\n          sync.postMessage(<SyncData>{to: e.data.from, key: e.data.key, str: cutoffs});\n        } // send response\n      } else if (e.data.to) {  // receive cutoffs\n        if (e.data.to == tabId) {\n          storage.setItem(e.data.key, <string>e.data.str);\n        }\n      }\n    });\n  }\n  // The observer instance for responsive navs\n  const rjsObserver = new ResizeObserver(\n      entries => entries.forEach(e => {\n        e.target.querySelectorAll<NavJsElement>(\".pagy-rjs\").forEach(el => el.render());\n      }));\n\n  /* Full set of B64 functions\n  const B64Encode     = (unicode:string) => btoa(String.fromCharCode(...(new TextEncoder).encode(unicode))),\n        B64Safe       = (unsafe:string)  => unsafe.replace(/[+/=]/g, (m) => m == \"+\" ? \"-\" : m == \"/\" ? \"_\" : \"\"),\n        B64SafeEncode = (unicode:string) => B64Safe(B64Encode(unicode)),\n        B64Decode     = (base64:string)  => (new TextDecoder()).decode(Uint8Array.from(atob(base64), c => c.charCodeAt(0))),\n        B64Unsafe     = (safe:string)    => safe.replace(/[-_]/g, (match) => match == \"-\" ? \"+\" : \"/\"),\n        B64SafeDecode = (base64:string)  => B64Decode(B64Unsafe(base64))\n  */\n  const B64SafeEncode = (unicode:string) => btoa(String.fromCharCode(...(new TextEncoder).encode(unicode)))\n                                            .replace(/[+/=]/g, (m) => m == \"+\" ? \"-\" : m == \"/\" ? \"_\" : \"\"),\n        B64Decode     = (base64:string)  => (new TextDecoder()).decode(Uint8Array.from(atob(base64), c => c.charCodeAt(0)));\n\n  // Return a random key: 3 chars max, base-36 number < 36**3\n  const randKey = () => Math.floor(Math.random() * 36 ** 3).toString(36);\n\n  // Manage the page augmentation for Keynav, called only if storageSupport\n  const augmentKeynav: AugmentKeynav = async (nav, [storageKey, pageKey, last, spliceArgs]) => {\n    let augment;\n    const browserKey = document.cookie.split(/;\\s+/)  // it works even if malformed\n                               .find((row) => row.startsWith(pagy + \"=\"))\n                               ?.split(\"=\")[1] ?? randKey();\n    document.cookie = pagy + \"=\" + browserKey;  // Smaller .min size: set the cookie without checking\n    if (storageKey && !(storageKey in storage)) {\n      // Sync the sessiongStorage from other tabs/windows (e.g., open page in the new tab/window)\n      sync.postMessage(<SyncData>{ from: tabId, key: storageKey });\n      // Wait for the listener to copy the cutoffs in the current sessionStorage\n      await new Promise<string|null>((resolve) => setTimeout(() => resolve(\"\"), 100));\n      if (!(storageKey in storage)) { // the storageKey didn't get copied: fallback to countless pagination\n        augment = (page: string) => page + '+' + last;\n      }\n    }\n    if (!augment) { // regular keynav pagination\n      if (!storageKey) { do { storageKey = randKey() } while (storageKey in storage) } // no dup keys\n      const data = storage.getItem(storageKey),\n          cutoffs = <Cutoff[]>(data ? JSON.parse(data) : [undefined]);\n      if (spliceArgs) {\n        cutoffs.splice(...spliceArgs);\n        storage.setItem(storageKey, JSON.stringify(cutoffs));\n      }\n      // Augment function\n      augment = (page:string) => {\n        const pageNum = parseInt(page);\n        return B64SafeEncode(JSON.stringify(\n            <AugmentedPage>[browserKey,\n                            storageKey,\n                            pageNum,\n                            cutoffs.length,       // pages/last\n                            cutoffs[pageNum - 1], // priorCutoff\n                            cutoffs[pageNum]]));  // pageCutoff\n      };\n    }\n    // Augment the page param of each href\n    for (const a of <NodeListOf<HTMLAnchorElement>><unknown>nav.querySelectorAll('a[href]')) {\n      const url = a.href,\n            re  = new RegExp(`(?<=\\\\?.*)\\\\b${pageKey}=(\\\\d+)`);         // find the numeric page from pageKey\n      a.href    = url.replace(re, pageKey + \"=\" + augment(url.match(re)![1]));  // eslint-disable-line @typescript-eslint/no-non-null-assertion\n    }\n    // Return the augment function for further augmentation (i.e., url token in input_nav_js)\n    return augment;\n  };\n\n  // Build the series_nav_js helper\n  const buildNavJs = (nav:NavJsElement, [[before, anchor, current, gap, after],\n                                        [widths, series, labels], keynavArgs]:SeriesNavJsArgs) => {\n    const  parent = <HTMLElement>nav.parentElement;\n    let lastWidth = -1;\n    (nav.render = () => {\n      const index = widths.findIndex(w => w < parent.clientWidth);\n      if (widths[index] === lastWidth) { return } // no change: abort\n\n      let html = before;\n      series[index].forEach((item, i) => {\n        // Avoid the if blocks and chain the results (shorter pagy.min.js and easier reading)\n        html += item == \"gap\" ? gap :\n                // @ts-expect-error the item may be a number, but the 'replace' converts it to string (shorter pagy.min.js)\n                (typeof item == \"number\" ? anchor.replace(pageRe, item) : current)\n                    .replace(\"L<\", labels?.[index][i] ?? item + \"<\");\n      });\n      html         += after;\n      nav.innerHTML = \"\";\n      nav.insertAdjacentHTML(\"afterbegin\", html);\n      lastWidth = widths[index];\n      if (keynavArgs && storageSupport) { void augmentKeynav(nav, keynavArgs) }\n    })();\n    if (nav.classList.contains(pagy + \"-rjs\")) { rjsObserver.observe(parent) }\n  };\n\n  // Init the input_nav_js helpers\n  const initInputNavJs = async (nav:HTMLElement, [url_token, keynavArgs]:InputNavJsArgs) => {\n    const augment = keynavArgs && storageSupport\n                    ? await augmentKeynav(nav, keynavArgs)\n                    : (page: string) => page;\n    initInput(nav, inputValue => url_token.replace(pageRe, augment(inputValue)));\n  };\n\n  // Init the limit_tag_js helper\n  const initLimitTagJs = (span:HTMLSpanElement, [from, url_token]:LimitTagJsArgs) => {\n    initInput(span, inputValue => {\n      // @ts-expect-error the page is a number, but the 'replace' converts it to string (shorter pagy.min.js)\n      return url_token.replace(pageRe, Math.max(Math.ceil(from / parseInt(inputValue)), 1))\n                      .replace('L ', inputValue);\n    });\n  };\n\n  // Init the input element\n  const initInput = (element:HTMLElement, getUrl:(v:string) => string) => {\n    const input   = <HTMLInputElement>element.querySelector(\"input\"),\n          link    = <HTMLAnchorElement>element.querySelector(\"a\"),\n          initial = input.value,\n          action  = () => {\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                      link.href = getUrl(input.value);\n                      link.click();\n                    };\n    input.addEventListener(\"focus\", () => input.select());\n    input.addEventListener(\"focusout\", action);\n    input.addEventListener(\"keypress\", e => { if (e.key == \"Enter\") { action() } });\n  };\n\n  // Public interface\n  return {\n    version: \"43.0.7\",\n\n    // Scan for elements with a \"data-pagy\" attribute and call their init functions with the decoded args\n    init(arg?:HTMLElement) {\n      const target   = arg instanceof HTMLElement ? arg : document,\n            elements = target.querySelectorAll(\"[data-pagy]\");\n      for (const element of <NodeListOf<HTMLElement>>elements) {\n        try {\n          const [helperId, ...args] = <InitArgs>JSON.parse(B64Decode(<string>element.getAttribute(\"data-pagy\")));\n          if (helperId == \"k\") {\n            // @ts-expect-error spread 2 arguments, not 3 as it complains about\n            void augmentKeynav(element, ...<KeynavArgs><unknown>args);\n          } else if (helperId == \"snj\") {\n            buildNavJs(<NavJsElement>element, <SeriesNavJsArgs><unknown>args);\n          } else if (helperId == \"inj\") {\n            void initInputNavJs(element, <InputNavJsArgs><unknown>args);\n          } else if (helperId == \"ltj\") {\n            initLimitTagJs(element, <LimitTagJsArgs><unknown>args);\n          }\n          // else { console.warn(\"Pagy.init: %o\\nUnknown helperId '%s'\", element, helperId) }\n        } catch (err) { console.warn(\"Pagy.init: %o\\n%s\", element, err) }\n      }\n    }\n  };\n})();\n"
+    "interface SyncData {\n  from?: number\n  to?:   number\n  key:   string\n  str?:  string\n}\ntype InitArgs = [\"k\",  KeynavArgs] |          // series_nav[_js] with keynav instance\n                [\"snj\", SeriesNavJsArgs] |    // series_nav_js\n                [\"inj\", InputNavJsArgs] |     // input_nav_js\n                [\"ltj\", LimitTagJsArgs]       // limit_tag_js\ntype AugmentKeynav = (nav:HTMLElement, keynavArgs:KeynavArgs) => Promise<((page: string) => string)>\ntype KeynavArgs = readonly [storageKey:  string | null,\n                            pageKey:     string,\n                            last:        number,\n                            spliceArgs?: SpliceArgs]\ntype SpliceArgs = readonly [start:       number,\n                            deleteCount: number,     // it would be optional, but ts complains\n                            ...items:    Cutoff[]]\ntype Cutoff = readonly (string | number | boolean)[]\ntype AugmentedPage = [browserId:   string,\n                      storageKey:  string,\n                      pageNumber:  number,\n                      pages:       number,\n                      priorCutoff: Cutoff | null,\n                      pageCutoff:  Cutoff | null]\ntype SeriesNavJsArgs = readonly [NavJsTokens, NavJsSeries, KeynavArgs?]\ntype NavJsSeries = readonly [widths: number[],\n                             series: (string | number)[][],\n                             labels: string[][] | null]\ntype InputNavJsArgs = readonly [urlToken: string, KeynavArgs?]\ntype LimitTagJsArgs = readonly [from:     number,\n                                urlToken: string]\ntype NavJsTokens = readonly [before:  string,\n                             anchor:  string,\n                             current: string,\n                             gap:     string,\n                             after:   string]\ninterface NavJsElement extends HTMLElement {\n  render(): void\n}\n\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nconst Pagy = (() => {\n  const storageSupport = 'sessionStorage' in window && 'BroadcastChannel' in window,\n        pageRe         = \"P \";  // shorten the compiled size\n  // eslint-disable-next-line prefer-const\n  let pagy = \"pagy\", storage: Storage, sync: BroadcastChannel, tabId: number;\n  if (storageSupport) {\n    storage = sessionStorage; // shorten the compiled size\n    sync    = new BroadcastChannel(pagy);\n    tabId   = Date.now();\n    // Sync the sessionStorage keys for the cutoffs opened in a new tab/window\n    sync.addEventListener(\"message\", (e:MessageEvent<SyncData>) => {\n      if (e.data.from) { // request cutoffs\n        const cutoffs = storage.getItem(e.data.key);\n        if (cutoffs) {\n          sync.postMessage(<SyncData>{to: e.data.from, key: e.data.key, str: cutoffs});\n        } // send response\n      } else if (e.data.to) {  // receive cutoffs\n        if (e.data.to == tabId) {\n          storage.setItem(e.data.key, <string>e.data.str);\n        }\n      }\n    });\n  }\n  // The observer instance for responsive navs\n  const rjsObserver = new ResizeObserver(\n      entries => entries.forEach(e => {\n        e.target.querySelectorAll<NavJsElement>(\".pagy-rjs\").forEach(el => el.render());\n      }));\n\n  /* Full set of B64 functions\n  const B64Encode     = (unicode:string) => btoa(String.fromCharCode(...(new TextEncoder).encode(unicode))),\n        B64Safe       = (unsafe:string)  => unsafe.replace(/[+/=]/g, (m) => m == \"+\" ? \"-\" : m == \"/\" ? \"_\" : \"\"),\n        B64SafeEncode = (unicode:string) => B64Safe(B64Encode(unicode)),\n        B64Decode     = (base64:string)  => (new TextDecoder()).decode(Uint8Array.from(atob(base64), c => c.charCodeAt(0))),\n        B64Unsafe     = (safe:string)    => safe.replace(/[-_]/g, (match) => match == \"-\" ? \"+\" : \"/\"),\n        B64SafeDecode = (base64:string)  => B64Decode(B64Unsafe(base64))\n  */\n  const B64SafeEncode = (unicode:string) => btoa(String.fromCharCode(...(new TextEncoder).encode(unicode)))\n                                            .replace(/[+/=]/g, (m) => m == \"+\" ? \"-\" : m == \"/\" ? \"_\" : \"\"),\n        B64Decode     = (base64:string)  => (new TextDecoder()).decode(Uint8Array.from(atob(base64), c => c.charCodeAt(0)));\n\n  // Return a random key: 3 chars max, base-36 number < 36**3\n  const randKey = () => Math.floor(Math.random() * 36 ** 3).toString(36);\n\n  // Manage the page augmentation for Keynav, called only if storageSupport\n  const augmentKeynav: AugmentKeynav = async (nav, [storageKey, pageKey, last, spliceArgs]) => {\n    let augment;\n    const browserKey = document.cookie.split(/;\\s+/)  // it works even if malformed\n                               .find((row) => row.startsWith(pagy + \"=\"))\n                               ?.split(\"=\")[1] ?? randKey();\n    document.cookie = pagy + \"=\" + browserKey;  // Smaller .min size: set the cookie without checking\n    if (storageKey && !(storageKey in storage)) {\n      // Sync the sessiongStorage from other tabs/windows (e.g., open page in the new tab/window)\n      sync.postMessage(<SyncData>{ from: tabId, key: storageKey });\n      // Wait for the listener to copy the cutoffs in the current sessionStorage\n      await new Promise<string|null>((resolve) => setTimeout(() => resolve(\"\"), 100));\n      if (!(storageKey in storage)) { // the storageKey didn't get copied: fallback to countless pagination\n        augment = (page: string) => page + '+' + last;\n      }\n    }\n    if (!augment) { // regular keynav pagination\n      if (!storageKey) { do { storageKey = randKey() } while (storageKey in storage) } // no dup keys\n      const data = storage.getItem(storageKey),\n          cutoffs = <Cutoff[]>(data ? JSON.parse(data) : [undefined]);\n      if (spliceArgs) {\n        cutoffs.splice(...spliceArgs);\n        storage.setItem(storageKey, JSON.stringify(cutoffs));\n      }\n      // Augment function\n      augment = (page:string) => {\n        const pageNum = parseInt(page);\n        return B64SafeEncode(JSON.stringify(\n            <AugmentedPage>[browserKey,\n                            storageKey,\n                            pageNum,\n                            cutoffs.length,       // pages/last\n                            cutoffs[pageNum - 1], // priorCutoff\n                            cutoffs[pageNum]]));  // pageCutoff\n      };\n    }\n    // Augment the page param of each href\n    for (const a of <NodeListOf<HTMLAnchorElement>><unknown>nav.querySelectorAll('a[href]')) {\n      const url = a.href,\n            re  = new RegExp(`(?<=\\\\?.*)\\\\b${pageKey}=(\\\\d+)`);         // find the numeric page from pageKey\n      a.href    = url.replace(re, pageKey + \"=\" + augment(url.match(re)![1]));  // eslint-disable-line @typescript-eslint/no-non-null-assertion\n    }\n    // Return the augment function for further augmentation (i.e., url token in input_nav_js)\n    return augment;\n  };\n\n  // Build the series_nav_js helper\n  const buildNavJs = (nav:NavJsElement, [[before, anchor, current, gap, after],\n                                        [widths, series, labels], keynavArgs]:SeriesNavJsArgs) => {\n    const  parent = <HTMLElement>nav.parentElement;\n    let lastWidth = -1;\n    (nav.render = () => {\n      const index = widths.findIndex(w => w < parent.clientWidth);\n      if (widths[index] === lastWidth) { return } // no change: abort\n\n      let html = before;\n      series[index].forEach((item, i) => {\n        // Avoid the if blocks and chain the results (shorter pagy.min.js and easier reading)\n        html += item == \"gap\" ? gap :\n                // @ts-expect-error the item may be a number, but the 'replace' converts it to string (shorter pagy.min.js)\n                (typeof item == \"number\" ? anchor.replace(pageRe, item) : current)\n                    .replace(\"L<\", labels?.[index][i] ?? item + \"<\");\n      });\n      html         += after;\n      nav.innerHTML = \"\";\n      nav.insertAdjacentHTML(\"afterbegin\", html);\n      lastWidth = widths[index];\n      if (keynavArgs && storageSupport) { void augmentKeynav(nav, keynavArgs) }\n    })();\n    if (nav.classList.contains(pagy + \"-rjs\")) { rjsObserver.observe(parent) }\n  };\n\n  // Init the input_nav_js helpers\n  const initInputNavJs = async (nav:HTMLElement, [url_token, keynavArgs]:InputNavJsArgs) => {\n    const augment = keynavArgs && storageSupport\n                    ? await augmentKeynav(nav, keynavArgs)\n                    : (page: string) => page;\n    initInput(nav, inputValue => url_token.replace(pageRe, augment(inputValue)));\n  };\n\n  // Init the limit_tag_js helper\n  const initLimitTagJs = (span:HTMLSpanElement, [from, url_token]:LimitTagJsArgs) => {\n    initInput(span, inputValue => {\n      // @ts-expect-error the page is a number, but the 'replace' converts it to string (shorter pagy.min.js)\n      return url_token.replace(pageRe, Math.max(Math.ceil(from / parseInt(inputValue)), 1))\n                      .replace('L ', inputValue);\n    });\n  };\n\n  // Init the input element\n  const initInput = (element:HTMLElement, getUrl:(v:string) => string) => {\n    const input   = <HTMLInputElement>element.querySelector(\"input\"),\n          link    = <HTMLAnchorElement>element.querySelector(\"a\"),\n          initial = input.value,\n          action  = () => {\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                      link.href = getUrl(input.value);\n                      link.click();\n                    };\n    input.addEventListener(\"focus\", () => input.select());\n    input.addEventListener(\"focusout\", action);\n    input.addEventListener(\"keypress\", e => { if (e.key == \"Enter\") { action() } });\n  };\n\n  // Public interface\n  return {\n    version: \"43.1.0\",\n\n    // Scan for elements with a \"data-pagy\" attribute and call their init functions with the decoded args\n    init(arg?:HTMLElement) {\n      const target   = arg instanceof HTMLElement ? arg : document,\n            elements = target.querySelectorAll(\"[data-pagy]\");\n      for (const element of <NodeListOf<HTMLElement>>elements) {\n        try {\n          const [helperId, ...args] = <InitArgs>JSON.parse(B64Decode(<string>element.getAttribute(\"data-pagy\")));\n          if (helperId == \"k\") {\n            // @ts-expect-error spread 2 arguments, not 3 as it complains about\n            void augmentKeynav(element, ...<KeynavArgs><unknown>args);\n          } else if (helperId == \"snj\") {\n            buildNavJs(<NavJsElement>element, <SeriesNavJsArgs><unknown>args);\n          } else if (helperId == \"inj\") {\n            void initInputNavJs(element, <InputNavJsArgs><unknown>args);\n          } else if (helperId == \"ltj\") {\n            initLimitTagJs(element, <LimitTagJsArgs><unknown>args);\n          }\n          // else { console.warn(\"Pagy.init: %o\\nUnknown helperId '%s'\", element, helperId) }\n        } catch (err) { console.warn(\"Pagy.init: %o\\n%s\", element, err) }\n      }\n    }\n  };\n})();\n"
   ],
   "mappings": "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",
-  "debugId": "340F68B25BC9072264756E2164756E21",
+  "debugId": "7F9EF7EF7A33670664756E2164756E21",
   "names": []
 }

data/javascripts/pagy.min.js

@@ -1 +1 @@
-window.Pagy=(()=>{const L="sessionStorage"in window&&"BroadcastChannel"in window;let j="pagy",Y,D,O;if(L)Y=sessionStorage,D=new BroadcastChannel(j),O=Date.now(),D.addEventListener("message",(q)=>{if(q.data.from){const z=Y.getItem(q.data.key);if(z)D.postMessage({to:q.data.from,key:q.data.key,str:z})}else if(q.data.to){if(q.data.to==O)Y.setItem(q.data.key,q.data.str)}});const U=new ResizeObserver((q)=>q.forEach((z)=>{z.target.querySelectorAll(".pagy-rjs").forEach((C)=>C.render())})),S=(q)=>btoa(String.fromCharCode(...new TextEncoder().encode(q))).replace(/[+/=]/g,(z)=>z=="+"?"-":z=="/"?"_":""),_=(q)=>new TextDecoder().decode(Uint8Array.from(atob(q),(z)=>z.charCodeAt(0))),B=()=>Math.floor(Math.random()*46656).toString(36),P=async(q,[z,C,F,G])=>{let M;const R=document.cookie.split(/;\s+/).find((H)=>H.startsWith(j+"="))?.split("=")[1]??B();if(document.cookie=j+"="+R,z&&!(z in Y)){if(D.postMessage({from:O,key:z}),await new Promise((H)=>setTimeout(()=>H(""),100)),!(z in Y))M=(H)=>H+"+"+F}if(!M){if(!z)do z=B();while(z in Y);const H=Y.getItem(z),Q=H?JSON.parse(H):[void 0];if(G)Q.splice(...G),Y.setItem(z,JSON.stringify(Q));M=(X)=>{const Z=parseInt(X);return S(JSON.stringify([R,z,Z,Q.length,Q[Z-1],Q[Z]]))}}for(let H of q.querySelectorAll("a[href]")){const Q=H.href,X=new RegExp(`(?<=\\?.*)\\b${C}=(\\d+)`);H.href=Q.replace(X,C+"="+M(Q.match(X)[1]))}return M},x=(q,[[z,C,F,G,M],[R,H,Q],X])=>{const Z=q.parentElement;let J=-1;if((q.render=()=>{const E=R.findIndex(($)=>$<Z.clientWidth);if(R[E]===J)return;let T=z;if(H[E].forEach(($,A)=>{T+=$=="gap"?G:(typeof $=="number"?C.replace("P ",$):F).replace("L<",Q?.[E][A]??$+"<")}),T+=M,q.innerHTML="",q.insertAdjacentHTML("afterbegin",T),J=R[E],X&&L)P(q,X)})(),q.classList.contains(j+"-rjs"))U.observe(Z)},N=async(q,[z,C])=>{const F=C&&L?await P(q,C):(G)=>G;W(q,(G)=>z.replace("P ",F(G)))},V=(q,[z,C])=>{W(q,(F)=>{return C.replace("P ",Math.max(Math.ceil(z/parseInt(F)),1)).replace("L ",F)})},W=(q,z)=>{const C=q.querySelector("input"),F=q.querySelector("a"),G=C.value,M=()=>{if(C.value===G)return;const[R,H,Q]=[C.min,C.value,C.max].map((X)=>parseInt(X)||0);if(H<R||H>Q){C.value=G,C.select();return}F.href=z(C.value),F.click()};C.addEventListener("focus",()=>C.select()),C.addEventListener("focusout",M),C.addEventListener("keypress",(R)=>{if(R.key=="Enter")M()})};return{version:"43.0.7",init(q){const z=q instanceof HTMLElement?q:document,C=z.querySelectorAll("[data-pagy]");for(let F of C)try{const[G,...M]=JSON.parse(_(F.getAttribute("data-pagy")));if(G=="k")P(F,...M);else if(G=="snj")x(F,M);else if(G=="inj")N(F,M);else if(G=="ltj")V(F,M)}catch(G){console.warn("Pagy.init: %o\n%s",F,G)}}}})();
+window.Pagy=(()=>{const L="sessionStorage"in window&&"BroadcastChannel"in window;let j="pagy",Y,D,O;if(L)Y=sessionStorage,D=new BroadcastChannel(j),O=Date.now(),D.addEventListener("message",(q)=>{if(q.data.from){const z=Y.getItem(q.data.key);if(z)D.postMessage({to:q.data.from,key:q.data.key,str:z})}else if(q.data.to){if(q.data.to==O)Y.setItem(q.data.key,q.data.str)}});const U=new ResizeObserver((q)=>q.forEach((z)=>{z.target.querySelectorAll(".pagy-rjs").forEach((C)=>C.render())})),S=(q)=>btoa(String.fromCharCode(...new TextEncoder().encode(q))).replace(/[+/=]/g,(z)=>z=="+"?"-":z=="/"?"_":""),_=(q)=>new TextDecoder().decode(Uint8Array.from(atob(q),(z)=>z.charCodeAt(0))),B=()=>Math.floor(Math.random()*46656).toString(36),P=async(q,[z,C,F,G])=>{let M;const R=document.cookie.split(/;\s+/).find((H)=>H.startsWith(j+"="))?.split("=")[1]??B();if(document.cookie=j+"="+R,z&&!(z in Y)){if(D.postMessage({from:O,key:z}),await new Promise((H)=>setTimeout(()=>H(""),100)),!(z in Y))M=(H)=>H+"+"+F}if(!M){if(!z)do z=B();while(z in Y);const H=Y.getItem(z),Q=H?JSON.parse(H):[void 0];if(G)Q.splice(...G),Y.setItem(z,JSON.stringify(Q));M=(X)=>{const Z=parseInt(X);return S(JSON.stringify([R,z,Z,Q.length,Q[Z-1],Q[Z]]))}}for(let H of q.querySelectorAll("a[href]")){const Q=H.href,X=new RegExp(`(?<=\\?.*)\\b${C}=(\\d+)`);H.href=Q.replace(X,C+"="+M(Q.match(X)[1]))}return M},x=(q,[[z,C,F,G,M],[R,H,Q],X])=>{const Z=q.parentElement;let J=-1;if((q.render=()=>{const E=R.findIndex(($)=>$<Z.clientWidth);if(R[E]===J)return;let T=z;if(H[E].forEach(($,A)=>{T+=$=="gap"?G:(typeof $=="number"?C.replace("P ",$):F).replace("L<",Q?.[E][A]??$+"<")}),T+=M,q.innerHTML="",q.insertAdjacentHTML("afterbegin",T),J=R[E],X&&L)P(q,X)})(),q.classList.contains(j+"-rjs"))U.observe(Z)},N=async(q,[z,C])=>{const F=C&&L?await P(q,C):(G)=>G;W(q,(G)=>z.replace("P ",F(G)))},V=(q,[z,C])=>{W(q,(F)=>{return C.replace("P ",Math.max(Math.ceil(z/parseInt(F)),1)).replace("L ",F)})},W=(q,z)=>{const C=q.querySelector("input"),F=q.querySelector("a"),G=C.value,M=()=>{if(C.value===G)return;const[R,H,Q]=[C.min,C.value,C.max].map((X)=>parseInt(X)||0);if(H<R||H>Q){C.value=G,C.select();return}F.href=z(C.value),F.click()};C.addEventListener("focus",()=>C.select()),C.addEventListener("focusout",M),C.addEventListener("keypress",(R)=>{if(R.key=="Enter")M()})};return{version:"43.1.0",init(q){const z=q instanceof HTMLElement?q:document,C=z.querySelectorAll("[data-pagy]");for(let F of C)try{const[G,...M]=JSON.parse(_(F.getAttribute("data-pagy")));if(G=="k")P(F,...M);else if(G=="snj")x(F,M);else if(G=="inj")N(F,M);else if(G=="ltj")V(F,M)}catch(G){console.warn("Pagy.init: %o\n%s",F,G)}}}})();

data/javascripts/pagy.mjs

@@ -123,7 +123,7 @@ const Pagy = (() => {
     });
   };
   return {
-    version: "43.0.7",
+    version: "43.1.0",
     init(arg) {
       const target = arg instanceof HTMLElement ? arg : document, elements = target.querySelectorAll("[data-pagy]");
       for (const element of elements) {

data/lib/pagy/classes/exceptions.rb

@@ -22,12 +22,4 @@ class Pagy
 
   # Generic internal error
   class InternalError < StandardError; end
-
-  # JsonApi :page param error
-  class JsonapiReservedParamError < StandardError
-    # Inform about the actual value
-    def initialize(value)
-      super("expected reserved :page param to be nil or Hash-like; got #{value.inspect}")
-    end
-  end
 end

data/lib/pagy/classes/request.rb

@@ -1,26 +1,23 @@
 # frozen_string_literal: true
 
 class Pagy
-  # Decouple the reuest from the env, allowing non-rack apps to use pagy by passing a hash.
-  # Resolve :page and :limit, supporting the :jsonapi option. Support for URL composition.
-  #
+  # Decouple the request from the env, allowing non-rack apps to use pagy by passing a hash.
+  # Resolve the :page and :limit options from params.
   class Request
-    def initialize(request, options = {})
+    def initialize(request)
       @base_url, @path, @params, @cookie =
         if request.is_a?(Hash)
           request.values_at(:base_url, :path, :params, :cookie)
         else
           [request.base_url, request.path, request.GET.merge(request.POST), request.cookies['pagy']]
         end
-      @jsonapi = @params['page'] && options[:jsonapi]
-      raise JsonapiReservedParamError, @params['page'] if @jsonapi && !@params['page'].respond_to?(:fetch)
     end
 
     attr_reader :base_url, :path, :params, :cookie
 
     def resolve_page(options, force_integer: true)
       page_key = options[:page_key] || DEFAULT[:page_key]
-      page     = @jsonapi ? @params['page'][page_key] : @params[page_key]
+      page     = @params.dig(options[:root_key], page_key) || @params[page_key]
       page     = nil if page == ''   # fix for app-generated queries like ?page=
       force_integer ? (page || 1).to_i : page
     end
@@ -29,7 +26,7 @@ class Pagy
       limit_key = options[:limit_key] || DEFAULT[:limit_key]
       return options[:limit] || DEFAULT[:limit] \
              unless options[:client_max_limit] &&
-                    (requested_limit = @jsonapi ? @params['page'][limit_key] : @params[limit_key])
+                    (requested_limit = @params.dig(options[:root_key], limit_key) || @params[limit_key])
 
       [requested_limit.to_i, options[:client_max_limit]].min
     end

data/lib/pagy/modules/abilities/linkable.rb

@@ -40,16 +40,16 @@ class Pagy
 
     # Return the URL for the page, relying on the Pagy::Request
     def compose_page_url(page, limit_token: nil, **options)
-      jsonapi, page_key, limit_key, limit, client_max_limit, querify, absolute, path, fragment =
+      root_key, page_key, limit_key, limit, client_max_limit, querify, absolute, path, fragment =
         @options.merge(options)
-                .values_at(:jsonapi, :page_key, :limit_key, :limit, :client_max_limit, :querify, :absolute, :path, :fragment)
+                .values_at(:root_key, :page_key, :limit_key, :limit, :client_max_limit, :querify, :absolute, :path, :fragment)
       params = @request.params.clone(freeze: false)
-      params.delete(jsonapi ? 'page' : page_key)
+      params.delete(root_key || page_key)
       factors = {}.tap do |h|
                   h[page_key]  = countless? ? "#{page || 1}+#{@last}" : page
                   h[limit_key] = limit_token || limit if client_max_limit
                 end.compact # No empty params
-      params.merge!(jsonapi ? { 'page' => factors } : factors) if factors.size.positive?
+      params.merge!(root_key ? { root_key => factors } : factors) if factors.size.positive?
       querify&.(params) # Must modify the params: the returned value is ignored
       query_string = QueryUtils.build_nested_query(params, nil, [page_key, limit_key])
       query_string = "?#{query_string}" unless query_string.empty?

data/lib/pagy/modules/console.rb

@@ -3,20 +3,6 @@
 class Pagy
   # Provide a ready to use pagy environment when included in irb/rails console
   module Console
-    class Request
-      attr_accessor :base_url, :path, :params
-
-      def initialize
-        @base_url = 'http://www.example.com'
-        @path     = '/path'
-        @params   = { example: '123' }
-      end
-
-      def GET = @params  # rubocop:disable Naming/MethodName
-
-      def cookies = {}
-    end
-
     class Collection < Array
       def initialize(arr = Array(1..1000))
         super
@@ -31,8 +17,8 @@ class Pagy
     include Method
 
     # Direct reference to request.params via a method
-    def params     = request.params
-    def request    = @request ||= Request.new
+    def request    = @request ||= { base_url: 'http://www.example.com', path: '/path', params: { example: '123' } }
+    def params     = request[:params]
     def collection = Collection
   end
 end

data/lib/pagy/modules/searcher.rb

@@ -6,13 +6,11 @@ class Pagy
     module_function
 
     # Common search logic
-    def wrap(context, pagy_search_args, options)
-      context.instance_exec do
-        options[:page]  ||= options[:request].resolve_page(options)
-        options[:limit] ||= options[:request].resolve_limit(options)
-      end
-      pagy, results = yield
-      calling = pagy_search_args[4..]
+    def wrap(pagy_search_args, options)
+      options[:page] ||= options[:request].resolve_page(options)
+      options[:limit]  = options[:request].resolve_limit(options)
+      pagy, results    = yield
+      calling          = pagy_search_args[4..]
       [pagy, calling.empty? ? results : results.send(*calling)]
     end
   end

data/lib/pagy/toolbox/paginators/calendar.rb

@@ -11,7 +11,6 @@ class Pagy
         raise ArgumentError, "keys must be in #{allowed_options.inspect}" \
               unless config.is_a?(Hash) && (config.keys - allowed_options).empty?
 
-        config[:request]  = Request.new(config[:request] || request)
         config[:offset] ||= {}
         unless config[:disabled]
           calendar, from, to =

data/lib/pagy/toolbox/paginators/countless.rb

@@ -4,22 +4,19 @@ class Pagy
   module CountlessPaginator
     module_function
 
-    # Return Pagy object and records
-    def paginate(context, collection, **options)
-      context.instance_eval do
-        request = Request.new(options[:request] || self.request, options)
-        if options[:page].nil?
-          page = request.resolve_page(options, force_integer: false) # accept nil and strings
-          if page.is_a?(String)
-            p, l = page.split(/ /, 2).map(&:to_i)
-            options[:page] = p if p.positive?
-            options[:last] = l if l&.positive?
-          end
+    # Return the Offset::Countless instance and records
+    def paginate(collection, options)
+      if options[:page].nil?
+        page = options[:request].resolve_page(options, force_integer: false) # accept nil and strings
+        if page.is_a?(String)
+          p, l = page.split(/ /, 2).map(&:to_i) # decoded '+' added by the compose_page_url
+          options[:page] = p if p.positive?
+          options[:last] = l if l&.positive?
         end
-        options[:limit] = request.resolve_limit(options)
-        pagy = Offset::Countless.new(**options, request:)
-        [pagy, pagy.records(collection)]
       end
+      options[:limit] = options[:request].resolve_limit(options)
+      pagy = Offset::Countless.new(**options)
+      [pagy, pagy.records(collection)]
     end
   end
 end

data/lib/pagy/toolbox/paginators/elasticsearch_rails.rb

@@ -7,26 +7,23 @@ class Pagy
     module_function
 
     # Paginate from the search object
-    def paginate(context, search, **options)
-      context.instance_eval do
-        options[:request] = Request.new(options[:request] || request, options)
-        if search.is_a?(Search::Arguments)
-          # The search is the array of pagy_search arguments
-          Searcher.wrap(self, search, options) do
-            model, query_or_payload, search_options = search
-            search_options[:size] = options[:limit]
-            search_options[:from] = options[:limit] * ((options[:page] || 1) - 1)
-            results               = model.send(ElasticsearchRails::DEFAULT[:search_method], query_or_payload, **search_options)
-            options[:count]       = ElasticsearchRails.total_count(results)
-            [ElasticsearchRails.new(**options), results]
-          end
-        else
-          # The search is an elasticsearch_rails response
-          options[:limit] = search.search.options[:size] || 10
-          options[:page]  = ((search.search.options[:from] || 0) / options[:limit]) + 1
-          options[:count] = ElasticsearchRails.total_count(search)
-          ElasticsearchRails.new(**options)
+    def paginate(search, options)
+      if search.is_a?(Search::Arguments)
+        # The search is the array of pagy_search arguments
+        Searcher.wrap(search, options) do
+          model, query_or_payload, search_options = search
+          search_options[:size] = options[:limit]
+          search_options[:from] = options[:limit] * ((options[:page] || 1) - 1)
+          results               = model.send(ElasticsearchRails::DEFAULT[:search_method], query_or_payload, **search_options)
+          options[:count]       = ElasticsearchRails.total_count(results)
+          [ElasticsearchRails.new(**options), results]
         end
+      else
+        # The search is an elasticsearch_rails response
+        options[:limit] = search.search.options[:size] || 10
+        options[:page]  = ((search.search.options[:from] || 0) / options[:limit]) + 1
+        options[:count] = ElasticsearchRails.total_count(search)
+        ElasticsearchRails.new(**options)
       end
     end
   end

data/lib/pagy/toolbox/paginators/keynav_js.rb

@@ -6,24 +6,21 @@ class Pagy
   module KeynavJsPaginator
     module_function
 
-    # Return Pagy::Keyset::Keynav object and paginated records.
+    # Return the Pagy::Keyset::Keynav instance and paginated records.
     # Fall back to :countless if the :page has no client data.
-    def paginate(context, set, **options)
-      context.instance_eval do
-        request = Request.new(options[:request] || self.request, options)
-        page    = request.resolve_page(options, force_integer: false) # allow nil
-        if page&.match(' ')       # countless page -> no augmentation -> fallback
-          return pagy(:countless, set, page:, **options)
-        elsif page.is_a?(String)  # keynav page param
-          page_arguments = JSON.parse(B64.urlsafe_decode(page))
-          # Restart the pagination from page 1 if the url has been requested from another browser
-          options[:page] = page_arguments if request.cookie == page_arguments.shift
-        end
-
-        options[:limit] = request.resolve_limit(options)
-        pagy = Keyset::Keynav.new(set, **options, request:)
-        [pagy, pagy.records]
+    def paginate(set, options)
+      page = options[:request].resolve_page(options, force_integer: false) # allow nil
+      if page&.match(' ')       # countless page -> no augmentation -> fallback
+        return CountlessPaginator.paginate(set, page:, **options)
+      elsif page.is_a?(String)  # keynav page param
+        page_arguments = JSON.parse(B64.urlsafe_decode(page))
+        # Restart the pagination from page 1 if the url has been requested from another browser
+        options[:page] = page_arguments if options[:request].cookie == page_arguments.shift
       end
+
+      options[:limit] = options[:request].resolve_limit(options)
+      pagy = Keyset::Keynav.new(set, **options)
+      [pagy, pagy.records]
     end
   end
 end

data/lib/pagy/toolbox/paginators/keyset.rb

@@ -4,15 +4,12 @@ class Pagy
   module KeysetPaginator
     module_function
 
-    # Return Pagy::Keyset object and paginated records
-    def paginate(context, set, **options)
-      context.instance_eval do
-        request = Request.new(options[:request] || self.request, options)
-        options[:page] ||= request.resolve_page(options, force_integer: false) # allow nil
-        options[:limit]  = request.resolve_limit(options)
-        pagy = Keyset.new(set, **options, request:)
-        [pagy, pagy.records]
-      end
+    # Return Pagy::Keyset instance and paginated records
+    def paginate(set, options)
+      options[:page] ||= options[:request].resolve_page(options, force_integer: false) # allow nil
+      options[:limit]  = options[:request].resolve_limit(options)
+      pagy = Keyset.new(set, **options)
+      [pagy, pagy.records]
     end
   end
 end

data/lib/pagy/toolbox/paginators/meilisearch.rb

@@ -7,26 +7,23 @@ class Pagy
     module_function
 
     # Paginate from the search object
-    def paginate(context, search, **options)
-      context.instance_eval do
-        options[:request] = Request.new(options[:request] || request, options)
-        if search.is_a?(Search::Arguments)
-          # The search is the array of pagy_search arguments
-          Searcher.wrap(self, search, options) do
-            model, term, search_options    = search
-            search_options[:hits_per_page] = options[:limit]
-            search_options[:page]          = options[:page]
-            results                        = model.send(Meilisearch::DEFAULT[:search_method], term, search_options)
-            options[:count]                = results.raw_answer['totalHits']
-            [Meilisearch.new(**options), results]
-          end
-        else
-          # The search is a meilisearch results object
-          options[:limit] = search.raw_answer['hitsPerPage']
-          options[:page]  = search.raw_answer['page']
-          options[:count] = search.raw_answer['totalHits']
-          Meilisearch.new(**options)
+    def paginate(search, options)
+      if search.is_a?(Search::Arguments)
+        # The search is the array of pagy_search arguments
+        Searcher.wrap(search, options) do
+          model, term, search_options    = search
+          search_options[:hits_per_page] = options[:limit]
+          search_options[:page]          = options[:page]
+          results                        = model.send(Meilisearch::DEFAULT[:search_method], term, search_options)
+          options[:count]                = results.raw_answer['totalHits']
+          [Meilisearch.new(**options), results]
         end
+      else
+        # The search is a meilisearch results object
+        options[:limit] = search.raw_answer['hitsPerPage']
+        options[:page]  = search.raw_answer['page']
+        options[:count] = search.raw_answer['totalHits']
+        Meilisearch.new(**options)
       end
     end
   end

data/lib/pagy/toolbox/paginators/method.rb

@@ -15,13 +15,19 @@ class Pagy
   path = Pathname.new(__dir__)
   paginators.each { |symbol, name| autoload name, path.join(symbol.to_s) }
 
-  # Defines the pagy method. Include in the app controller/view.
+  # Pagy::Method defines the pagy method to be included in the app controller/view.
   Method = Module.new do
              protected
 
              define_method :pagy do |paginator = :offset, collection, **options|
-               merged_options = paginator == :calendar ? options : Pagy.options.merge(options)
-               Pagy.const_get(paginators[paginator]).paginate(self, collection, **merged_options)
+               options[:root_key] = 'page' if options[:jsonapi] # enforce 'page' root_key for JSON:API
+               options[:request]  = Request.new(options[:request] || request)
+               arguments          = if paginator == :calendar
+                                      [self, collection, options]
+                                    else
+                                      [collection, Pagy.options.merge(options)]
+                                    end
+               Pagy.const_get(paginators[paginator]).paginate(*arguments)
              end
            end
 end

data/lib/pagy/toolbox/paginators/offset.rb

@@ -4,16 +4,13 @@ class Pagy
   module OffsetPaginator
     module_function
 
-    # Return instance and page of results
-    def paginate(context, collection, **options)
-      context.instance_eval do
-        request = Request.new(options[:request] || self.request, options)
-        options[:page]  ||= request.resolve_page(options)
-        options[:limit]   = request.resolve_limit(options)
-        options[:count] ||= collection.instance_of?(Array) ? collection.size : OffsetPaginator.get_count(collection, options)
-        pagy = Offset.new(**options, request:)
-        [pagy, collection.instance_of?(Array) ? collection[pagy.offset, pagy.limit] : pagy.records(collection)]
-      end
+    # Return the Pagy::Offset instance and results
+    def paginate(collection, options)
+      options[:page]  ||= options[:request].resolve_page(options)
+      options[:limit]   = options[:request].resolve_limit(options)
+      options[:count] ||= collection.instance_of?(Array) ? collection.size : OffsetPaginator.get_count(collection, options)
+      pagy = Offset.new(**options)
+      [pagy, collection.instance_of?(Array) ? collection[pagy.offset, pagy.limit] : pagy.records(collection)]
     end
 
     # Get the collection count

data/lib/pagy/toolbox/paginators/searchkick.rb

@@ -7,26 +7,23 @@ class Pagy
     module_function
 
     # Paginate from the search object
-    def paginate(context, search, **options)
-      context.instance_eval do
-        options[:request] = Request.new(options[:request] || request, options)
-        if search.is_a?(Search::Arguments)
-          # The search is the array of pagy_search arguments
-          Searcher.wrap(self, search, options) do
-            model, term, search_options, block = search
-            search_options[:per_page] = options[:limit]
-            search_options[:page]     = options[:page]
-            results                   = model.send(Searchkick::DEFAULT[:search_method], term || '*', **search_options, &block)
-            options[:count]           = results.total_count
-            [Searchkick.new(**options), results]
-          end
-        else
-          # The search is a searchkick results object
-          options[:limit] = search.respond_to?(:options) ? search.options[:per_page] : search.per_page
-          options[:page]  = search.respond_to?(:options) ? search.options[:page]     : search.current_page
-          options[:count] = search.total_count
-          Searchkick.new(**options)
+    def paginate(search, options)
+      if search.is_a?(Search::Arguments)
+        # The search is the array of pagy_search arguments
+        Searcher.wrap(search, options) do
+          model, term, search_options, block = search
+          search_options[:per_page] = options[:limit]
+          search_options[:page]     = options[:page]
+          results                   = model.send(Searchkick::DEFAULT[:search_method], term || '*', **search_options, &block)
+          options[:count]           = results.total_count
+          [Searchkick.new(**options), results]
         end
+      else
+        # The search is a searchkick results object
+        options[:limit] = search.respond_to?(:options) ? search.options[:per_page] : search.per_page
+        options[:page]  = search.respond_to?(:options) ? search.options[:page]     : search.current_page
+        options[:count] = search.total_count
+        Searchkick.new(**options)
       end
     end
   end

data/lib/pagy.rb

@@ -8,7 +8,7 @@ require_relative 'pagy/toolbox/helpers/loader'
 
 # Top superclass: it defines only what's common to all the subclasses
 class Pagy
-  VERSION     = '43.0.7'
+  VERSION     = '43.1.0'
   ROOT        = Pathname.new(__dir__).parent.freeze
   DEFAULT     = { limit: 20, limit_key: 'limit', page_key: 'page' }.freeze
   PAGE_TOKEN  = 'P '

data/locales/id.yml

@@ -4,9 +4,7 @@ id:
   pagy:
     p11n: 'Other'
     aria_label:
-      # please add a comment in the https://github.com/ddnexus/pagy/issues/588
-      # posting the translation of the following  "Page"/"Pages" with the plurals for this locale
-      nav: "Pages"
+      nav: "Halaman"
       previous: "Sebelumnya"
       next: "Selanjutnya"
     previous: "<"

data/locales/ja.yml

@@ -4,9 +4,7 @@ ja:
   pagy:
     p11n: 'Other'
     aria_label:
-      # please add a comment in the https://github.com/ddnexus/pagy/issues/590
-      # posting the translation of the following  "Page"/"Pages" with the plurals for this locale
-      nav: "Pages"
+      nav: "ページ"
       previous: "前へ"
       next: "次へ"
     previous: "<"

data/locales/km.yml

@@ -4,9 +4,7 @@ km:
   pagy:
     p11n: 'Other'
     aria_label:
-      # please add a comment in the https://github.com/ddnexus/pagy/issues/591
-      # posting the translation of the following  "Page"/"Pages" with the plurals for this locale
-      nav: "Pages"
+      nav: "ទំព័រ"
       previous: "មុន"
       next: "បន្ទាប់"
     previous: "<"

data/locales/sw.yml

@@ -9,8 +9,8 @@ sw:
     # after you make these changes.
     aria_label:
       nav:
-        one: "Page"
-        other: "Pages"
+        one: "Ukurasa"
+        other: "Kurasa"
       previous: "Awali"
       next: "Ifuatayo"
     previous: "<"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 43.0.7
+  version: 43.1.0
 platform: ruby
 authors:
 - Domizio Demichelis