eleventy-plugin-vento 2.0.0-beta.1 → 2.0.0-beta.3

package/VentoPlugin.js

@@ -63,21 +63,24 @@ export function VentoPlugin(eleventyConfig, options = {}) {
 		}
 	}
 
+	// Load filters into vento
+	for (const filter in filters) {
+		env.filters[filter] = filters[filter];
+	}
+
 	// Load user-defined plugins into vento
 	for (const plugin of options.plugins) env.use(plugin);
 
 	// Add autotrim plugin if enabled
 	if (options.trimTags) env.use(autoTrim({ tags: options.trimTags || ventoDefaultTrimTags }));
 
-	eleventyConfig.on('eleventy.before', () => {
-		env.cache.clear();
-	});
-
 	// Add vto as a template format and create a custom template for it
 	eleventyConfig.addTemplateFormats('vto');
 	eleventyConfig.addExtension('vto', {
 		outputFileExtension: 'html',
+
 		async compile(inputContent, inputPath) {
+			env.cache.clear();
 			return async (data) => {
 				if (options.addHelpers) {
 					// Extract a possible namespace from the addHelpers option
@@ -89,8 +92,8 @@ export function VentoPlugin(eleventyConfig, options = {}) {
 					}
 
 					// Rebind filters the same way
-					for (const filter in filters) {
-						env.filters[filter] = filters[filter].bind(data);
+					for (const filter in env.filters) {
+						env.filters[filter] = env.filters[filter].bind(data);
 					}
 
 					// Merge helpers into page data
@@ -98,8 +101,20 @@ export function VentoPlugin(eleventyConfig, options = {}) {
 					else data = { ...data, ...helperFunctions };
 				}
 
-				return await env.runString(inputContent, data, inputPath).then((result) => result.content);
+				const result = await env.runString(inputContent, data, inputPath);
+
+				return result.content;
 			};
 		},
+
+		compileOptions: {
+			permalink(linkContents, inputPath) {
+				if (!linkContents) return linkContents;
+				return async (data) => {
+					const result = await env.runString(linkContents, data, inputPath);
+					return result.content;
+				};
+			},
+		},
 	});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "eleventy-plugin-vento",
-	"version": "2.0.0-beta.1",
+	"version": "2.0.0-beta.3",
 	"description": "Adds support for the Vento templating language to Eleventy.",
 	"type": "module",
 	"packageManager": "pnpm@9.1.4",

package/readme.md

@@ -5,7 +5,7 @@ An [Eleventy](https://11ty.dev/) plugin that adds support for [Vento](https://ve
 [Installing](#installing)<br>
 [Usage](#usage)<br>
 [Plugin Options](#plugin-options)<br>
-[Vento Filters](#vento-filters)<br>
+[Filters](#filters)<br>
 [Vento Plugins](#vento-plugins)<br>
 [Auto-Trimming Tags](#auto-trimming-tags)<br>
 [JavaScript Helpers](#javascript-helpers)<br>
@@ -49,7 +49,7 @@ export default function (eleventyConfig) {
     addHelpers: true,
 
     // Define tags that should be trimmed, or set to true
-    // to trim the default tags
+    // to trim the default tags (see section on Auto-trimming)
     trimTags: [],
 
     // A Vento configuration object

package/test/input/directory-data/dir-data.vto

@@ -0,0 +1,6 @@
+---
+title: Directory data test page
+layout: page-layout.vto
+---
+
+This page has directory data set with dynamic permalinks

package/test/input/directory-data/directory-data.11tydata.json

@@ -0,0 +1,3 @@
+{
+	"permalink": "/{{ title |> slugify }}.html"
+}

package/test/input/eleventy.config.js

@@ -19,5 +19,5 @@ export default async function (eleventyConfig) {
 		trimTags: [...ventoDefaultTrimTags, 'for'],
 	});
 
-	eleventyConfig.addShortcode('possumPosse', () => 'Release the possums!!!');
+	eleventyConfig.addShortcode('possumPosse', (number = 'the') => `Release ${number} possums!!!`);
 }

package/test/input/permalinks.vto

@@ -0,0 +1,7 @@
+---
+permalink: /test/page/permalink/
+title: Test page
+layout: page-layout.vto
+---
+
+This content lives at `/test/page/permalink/`

package/test/input/root.vto

@@ -0,0 +1,6 @@
+---
+permalink: /
+layout: page-layout.vto
+---
+
+This should render on the homepage.

package/test/input/with-shortcodes.vto

@@ -3,4 +3,4 @@ title: Page with shortcodes
 layout: page-layout.vto
 ---
 
-{{ possumPosse() }}
+{{ possumPosse(32) }}