Skip to content

Commit 5c3d3ba

Browse files
thewebartisan7thewebartisan7
committed
Fix context
1 parent e78104f commit 5c3d3ba

File tree

7 files changed

+124
-3
lines changed

7 files changed

+124
-3
lines changed

‎docs/test2.html

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<div class="wrapper">
2+
<div class="parent">
3+
{"name":{"filled":true,"rendered":false,"tag":"fill:name","attrs":{},"content":["Slot parent"],"source":"Slot parent","locals":{}}}
4+
<div class="parent-content">I'm parent</div>
5+
<div class="parent-yield">
6+
<h1>Parent yield</h1>
7+
<div class="child">
8+
{"name":{"filled":true,"rendered":false,"tag":"fill:name","attrs":{},"content":["Slot child"],"source":"Slot child","locals":{}}}
9+
<div class="child-content">I'm child</div>
10+
<div class="child-yield">
11+
<h1>Child yield</h1>
12+
</div>
13+
<div class="child-slot">Slot child</div>
14+
</div>
15+
</div>
16+
<div class="parent-slot">Slot parent</div>
17+
</div>
18+
{"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
19+
<div class="\&quot;parent2-child2-slot\&quot;">\n parent2-child2 slot\n</div>
20+
\n ","locals":{}}}
21+
22+
23+
yes is filled
24+
<div class="parent2-child2-slot">parent2-child2 slot</div>
25+
<div class="parent2-child2-yield">parent2-child2 yield</div>
26+
</div>

‎examples/dist/test2.html

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<div class="wrapper">
2+
<div class="parent">
3+
{"name":{"filled":true,"rendered":false,"tag":"fill:name","attrs":{},"content":["Slot parent"],"source":"Slot parent","locals":{}}}
4+
<div class="parent-content">I'm parent</div>
5+
<div class="parent-yield">
6+
<h1>Parent yield</h1>
7+
<div class="child">
8+
{"name":{"filled":true,"rendered":false,"tag":"fill:name","attrs":{},"content":["Slot child"],"source":"Slot child","locals":{}}}
9+
<div class="child-content">I'm child</div>
10+
<div class="child-yield">
11+
<h1>Child yield</h1>
12+
</div>
13+
<div class="child-slot">Slot child</div>
14+
</div>
15+
</div>
16+
<div class="parent-slot">Slot parent</div>
17+
</div>
18+
{"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
19+
<div class="\&quot;parent2-child2-slot\&quot;">\n parent2-child2 slot\n</div>
20+
\n ","locals":{}}}
21+
22+
23+
yes is filled
24+
<div class="parent2-child2-slot">parent2-child2 slot</div>
25+
<div class="parent2-child2-yield">parent2-child2 yield</div>
26+
</div>

‎examples/src/components/child2.html

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<div class="child">
2+
{{ $slots }}
3+
4+
<div class="child-content">
5+
I'm child
6+
</div>
7+
8+
<div class="child-yield">
9+
<yield></yield>
10+
</div>
11+
12+
<div class="child-slot">
13+
<slot:name></slot:name>
14+
</div>
15+
</div>

‎examples/src/components/parent2-child2.html

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<div class="wrapper">
2+
<x-parent2>
3+
<h1>Parent yield</h1>
4+
5+
<x-child2>
6+
7+
<h1>Child yield</h1>
8+
9+
<fill:name>Slot child</fill:name>
10+
11+
</x-child2>
12+
13+
<fill:name>Slot parent</fill:name>
14+
15+
</x-parent2>
16+
17+
{{ $slots }}
18+
19+
<if condition="{{ $slots.name.filled }}">
20+
yes is filled
21+
</if>
22+
23+
<slot:name></slot:name>
24+
25+
<yield></yield>
26+
</div>

‎examples/src/components/parent2.html

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<div class="parent">
2+
{{ $slots }}
3+
4+
<div class="parent-content">
5+
I'm parent
6+
</div>
7+
8+
<div class="parent-yield">
9+
<yield></yield>
10+
</div>
11+
12+
<div class="parent-slot">
13+
<slot:name></slot:name>
14+
</div>
15+
</div>

‎examples/src/pages/test2.html

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<x-parent2-child2>
2+
<div class="parent2-child2-yield">
3+
parent2-child2 yield
4+
</div>
5+
6+
<fill:name>
7+
<div class="parent2-child2-slot">
8+
parent2-child2 slot
9+
</div>
10+
</fill:name>
11+
</x-parent2-child2>

‎src/index.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ module.exports = (options = {}) => tree => {
103103
function processTree(options) {
104104
const filledSlots = {};
105105

106-
// let processCounter = 0;
106+
let processCounter = 0;
107107

108108
return function (tree) {
109109
if (options.plugins.length > 0) {
@@ -121,13 +121,15 @@ function processTree(options) {
121121
return currentNode;
122122
}
123123

124-
// console.log(`${++processCounter}) Processing component ${componentPath}`);
124+
console.log(`${++processCounter}) Processing component ${componentPath}`);
125+
126+
// log(currentNode, 'currentNode');
125127

126128
let nextNode = parser(readFileSync(componentPath, 'utf8'));
127129

128130
// Set filled slots
129131
setFilledSlots(currentNode, filledSlots, options);
130-
setFilledSlots(nextNode, filledSlots, options);
132+
// setFilledSlots(nextNode, filledSlots, options);
131133

132134
// Reset previous locals with passed global and keep aware locals
133135
options.expressions.locals = {...options.locals, ...options.aware};

0 commit comments

Comments
 (0)