refactor(tag): use main instead of yield for components

edge-js · Mar 21, 2017 · b966077 · b966077
1 parent e1445d8
commit b966077
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/Tags/ComponentTag.js b/src/Tags/ComponentTag.js
@@ -116,10 +116,10 @@ class ComponentTag extends BaseTag {
         slotLineNo = slotLineNo + child.childs.length + 1
       } else {
         slotLineNo++
-        result.yield.push(compiler.parseAndReturnLine(child))
+        result.main.push(compiler.parseAndReturnLine(child))
       }
       return result
-    }, {yield: []})
+    }, {main: []})
 
     return transformedChilds
   }

diff --git a/test-helpers/views/components/alert.edge b/test-helpers/views/components/alert.edge
@@ -1,5 +1,5 @@
-@if($slot.yield)
-  {{{ $slot.yield }}}
+@if($slot.main)
+  {{{ $slot.main }}}
 @else
   <div class="header">
     {{{ $slot.header }}}

diff --git a/test/unit/tags/component.spec.js b/test/unit/tags/component.spec.js
@@ -37,7 +37,7 @@ test.group('Tags | Component ', (group) => {
       let out = new String()
       this.isolate(function () {
         out += \`\${this.runTimeRender('components.alert')}\\n\`
-      }.bind(this.newContext({$slot: { yield: \`  <h2> Hello dude </h2>\` } })))
+      }.bind(this.newContext({$slot: { main: \`  <h2> Hello dude </h2>\` } })))
       return out
     }).bind(this)()
     `)
@@ -57,7 +57,7 @@ test.group('Tags | Component ', (group) => {
       let out = new String()
       this.isolate(function () {
         out += \`\${this.runTimeRender('components.alert')}\\n\`
-      }.bind(this.newContext({username: 'virk'},{$slot: { yield: \`  <h2> Hello dude </h2>\` } })))
+      }.bind(this.newContext({username: 'virk'},{$slot: { main: \`  <h2> Hello dude </h2>\` } })))
       return out
     }).bind(this)()
     `)
@@ -77,7 +77,7 @@ test.group('Tags | Component ', (group) => {
       let out = new String()
       this.isolate(function () {
         out += \`\${this.runTimeRender('components.alert')}\\n\`
-      }.bind(this.newContext({username: this.context.resolve('username')},{$slot: { yield: \`  <h2> Hello dude </h2>\` } })))
+      }.bind(this.newContext({username: this.context.resolve('username')},{$slot: { main: \`  <h2> Hello dude </h2>\` } })))
       return out
     }).bind(this)()
     `)
@@ -97,7 +97,7 @@ test.group('Tags | Component ', (group) => {
       let out = new String()
       this.isolate(function () {
         out += \`\${this.runTimeRender('components.alert')}\\n\`
-      }.bind(this.newContext({username: this.context.resolve('username')},{$slot: { yield: \`  <h2> Hello dude </h2>\` } })))
+      }.bind(this.newContext({username: this.context.resolve('username')},{$slot: { main: \`  <h2> Hello dude </h2>\` } })))
       return out
     }).bind(this)()
     `)
@@ -115,7 +115,7 @@ test.group('Tags | Component ', (group) => {
     @endcomponent
     `
     const output = template.compileString(statement)
-    const slot = `{$slot: { yield: \`
+    const slot = `{$slot: { main: \`
     This is the body\`, header: \`    <h2> This is the header </h2>\` } }`
 
     assert.equal(output, dedent`
@@ -143,7 +143,7 @@ test.group('Tags | Component ', (group) => {
     @endcomponent
     `
     const output = template.compileString(statement)
-    const slot = `{$slot: { yield: \`\`, header: \`    <h2> This is the header </h2>\`, body: \`    This is the body\` } }`
+    const slot = `{$slot: { main: \`\`, header: \`    <h2> This is the header </h2>\`, body: \`    This is the body\` } }`
 
     assert.equal(output, dedent`
     return (function templateFn () {