pagy 43.8.2 → 43.8.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/apps/active_search.ru +1 -1
- data/apps/calendar.ru +1 -1
- data/apps/demo.ru +1 -1
- data/apps/keynav+root_key.ru +1 -1
- data/apps/keynav.ru +1 -1
- data/apps/keyset.ru +1 -1
- data/apps/keyset_sequel.ru +1 -1
- data/apps/rails.ru +1 -1
- data/apps/repro.ru +1 -1
- data/config/pagy.rb +1 -1
- data/javascripts/pagy.js +12 -8
- data/javascripts/pagy.min.js +2 -2
- data/javascripts/pagy.mjs +10 -6
- data/lib/pagy/classes/calendar/calendar.rb +2 -3
- data/lib/pagy/classes/keyset/keynav.rb +74 -27
- data/lib/pagy/classes/keyset/keyset.rb +3 -1
- data/lib/pagy/classes/request.rb +6 -4
- data/lib/pagy/toolbox/paginators/calendar.rb +1 -2
- data/lib/pagy/toolbox/paginators/countish.rb +1 -1
- data/lib/pagy/toolbox/paginators/countless.rb +1 -1
- data/lib/pagy/toolbox/paginators/keynav_js.rb +3 -3
- data/lib/pagy.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 187dac4b219c254c88782c509a93b7569f816f49668f9e2dd5617f3e887da322
|
|
4
|
+
data.tar.gz: 23c17b93d05c7b5e38f9c59cd2dfd931c2d4bae59d30ff29785a1eacec79643e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e508d84d633d8149fbbb0a61be50f145fb5e9f4c650ea555b26621f348e7a0a6ec13567b9101b1a8e69da968d32acdd775d3ed134dd23bb2ad114641dd92537f
|
|
7
|
+
data.tar.gz: 375508411fe7a90f80300f784a14a6cb24e5ffe4626cf6628bea140b2ab9c897a513949992cfac539141afc6bd9139beb853ca661182fd0b911928d28489917d
|
data/apps/active_search.ru
CHANGED
data/apps/calendar.ru
CHANGED
data/apps/demo.ru
CHANGED
data/apps/keynav+root_key.ru
CHANGED
data/apps/keynav.ru
CHANGED
data/apps/keyset.ru
CHANGED
data/apps/keyset_sequel.ru
CHANGED
data/apps/rails.ru
CHANGED
data/apps/repro.ru
CHANGED
data/config/pagy.rb
CHANGED
data/javascripts/pagy.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
var pagy_default = (() => {
|
|
3
3
|
const storageSupport = "sessionStorage" in window && "BroadcastChannel" in window;
|
|
4
4
|
let pagy = "pagy", storage, sync, tabId;
|
|
5
|
+
let newKeys = {};
|
|
5
6
|
if (storageSupport) {
|
|
6
7
|
storage = sessionStorage;
|
|
7
8
|
sync = new BroadcastChannel(pagy);
|
|
@@ -28,8 +29,9 @@ var pagy_default = (() => {
|
|
|
28
29
|
});
|
|
29
30
|
const B64SafeEncode = (unicode) => btoa(String.fromCharCode(...new TextEncoder().encode(unicode))).replace(/[+/=]/g, (m) => m == "+" ? "-" : m == "/" ? "_" : ""), B64Decode = (base64) => new TextDecoder().decode(Uint8Array.from(atob(base64), (c) => c.charCodeAt(0)));
|
|
30
31
|
const randKey = () => Math.floor(Math.random() * 36 ** 3).toString(36);
|
|
31
|
-
const augmentKeynav = async (nav, [storageKey, rootKey, pageKey, last, spliceArgs]) => {
|
|
32
|
+
const augmentKeynav = async (nav, [storageKey, rootKey, pageKey, last, spliceArgs, seen]) => {
|
|
32
33
|
let augmentPage;
|
|
34
|
+
const search = rootKey ? `${rootKey}%5B${pageKey}%5D` : pageKey;
|
|
33
35
|
const browserKey = document.cookie.split(/;\s+/).find((row) => row.startsWith(pagy + "="))?.split("=")[1] ?? randKey();
|
|
34
36
|
document.cookie = `${pagy}=${browserKey}`;
|
|
35
37
|
if (storageKey && !(storageKey in storage)) {
|
|
@@ -42,13 +44,14 @@ var pagy_default = (() => {
|
|
|
42
44
|
}
|
|
43
45
|
}
|
|
44
46
|
if (!augmentPage) {
|
|
45
|
-
if (!storageKey) {
|
|
47
|
+
if (!storageKey && !(storageKey = newKeys[search])) {
|
|
46
48
|
do {
|
|
47
49
|
storageKey = randKey();
|
|
48
50
|
} while (storageKey in storage);
|
|
51
|
+
newKeys[search] = storageKey;
|
|
49
52
|
}
|
|
50
53
|
const data = storage.getItem(storageKey), cutoffs = data ? JSON.parse(data) : [undefined];
|
|
51
|
-
if (spliceArgs) {
|
|
54
|
+
if (spliceArgs && (!seen || JSON.stringify(seen) == JSON.stringify([-1, 0, 1].map((i) => cutoffs[spliceArgs[0] + i])))) {
|
|
52
55
|
cutoffs.splice(...spliceArgs);
|
|
53
56
|
storage.setItem(storageKey, JSON.stringify(cutoffs));
|
|
54
57
|
}
|
|
@@ -60,11 +63,11 @@ var pagy_default = (() => {
|
|
|
60
63
|
pageNum,
|
|
61
64
|
cutoffs.length,
|
|
62
65
|
cutoffs[pageNum - 1],
|
|
63
|
-
cutoffs[pageNum]
|
|
66
|
+
cutoffs[pageNum],
|
|
67
|
+
cutoffs[pageNum + 1]
|
|
64
68
|
]));
|
|
65
69
|
};
|
|
66
70
|
}
|
|
67
|
-
const search = rootKey ? `${rootKey}%5B${pageKey}%5D` : pageKey;
|
|
68
71
|
const re = new RegExp(`(?<=\\?.*)(\\b${search}=)(\\d+)`);
|
|
69
72
|
for (const a of nav.querySelectorAll("a[href]")) {
|
|
70
73
|
a.href = a.href.replace(re, (_match, prefix, digit) => `${String(prefix)}${augmentPage(digit)}`);
|
|
@@ -135,8 +138,9 @@ var pagy_default = (() => {
|
|
|
135
138
|
});
|
|
136
139
|
};
|
|
137
140
|
return {
|
|
138
|
-
version: "43.8.
|
|
141
|
+
version: "43.8.4",
|
|
139
142
|
init(arg) {
|
|
143
|
+
newKeys = {};
|
|
140
144
|
const target = arg instanceof HTMLElement ? arg : document, elements = target.querySelectorAll("[data-pagy]");
|
|
141
145
|
for (const element of elements) {
|
|
142
146
|
try {
|
|
@@ -162,5 +166,5 @@ var pagy_default = (() => {
|
|
|
162
166
|
// pagy-shim.ts
|
|
163
167
|
window.Pagy = pagy_default;
|
|
164
168
|
|
|
165
|
-
//# debugId=
|
|
166
|
-
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["pagy.ts", "pagy-shim.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, 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// The syntax used in this file has been carefully composed to minimize\n// the pagy.min.js size and avoid pollution in the window object.\nexport default (() => {\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\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(entries => {\n    entries.forEach(e => {\n      e.target.querySelectorAll<NavJsElement>(\".series-nav-js\").forEach(el => {\n        el.render();\n      });\n    });\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    // eslint-disable-next-line align-assignments/align-assignments\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}+${String(last)}`;      }\n    }\n    // @ts-expect-error If it is not assigned it means it supports keynav\n    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\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 => `${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    let lastWidth = -1;\n    const parent  = <HTMLElement>nav.parentElement;\n\n    nav.render = () => {\n      const index = widths.findIndex(w => w < parent.clientWidth);\n      if (index === -1 || widths[index] === lastWidth) { return }\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] ?? `${String(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\n    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    let   initial = input.value;\n    const 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                      initial   = input.value;\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.8.2\",\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            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\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",
    "import Pagy from \"./pagy.ts\"\nwindow.Pagy = Pagy\n"
  ],
  "mappings": "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",
  "debugId": "88ABF0D72919B79664756E2164756E21",
  "names": []
}
|
|
169
|
+
//# debugId=A8E342DDB191D74E64756E2164756E21
|
|
170
|
+
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["pagy.ts", "pagy-shim.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,\n                            seen?      : SeenCutoffs];\ntype SpliceArgs = readonly [start      : number,\n                            deleteCount: number,     // it would be optional, but ts complains\n                            ...items:    Cutoff[]];\ntype Cutoff = readonly (string | number | boolean)[];\n// The cutoffs received by the server with the page that generated the spliceArgs\ntype SeenCutoffs = readonly [priorCutoff: Cutoff | null,\n                             pageCutoff : Cutoff | null,\n                             nextCutoff : Cutoff | null];\ntype AugmentedPage = [browserId  : string,\n                      storageKey : string,\n                      pageNumber : number,\n                      pages      : number,\n                      priorCutoff: Cutoff | null,\n                      pageCutoff : Cutoff | null,\n                      nextCutoff : 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// The syntax used in this file has been carefully composed to minimize\n// the pagy.min.js size and avoid pollution in the window object.\nexport default (() => {\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  // The new storage keys generated since the last init: shared by the navs of the same pagination\n  let newKeys: Record<string, string> = {};\n  if (storageSupport) {\n    storage = sessionStorage; // shorten the compiled size\n    sync    = new BroadcastChannel(pagy);\n    tabId   = Date.now();\n\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({to: e.data.from, key: e.data.key, str: cutoffs} satisfies SyncData);\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(entries => {\n    entries.forEach(e => {\n      e.target.querySelectorAll<NavJsElement>(\".series-nav-js\").forEach(el => {\n        el.render();\n      });\n    });\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, seen]) => {\n    // eslint-disable-next-line align-assignments/align-assignments\n    let augmentPage: (page: string) => string;\n    const search     = (rootKey) ? `${rootKey}%5B${pageKey}%5D` : pageKey;\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({ from: tabId, key: storageKey } satisfies SyncData);\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}+${String(last)}`;      }\n    }\n    // @ts-expect-error If it is not assigned it means it supports keynav\n    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n    if (!augmentPage) { // regular keynav pagination\n      // Use a new key (no dup keys) shared by the navs of the same pagination\n      if (!storageKey && !(storageKey = newKeys[search])) {\n        do { storageKey = randKey() } while (storageKey in storage);\n        newKeys[search] = storageKey;\n      }\n      const data = storage.getItem(storageKey),\n          cutoffs = <Cutoff[]>(data ? JSON.parse(data) : [undefined]);\n      // Skip the splice generated from cutoffs that changed in the meantime (e.g., reloaded page, other navs in the page)\n      if (spliceArgs && (!seen || JSON.stringify(seen) == JSON.stringify([-1, 0, 1].map(i => cutoffs[spliceArgs[0] + i])))) {\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                            cutoffs[pageNum + 1]]));  // nextCutoff\n      };\n    }\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 => `${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    let lastWidth = -1;\n    const parent  = <HTMLElement>nav.parentElement;\n\n    nav.render = () => {\n      const index = widths.findIndex(w => w < parent.clientWidth);\n      if (index === -1 || widths[index] === lastWidth) { return }\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] ?? `${String(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\n    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    let   initial = input.value;\n    const 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                      initial   = input.value;\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.8.4\",\n\n    // Scan for elements with a \"data-pagy\" attribute and call their init functions with the decoded args\n    init(arg?:HTMLElement) {\n      newKeys = {};  // new keys for each init\n\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            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\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",
    "import Pagy from \"./pagy.ts\"\nwindow.Pagy = Pagy\n"
  ],
  "mappings": "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",
  "debugId": "A8E342DDB191D74E64756E2164756E21",
  "names": []
}
|
data/javascripts/pagy.min.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
window.Pagy=(()=>{let
|
|
2
|
-
%s`,
|
|
1
|
+
window.Pagy=(()=>{let B="sessionStorage"in window&&"BroadcastChannel"in window,W="pagy",Z,L,J,U={};if(B)Z=sessionStorage,L=new BroadcastChannel(W),J=Date.now(),L.addEventListener("message",(q)=>{if(q.data.from){let z=Z.getItem(q.data.key);if(z)L.postMessage({to:q.data.from,key:q.data.key,str:z})}else if(q.data.to){if(q.data.to==J)Z.setItem(q.data.key,q.data.str)}});let _=new ResizeObserver((q)=>{q.forEach((z)=>{z.target.querySelectorAll(".series-nav-js").forEach((C)=>{C.render()})})}),T=(q)=>btoa(String.fromCharCode(...new TextEncoder().encode(q))).replace(/[+/=]/g,(z)=>z=="+"?"-":z=="/"?"_":""),x=(q)=>new TextDecoder().decode(Uint8Array.from(atob(q),(z)=>z.charCodeAt(0))),S=()=>Math.floor(Math.random()*46656).toString(36),P=async(q,[z,C,G,H,F,$])=>{let Q,j=C?`${C}%5B${G}%5D`:G,D=document.cookie.split(/;\s+/).find((M)=>M.startsWith(W+"="))?.split("=")[1]??S();if(document.cookie=`${W}=${D}`,z&&!(z in Z)){if(L.postMessage({from:J,key:z}),await new Promise((M)=>setTimeout(()=>{M("")},100)),!(z in Z))Q=(M)=>`${M}+${String(H)}`}if(!Q){if(!z&&!(z=U[j])){do z=S();while(z in Z);U[j]=z}let M=Z.getItem(z),R=M?JSON.parse(M):[void 0];if(F&&(!$||JSON.stringify($)==JSON.stringify([-1,0,1].map((X)=>R[F[0]+X]))))R.splice(...F),Z.setItem(z,JSON.stringify(R));Q=(X)=>{let Y=parseInt(X);return T(JSON.stringify([D,z,Y,R.length,R[Y-1],R[Y],R[Y+1]]))}}let O=new RegExp(`(?<=\\?.*)(\\b${j}=)(\\d+)`);for(let M of q.querySelectorAll("a[href]"))M.href=M.href.replace(O,(R,X,Y)=>`${String(X)}${Q(Y)}`);return Q},I=(q,[[z,C,G,H,F],$,[Q,j,D],O])=>{let M=-1,R=q.parentElement;q.render=()=>{let X=Q.findIndex((E)=>E<R.clientWidth);if(X===-1||Q[X]===M)return;let Y=z;if(j[X].forEach((E,w)=>{Y+=E=="gap"?H:(typeof E=="number"?C.replace($,E):G).replace("L<",D?.[X][w]??`${String(E)}<`)}),Y+=F,q.innerHTML="",q.insertAdjacentHTML("afterbegin",Y),M=Q[X],O&&B)P(q,O)},_.observe(R)},b=async(q,[z,C,G])=>{let H=G&&B?await P(q,G):(F)=>F;N(q,(F)=>z.replace(C,H(F)))},A=(q,[z,C,G,H])=>{N(q,(F)=>{return C.replace(G,Math.max(Math.ceil(z/parseInt(F)),1)).replace(H,F)})},N=(q,z)=>{let C=q.querySelector("input"),G=q.querySelector("a"),H=C.value,F=()=>{if(C.value===H)return;let[$,Q,j]=[C.min,C.value,C.max].map((D)=>parseInt(D)||0);if(Q<$||Q>j){C.value=H,C.select();return}H=C.value,G.href=z(C.value),G.click()};C.addEventListener("focus",()=>{C.select()}),C.addEventListener("focusout",F),C.addEventListener("keypress",($)=>{if($.key=="Enter")F()})};return{version:"43.8.4",init(q){U={};let z=q instanceof HTMLElement?q:document,C=z.querySelectorAll("[data-pagy]");for(let G of C)try{let[H,...F]=JSON.parse(x(G.getAttribute("data-pagy")));if(H=="k")P(G,...F);else if(H=="snj")I(G,F);else if(H=="inj")b(G,F);else if(H=="ltj")A(G,F)}catch(H){console.warn(`Pagy.init: %o
|
|
2
|
+
%s`,G,H)}}}})();
|
data/javascripts/pagy.mjs
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export default (() => {
|
|
2
2
|
const storageSupport = "sessionStorage" in window && "BroadcastChannel" in window;
|
|
3
3
|
let pagy = "pagy", storage, sync, tabId;
|
|
4
|
+
let newKeys = {};
|
|
4
5
|
if (storageSupport) {
|
|
5
6
|
storage = sessionStorage;
|
|
6
7
|
sync = new BroadcastChannel(pagy);
|
|
@@ -27,8 +28,9 @@ export default (() => {
|
|
|
27
28
|
});
|
|
28
29
|
const B64SafeEncode = (unicode) => btoa(String.fromCharCode(...new TextEncoder().encode(unicode))).replace(/[+/=]/g, (m) => m == "+" ? "-" : m == "/" ? "_" : ""), B64Decode = (base64) => new TextDecoder().decode(Uint8Array.from(atob(base64), (c) => c.charCodeAt(0)));
|
|
29
30
|
const randKey = () => Math.floor(Math.random() * 36 ** 3).toString(36);
|
|
30
|
-
const augmentKeynav = async (nav, [storageKey, rootKey, pageKey, last, spliceArgs]) => {
|
|
31
|
+
const augmentKeynav = async (nav, [storageKey, rootKey, pageKey, last, spliceArgs, seen]) => {
|
|
31
32
|
let augmentPage;
|
|
33
|
+
const search = rootKey ? `${rootKey}%5B${pageKey}%5D` : pageKey;
|
|
32
34
|
const browserKey = document.cookie.split(/;\s+/).find((row) => row.startsWith(pagy + "="))?.split("=")[1] ?? randKey();
|
|
33
35
|
document.cookie = `${pagy}=${browserKey}`;
|
|
34
36
|
if (storageKey && !(storageKey in storage)) {
|
|
@@ -41,13 +43,14 @@ export default (() => {
|
|
|
41
43
|
}
|
|
42
44
|
}
|
|
43
45
|
if (!augmentPage) {
|
|
44
|
-
if (!storageKey) {
|
|
46
|
+
if (!storageKey && !(storageKey = newKeys[search])) {
|
|
45
47
|
do {
|
|
46
48
|
storageKey = randKey();
|
|
47
49
|
} while (storageKey in storage);
|
|
50
|
+
newKeys[search] = storageKey;
|
|
48
51
|
}
|
|
49
52
|
const data = storage.getItem(storageKey), cutoffs = data ? JSON.parse(data) : [undefined];
|
|
50
|
-
if (spliceArgs) {
|
|
53
|
+
if (spliceArgs && (!seen || JSON.stringify(seen) == JSON.stringify([-1, 0, 1].map((i) => cutoffs[spliceArgs[0] + i])))) {
|
|
51
54
|
cutoffs.splice(...spliceArgs);
|
|
52
55
|
storage.setItem(storageKey, JSON.stringify(cutoffs));
|
|
53
56
|
}
|
|
@@ -59,11 +62,11 @@ export default (() => {
|
|
|
59
62
|
pageNum,
|
|
60
63
|
cutoffs.length,
|
|
61
64
|
cutoffs[pageNum - 1],
|
|
62
|
-
cutoffs[pageNum]
|
|
65
|
+
cutoffs[pageNum],
|
|
66
|
+
cutoffs[pageNum + 1]
|
|
63
67
|
]));
|
|
64
68
|
};
|
|
65
69
|
}
|
|
66
|
-
const search = rootKey ? `${rootKey}%5B${pageKey}%5D` : pageKey;
|
|
67
70
|
const re = new RegExp(`(?<=\\?.*)(\\b${search}=)(\\d+)`);
|
|
68
71
|
for (const a of nav.querySelectorAll("a[href]")) {
|
|
69
72
|
a.href = a.href.replace(re, (_match, prefix, digit) => `${String(prefix)}${augmentPage(digit)}`);
|
|
@@ -134,8 +137,9 @@ export default (() => {
|
|
|
134
137
|
});
|
|
135
138
|
};
|
|
136
139
|
return {
|
|
137
|
-
version: "43.8.
|
|
140
|
+
version: "43.8.4",
|
|
138
141
|
init(arg) {
|
|
142
|
+
newKeys = {};
|
|
139
143
|
const target = arg instanceof HTMLElement ? arg : document, elements = target.querySelectorAll("[data-pagy]");
|
|
140
144
|
for (const element of elements) {
|
|
141
145
|
try {
|
|
@@ -60,11 +60,10 @@ class Pagy
|
|
|
60
60
|
private
|
|
61
61
|
|
|
62
62
|
# Create the calendar
|
|
63
|
-
def init(conf, period
|
|
63
|
+
def init(conf, period)
|
|
64
64
|
@conf = conf
|
|
65
65
|
@units = Calendar::UNITS & conf.keys # get the units in time length desc order
|
|
66
66
|
@period = period
|
|
67
|
-
@params = params
|
|
68
67
|
@page_key = conf[:offset][:page_key] || DEFAULT[:page_key]
|
|
69
68
|
|
|
70
69
|
# Set all the :page_key options for later deletion
|
|
@@ -78,7 +77,7 @@ class Pagy
|
|
|
78
77
|
unit_conf = conf[unit]
|
|
79
78
|
unit_conf[:querify] = ->(up) { up.except!(*params_to_delete.map(&:to_s)) }
|
|
80
79
|
unit_conf[:period] = unit_object&.send(:active_period) || @period
|
|
81
|
-
unit_conf[:page] =
|
|
80
|
+
unit_conf[:page] = conf[:request].resolve_page(unit_conf[:page_key]) # requested page
|
|
82
81
|
# Simplecov doesn't need to cover a fail block_given?
|
|
83
82
|
# simplecov:disable
|
|
84
83
|
unit_conf[:counts] = yield(unit, unit_conf[:period]) if block_given?
|
|
@@ -7,6 +7,12 @@ class Pagy
|
|
|
7
7
|
# Avoid conflicts between filter arguments in composite SQL fragments
|
|
8
8
|
PRIOR_PREFIX = 'prior_'
|
|
9
9
|
PAGE_PREFIX = 'page_'
|
|
10
|
+
# The delete count of the client splice and the increment of @last for each type of update
|
|
11
|
+
SPLICE = { append: [1, 1], # add the cutoff of the last page
|
|
12
|
+
split: [0, 1], # insert the cutoff of a grown page before its old cutoff
|
|
13
|
+
move: [1, 0], # replace the cutoff of the page
|
|
14
|
+
merge: [1, -1] }.freeze # delete the cutoff of a short page that fits with the next page
|
|
15
|
+
# The :reset update is calculated: it deletes all the cutoffs from the page on, and adds the cutoff of the page
|
|
10
16
|
|
|
11
17
|
# Define empty subclasses to allow specific typing without triggering autoload
|
|
12
18
|
class ActiveRecord < self; end
|
|
@@ -25,30 +31,25 @@ class Pagy
|
|
|
25
31
|
attr_reader :update, :previous, :last
|
|
26
32
|
alias pages last
|
|
27
33
|
|
|
28
|
-
# Prepare the @update for the client when
|
|
34
|
+
# Prepare the @update for the client when its cutoffs must change, and return the next page number
|
|
29
35
|
def next
|
|
30
36
|
records
|
|
31
37
|
@count = 0 if !@more && @page == 1 # empty records (trigger the right info message for known 0 count)
|
|
38
|
+
update_cutoffs if @splice
|
|
32
39
|
return unless @more
|
|
33
40
|
|
|
34
|
-
@next ||=
|
|
35
|
-
unless @page_cutoff
|
|
36
|
-
@page_cutoff = extract_cutoff
|
|
37
|
-
@last += 1 # reflect the added cutoff
|
|
38
|
-
@update.push(@last, [@page, 1, @page_cutoff]) # last + splice arguments for the client cutoffs
|
|
39
|
-
end
|
|
40
|
-
@page + 1
|
|
41
|
-
end
|
|
41
|
+
@next ||= @page + 1
|
|
42
42
|
end
|
|
43
43
|
|
|
44
44
|
protected
|
|
45
45
|
|
|
46
46
|
def keynav? = true
|
|
47
47
|
|
|
48
|
-
# Process the page array
|
|
48
|
+
# Process the page array, restarting from page 1 if it is missing or malformed
|
|
49
49
|
def assign_page
|
|
50
|
-
if
|
|
51
|
-
storage_key, @page, @last, @prior_cutoff, @page_cutoff = @options[:page]
|
|
50
|
+
if valid_page?(*@options[:page])
|
|
51
|
+
storage_key, @page, @last, @prior_cutoff, @page_cutoff, @next_cutoff = @options[:page]
|
|
52
|
+
@guarded = @options[:page].size > 5 # the client sends the next cutoff and guards the updates
|
|
52
53
|
else
|
|
53
54
|
@page = @last = 1
|
|
54
55
|
end
|
|
@@ -56,27 +57,73 @@ class Pagy
|
|
|
56
57
|
@update = [storage_key, @options[:root_key], @options[:page_key]]
|
|
57
58
|
end
|
|
58
59
|
|
|
59
|
-
#
|
|
60
|
+
# Add the change of the page cutoff to the @update for the client: last + splice arguments + guard
|
|
61
|
+
def update_cutoffs
|
|
62
|
+
cutoffs = @splice == :merge || !@more ? [] : [extract_cutoff]
|
|
63
|
+
delete, increment = SPLICE[@splice] || [@last - @page, @page + cutoffs.size - @last] # :reset
|
|
64
|
+
seen = [@prior_cutoff, @page_cutoff, @next_cutoff] # the cutoffs sent by the client
|
|
65
|
+
@page_cutoff = @splice == :merge ? @next_cutoff : cutoffs.first
|
|
66
|
+
@last += increment
|
|
67
|
+
@splice = nil # update once
|
|
68
|
+
@update.push(@last, [@page, delete, *cutoffs], seen)
|
|
69
|
+
end
|
|
70
|
+
|
|
71
|
+
# Check the page array coming from the client, which stores its cutoffs at the positions from 1 to last - 1:
|
|
72
|
+
# each cutoff of the array (prior, page and next cutoff, if sent) must be present only at those positions
|
|
73
|
+
def valid_page?(storage_key = nil, page = nil, last = nil, *cutoffs)
|
|
74
|
+
storage_key.is_a?(String) && page.is_a?(Integer) && last.is_a?(Integer) && page.between?(1, last) &&
|
|
75
|
+
cutoffs.all? { _1.nil? || (_1.is_a?(Array) && _1.size == @keyset.size) } &&
|
|
76
|
+
(0...[cutoffs.size, 2].max).all? { cutoffs[_1].nil? != (page - 1 + _1).between?(1, last - 1) }
|
|
77
|
+
end
|
|
78
|
+
|
|
79
|
+
# Fetch the records between the cutoffs of the visited pages, rebalancing the pages that changed size
|
|
60
80
|
def fetch_records
|
|
61
|
-
return super unless @page_cutoff # last page
|
|
81
|
+
return super.tap { @splice = :append if @more } unless @page_cutoff # last page
|
|
82
|
+
|
|
83
|
+
set = @set
|
|
84
|
+
@more = true # not the last page
|
|
85
|
+
records = fetch_between(set, @prior_cutoff, @page_cutoff, @limit + 1)
|
|
86
|
+
if records.size > @limit # page grown beyond the limit
|
|
87
|
+
records.pop
|
|
88
|
+
@splice = @guarded ? :split : :move
|
|
89
|
+
elsif @guarded && records.size < @limit # short page
|
|
90
|
+
room = @limit - records.size
|
|
91
|
+
more = fetch_between(set, @page_cutoff, @next_cutoff, room + 1) # from the next page
|
|
92
|
+
if @next_cutoff && records.empty? && more.empty? # two empty pages: restart as the last known page
|
|
93
|
+
@set = set
|
|
94
|
+
@splice = :reset
|
|
95
|
+
return super
|
|
96
|
+
elsif more.size <= room # the next page fits
|
|
97
|
+
records.concat(more)
|
|
98
|
+
@splice = :merge
|
|
99
|
+
@more = !@next_cutoff.nil? # merged with the last page
|
|
100
|
+
elsif @next_cutoff.nil? || records.empty? # fill from the last page, or skip the empty page
|
|
101
|
+
more.pop
|
|
102
|
+
records.concat(more)
|
|
103
|
+
@splice = :move
|
|
104
|
+
end
|
|
105
|
+
end
|
|
106
|
+
records
|
|
107
|
+
end
|
|
62
108
|
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
109
|
+
# Use a compound predicate to fetch the records after the prior cutoff, and not after the page cutoff
|
|
110
|
+
def fetch_between(set, prior_cutoff, page_cutoff, limit)
|
|
111
|
+
@set = set
|
|
112
|
+
predicates = []
|
|
113
|
+
arguments = {}
|
|
66
114
|
|
|
67
|
-
if
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
arguments.merge!(arguments_from(@prior_cutoff, PRIOR_PREFIX))
|
|
115
|
+
if prior_cutoff # not the first page
|
|
116
|
+
predicates << "(#{compose_predicate(PRIOR_PREFIX)})"
|
|
117
|
+
arguments.merge!(arguments_from(prior_cutoff, PRIOR_PREFIX))
|
|
71
118
|
end
|
|
72
119
|
|
|
73
|
-
#
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
120
|
+
if page_cutoff # not the last page
|
|
121
|
+
predicates << "NOT (#{compose_predicate(PAGE_PREFIX)})"
|
|
122
|
+
arguments.merge!(arguments_from(page_cutoff, PAGE_PREFIX))
|
|
123
|
+
end
|
|
77
124
|
|
|
78
|
-
|
|
79
|
-
@set.limit(
|
|
125
|
+
apply_where(predicates.join(' AND '), arguments)
|
|
126
|
+
@set.limit(limit).to_a
|
|
80
127
|
end
|
|
81
128
|
|
|
82
129
|
prepend Deprecated::Keynav if defined?(Deprecated::Keynav)
|
|
@@ -88,8 +88,10 @@ class Pagy
|
|
|
88
88
|
|
|
89
89
|
def keyset? = true
|
|
90
90
|
|
|
91
|
+
# Decode the page, restarting from the first page if it is missing or malformed
|
|
91
92
|
def assign_page
|
|
92
|
-
|
|
93
|
+
cutoff = Keyset.decode(@options[:page])
|
|
94
|
+
@prior_cutoff = cutoff if cutoff.is_a?(Array) && cutoff.size == @keyset.size
|
|
93
95
|
end
|
|
94
96
|
|
|
95
97
|
def fetch_records
|
data/lib/pagy/classes/request.rb
CHANGED
|
@@ -13,14 +13,16 @@ class Pagy
|
|
|
13
13
|
else
|
|
14
14
|
[request.base_url, request.path, get_params(request), request.cookies['pagy']]
|
|
15
15
|
end
|
|
16
|
+
# The client may send a non-Hash root_key param (e.g. ?page=2 with the jsonapi root_key 'page'): drop it
|
|
17
|
+
root_key = @options[:root_key]
|
|
18
|
+
@params = @params.except(root_key).freeze unless @params.fetch(root_key, {}).is_a?(Hash)
|
|
16
19
|
freeze
|
|
17
20
|
end
|
|
18
21
|
|
|
19
22
|
attr_reader :base_url, :path, :params, :cookie
|
|
20
23
|
|
|
21
|
-
def resolve_page(force_integer: true)
|
|
22
|
-
|
|
23
|
-
page = @params.dig(@options[:root_key], page_key) || @params[page_key]
|
|
24
|
+
def resolve_page(page_key = @options[:page_key] || DEFAULT[:page_key], force_integer: true)
|
|
25
|
+
page = @params.dig(@options[:root_key], page_key) || @params[page_key]
|
|
24
26
|
return [page.to_s.to_i, 1].max if force_integer
|
|
25
27
|
|
|
26
28
|
page if page.is_a?(String) && !page.empty?
|
|
@@ -33,7 +35,7 @@ class Pagy
|
|
|
33
35
|
|
|
34
36
|
limit_key = @options[:limit_key] || DEFAULT[:limit_key]
|
|
35
37
|
limit = (@params.dig(@options[:root_key], limit_key) || @params[limit_key]).to_s.to_i
|
|
36
|
-
limit.
|
|
38
|
+
limit.positive? ? [limit, client_limit].min : default
|
|
37
39
|
end
|
|
38
40
|
|
|
39
41
|
private
|
|
@@ -17,9 +17,8 @@ class Pagy
|
|
|
17
17
|
|
|
18
18
|
unless config[:disabled]
|
|
19
19
|
period = pagy_calendar_period(collection)
|
|
20
|
-
params = config[:request].params
|
|
21
20
|
|
|
22
|
-
calendar, from, to = Calendar.send(:init, config, period
|
|
21
|
+
calendar, from, to = Calendar.send(:init, config, period) do |unit, unit_period|
|
|
23
22
|
pagy_calendar_counts(collection, unit, *unit_period) if respond_to?(:pagy_calendar_counts)
|
|
24
23
|
end
|
|
25
24
|
|
|
@@ -11,7 +11,7 @@ class Pagy
|
|
|
11
11
|
|
|
12
12
|
if options[:page].is_a?(String)
|
|
13
13
|
page, count, epoch = options[:page].split.map(&:to_i)
|
|
14
|
-
options[:page] = page
|
|
14
|
+
options[:page] = [page.to_i, 1].max # the client may send a malformed page
|
|
15
15
|
end
|
|
16
16
|
|
|
17
17
|
options[:limit] = options[:request].resolve_limit
|
|
@@ -9,7 +9,7 @@ class Pagy
|
|
|
9
9
|
|
|
10
10
|
if options[:page].is_a?(String)
|
|
11
11
|
page, last = options[:page].split.map(&:to_i) # ' ' separator, (encoded as '+' by Countless#compose_page_param)
|
|
12
|
-
options[:page] = page
|
|
12
|
+
options[:page] = [page.to_i, 1].max # the client may send a malformed page
|
|
13
13
|
options[:last] = last if last&.positive?
|
|
14
14
|
end
|
|
15
15
|
|
|
@@ -11,10 +11,10 @@ class Pagy
|
|
|
11
11
|
|
|
12
12
|
return CountlessPaginator.paginate(set, page:, **options) if page&.match(' ') # countless fallback
|
|
13
13
|
|
|
14
|
-
if page.is_a?(String) && (page_arguments = Keyset.decode(page))
|
|
14
|
+
if page.is_a?(String) && (page_arguments = Keyset.decode(page)).is_a?(Array)
|
|
15
15
|
# Restart the pagination from page 1/nil if the url has been requested from another browser
|
|
16
|
-
options[:
|
|
17
|
-
|
|
16
|
+
cookie = options[:request].cookie
|
|
17
|
+
options[:page] = page_arguments if cookie && cookie == page_arguments.shift
|
|
18
18
|
end
|
|
19
19
|
|
|
20
20
|
options[:limit] = options[:request].resolve_limit
|
data/lib/pagy.rb
CHANGED
|
@@ -9,7 +9,7 @@ require_relative 'pagy/toolbox/helpers/loaders'
|
|
|
9
9
|
|
|
10
10
|
# Top superclass
|
|
11
11
|
class Pagy
|
|
12
|
-
VERSION = '43.8.
|
|
12
|
+
VERSION = '43.8.4'
|
|
13
13
|
ROOT = Pathname.new(__dir__).parent.freeze
|
|
14
14
|
DEFAULT = { limit: 20, limit_key: 'limit', page_key: 'page' }.freeze
|
|
15
15
|
PAGE_TOKEN = EscapedValue.new('P ')
|