pagy 43.2.0 → 43.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88bd8a007346649a403e578e204c825668c2650f8f5ec1c9a678d170546bc971
-  data.tar.gz: 286bbc24c67a1019e146ca9671e2ec81b8faf6f2231b433f394cdd3e72d99f85
+  metadata.gz: 48e5f5812c5ef4b7f2a655990b494066bfbc0730635463d140d1e2bdd636523c
+  data.tar.gz: b68fde5b5b43bb8014ea9664a91703c7453dca9c7fd23fa3bebce40b9d92678d
 SHA512:
-  metadata.gz: 1d910c3b2b1d7105ecb68bd87df0443ccafe87450380d2e599879ba8d98c0b1b1deb94b3a4d2a431259652d5197343f0067a74c5936baf530580b1f3a4ec817e
-  data.tar.gz: c3fab21e05725fc9b83379b696debb7f49758c3d8dc8df017af5de2ceb59ebc3d7fc0ad7c0e90ab05779a3e0313e6ff251ce3cb3f4c2eeffc2c0092ca25792fa
+  metadata.gz: ea47f8b51fd9a8d67df167f37fa6817ae7ec5dc1a509ae973f6b66af6e6e4aba0326d727adf6fcdc7e2a0ab053ce3872cc28e7c8ad4b62f4e08347f15049402e
+  data.tar.gz: 33a577b3e6fe5b9b9124bdccbcf5cb4ec8082e9cdf3122ccac941fe2f87b126084032ea0b849b9587ac62a8d547e690c8d571e46c376dc7e396265092b2db148

data/apps/calendar.ru

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

data/apps/keynav+root_key.ru

@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.2.0'
+VERSION = '43.2.1'
 
 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.2.0'
+VERSION = '43.2.1'
 
 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.2.0'
+VERSION = '43.2.1'
 
 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.2.0'
+VERSION = '43.2.1'
 
 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.2.0'
+VERSION = '43.2.1'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")
@@ -35,6 +35,7 @@ end
 # require 'rails/all'     # too much stuff
 require 'action_controller/railtie'
 require 'active_record'
+# require_relative 'rails_page_segment'  # Uncomment to test the rails_page_segment.rb override
 
 OUTPUT = Rails.env.showcase? ? IO::NULL : $stdout
 
@@ -49,6 +50,7 @@ class PagyRails < Rails::Application # :nodoc:
 
   routes.draw do
     root to: 'comments#index'
+    # get '/comments(/:page)', to: 'comments#index'  # Uncomment to test the rails_page_segment.rb override
     get '/javascripts/:file', to: 'pagy#javascripts', file: /.*/
   end
 end

data/apps/rails_page_segment.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+# ################# IMPORTANT WARNING #################
+# Use this override ONLY if you strictly need to support the page param as a dynamic segment.
+# (e.g. get '/comments(/:page)', to: 'comments#index').
+#
+# This setup forces Pagy to use the Rails `url_for` method, which is significantly
+# slower (~20x) than Pagy's native URL generation.
+# #####################################################
+
+# 1. CONSTANT REDEFINITION
+# We must replace Pagy's internal tokens.
+# Why: Pagy marks its default tokens as "Escaped" to allow spaces into the URL template for safe interpolation.
+# Since we are handing control back to Rails' standard QueryUtils, we need simple, URL-safe placeholders
+# that Rails won't need to escape, to avoid mismatches between non-escaped and escaped tokens.
+Pagy.send(:remove_const, :PAGE_TOKEN)
+Pagy.send(:remove_const, :LIMIT_TOKEN)
+
+Pagy::PAGE_TOKEN  = '___PAGY_PAGE___'
+Pagy::LIMIT_TOKEN = '___PAGY_LIMIT___'
+
+require 'pagy/toolbox/paginators/method'
+require 'pagy/modules/abilities/linkable'
+
+class Pagy
+  # 2. REQUEST PARAMETERS
+  # Why: Pagy defaults to Rack::Request to be framework agnostic.
+  # To support dynamic segments (which are routing concepts, not query params),
+  # we must switch to the Rails `request.params` method which includes path parameters.
+  module RequestOverride
+    def get_params(request)
+      request.params
+    end
+  end
+  Request.prepend RequestOverride
+
+  # 3. CONTEXT INJECTION
+  # Why: The Pagy object needs access to the Controller instance to call `url_for`.
+  # We intercept the `pagy` method in the controller to inject `self` (the controller)
+  # into the Pagy instance as `@context`.
+  module MethodOverride
+    def pagy(...)
+      super.tap do |result|
+        # result is [pagy_object, records]
+        # We inject the controller (self) directly into the pagy object
+        result[0].instance_variable_set(:@context, self)
+      end
+    end
+  end
+  Method.prepend MethodOverride
+
+  # 4. URL GENERATION
+  # Why: We override Pagy's optimized string interpolation with Rails' `url_for`.
+  # We combine the current Rails parameters with Pagy's options and generate the URL.
+  module LinkableOverride
+    def compose_url(absolute, _path, params, fragment)
+      params[:anchor]    = fragment if fragment
+      params[:only_path] = !absolute
+
+      # Call the Rails url_for method from the controller context
+      @context.url_for(params)
+    end
+  end
+  Linkable.prepend LinkableOverride
+end
+
+# USAGE with rails.ru
+
+# Search and uncomment the following lines in the rails.ru app:
+# require_relative 'rails_page_segment'  # Uncomment to test the rails_page_segment.rb override
+# get '/comments(/:page)', to: 'comments#index'  # Uncomment to test the rails_page_segment.rb override

data/apps/repro.ru

@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.2.0'
+VERSION = '43.2.1'
 
 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.2.0'
+VERSION = '43.2.1'
 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.2.0)
+# Pagy initializer file (43.2.1)
 # See https://ddnexus.github.io/pagy/resources/initializer/
 
 ############ Global Options ################################################################

data/javascripts/pagy.js

@@ -1,6 +1,6 @@
 // pagy.ts
 window.Pagy = (() => {
-  const storageSupport = "sessionStorage" in window && "BroadcastChannel" in window, pageRe = "P ";
+  const storageSupport = "sessionStorage" in window && "BroadcastChannel" in window;
   let pagy = "pagy", storage, sync, tabId;
   if (storageSupport) {
     storage = sessionStorage;
@@ -67,6 +67,7 @@ window.Pagy = (() => {
   };
   const buildNavJs = (nav, [
     [before, anchor, current, gap, after],
+    pageToken,
     [widths, series, labels],
     keynavArgs
   ]) => {
@@ -79,7 +80,7 @@ window.Pagy = (() => {
       }
       let html = before;
       series[index].forEach((item, i) => {
-        html += item == "gap" ? gap : (typeof item == "number" ? anchor.replace(pageRe, item) : current).replace("L<", labels?.[index][i] ?? item + "<");
+        html += item == "gap" ? gap : (typeof item == "number" ? anchor.replace(pageToken, item) : current).replace("L<", labels?.[index][i] ?? item + "<");
       });
       html += after;
       nav.innerHTML = "";
@@ -93,13 +94,13 @@ window.Pagy = (() => {
       rjsObserver.observe(parent);
     }
   };
-  const initInputNavJs = async (nav, [url_token, keynavArgs]) => {
+  const initInputNavJs = async (nav, [url_token, pageToken, keynavArgs]) => {
     const augment = keynavArgs && storageSupport ? await augmentKeynav(nav, keynavArgs) : (page) => page;
-    initInput(nav, (inputValue) => url_token.replace(pageRe, augment(inputValue)));
+    initInput(nav, (inputValue) => url_token.replace(pageToken, augment(inputValue)));
   };
-  const initLimitTagJs = (span, [from, url_token]) => {
+  const initLimitTagJs = (span, [from, url_token, page_token, limitToken]) => {
     initInput(span, (inputValue) => {
-      return url_token.replace(pageRe, Math.max(Math.ceil(from / parseInt(inputValue)), 1)).replace("L ", inputValue);
+      return url_token.replace(page_token, Math.max(Math.ceil(from / parseInt(inputValue)), 1)).replace(limitToken, inputValue);
     });
   };
   const initInput = (element, getUrl) => {
@@ -125,7 +126,7 @@ window.Pagy = (() => {
     });
   };
   return {
-    version: "43.2.0",
+    version: "43.2.1",
     init(arg) {
       const target = arg instanceof HTMLElement ? arg : document, elements = target.querySelectorAll("[data-pagy]");
       for (const element of elements) {
@@ -149,5 +150,5 @@ window.Pagy = (() => {
   };
 })();
 
-//# debugId=E46E32F1566B8C2964756E2164756E21
+//# debugId=F3282E394DA790A164756E2164756E21
 //# 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                            rootKey:     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, rootKey, pageKey, last, spliceArgs]) => {\n    let augmentPage:(page: string) => string;\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        augmentPage = (page: string) => page + '+' + last;\n      }\n    }\n    // @ts-expect-error If it is not assigned it means it supports keynav\n    if (!augmentPage) { // 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      augmentPage = (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    const search = (rootKey) ? `${rootKey}%5B${pageKey}%5D` : pageKey;\n    const re     = new RegExp(`(?<=\\\\?.*)(\\\\b${search}=)(\\\\d+)`);\n    // Augment the page param of each href\n    for (const a of <NodeListOf<HTMLAnchorElement>><unknown>nav.querySelectorAll('a[href]')) {\n      a.href = a.href.replace(re, (_match, prefix, digit): string => `${prefix}${augmentPage(<string>digit)}`);\n    }\n    // Return the augment function for further augmentation (i.e., url token in input_nav_js)\n    return augmentPage;\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.2.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"
+    "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                            rootKey:     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, pageToken: string, NavJsSeries, KeynavArgs?]\ntype NavJsSeries = readonly [widths: number[],\n                             series: (string | number)[][],\n                             labels: string[][] | null]\ntype InputNavJsArgs = readonly [urlToken:  string,\n                                pageToken: string,\n                                KeynavArgs?]\ntype LimitTagJsArgs = readonly [from:     number,\n                                urlToken: string,\n                                pageToken: string,\n                                limitToken: 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  // 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, rootKey, pageKey, last, spliceArgs]) => {\n    let augmentPage:(page: string) => string;\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        augmentPage = (page: string) => page + '+' + last;\n      }\n    }\n    // @ts-expect-error If it is not assigned it means it supports keynav\n    if (!augmentPage) { // 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      augmentPage = (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    const search = (rootKey) ? `${rootKey}%5B${pageKey}%5D` : pageKey;\n    const re     = new RegExp(`(?<=\\\\?.*)(\\\\b${search}=)(\\\\d+)`);\n    // Augment the page param of each href\n    for (const a of <NodeListOf<HTMLAnchorElement>><unknown>nav.querySelectorAll('a[href]')) {\n      a.href = a.href.replace(re, (_match, prefix, digit): string => `${prefix}${augmentPage(<string>digit)}`);\n    }\n    // Return the augment function for further augmentation (i.e., url token in input_nav_js)\n    return augmentPage;\n  };\n\n  // Build the series_nav_js helper\n  const buildNavJs = (nav:NavJsElement, [[before, anchor, current, gap, after], pageToken,\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(pageToken, 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, pageToken, keynavArgs]:InputNavJsArgs) => {\n    const augment = keynavArgs && storageSupport\n                    ? await augmentKeynav(nav, keynavArgs)\n                    : (page: string) => page;\n    initInput(nav, inputValue => url_token.replace(pageToken, augment(inputValue)));\n  };\n\n  // Init the limit_tag_js helper\n  const initLimitTagJs = (span:HTMLSpanElement, [from, url_token, page_token, limitToken]: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(page_token, Math.max(Math.ceil(from / parseInt(inputValue)), 1))\n                      .replace(limitToken, 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.2.1\",\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": ";AA2CA,IAAM,QAAQ,MAAM;AAAA,EAClB,MAAM,iBAAiB,oBAAoB,UAAU,sBAAsB,QACrE,SAAiB;AAAA,EAEvB,IAAI,OAAO,QAAQ,SAAkB,MAAwB;AAAA,EAC7D,IAAI,gBAAgB;AAAA,IAClB,UAAU;AAAA,IACV,OAAU,IAAI,iBAAiB,IAAI;AAAA,IACnC,QAAU,KAAK,IAAI;AAAA,IAEnB,KAAK,iBAAiB,WAAW,CAAC,MAA6B;AAAA,MAC7D,IAAI,EAAE,KAAK,MAAM;AAAA,QACf,MAAM,UAAU,QAAQ,QAAQ,EAAE,KAAK,GAAG;AAAA,QAC1C,IAAI,SAAS;AAAA,UACX,KAAK,YAAsB,EAAC,IAAI,EAAE,KAAK,MAAM,KAAK,EAAE,KAAK,KAAK,KAAK,QAAO,CAAC;AAAA,QAC7E;AAAA,MACF,EAAO,SAAI,EAAE,KAAK,IAAI;AAAA,QACpB,IAAI,EAAE,KAAK,MAAM,OAAO;AAAA,UACtB,QAAQ,QAAQ,EAAE,KAAK,KAAa,EAAE,KAAK,GAAG;AAAA,QAChD;AAAA,MACF;AAAA,KACD;AAAA,EACH;AAAA,EAEA,MAAM,cAAc,IAAI,eACpB,aAAW,QAAQ,QAAQ,OAAK;AAAA,IAC9B,EAAE,OAAO,iBAA+B,WAAW,EAAE,QAAQ,QAAM,GAAG,OAAO,CAAC;AAAA,GAC/E,CAAC;AAAA,EAUN,MAAM,gBAAgB,CAAC,YAAmB,KAAK,OAAO,aAAa,GAAI,IAAI,cAAa,OAAO,OAAO,CAAC,CAAC,EAC7D,QAAQ,UAAU,CAAC,MAAM,KAAK,MAAM,MAAM,KAAK,MAAM,MAAM,EAAE,GAClG,YAAgB,CAAC,WAAoB,IAAI,YAAY,EAAG,OAAO,WAAW,KAAK,KAAK,MAAM,GAAG,OAAK,EAAE,WAAW,CAAC,CAAC,CAAC;AAAA,EAGxH,MAAM,UAAU,MAAM,KAAK,MAAM,KAAK,OAAO,IAAI,MAAM,CAAC,EAAE,SAAS,EAAE;AAAA,EAGrE,MAAM,gBAA+B,OAAO,MAAM,YAAY,SAAS,SAAS,MAAM,gBAAgB;AAAA,IACpG,IAAI;AAAA,IACJ,MAAM,aAAa,SAAS,OAAO,MAAM,MAAM,EACnB,KAAK,CAAC,QAAQ,IAAI,WAAW,OAAO,GAAG,CAAC,GACvC,MAAM,GAAG,EAAE,MAAM,QAAQ;AAAA,IACtD,SAAS,SAAS,OAAO,MAAM;AAAA,IAC/B,IAAI,cAAc,EAAE,cAAc,UAAU;AAAA,MAE1C,KAAK,YAAsB,EAAE,MAAM,OAAO,KAAK,WAAW,CAAC;AAAA,MAE3D,MAAM,IAAI,QAAqB,CAAC,YAAY,WAAW,MAAM,QAAQ,EAAE,GAAG,GAAG,CAAC;AAAA,MAC9E,IAAI,EAAE,cAAc,UAAU;AAAA,QAC5B,cAAc,CAAC,SAAiB,OAAO,MAAM;AAAA,MAC/C;AAAA,IACF;AAAA,IAEA,IAAI,CAAC,aAAa;AAAA,MAChB,IAAI,CAAC,YAAY;AAAA,QAAE,GAAG;AAAA,UAAE,aAAa,QAAQ;AAAA,QAAE,SAAS,cAAc;AAAA,MAAS;AAAA,MAC/E,MAAM,OAAO,QAAQ,QAAQ,UAAU,GACnC,UAAqB,OAAO,KAAK,MAAM,IAAI,IAAI,CAAC,SAAS;AAAA,MAC7D,IAAI,YAAY;AAAA,QACd,QAAQ,OAAO,GAAG,UAAU;AAAA,QAC5B,QAAQ,QAAQ,YAAY,KAAK,UAAU,OAAO,CAAC;AAAA,MACrD;AAAA,MAEA,cAAc,CAAC,SAAgB;AAAA,QAC7B,MAAM,UAAU,SAAS,IAAI;AAAA,QAC7B,OAAO,cAAc,KAAK,UACP;AAAA,UAAC;AAAA,UACA;AAAA,UACA;AAAA,UACA,QAAQ;AAAA,UACR,QAAQ,UAAU;AAAA,UAClB,QAAQ;AAAA,QAAQ,CAAC,CAAC;AAAA;AAAA,IAE1C;AAAA,IACA,MAAM,SAAU,UAAW,GAAG,aAAa,eAAe;AAAA,IAC1D,MAAM,KAAS,IAAI,OAAO,iBAAiB,gBAAgB;AAAA,IAE3D,WAAW,KAA6C,IAAI,iBAAiB,SAAS,GAAG;AAAA,MACvF,EAAE,OAAO,EAAE,KAAK,QAAQ,IAAI,CAAC,QAAQ,QAAQ,UAAkB,GAAG,SAAS,YAAoB,KAAK,GAAG;AAAA,IACzG;AAAA,IAEA,OAAO;AAAA;AAAA,EAIT,MAAM,aAAa,CAAC;AAAA,KAAoB,QAAQ,QAAQ,SAAS,KAAK;AAAA,KAC/B,QAAQ,QAAQ;AAAA,IAAS;AAAA,QAAgC;AAAA,IAC9F,MAAO,SAAsB,IAAI;AAAA,IACjC,IAAI,YAAY;AAAA,KACf,IAAI,SAAS,MAAM;AAAA,MAClB,MAAM,QAAQ,OAAO,UAAU,OAAK,IAAI,OAAO,WAAW;AAAA,MAC1D,IAAI,OAAO,WAAW,WAAW;AAAA,QAAE;AAAA,MAAO;AAAA,MAE1C,IAAI,OAAO;AAAA,MACX,OAAO,OAAO,QAAQ,CAAC,MAAM,MAAM;AAAA,QAEjC,QAAQ,QAAQ,QAAQ,OAEf,OAAO,QAAQ,WAAW,OAAO,QAAQ,QAAQ,IAAI,IAAI,SACrD,QAAQ,MAAM,SAAS,OAAO,MAAM,OAAO,GAAG;AAAA,OAC5D;AAAA,MACD,QAAgB;AAAA,MAChB,IAAI,YAAY;AAAA,MAChB,IAAI,mBAAmB,cAAc,IAAI;AAAA,MACzC,YAAY,OAAO;AAAA,MACnB,IAAI,cAAc,gBAAgB;AAAA,QAAO,cAAc,KAAK,UAAU;AAAA,MAAE;AAAA,OACvE;AAAA,IACH,IAAI,IAAI,UAAU,SAAS,OAAO,MAAM,GAAG;AAAA,MAAE,YAAY,QAAQ,MAAM;AAAA,IAAE;AAAA;AAAA,EAI3E,MAAM,iBAAiB,OAAO,MAAkB,WAAW,gBAA+B;AAAA,IACxF,MAAM,UAAU,cAAc,iBACZ,MAAM,cAAc,KAAK,UAAU,IACnC,CAAC,SAAiB;AAAA,IACpC,UAAU,KAAK,gBAAc,UAAU,QAAQ,QAAQ,QAAQ,UAAU,CAAC,CAAC;AAAA;AAAA,EAI7E,MAAM,iBAAiB,CAAC,OAAuB,MAAM,eAA8B;AAAA,IACjF,UAAU,MAAM,gBAAc;AAAA,MAE5B,OAAO,UAAU,QAAQ,QAAQ,KAAK,IAAI,KAAK,KAAK,OAAO,SAAS,UAAU,CAAC,GAAG,CAAC,CAAC,EACnE,QAAQ,MAAM,UAAU;AAAA,KAC1C;AAAA;AAAA,EAIH,MAAM,YAAY,CAAC,SAAqB,WAAgC;AAAA,IACtE,MAAM,QAA4B,QAAQ,cAAc,OAAO,GACzD,OAA6B,QAAQ,cAAc,GAAG,GACtD,UAAU,MAAM,OAChB,SAAU,MAAM;AAAA,MACJ,IAAI,MAAM,UAAU,SAAS;AAAA,QAAE;AAAA,MAAO;AAAA,MACtC,OAAO,KAAK,KAAK,OAAO,CAAC,MAAM,KAAK,MAAM,OAAO,MAAM,GAAG,EAAE,IAAI,OAAK,SAAS,CAAC,KAAK,CAAC;AAAA,MACrF,IAAI,MAAM,OAAO,MAAM,KAAK;AAAA,QAC1B,MAAM,QAAQ;AAAA,QACd,MAAM,OAAO;AAAA,QACb;AAAA,MACF;AAAA,MACA,KAAK,OAAO,OAAO,MAAM,KAAK;AAAA,MAC9B,KAAK,MAAM;AAAA;AAAA,IAE7B,MAAM,iBAAiB,SAAS,MAAM,MAAM,OAAO,CAAC;AAAA,IACpD,MAAM,iBAAiB,YAAY,MAAM;AAAA,IACzC,MAAM,iBAAiB,YAAY,OAAK;AAAA,MAAE,IAAI,EAAE,OAAO,SAAS;AAAA,QAAE,OAAO;AAAA,MAAE;AAAA,KAAG;AAAA;AAAA,EAIhF,OAAO;AAAA,IACL,SAAS;AAAA,IAGT,IAAI,CAAC,KAAkB;AAAA,MACrB,MAAM,SAAW,eAAe,cAAc,MAAM,UAC9C,WAAW,OAAO,iBAAiB,aAAa;AAAA,MACtD,WAAW,WAAoC,UAAU;AAAA,QACvD,IAAI;AAAA,UACF,OAAO,aAAa,QAAkB,KAAK,MAAM,UAAkB,QAAQ,aAAa,WAAW,CAAC,CAAC;AAAA,UACrG,IAAI,YAAY,KAAK;AAAA,YAEd,cAAc,SAAS,GAAwB,IAAI;AAAA,UAC1D,EAAO,SAAI,YAAY,OAAO;AAAA,YAC5B,WAAyB,SAAmC,IAAI;AAAA,UAClE,EAAO,SAAI,YAAY,OAAO;AAAA,YACvB,eAAe,SAAkC,IAAI;AAAA,UAC5D,EAAO,SAAI,YAAY,OAAO;AAAA,YAC5B,eAAe,SAAkC,IAAI;AAAA,UACvD;AAAA,UAEA,OAAO,KAAK;AAAA,UAAE,QAAQ,KAAK;AAAA,KAAqB,SAAS,GAAG;AAAA;AAAA,MAChE;AAAA;AAAA,EAEJ;AAAA,GACC;",
-  "debugId": "E46E32F1566B8C2964756E2164756E21",
+  "mappings": "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",
+  "debugId": "F3282E394DA790A164756E2164756E21",
   "names": []
 }

data/javascripts/pagy.min.js

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

data/javascripts/pagy.mjs

@@ -1,5 +1,5 @@
 const Pagy = (() => {
-  const storageSupport = "sessionStorage" in window && "BroadcastChannel" in window, pageRe = "P ";
+  const storageSupport = "sessionStorage" in window && "BroadcastChannel" in window;
   let pagy = "pagy", storage, sync, tabId;
   if (storageSupport) {
     storage = sessionStorage;
@@ -66,6 +66,7 @@ const Pagy = (() => {
   };
   const buildNavJs = (nav, [
     [before, anchor, current, gap, after],
+    pageToken,
     [widths, series, labels],
     keynavArgs
   ]) => {
@@ -78,7 +79,7 @@ const Pagy = (() => {
       }
       let html = before;
       series[index].forEach((item, i) => {
-        html += item == "gap" ? gap : (typeof item == "number" ? anchor.replace(pageRe, item) : current).replace("L<", labels?.[index][i] ?? item + "<");
+        html += item == "gap" ? gap : (typeof item == "number" ? anchor.replace(pageToken, item) : current).replace("L<", labels?.[index][i] ?? item + "<");
       });
       html += after;
       nav.innerHTML = "";
@@ -92,13 +93,13 @@ const Pagy = (() => {
       rjsObserver.observe(parent);
     }
   };
-  const initInputNavJs = async (nav, [url_token, keynavArgs]) => {
+  const initInputNavJs = async (nav, [url_token, pageToken, keynavArgs]) => {
     const augment = keynavArgs && storageSupport ? await augmentKeynav(nav, keynavArgs) : (page) => page;
-    initInput(nav, (inputValue) => url_token.replace(pageRe, augment(inputValue)));
+    initInput(nav, (inputValue) => url_token.replace(pageToken, augment(inputValue)));
   };
-  const initLimitTagJs = (span, [from, url_token]) => {
+  const initLimitTagJs = (span, [from, url_token, page_token, limitToken]) => {
     initInput(span, (inputValue) => {
-      return url_token.replace(pageRe, Math.max(Math.ceil(from / parseInt(inputValue)), 1)).replace("L ", inputValue);
+      return url_token.replace(page_token, Math.max(Math.ceil(from / parseInt(inputValue)), 1)).replace(limitToken, inputValue);
     });
   };
   const initInput = (element, getUrl) => {
@@ -124,7 +125,7 @@ const Pagy = (() => {
     });
   };
   return {
-    version: "43.2.0",
+    version: "43.2.1",
     init(arg) {
       const target = arg instanceof HTMLElement ? arg : document, elements = target.querySelectorAll("[data-pagy]");
       for (const element of elements) {

data/lib/pagy/classes/calendar/calendar.rb

@@ -21,17 +21,17 @@ class Pagy
     UNITS = %i[year quarter month week day]  # rubocop:disable Style/MutableConstant
 
     class << self
-      # :nocov:
       # Localize with rails-i18n in any env
       def localize_with_rails_i18n_gem(*locales)
         Unit.prepend(Module.new { def localize(...) = ::I18n.localize(...) })
+        # :nocov:
         raise RailsI18nLoadError, "Pagy: The gem 'rails-i18n' must be installed if you don't use Rails" \
               unless (path = Gem.loaded_specs['rails-i18n']&.full_gem_path)
 
+        # :nocov:
         path = Pathname.new(path)
         ::I18n.load_path += locales.map { |locale| path.join("rails/locale/#{locale}.yml") }
       end
-      # :nocov:
 
       private
 

data/lib/pagy/classes/calendar/unit.rb

@@ -17,7 +17,7 @@ class Pagy
       include Rangeable
       include Shiftable
 
-      def initialize(**)    # rubocop:disable Lint/MissingSuper
+      def initialize(**)
         assign_options(**)
         assign_and_check(page: 1)
         assign_unit_variables
@@ -50,14 +50,7 @@ class Pagy
         unless time.between?(@initial, fit_final)
           raise RangeError.new(self, :time, "between #{@initial} and #{fit_final}", time) unless options[:fit_time]
 
-          if time < @final
-            fit_time = @initial
-            ordinal  = 'first'
-          else
-            fit_time = fit_final
-            ordinal  = 'last'
-          end
-          warn "Pagy::Calendar#page_at: Rescued #{time} out of range by returning the #{ordinal} page."
+          fit_time = time < @final ? @initial : fit_final
         end
         offset = page_offset_at(fit_time)   # offset starts from 0
         @order == :asc ? offset + 1 : @last - offset
@@ -75,7 +68,10 @@ class Pagy
       # Apply the strftime format to the time.
       # Localization other than :en, require the rails-I18n gem.
       def localize(time, **options)
+        # Impossible to "unprepend" the rails-i18n after it runs localize_with_rails_i18n_gem in test
+        # :nocov:
         time.strftime(options[:format])
+        # :nocov:
       end
 
       # The number of time units to offset from the @initial time, in order to get the ordered starting time for the page.

data/lib/pagy/classes/keyset/keynav.rb

@@ -8,9 +8,10 @@ class Pagy
       PRIOR_PREFIX = 'prior_'
       PAGE_PREFIX  = 'page_'
 
-      path = Pathname.new(__FILE__).sub_ext('')
-      autoload :ActiveRecord, path.join('active_record')
-      autoload :Sequel,       path.join('sequel')
+      # Define empty subclasses to allow specific typing without triggering autoload.
+      # The .new factory in Keyset will handle mixing in the adapter logic from Pagy::Keyset::Adapters.
+      class ActiveRecord < self; end
+      class Sequel < self; end
 
       # Finalize the instance variables needed for the UI
       def initialize(set, **)

data/lib/pagy/classes/keyset/keyset.rb

@@ -6,31 +6,53 @@ require_relative '../../modules/b64'
 class Pagy
   # Implement wicked-fast keyset pagination for big data
   class Keyset < Pagy
-    path = Pathname.new(__dir__)
-    autoload :ActiveRecord, path.join('active_record')
-    autoload :Sequel,       path.join('sequel')
-    autoload :Keynav,       path.join('keynav')
+    # Autoload adapters: files are loaded only when const_get accesses them
+    module Adapters
+      path = Pathname.new(__dir__)
+      autoload :ActiveRecord, path.join('adapters/active_record')
+      autoload :Sequel,       path.join('adapters/sequel')
+    end
+
+    autoload :Keynav,  Pathname.new(__dir__).join('keynav')
+
+    # Define empty subclasses to allow specific typing without triggering autoload
+    class ActiveRecord < self; end
+    class Sequel       < self; end
 
     class TypeError < ::TypeError; end
 
-    # Initialize Keyset* and Keyset::Keynav* classes and subclasses
+    # Factory method: detects the set type, configures the subclass, and instantiates
     def self.new(set, **)
-      # Subclass instances run only the initializer
-      if /::(?:ActiveRecord|Sequel)$/.match?(name)  # check without triggering autoload
+      # 1. Handle direct subclass usage (e.g. Pagy::Keyset::ActiveRecord.new)
+      if /::(?:ActiveRecord|Sequel)$/.match?(name)
+        # Ensure the adapter is mixed in (lazy load)
+        mix_in_adapter(name.split('::').last)
         return allocate.tap { |instance| instance.send(:initialize, set, **) }
       end
 
-      subclass = if defined?(::ActiveRecord) && set.is_a?(::ActiveRecord::Relation)
-                   self::ActiveRecord
+      # 2. Handle Factory usage (Pagy::Keyset.new)
+      orm_name = if defined?(::ActiveRecord) && set.is_a?(::ActiveRecord::Relation)
+                   :ActiveRecord
                  elsif defined?(::Sequel) && set.is_a?(::Sequel::Dataset)
-                   self::Sequel
+                   :Sequel
                  else
                    raise TypeError, "expected an ActiveRecord::Relation or Sequel::Dataset; got #{set.class}"
                  end
+
+      # Get the specific subclass (self::ActiveRecord)
+      subclass = const_get(orm_name)
+      # Ensure the adapter is mixed in (lazy load)
+      subclass.mix_in_adapter(orm_name)
       subclass.new(set, **)
     end
 
-    def initialize(set, **) # rubocop:disable Lint/MissingSuper
+    # Helper to lazy-include the adapter module
+    def self.mix_in_adapter(orm_name)
+      adapter_module = Pagy::Keyset::Adapters.const_get(orm_name)
+      include(adapter_module) unless self < adapter_module
+    end
+
+    def initialize(set, **)
       assign_options(**)
       assign_and_check(limit: 1)
       @set    = set
@@ -102,7 +124,7 @@ class Pagy
           last_column, last_direction = keyset.pop
           intersection = +'('
           intersection << (keyset.map { |column, _d| "#{identifier[column]} = #{placeholder[column]}" } \
-                            << "#{identifier[last_column]} #{operator[last_direction]} #{placeholder[last_column]}").join(' AND ')
+          << "#{identifier[last_column]} #{operator[last_direction]} #{placeholder[last_column]}").join(' AND ')
           intersection << ')'
           union << intersection
         end

data/lib/pagy/classes/offset/countless.rb

@@ -4,7 +4,7 @@ class Pagy
   class Offset
     # Offset pagination without a count
     class Countless < Offset
-      def initialize(**) # rubocop:disable Lint/MissingSuper
+      def initialize(**)
         assign_options(**)
         assign_and_check(limit: 1, page: 1)
         @page = upto_max_pages(@page)

data/lib/pagy/classes/offset/offset.rb

@@ -14,7 +14,7 @@ class Pagy
     include Rangeable
     include Shiftable
 
-    def initialize(**) # rubocop:disable Lint/MissingSuper
+    def initialize(**)
       assign_options(**)
       assign_and_check(limit: 1, count: 0, page: 1)
       assign_last

data/lib/pagy/classes/offset/search.rb

@@ -3,7 +3,7 @@
 class Pagy
   module Search
     class Arguments < Array
-      def respond_to_missing? = true
+      def respond_to_missing?(*) = true
 
       def method_missing(*) = push(*)
     end

data/lib/pagy/classes/request.rb

@@ -11,7 +11,7 @@ class Pagy
         if request.is_a?(Hash)
           request.values_at(:base_url, :path, :params, :cookie)
         else
-          [request.base_url, request.path, request.GET.merge(request.POST).to_h, request.cookies['pagy']]
+          [request.base_url, request.path, get_params(request), request.cookies['pagy']]
         end
     end
 
@@ -32,5 +32,9 @@ class Pagy
 
       [requested_limit.to_i, @options[:client_max_limit]].min
     end
+
+    private
+
+    def get_params(request) = request.GET.merge(request.POST).to_h
   end
 end

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

@@ -47,13 +47,17 @@ class Pagy
         @options.merge(options)
                 .values_at(:root_key, :page_key, :limit_key, :client_max_limit, :limit, :querify, :absolute, :path, :fragment)
       params = @request.params.clone(freeze: false)
-      (root_key ? params[root_key] ||= {} : params).tap do |h|
+      (root_key ? params[root_key] = params[root_key]&.clone(freeze: false) || {} : params).tap do |h|
         { page_key  => compose_page_param(page),
           limit_key => client_max_limit && limit }.each { |k, v| v ? h[k] = v : h.delete(k) }
       end
       querify&.(params) # Must modify the params: the returned value is ignored
+      fragment &&= "##{fragment.delete_prefix('#')}"
+      compose_url(absolute, path, params, fragment)
+    end
+
+    def compose_url(absolute, path, params, fragment)
       query_string = QueryUtils.build_nested_query(params).sub(/\A(?=.)/, '?')
-      fragment   &&= "##{fragment.delete_prefix('#')}"
       "#{@request.base_url if absolute}#{path || @request.path}#{query_string}#{fragment}"
     end
   end

data/lib/pagy/toolbox/helpers/data_hash.rb

@@ -1,27 +1,27 @@
 # frozen_string_literal: true
 
 class Pagy
-  DEFAULT_DATA_KEYS = %i[url_template first_url previous_url page_url next_url last_url
+  DEFAULT_DATA_KEYS = %i[url_template first_url previous_url current_url page_url next_url last_url
                          count page limit last in from to previous next options].freeze
 
   # Generate a hash of the wanted internal data
   def data_hash(data_keys: @options[:data_keys] || DEFAULT_DATA_KEYS, **)
-    data_keys -= %i[count limit] if calendar?
     template   = compose_page_url(PAGE_TOKEN, **)
-    to_url     = ->(page) { template.sub(PAGE_TOKEN, page.to_s) }
-
+    to_url     = ->(page) { template.sub(PAGE_TOKEN, page.to_s) if page }
+    data_keys -= %i[count limit] if calendar?
     data_keys.each_with_object({}) do |key, data|
-      data[key] = case key
-                  when :url_template then template
-                  when :first_url    then compose_page_url(nil, **)
-                  when :previous_url then to_url.(@previous)
-                  when :page_url     then to_url.(@page)
-                  when :next_url     then to_url.(@next)
-                  when :last_url     then to_url.(@last)
-                  else send(key)
-                  end
+      value = case key
+              when :url_template           then template
+              when :first_url              then compose_page_url(nil, **)
+              when :previous_url           then to_url.(@previous)
+              when :current_url, :page_url then to_url.(@page)
+              when :next_url               then to_url.(@next)
+              when :last_url               then to_url.(@last)
+              else send(key)
+              end
+      data[key] = value if value
     rescue NoMethodError
-      raise OptionError.new(self, :data, 'to contain known keys', key)
+      raise OptionError.new(self, :data_keys, 'to contain known keys/methods', key)
     end
   end
 end

data/lib/pagy/toolbox/helpers/limit_tag_js.rb

@@ -7,12 +7,12 @@ class Pagy
   def limit_tag_js(id: nil, item_name: nil, client_max_limit: @options[:client_max_limit], **)
     raise OptionError.new(self, :client_max_limit, 'to be truthy', client_max_limit) unless client_max_limit
 
-    limit_input = %(<input name="limit" type="number" min="1" max="#{@options[:client_max_limit]}" value="#{
+    limit_input = %(<input name="limit" type="number" min="1" max="#{client_max_limit}" value="#{
                     @limit}" style="padding: 0; text-align: center; width: #{@limit.to_s.length + 1}rem;">#{A_TAG})
     url_token   = compose_page_url(PAGE_TOKEN, limit: LIMIT_TOKEN)
 
     %(<span#{%( id="#{id}") if id} class="pagy limit-tag-js" #{
-      data_pagy_attribute(:ltj, @from, url_token)
+      data_pagy_attribute(:ltj, @from, url_token, PAGE_TOKEN, LIMIT_TOKEN)
       }><label>#{
       I18n.translate('pagy.limit_tag_js',
                      item_name: item_name || I18n.translate('pagy.item_name', count: @limit),

data/lib/pagy/toolbox/helpers/loader.rb

@@ -24,8 +24,11 @@ class Pagy
       send(visibility)
       # Load the method, overriding its own alias. Next requests will call the method directly.
       define_method(:"load_#{visibility}") do |*args, **kwargs|
+        # Tests shadow the usage of these lines
+        # :nocov:
         require_relative methods[__callee__]
         send(__callee__, *args, **kwargs)
+        # :nocov:
       end
       methods.each_key { |method| alias_method method, :"load_#{visibility}" }
     end

data/lib/pagy/toolbox/helpers/page_url.rb

@@ -2,17 +2,15 @@
 
 class Pagy
   # Return the page url for any page
-  # :nocov:
   def page_url(page, **)
     target = case page
-             when :first    then nil
-             when :current  then @page
-             when :previous then @previous
-             when :next     then @next
-             when :last     then @last
-             else                page
+             when :first          then nil
+             when :current, :page then @page
+             when :previous       then @previous
+             when :next           then @next
+             when :last           then @last
+             else                      page
              end
     compose_page_url(target, **) if target || page == :first
   end
-  # :nocov:
 end

data/lib/pagy/toolbox/helpers/support/wrap_input_nav_js.rb

@@ -12,7 +12,7 @@ class Pagy
   def wrap_input_nav_js(html, nav_classes, id: nil, aria_label: nil, **)
     %(<nav#{%( id="#{id}") if id} class="#{nav_classes}" #{
       nav_aria_label_attribute(aria_label:)} #{
-      data = [:inj, compose_page_url(PAGE_TOKEN, **)]
+      data = [:inj, compose_page_url(PAGE_TOKEN, **), PAGE_TOKEN]
       data.push(@update) if keynav?
       data_pagy_attribute(*data)
       }>#{html}</nav>)

data/lib/pagy/toolbox/helpers/support/wrap_series_nav_js.rb

@@ -29,7 +29,7 @@ class Pagy
     nav_classes = "pagy-rjs #{nav_classes}" if sequels[0].size > 1
     %(<nav#{%( id="#{id}") if id} class="#{nav_classes}" #{
       nav_aria_label_attribute(aria_label:)} #{
-      data = [:snj, tokens.values, sequels]
+      data = [:snj, tokens.values, PAGE_TOKEN, sequels]
       data.push(@update) if keynav?
       data_pagy_attribute(*data)
       }></nav>)

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

@@ -21,11 +21,11 @@ class Pagy
              protected
 
              define_method :pagy do |paginator = :offset, collection, **options|
-               arguments = if paginator == :calendar
-                             [self, collection, options]
-                           else
-                             [collection, options = Pagy.options.merge(options)]
-                           end
+               arguments           = if paginator == :calendar
+                                       [self, collection, options]
+                                     else
+                                       [collection, options = Pagy.options.merge(options)]
+                                     end
                options[:root_key]  = 'page' if options[:jsonapi] # enforce 'page' root_key for JSON:API
                options[:request] ||= request                     # user set request or self.request
                options[:request]   = Request.new(options)        # Pagy::Request

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.2.0'
+  VERSION     = '43.2.1'
   ROOT        = Pathname.new(__dir__).parent.freeze
   DEFAULT     = { limit: 20, limit_key: 'limit', page_key: 'page' }.freeze
   PAGE_TOKEN  = EscapedValue.new('P ')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 43.2.0
+  version: 43.2.1
 platform: ruby
 authors:
 - Domizio Demichelis
@@ -54,6 +54,7 @@ files:
 - apps/keyset.ru
 - apps/keyset_sequel.ru
 - apps/rails.ru
+- apps/rails_page_segment.rb
 - apps/repro.ru
 - bin/pagy
 - config/pagy.rb
@@ -74,14 +75,10 @@ files:
 - lib/pagy/classes/calendar/week.rb
 - lib/pagy/classes/calendar/year.rb
 - lib/pagy/classes/exceptions.rb
-- lib/pagy/classes/keyset/active_record.rb
 - lib/pagy/classes/keyset/adapters/active_record.rb
 - lib/pagy/classes/keyset/adapters/sequel.rb
 - lib/pagy/classes/keyset/keynav.rb
-- lib/pagy/classes/keyset/keynav/active_record.rb
-- lib/pagy/classes/keyset/keynav/sequel.rb
 - lib/pagy/classes/keyset/keyset.rb
-- lib/pagy/classes/keyset/sequel.rb
 - lib/pagy/classes/offset/countish.rb
 - lib/pagy/classes/offset/countless.rb
 - lib/pagy/classes/offset/offset.rb

data/lib/pagy/classes/keyset/active_record.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'adapters/active_record'
-
-class Pagy
-  class Keyset
-    class ActiveRecord < Keyset
-      include Adapters::ActiveRecord
-    end
-  end
-end

data/lib/pagy/classes/keyset/keynav/active_record.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../adapters/active_record'
-
-class Pagy
-  class Keyset
-    class Keynav
-      class ActiveRecord < Keynav
-        include Adapters::ActiveRecord
-      end
-    end
-  end
-end

data/lib/pagy/classes/keyset/keynav/sequel.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../adapters/sequel'
-
-class Pagy
-  class Keyset
-    class Keynav
-      class Sequel < Keynav
-        include Adapters::Sequel
-      end
-    end
-  end
-end

data/lib/pagy/classes/keyset/sequel.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'adapters/sequel'
-
-class Pagy
-  class Keyset
-    class Sequel < Keyset
-      include Adapters::Sequel
-    end
-  end
-end