If/ElseIf/Else cleanup

compiler/Builder.js

@@ -64,9 +64,7 @@ class Builder {
     elseIfStatement(test, body, elseStatement) {
         test = makeNode(test);
 
-        return new ElseIf({
+        return new ElseIf({test, body, else: elseStatement});
-            if: new If({test, body, else: elseStatement})
-        });
     }
 
     expression(value) {

compiler/ast/ElseIf.js

@@ -1,12 +1,13 @@
 'use strict';
 
 var Node = require('./Node');
-var ok = require('assert').ok;
 
 class ElseIf extends Node {
     constructor(def) {
         super('ElseIf');
-        this.if = def.if;
+        this.test = def.test;
+        this.body = this.makeContainer(def.body);
+        this.else = def.else;
         this.matched = false;
     }
 
@@ -16,11 +17,9 @@ class ElseIf extends Node {
             return;
         }
 
-        var ifStatement = this.if;
+        var ifStatement = generator.builder.ifStatement(this.test, this.body, this.else);
-        ok(ifStatement);
-
         generator.write('else ');
-        generator.generateCode(this.if);
+        generator.generateCode(ifStatement);
     }
 }
 

compiler/ast/If.js

@@ -6,6 +6,7 @@ function removeWhitespaceNodes(whitespaceNodes) {
     for (var i=0; i<whitespaceNodes.length; i++) {
         whitespaceNodes[i].detach();
     }
+    whitespaceNodes.length = 0;
 }
 
 class If extends Node {

taglibs/core/core-transformer.js

@@ -25,7 +25,7 @@ var coreAttrHandlers = [
                 return;
             }
             var ifNode = this.builder.ifStatement(ifArgument);
-            //Surround the existing node with an "if" node
+            //Surround the existing node with an "If" node
             node.wrap(ifNode);
         }
     ],
@@ -35,6 +35,7 @@ var coreAttrHandlers = [
             if (!ifArgument) {
                 return;
             }
+            ifArgument = this.builder.negate(ifArgument);
             var ifNode = this.builder.ifStatement(ifArgument);
             //Surround the existing node with an "if" node
             node.wrap(ifNode);
@@ -47,28 +48,29 @@ var coreAttrHandlers = [
                 return;
             }
             var elseIfNode = this.builder.elseIfStatement(elseIfArgument);
-            //Surround the existing node with an "if" node
+            //Surround the existing node with an "ElseIf" node
             node.wrap(elseIfNode);
         }
     ],
     [
         'else', function(attr, node) {
             var elseNode = this.builder.elseStatement();
-            //Surround the existing node with an "if" node
+            //Surround the existing node with an "Else" node
             node.wrap(elseNode);
         }
     ],
     [
         'body-only-if', function(attr, node, el) {
-            var condition = attr.argument;
+            throw new Error('body-only-if Not Implemented');
-            if (!condition) {
+            // var condition = attr.argument;
-                this.addError('Invalid "body-only-if" attribute');
+            // if (!condition) {
-                return;
+            //     this.addError('Invalid "body-only-if" attribute');
-            }
+            //     return;
-
+            // }
-            if (el.nodeType !== '')
+            //
-
+            // if (el.nodeType !== '')
-            el.setStripExpression(attr);
+            //
+            // el.setStripExpression(attr);
         }
     ],
     [

taglibs/core/else-if-tag.js

@@ -1,17 +1,18 @@
 module.exports = function nodeFactory(el, context) {
     var argument = el.argument;
-
-
     var attributes = el.attributes;
-    var elseIfStatement = context.builder.elseIfStatement(argument || 'INVALID');
+
 
     if (!argument) {
-        context.addError(elseIfStatement, 'Invalid <else-if> tag. Argument is missing. Example; <if(foo === true)>');
+        context.addError(el, 'Invalid <else-if> tag. Argument is missing. Example; <if(foo === true)>');
+        return el;
     }
 
     if (attributes.length) {
-        context.addError(elseIfStatement, 'Invalid <else-if> tag. Attributes not allowed.');
+        context.addError(el, 'Invalid <else-if> tag. Attributes not allowed.');
+        return el;
     }
 
+    var elseIfStatement = context.builder.elseIfStatement(argument);
     return elseIfStatement;
 };

test/fixtures/render/autotest/if-else-attr/expected.html

@@ -0,0 +1 @@
+<div>B</div>

test/fixtures/render/autotest/if-else-attr/template.marko

@@ -0,0 +1,6 @@
+<div if(data.foo === 0)>
+    A
+</div>
+<div else>
+    B
+</div>

test/fixtures/render/autotest/if-else-attr/test.js

@@ -0,0 +1,24 @@
+exports.templateData = {
+    "accounts": [
+        {
+            "balance": 0,
+            "balanceFormatted": "$0.00",
+            "status": "open"
+        },
+        {
+            "balance": 10,
+            "balanceFormatted": "$10.00",
+            "status": "closed"
+        },
+        {
+            "balance": -100,
+            "balanceFormatted": "$-100.00",
+            "status": "suspended"
+        },
+        {
+            "balance": 999,
+            "balanceFormatted": "$999.00",
+            "status": "open"
+        }
+    ]
+};

test/fixtures/render/autotest/if-else-if-attr/expected.html

@@ -0,0 +1 @@
+<div>B</div>

test/fixtures/render/autotest/if-else-if-attr/template.marko

@@ -0,0 +1,6 @@
+<div if(data.foo === 0)>
+    A
+</div>
+<div else-if(true)>
+    B
+</div>

test/fixtures/render/autotest/if-else-if-attr/test.js

@@ -0,0 +1,24 @@
+exports.templateData = {
+    "accounts": [
+        {
+            "balance": 0,
+            "balanceFormatted": "$0.00",
+            "status": "open"
+        },
+        {
+            "balance": 10,
+            "balanceFormatted": "$10.00",
+            "status": "closed"
+        },
+        {
+            "balance": -100,
+            "balanceFormatted": "$-100.00",
+            "status": "suspended"
+        },
+        {
+            "balance": 999,
+            "balanceFormatted": "$999.00",
+            "status": "open"
+        }
+    ]
+};

test/fixtures/render/autotest/if-else-if-else-attr/expected.html

@@ -0,0 +1 @@
+<div>C</div>

test/fixtures/render/autotest/if-else-if-else-attr/template.marko

@@ -0,0 +1,9 @@
+<div if(data.foo === 0)>
+    A
+</div>
+<div else-if(data.foo === 1)>
+    B
+</div>
+<div else>
+    C
+</div>

test/fixtures/render/autotest/if-else-if-else-attr/test.js

@@ -0,0 +1,24 @@
+exports.templateData = {
+    "accounts": [
+        {
+            "balance": 0,
+            "balanceFormatted": "$0.00",
+            "status": "open"
+        },
+        {
+            "balance": 10,
+            "balanceFormatted": "$10.00",
+            "status": "closed"
+        },
+        {
+            "balance": -100,
+            "balanceFormatted": "$-100.00",
+            "status": "suspended"
+        },
+        {
+            "balance": 999,
+            "balanceFormatted": "$999.00",
+            "status": "open"
+        }
+    ]
+};

test/fixtures/render/autotest/if-else-if-else/expected.html

@@ -0,0 +1 @@
+C

test/fixtures/render/autotest/if-else-if-else/template.marko

@@ -0,0 +1,9 @@
+<if(false)>
+    A
+</if>
+<else-if(false)>
+    B
+</else-if>
+<else>
+    C
+</else>

test/fixtures/render/autotest/if-else-if-else/test.js

@@ -0,0 +1 @@
+exports.templateData = {};

test/fixtures/render/autotest/if-else-if/expected.html

@@ -0,0 +1 @@
+B

test/fixtures/render/autotest/if-else-if/template.marko

@@ -0,0 +1,6 @@
+<if(false)>
+    A
+</if>
+<else-if(true)>
+    B
+</else-if>

test/fixtures/render/autotest/if-else-if/test.js

@@ -0,0 +1 @@
+exports.templateData = {};

test/fixtures/render/autotest/if-else/expected.html

@@ -0,0 +1 @@
+A

test/fixtures/render/autotest/if-else/template.marko

@@ -0,0 +1,6 @@
+<if(true)>
+    A
+</if>
+<else>
+    B
+</else>

test/fixtures/render/autotest/if-else/test.js

@@ -0,0 +1 @@
+exports.templateData = {};