Fix context

posthtml · Oct 24, 2022 · 5c3d3ba · 5c3d3ba
1 parent e78104f
commit 5c3d3ba
Show file tree

Hide file tree

Showing 7 changed files with 124 additions and 3 deletions.
diff --git a/docs/test2.html b/docs/test2.html
@@ -0,0 +1,26 @@
+<div class="wrapper">
+  <div class="parent">
+    {"name":{"filled":true,"rendered":false,"tag":"fill:name","attrs":{},"content":["Slot parent"],"source":"Slot parent","locals":{}}}
+    <div class="parent-content">I'm parent</div>
+    <div class="parent-yield">
+      <h1>Parent yield</h1>
+      <div class="child">
+        {"name":{"filled":true,"rendered":false,"tag":"fill:name","attrs":{},"content":["Slot child"],"source":"Slot child","locals":{}}}
+        <div class="child-content">I'm child</div>
+        <div class="child-yield">
+          <h1>Child yield</h1>
+        </div>
+        <div class="child-slot">Slot child</div>
+      </div>
+    </div>
+    <div class="parent-slot">Slot parent</div>
+  </div>
+  {"name":{"filled":true,"rendered":false,"tag":"fill:name","attrs":{},"content":["\n    ",{"tag":"div","attrs":{"class":"parent2-child2-slot"},"content":["\n      parent2-child2 slot\n    "]},"\n  "],"source":"\n
+  <div class="\&quot;parent2-child2-slot\&quot;">\n      parent2-child2 slot\n</div>
+  \n  ","locals":{}}}
+
+
+    yes is filled
+  <div class="parent2-child2-slot">parent2-child2 slot</div>
+  <div class="parent2-child2-yield">parent2-child2 yield</div>
+</div>
diff --git a/examples/dist/test2.html b/examples/dist/test2.html
@@ -0,0 +1,26 @@
+<div class="wrapper">
+  <div class="parent">
+    {"name":{"filled":true,"rendered":false,"tag":"fill:name","attrs":{},"content":["Slot parent"],"source":"Slot parent","locals":{}}}
+    <div class="parent-content">I'm parent</div>
+    <div class="parent-yield">
+      <h1>Parent yield</h1>
+      <div class="child">
+        {"name":{"filled":true,"rendered":false,"tag":"fill:name","attrs":{},"content":["Slot child"],"source":"Slot child","locals":{}}}
+        <div class="child-content">I'm child</div>
+        <div class="child-yield">
+          <h1>Child yield</h1>
+        </div>
+        <div class="child-slot">Slot child</div>
+      </div>
+    </div>
+    <div class="parent-slot">Slot parent</div>
+  </div>
+  {"name":{"filled":true,"rendered":false,"tag":"fill:name","attrs":{},"content":["\n    ",{"tag":"div","attrs":{"class":"parent2-child2-slot"},"content":["\n      parent2-child2 slot\n    "]},"\n  "],"source":"\n
+  <div class="\&quot;parent2-child2-slot\&quot;">\n      parent2-child2 slot\n</div>
+  \n  ","locals":{}}}
+
+
+    yes is filled
+  <div class="parent2-child2-slot">parent2-child2 slot</div>
+  <div class="parent2-child2-yield">parent2-child2 yield</div>
+</div>
diff --git a/examples/src/components/child2.html b/examples/src/components/child2.html
@@ -0,0 +1,15 @@
+<div class="child">
+  {{ $slots }}
+
+  <div class="child-content">
+    I'm child
+  </div>
+
+  <div class="child-yield">
+    <yield></yield>
+  </div>
+
+  <div class="child-slot">
+    <slot:name></slot:name>
+  </div>
+</div>
diff --git a/examples/src/components/parent2-child2.html b/examples/src/components/parent2-child2.html
@@ -0,0 +1,26 @@
+<div class="wrapper">
+  <x-parent2>
+    <h1>Parent yield</h1>
+
+    <x-child2>
+
+      <h1>Child yield</h1>
+
+      <fill:name>Slot child</fill:name>
+
+    </x-child2>
+
+    <fill:name>Slot parent</fill:name>
+
+  </x-parent2>
+
+  {{ $slots }}
+
+  <if condition="{{ $slots.name.filled }}">
+    yes is filled
+  </if>
+
+  <slot:name></slot:name>
+
+  <yield></yield>
+</div>
diff --git a/examples/src/components/parent2.html b/examples/src/components/parent2.html
@@ -0,0 +1,15 @@
+<div class="parent">
+  {{ $slots }}
+
+  <div class="parent-content">
+    I'm parent
+  </div>
+
+  <div class="parent-yield">
+    <yield></yield>
+  </div>
+
+  <div class="parent-slot">
+    <slot:name></slot:name>
+  </div>
+</div>
diff --git a/examples/src/pages/test2.html b/examples/src/pages/test2.html
@@ -0,0 +1,11 @@
+<x-parent2-child2>
+  <div class="parent2-child2-yield">
+    parent2-child2 yield
+  </div>
+
+  <fill:name>
+    <div class="parent2-child2-slot">
+      parent2-child2 slot
+    </div>
+  </fill:name>
+</x-parent2-child2>
diff --git a/src/index.js b/src/index.js
@@ -103,7 +103,7 @@ module.exports = (options = {}) => tree => {
 function processTree(options) {
   const filledSlots = {};
 
-  // let processCounter = 0;
+  let processCounter = 0;
 
   return function (tree) {
     if (options.plugins.length > 0) {
@@ -121,13 +121,15 @@ function processTree(options) {
         return currentNode;
       }
 
-      // console.log(`${++processCounter}) Processing component ${componentPath}`);
+      console.log(`${++processCounter}) Processing component ${componentPath}`);
+
+      // log(currentNode, 'currentNode');
 
       let nextNode = parser(readFileSync(componentPath, 'utf8'));
 
       // Set filled slots
       setFilledSlots(currentNode, filledSlots, options);
-      setFilledSlots(nextNode, filledSlots, options);
+      // setFilledSlots(nextNode, filledSlots, options);
 
       // Reset previous locals with passed global and keep aware locals
       options.expressions.locals = {...options.locals, ...options.aware};