Pagination: let data key be a function

src/Plugins/Pagination.js

@@ -4,6 +4,7 @@ const lodashSet = require("lodash/set");
 const EleventyBaseError = require("../EleventyBaseError");
 const { DeepCopy } = require("../Util/Merge");
 const { ProxyWrap } = require("../Util/ProxyWrap");
+const getPaginationDataKey = require("../Util/GetPaginationDataKey");
 
 class PaginationConfigError extends EleventyBaseError {}
 class PaginationError extends EleventyBaseError {}
@@ -32,13 +33,13 @@ class Pagination {
     return Pagination.hasPagination(this.data);
   }
 
-  circularReferenceCheck(data) {
-    if (data.eleventyExcludeFromCollections) {
+  circularReferenceCheck() {
+    if (this.data.eleventyExcludeFromCollections) {
       return;
     }
 
-    let key = data.pagination.data;
-    let tags = data.tags || [];
+    let key = getPaginationDataKey(this.data);
+    let tags = this.data.tags || [];
     for (let tag of tags) {
       if (`collections.${tag}` === key) {
         throw new PaginationError(
@@ -65,7 +66,7 @@ class Pagination {
     } else if (!("size" in data.pagination)) {
       throw new Error("Missing pagination size in front matter data.");
     }
-    this.circularReferenceCheck(data);
+    this.circularReferenceCheck();
 
     this.size = data.pagination.size;
     this.alias = data.pagination.alias;
@@ -141,16 +142,18 @@ class Pagination {
 
   _has(target, key) {
     let notFoundValue = "__NOT_FOUND_ERROR__";
-    let data = lodashGet(target, key, notFoundValue);
+    let paginationDataKey = getPaginationDataKey(this.data);
+    let data = lodashGet(target, paginationDataKey, notFoundValue);
     return data !== notFoundValue;
   }
 
   _get(target, key) {
     let notFoundValue = "__NOT_FOUND_ERROR__";
-    let data = lodashGet(target, key, notFoundValue);
+    let paginationDataKey = getPaginationDataKey(this.data);
+    let data = lodashGet(target, paginationDataKey, notFoundValue);
     if (data === notFoundValue) {
       throw new Error(
-        `Could not find pagination data, went looking for: ${key}`
+        `Could not find pagination data, went looking for: ${paginationDataKey}`
       );
     }
     return data;

src/TemplateMap.js

@@ -6,6 +6,7 @@ const EleventyErrorUtil = require("./EleventyErrorUtil");
 const UsingCircularTemplateContentReferenceError = require("./Errors/UsingCircularTemplateContentReferenceError");
 const debug = require("debug")("Eleventy:TemplateMap");
 const debugDev = require("debug")("Dev:Eleventy:TemplateMap");
+const getPaginationDataKey = require("./Util/GetPaginationDataKey");
 
 const EleventyBaseError = require("./EleventyBaseError");
 
@@ -81,16 +82,14 @@ class TemplateMap {
    */
   isPaginationOverAllCollections(entry) {
     if (entry.data.pagination && entry.data.pagination.data) {
-      return (
-        entry.data.pagination.data === "collections" ||
-        entry.data.pagination.data === "collections.all"
-      );
+      const key = getPaginationDataKey(entry.data);
+      return key === "collections" || key === "collections.all";
     }
   }
 
   getPaginationTagTarget(entry) {
     if (entry.data.pagination && entry.data.pagination.data) {
-      return this.getTagTarget(entry.data.pagination.data);
+      return this.getTagTarget(getPaginationDataKey(entry.data));
     }
   }
 

src/Util/GetPaginationDataKey.js

@@ -0,0 +1,7 @@
+const lodashIsFunction = require("lodash/isFunction");
+
+module.exports = function (data) {
+  return lodashIsFunction(data.pagination.data)
+    ? data.pagination.data(data)
+    : data.pagination.data;
+};

test/GetPaginationDataKeyTest.js

@@ -0,0 +1,13 @@
+const test = require("ava");
+const getPaginationDataKey = require("../src/Util/GetPaginationDataKey");
+
+test("getPaginationDataKey when key is string", (t) => {
+  t.is(getPaginationDataKey({pagination: {data: "foo"}}), "foo");
+});
+
+test("getPaginationDataKey when key is function", (t) => {
+  t.is(
+    getPaginationDataKey({foo: "bar", pagination: {data: (data) => data.foo}}),
+    "bar"
+  );
+});

test/PaginationTest.js

@@ -706,6 +706,20 @@ test("Pagination `before` Callback with a Filter", async (t) => {
   t.deepEqual(templates[0].data.myalias, "item2");
 });
 
+test("Pagination when `data` is a function", async (t) => {
+  let tmpl = getNewTemplate(
+    "./test/stubs/paged/paged-data-key-func.njk",
+    "./test/stubs/",
+    "./dist"
+  );
+
+  let data = await tmpl.getData();
+  let templates = await tmpl.getTemplates(data);
+  t.is(templates.length, 2);
+  t.deepEqual(templates[0].data.pagination.items, ["foo"]);
+  t.deepEqual(templates[1].data.pagination.items, ["woo"]);
+});
+
 test("Pagination `before` Callback with `reverse: true` (test order of operations)", async (t) => {
   let tmpl = getNewTemplate(
     "./test/stubs/paged/paged-before-and-reverse.njk",

test/stubs/paged/paged-data-key-func.njk

@@ -0,0 +1,11 @@
+---js
+{
+  dataCanBeFoundIn: "items",
+  pagination: {
+    data: (data) => data.dataCanBeFoundIn,
+    size: 1
+  },
+  items: ["foo", "woo"]
+}
+---
+<ol>{% for item in pagination.items %}<li>{{ item }}</li>{% endfor %}</ol>