Fix pagination and eleventy computed for .njk engine (#3120)

src/Util/ProxyWrap.js

@@ -19,10 +19,7 @@ function wrapObject(target, fallback) {
     // Nunjucks needs this
     ownKeys(target) {
       // unique
-      let keys = new Set([
-        ...Reflect.ownKeys(target),
-        ...Reflect.ownKeys(fallback),
-      ]);
+      let keys = new Set([...Reflect.ownKeys(target), ...Reflect.ownKeys(fallback)]);
       // console.log( "handler:ownKeys", keys );
       return Array.from(keys);
     },
@@ -38,18 +35,16 @@ function wrapObject(target, fallback) {
 
       return fallback[prop];
     },
-    // set(target, prop, value) {
-    //   console.log( "handler:set", prop, value );
-    //   return Reflect.set(target, prop, value);
-    // }
+    set(target, prop, value) {
+      // console.log( "handler:set", prop, value );
+      return Reflect.set(target, prop, value);
+    },
   });
 }
 
 function ProxyWrap(target, fallback) {
   if (!isPlainObject(target) || !isPlainObject(fallback)) {
-    throw new Error(
-      "ProxyWrap expects objects for both the target and fallback"
-    );
+    throw new Error("ProxyWrap expects objects for both the target and fallback");
   }
   let wrapped = wrapObject(target, fallback);
   return wrapped;

test/PaginationTest.js

@@ -3,6 +3,7 @@ const TemplateData = require("../src/TemplateData");
 const Pagination = require("../src/Plugins/Pagination");
 const TemplateConfig = require("../src/TemplateConfig");
 const FileSystemSearch = require("../src/FileSystemSearch");
+const Eleventy = require("../src/Eleventy");
 
 const getNewTemplate = require("./_getNewTemplateForTests");
 const getRenderedTmpls = require("./_getRenderedTemplates");
@@ -828,3 +829,35 @@ test("Pagination and eleventyComputed permalink, issue #1555 and #1865", async (
   t.is(templates[1].data.page.url, "/venues/second/");
   t.is(templates[2].data.page.url, "/venues/third/");
 });
+
+test("Pagination and eleventyComputed data, issues #2512, #2837, #3013", async (t) => {
+  let templateLangs = ["liquid", "html", "md", "hbs", "mustache", "njk"];
+  let apostrophe = {
+    liquid: "'",
+    html: "'",
+    md: "'",
+    hbs: "'",
+    mustache: "'",
+    njk: "'",
+  };
+  for (let lang of templateLangs) {
+    let msg = `lang: ${lang}`;
+    let le = lang === "md" ? "\n" : "";
+
+    let elev = new Eleventy(`./test/stubs-3013/${lang}/`, `./test/stubs-3013/${lang}/_site`, {
+      source: "cli",
+      runMode: "build",
+    });
+    await elev.init();
+    let written = await elev.toJSON();
+
+    t.is(written[0].url, "/paul-mescal/", msg);
+    t.is(written[0].content, `<title>The Effervescent adventures of Paul Mescal</title>${le}`, msg);
+    t.is(written[1].url, "/populace-and-power/", msg);
+    t.is(
+      written[1].content,
+      `<title>Populace and Power: A user${apostrophe[lang]}s guide</title>${le}`,
+      msg
+    );
+  }
+});

test/stubs-3013/hbs/_data/books.json

@@ -0,0 +1,12 @@
+[
+    {
+        "id": 1,
+        "name": "The Effervescent adventures of Paul Mescal",
+        "shortname": "paul-mescal"
+    },
+    {
+        "id": 2,
+        "name": "Populace and Power: A user's guide",
+        "shortname": "populace-and-power"
+    }
+]

test/stubs-3013/hbs/_includes/base.hbs

@@ -0,0 +1,4 @@
+---
+title: Books
+---
+<title>{{ title }}</title>

test/stubs-3013/hbs/book.hbs

@@ -0,0 +1,11 @@
+---
+layout: base
+pagination:
+  data: books
+  size: 1
+  alias: book
+permalink: /{{ book.shortname }}/
+eleventyComputed:
+  title: "{{ book.name }}"
+---
+{{ title }}

test/stubs-3013/html/_data/books.json

@@ -0,0 +1,12 @@
+[
+    {
+        "id": 1,
+        "name": "The Effervescent adventures of Paul Mescal",
+        "shortname": "paul-mescal"
+    },
+    {
+        "id": 2,
+        "name": "Populace and Power: A user's guide",
+        "shortname": "populace-and-power"
+    }
+]

test/stubs-3013/html/_includes/base.html

@@ -0,0 +1,4 @@
+---
+title: Books
+---
+<title>{{ title }}</title>

test/stubs-3013/html/book.html

@@ -0,0 +1,11 @@
+---
+layout: base
+pagination:
+  data: books
+  size: 1
+  alias: book
+permalink: /{{ book.shortname }}/
+eleventyComputed:
+  title: "{{ book.name }}"
+---
+{{ title }}

test/stubs-3013/liquid/_data/books.json

@@ -0,0 +1,12 @@
+[
+    {
+        "id": 1,
+        "name": "The Effervescent adventures of Paul Mescal",
+        "shortname": "paul-mescal"
+    },
+    {
+        "id": 2,
+        "name": "Populace and Power: A user's guide",
+        "shortname": "populace-and-power"
+    }
+]

test/stubs-3013/liquid/_includes/base.liquid

@@ -0,0 +1,4 @@
+---
+title: Books
+---
+<title>{{ title }}</title>

test/stubs-3013/liquid/book.liquid

@@ -0,0 +1,11 @@
+---
+layout: base
+pagination:
+  data: books
+  size: 1
+  alias: book
+permalink: /{{ book.shortname }}/
+eleventyComputed:
+  title: "{{ book.name }}"
+---
+{{ title }}

test/stubs-3013/md/_data/books.json

@@ -0,0 +1,12 @@
+[
+    {
+        "id": 1,
+        "name": "The Effervescent adventures of Paul Mescal",
+        "shortname": "paul-mescal"
+    },
+    {
+        "id": 2,
+        "name": "Populace and Power: A user's guide",
+        "shortname": "populace-and-power"
+    }
+]

test/stubs-3013/md/_includes/base.md

@@ -0,0 +1,5 @@
+---
+title: Books
+---
+
+<title>{{ title }}</title>

test/stubs-3013/md/book.md

@@ -0,0 +1,12 @@
+---
+layout: base
+pagination:
+  data: books
+  size: 1
+  alias: book
+permalink: /{{ book.shortname }}/
+eleventyComputed:
+  title: "{{ book.name }}"
+---
+
+{{ title }}

test/stubs-3013/mustache/_data/books.json

@@ -0,0 +1,12 @@
+[
+    {
+        "id": 1,
+        "name": "The Effervescent adventures of Paul Mescal",
+        "shortname": "paul-mescal"
+    },
+    {
+        "id": 2,
+        "name": "Populace and Power: A user's guide",
+        "shortname": "populace-and-power"
+    }
+]

test/stubs-3013/mustache/_includes/base.mustache

@@ -0,0 +1,4 @@
+---
+title: Books
+---
+<title>{{ title }}</title>

test/stubs-3013/mustache/book.mustache

@@ -0,0 +1,11 @@
+---
+layout: base
+pagination:
+  data: books
+  size: 1
+  alias: book
+permalink: /{{ book.shortname }}/
+eleventyComputed:
+  title: "{{ book.name }}"
+---
+{{ title }}

test/stubs-3013/njk/_data/books.json

@@ -0,0 +1,12 @@
+[
+    {
+        "id": 1,
+        "name": "The Effervescent adventures of Paul Mescal",
+        "shortname": "paul-mescal"
+    },
+    {
+        "id": 2,
+        "name": "Populace and Power: A user's guide",
+        "shortname": "populace-and-power"
+    }
+]

test/stubs-3013/njk/_includes/base.njk

@@ -0,0 +1,4 @@
+---
+title: Books
+---
+<title>{{ title }}</title>

test/stubs-3013/njk/book.njk

@@ -0,0 +1,11 @@
+---
+layout: base
+pagination:
+  data: books
+  size: 1
+  alias: book
+permalink: /{{ book.shortname }}/
+eleventyComputed:
+  title: "{{ book.name }}"
+---
+{{ title }}

test/stubs/pagination-eleventycomputed-title.liquid

@@ -0,0 +1,20 @@
+---
+venues:
+  - id: 1
+    name: first
+  - id: 2
+    name: second
+  - id: 3
+    name: third
+randommetadata: "woopers"
+pagination:
+  data: venues
+  size: 1
+  alias: venue
+eleventyComputed:
+  title: "website - {{ venue.name }}"
+---
+
+{{ venue.name }}
+
+{{ randommetadata }}