fix if clause condition duplicate bug

kbrsh · May 19, 2019 · af9c57d · af9c57d
1 parent 9b4d608
commit af9c57d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/packages/moon/dist/moon.js b/packages/moon/dist/moon.js
@@ -142,7 +142,7 @@
 			} else {
 				// Return a dynamic match if there is a dynamic name or a local.
 				isStatic = false;
-				return name[0] === "$" ? match : "data." + name;
+				return name[0] === "$" ? name : "data." + name;
 			}
 		});
 		return {
@@ -635,12 +635,11 @@
 
 	function generateNodeIf(element, parent, index, staticNodes) {
 		var variable = "m" + generateVariable;
-		var attributes = element.attributes;
 		var prelude = "";
 		var emptyElseClause = true;
 		setGenerateVariable(generateVariable + 1); // Generate the initial `if` clause.
 
-		prelude += "var " + variable + ";if(" + attributes[""].value + "){" + generateClause(variable, element, staticNodes) + "}"; // Search for `else-if` and `else` clauses if there are siblings.
+		prelude += "var " + variable + ";if(" + element.attributes[""].value + "){" + generateClause(variable, element, staticNodes) + "}"; // Search for `else-if` and `else` clauses if there are siblings.
 
 		if (parent !== null) {
 			var siblings = parent.children;
@@ -650,7 +649,7 @@
 
 				if (sibling.name === "else-if") {
 					// Generate the `else-if` clause.
-					prelude += "else if(" + attributes[""].value + "){" + generateClause(variable, sibling, staticNodes) + "}"; // Remove the `else-if` clause so that it isn't generated
+					prelude += "else if(" + sibling.attributes[""].value + "){" + generateClause(variable, sibling, staticNodes) + "}"; // Remove the `else-if` clause so that it isn't generated
 					// individually by the parent.
 
 					siblings.splice(i, 1);

diff --git a/packages/moon/dist/moon.min.js b/packages/moon/dist/moon.min.js
diff --git a/packages/moon/src/compiler/generator/components/if.js b/packages/moon/src/compiler/generator/components/if.js
@@ -38,14 +38,13 @@ function generateClause(variable, element, staticNodes) {
  */
 export function generateNodeIf(element, parent, index, staticNodes) {
 	const variable = "m" + generateVariable;
-	const attributes = element.attributes;
 	let prelude = "";
 	let emptyElseClause = true;
 
 	setGenerateVariable(generateVariable + 1);
 
 	// Generate the initial `if` clause.
-	prelude += `var ${variable};if(${attributes[""].value}){${generateClause(variable, element, staticNodes)}}`;
+	prelude += `var ${variable};if(${element.attributes[""].value}){${generateClause(variable, element, staticNodes)}}`;
 
 	// Search for `else-if` and `else` clauses if there are siblings.
 	if (parent !== null) {
@@ -56,7 +55,7 @@ export function generateNodeIf(element, parent, index, staticNodes) {
 
 			if (sibling.name === "else-if") {
 				// Generate the `else-if` clause.
-				prelude += `else if(${attributes[""].value}){${generateClause(variable, sibling, staticNodes)}}`;
+				prelude += `else if(${sibling.attributes[""].value}){${generateClause(variable, sibling, staticNodes)}}`;
 
 				// Remove the `else-if` clause so that it isn't generated
 				// individually by the parent.

diff --git a/packages/moon/src/compiler/lexer/lexer.js b/packages/moon/src/compiler/lexer/lexer.js
@@ -74,7 +74,7 @@ function scopeExpression(expression) {
 		} else {
 			// Return a dynamic match if there is a dynamic name or a local.
 			isStatic = false;
-			return name[0] === "$" ? match : "data." + name;
+			return name[0] === "$" ? name : "data." + name;
 		}
 	});