fix(core): Support for nesting namespaces (#32)

* Support for nesting namespaces

Closes #31

* Avoid collisions

* Removed extra check

Author: iberdinsky-skilld

src/index.js

@@ -1,6 +1,6 @@
 import Twig from "twig"
-import { resolve, dirname } from "node:path"
-import { existsSync } from "node:fs"
+import { join, resolve, dirname } from "node:path"
+import { existsSync, readdirSync } from "node:fs"
 import { normalizePath } from "vite"
 
 const { twig } = Twig
@@ -25,6 +25,18 @@ const includeTokenTypes = [
   "Twig.logic.type.import",
 ]
 
+const findInChildDirectories = (directory, component) => {
+  const files = readdirSync(directory, { recursive: true })
+  for (const file of files) {
+    const filePath = join(directory, file)
+    if (file.endsWith(`/${component}.twig`)) {
+      return filePath
+    }
+  }
+
+  return null
+}
+
 const resolveFile = (directory, file) => {
   const filesToTry = [file, `${file}.twig`, `${file}.html.twig`]
   for (const ix in filesToTry) {
@@ -63,12 +75,25 @@ const pluckIncludes = (tokens) => {
 
 const resolveNamespaceOrComponent = (namespaces, template) => {
   let resolveTemplate = template
+  const isNamespace = template.includes(":")
+
   // Support for SDC.
-  if (template.includes(":")) {
+  if (isNamespace) {
     const [namespace, component] = template.split(":")
     resolveTemplate = `@${namespace}/${component}/${component}`
   }
-  return Twig.path.expandNamespace(namespaces, resolveTemplate)
+  let expandedPath = Twig.path.expandNamespace(namespaces, resolveTemplate)
+
+  // If file not found and we are in namespace -> search deeper.
+  if (!existsSync(expandedPath) && isNamespace) {
+    const [namespace, component] = template.split(":")
+    let foundFile = findInChildDirectories(namespaces[namespace], component)
+    if (existsSync(foundFile)) {
+      expandedPath = foundFile
+    }
+  }
+
+  return expandedPath
 }
 
 const compileTemplate = (id, file, { namespaces }) => {
@@ -224,7 +249,7 @@ const plugin = (options = {}) => {
         ${functions}
 
         addDrupalExtensions(Twig);
-        
+
         // Disable caching.
         Twig.cache(false);
 

tests/__snapshots__/smoke.test.js.snap

@@ -34,11 +34,13 @@ exports[`Basic smoke test > Should support global context and functions 1`] = `
 </section>
 <h2>SDC</h2>
 <p>Card</p>
+<div>atom badge from nested dir 🙌</div>
 <button>nested button 🙌</button>
 <button>SDC</button>
 <button>included button 👈️</button>
 <h2>Include card</h2>
 <p>🏆️ winning</p>
+<div>atom badge from nested dir 🙌</div>
 <button>nested button 🙌</button>
 "
 `;
@@ -72,11 +74,13 @@ exports[`Basic smoke test > Should support includes 1`] = `
 </section>
 <h2>SDC</h2>
 <p>Card</p>
+<div>atom badge from nested dir 🙌</div>
 <button>nested button 🙌</button>
 <button>SDC</button>
 <button>included button 👈️</button>
 <h2>Include card</h2>
 <p>🏆️ winning</p>
+<div>atom badge from nested dir 🙌</div>
 <button>nested button 🙌</button>
 "
 `;
@@ -127,11 +131,13 @@ exports[`Basic smoke test > Should support nested SDC 1`] = `
 </section>
 <h2>SDC</h2>
 <p>Card</p>
+<div>atom badge from nested dir 🙌</div>
 <button>nested button 🙌</button>
 <button>SDC</button>
 <button>included button 👈️</button>
 <h2>Include card</h2>
 <p>🏆️ winning</p>
+<div>atom badge from nested dir 🙌</div>
 <button>nested button 🙌</button>
 "
 `;
@@ -165,11 +171,13 @@ exports[`Basic smoke test > Should support variables 1`] = `
 </section>
 <h2>SDC</h2>
 <p>Card</p>
+<div>atom badge from nested dir 🙌</div>
 <button>nested button 🙌</button>
 <button>SDC</button>
 <button>included button 👈️</button>
 <h2>Include card</h2>
 <p>🏆️ winning</p>
+<div>atom badge from nested dir 🙌</div>
 <button>nested button 🙌</button>
 "
 `;

tests/fixtures/jabba/atoms/badge/badge.twig

@@ -0,0 +1 @@
+<div>{{ label }}</div>

tests/fixtures/jabba/card/card.html.twig

@@ -1,5 +1,9 @@
 <h2>{{title}}</h2>
 <p>{{teaser}}</p>
+{% include 'jabba:badge' with {
+  label: 'atom badge from nested dir 🙌',
+} %}
+
 {% include 'jabba:button' with {
   title: 'nested button 🙌',
 } %}