Adds page.url to global data.

Fixes 11ty#22
Fixes 11ty#36

README.md

@@ -156,6 +156,7 @@ This allows you to assign data values right in the template itself. Here are a f
 * `pkg`: The local project’s `package.json` values.
 * `pagination`: (When enabled in front matter) [Read more about Pagination](docs/pagination.md).
 * `collections`: Lists of all of your content, grouped by tags. [Read more about Collections](docs/collections.md)
+* `page`: Has information about the current page. Currently holds: `{ url: "/current/page/url.html" }`. Useful for finding the current page in a collection. [Read more about Collections](docs/collections.md) (look at _Example: Navigation Links with an `active` class added for on the current page_).
 
 ### Data Files
 

docs/collections.md

@@ -23,6 +23,18 @@ This will place this `mypost.md` into the `post` collection with all other piece
 </ul>
 ```
 
+### Example: Navigation Links with an `active` class added for on the current page
+
+Comapre the `post.url` and special Eleventy-provided `page.url` variable to find the current page. Building on the previous example:
+
+```
+<ul>
+{%- for post in collections.post -%}
+  <li{% if page.url == post.url %} class="active"{% endif %}>{{ post.data.title }}</li>
+{%- endfor -%}
+</ul>
+```
+
 ## Tag Syntax
 
 You can use a single tag, as in the above example OR you can use any number of tags for the content, using YAML syntax for a list.

src/Template.js

@@ -210,8 +210,24 @@ class Template {
     return Object.assign({}, data, mergedLayoutData, mergedLocalData);
   }
 
+  async addPageUrlToData(data) {
+    if ("page" in data && "url" in data.page) {
+      debug(
+        "Warning: data.page.url is in use by the application will be overwritten: %o",
+        data.page.url
+      );
+    }
+    if (!("page" in data)) {
+      data.page = {};
+    }
+    data.page.url = await this.getOutputHref();
+  }
+
+  // getData (with renderData and page.url added)
   async getRenderedData() {
     let data = await this.getData();
+    await this.addPageUrlToData(data);
+
     if (data.renderData) {
       data.renderData = await this.mapDataAsRenderedTemplates(
         data.renderData,
@@ -432,7 +448,6 @@ class Template {
       data: data
     };
 
-    // console.log( await this.render(data) );
     map.date = await this.getMappedDate(data);
 
     return map;

src/TemplateMap.js

@@ -35,6 +35,7 @@ class TemplateMap {
   getMapTemplateIndex(item) {
     let inputPath = item.inputPath;
     for (let j = 0, k = this.map.length; j < k; j++) {
+      // inputPath should be unique (even with pagination?)
       if (this.map[j].inputPath === inputPath) {
         return j;
       }
@@ -129,24 +130,11 @@ class TemplateMap {
     }
   }
 
-  async assignActiveTemplate(activeTemplate) {
-    if (activeTemplate) {
-      for (let collectionName in this.collectionsData) {
-        for (let item of this.collectionsData[collectionName]) {
-          // Assign active keys for all templates (both true and false)
-          item.active = await item.template.isEqual(activeTemplate);
-        }
-      }
-    }
-  }
-
   async getCollectionsDataForTemplate(template) {
     if (!this.collectionsData) {
       await this.cache();
     }
 
-    await this.assignActiveTemplate(template);
-
     return this.collectionsData;
   }
 }

src/TemplateWriter.js

@@ -3,7 +3,6 @@ const fs = require("fs-extra");
 const parsePath = require("parse-filepath");
 const Template = require("./Template");
 const TemplatePath = require("./TemplatePath");
-const TemplateRender = require("./TemplateRender");
 const TemplateMap = require("./TemplateMap");
 const EleventyError = require("./EleventyError");
 const Pagination = require("./Plugins/Pagination");
@@ -199,11 +198,11 @@ TemplateWriter.prototype._createTemplateMap = async function(paths) {
   return this.templateMap;
 };
 
-TemplateWriter.prototype._writeTemplate = async function(
-  tmpl,
-  outputPath,
-  data
-) {
+TemplateWriter.prototype._writeTemplate = async function(mapEntry) {
+  let outputPath = mapEntry.outputPath;
+  let data = mapEntry.data;
+  let tmpl = mapEntry.template;
+  console.log(mapEntry.data.page.url);
   try {
     await tmpl.writeWithData(outputPath, data);
   } catch (e) {
@@ -225,11 +224,7 @@ TemplateWriter.prototype.write = async function() {
   await this._createTemplateMap(paths);
 
   for (let mapEntry of this.templateMap.getMap()) {
-    await this._writeTemplate(
-      mapEntry.template,
-      mapEntry.outputPath,
-      mapEntry.data
-    );
+    await this._writeTemplate(mapEntry);
   }
 
   eleventyConfig.emit(

test/TemplateMapTest.js

@@ -33,16 +33,6 @@ test("populating the collection twice should clear the previous values (--watch
   t.is(tm.getMap().length, 2);
 });
 
-test("Active template flags are set properly by `assignActiveTemplate`", async t => {
-  let tm = new TemplateMap();
-  await tm.add(tmpl1);
-  await tm.add(tmpl2);
-  let collectionsData = await tm.getCollectionsDataForTemplate(tmpl1);
-  t.is(collectionsData.all.length, 2);
-  t.true(collectionsData.all[0].active);
-  t.false(collectionsData.all[1].active);
-});
-
 test("TemplateMap adds collections data and has templateContent values", async t => {
   let tm = new TemplateMap();
   await tm.add(tmpl1);

test/TemplateTest.js

@@ -571,3 +571,14 @@ test("getMappedDate (created date)", async t => {
   t.true(date instanceof Date);
   t.truthy(date.getTime());
 });
+
+test("getRenderedData() has page.url", async t => {
+  let tmpl = new Template(
+    "./test/stubs/template.ejs",
+    "./test/stubs/",
+    "./dist"
+  );
+  let data = await tmpl.getRenderedData();
+
+  t.truthy(data.page.url);
+});