vite-plugin-twig-drupal 1.6.3 → 1.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-twig-drupal",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "description": "Provides a ⚡️ Vite plugin to transform 🌱 Twig into HTML with a 💧 Drupal flavour",
   "keywords": [
     "Vite",

package/src/index.js

@@ -186,6 +186,11 @@ const plugin = (options = {}) => {
             return includes.reduce(
               (queue, template) =>
                 queue.then(() => {
+                  // _self is a special Twig variable referring to the current
+                  // template — it is not a real file import.
+                  if (template === "_self") {
+                    return Promise.resolve()
+                  }
                   const file = resolveFile(
                     dirname(id),
                     resolveNamespaceOrComponent(options.namespaces, template)

package/tests/__snapshots__/smoke.test.js.snap

@@ -134,6 +134,20 @@ exports[`Basic smoke test > Should support global context and functions 1`] = `
 "
 `;
 
+exports[`Basic smoke test > Should support import _self for recursive macros 1`] = `
+"
+
+<nav>
+  <ul>
+      <li><a href=\\"/home\\">Home</a></li>
+
+      <li><a href=\\"/about\\">About</a></li>
+
+  </ul>
+</nav>
+"
+`;
+
 exports[`Basic smoke test > Should support includes 1`] = `
 "<section>
   <h1>Include</h1>

package/tests/fixtures/self-import.twig

@@ -0,0 +1,12 @@
+{% import _self as nav %}
+
+{% macro menu_link(title, href) %}
+  <li><a href="{{ href }}">{{ title }}</a></li>
+{% endmacro %}
+
+<nav>
+  <ul>
+    {{ nav.menu_link('Home', '/home') }}
+    {{ nav.menu_link('About', '/about') }}
+  </ul>
+</nav>

package/tests/smoke.test.js

@@ -3,6 +3,7 @@ import Error from "../dist/error.js"
 import ErrorInclude from "../dist/errorInclude.js"
 import drupalFunctions from "../dist/drupalFunctions.js"
 import Menu from "../dist/menu.js"
+import SelfImport from "../dist/selfImport.js"
 import { describe, expect, it } from "vitest"
 
 describe("Basic smoke test", () => {
@@ -72,4 +73,10 @@ describe("Basic smoke test", () => {
     expect(markup).toContain("All received")
     expect(markup).toContain("pony town")
   })
+  it("Should support import _self for recursive macros", () => {
+    const markup = SelfImport()
+    expect(markup).toContain("Home")
+    expect(markup).toContain("About")
+    expect(markup).toMatchSnapshot()
+  })
 })

package/vite.config.js

@@ -15,6 +15,7 @@ export default defineConfig({
           __dirname,
           "tests/fixtures/drupal-functions.twig"
         ),
+        selfImport: resolve(__dirname, "tests/fixtures/self-import.twig"),
       },
       name: "vite-plugin-twig-drupal",
       formats: ["es"],