From af0a86e50be45d0862e7851c598afc61376a3b81 Mon Sep 17 00:00:00 2001
From: Kabir Shah <iamkbrsh@gmail.com>
Date: Mon, 10 Jun 2019 12:14:30 -0700
Subject: [PATCH] allow nested text expressions

---
 packages/moon/dist/moon.js                | 16 +++++++++++++---
 packages/moon/dist/moon.min.js            |  2 +-
 packages/moon/src/compiler/lexer/lexer.js | 15 +++++++++++++--
 packages/moon/test/compiler/lexer.test.js |  2 +-
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/packages/moon/dist/moon.js b/packages/moon/dist/moon.js
index dee3a842..bfaefb7a 100644
--- a/packages/moon/dist/moon.js
+++ b/packages/moon/dist/moon.js
@@ -366,13 +366,23 @@
 			} else if (_char === "{") {
 				// If a sequence of characters begins with "{", process it as an
 				// expression token.
-				var expression = ""; // Consume the input until the end of the expression.
+				var expression = ""; // Keep a stack of opened objects.
+
+				var opened = 0; // Consume the input until the end of the expression.
 
 				for (i += 1; i < input.length; i++) {
 					var _char2 = input[i];
 
-					if (_char2 === "}") {
-						break;
+					if (_char2 === "{") {
+						opened += 1;
+						expression += _char2;
+					} else if (_char2 === "}") {
+						if (opened === 0) {
+							break;
+						} else {
+							opened -= 1;
+							expression += _char2;
+						}
 					} else {
 						expression += _char2;
 					}
diff --git a/packages/moon/dist/moon.min.js b/packages/moon/dist/moon.min.js
index 55e3a117..d58c5f17 100644
--- a/packages/moon/dist/moon.min.js
+++ b/packages/moon/dist/moon.min.js
@@ -4,4 +4,4 @@
  * Released under the MIT License
  * https://kbrsh.github.io/moon
  */
-!function(e,t){"undefined"==typeof module?e.Moon=t():module.exports=t()}(this,function(){"use strict";var b={element:0,text:1,component:2};var y,O=/^\s+$/,S=/<([\w\d-_]+)([^>]*?)(\/?)>/g,C=/([\w\d-_:@]*)(?:=(?:("[^"]*"|'[^']*')|{([^=]*)}))?/g,t=/"[^"]*"|'[^']*'|\d+[a-zA-Z$_]\w*|\.[a-zA-Z$_]\w*|[a-zA-Z$_]\w*:|([a-zA-Z$_]\w*)/g,k=/&amp;|&gt;|&lt;|&nbsp;|&quot;|\\|"|\n|\r/g,r=["NaN","false","in","null","this","true","typeof","undefined","window"],q={"&amp;":"&","&gt;":">","&lt;":"<","&nbsp;":" ","&quot;":'\\"',"\\":"\\\\",'"':'\\"',"\n":"\\n","\r":"\\r"};function P(e){switch(e){case"class":return"className";case"for":return"htmlFor";default:return e}}function E(e){var n=!0;return{value:e.replace(t,function(e,t){return void 0===t||-1!==r.indexOf(t)?e:(n=!1,"$"===t[0]?t:"data."+t)}),isStatic:n}}function n(e){e=e.trim();for(var t,n=[],r=0;r<e.length;){var a=e[r];if("<"===a){var i=e[r+1];if("/"===i){var o=e.indexOf(">",r+2),l=e.slice(r+2,o);0,n.push({type:"tagClose",value:l}),r=o+1;continue}if("!"===i&&"-"===e[r+2]&&"-"===e[r+3]){var u=e.indexOf("--\x3e",r+4);0,r=u+3;continue}S.lastIndex=r;var d=S.exec(e);0;for(var s=d[0],f=d[1],v=d[2],c=d[3],p={},h=void 0;null!==(h=C.exec(v));){var m=h[0],g=P(h[1]),w=h[2],b=h[3];0===m.length?C.lastIndex+=1:64===g.charCodeAt(0)?p[g]={value:"["+E(b).value+",data]",isStatic:!1}:p[g]=void 0===b?{value:void 0===w?"true":w,isStatic:!0}:E(b)}n.push({type:"tagOpen",value:f,attributes:p,closed:"/"===c}),r+=s.length}else if("{"===a){var y="";for(r+=1;r<e.length;r++){var x=e[r];if("}"===x)break;y+=x}n.push({type:"tagOpen",value:"text",attributes:{"":E(y)},closed:!0}),r+=1}else{for(var N="";r<e.length;r++){var A=e[r];if("<"===A||"{"===A)break;N+=A}O.test(N)||n.push({type:"tagOpen",value:"text",attributes:{"":{value:'"'+(t=N,t.replace(k,function(e){return q[e]}))+'"',isStatic:!0}},closed:!0})}}return n}function s(e,t,n,r){this.message=e,this.start=t,this.end=n,this.next=r}function f(e,t,n){var r=n[e],a=n[t-1],i=t-e;if(0==i)return new s("",e,t);if(1==i)return"tagOpen"===r.type&&!0===r.closed?{name:r.value,attributes:r.attributes,children:[]}:new s("",e,t);if("tagOpen"!==r.type||"tagClose"!==a.type||r.value!==a.value)return new s("",e,t);var o=function e(t,n,r){var a;if(0==n-t)return[];for(var i=t+1;i<=n;i++){var o=f(t,i,r);if(o instanceof s)a=o;else{var l=e(i,n,r);if(!(l instanceof s)){for(var u=[o],d=0;d<l.length;d++)u.push(l[d]);return u}}}return new s("",t,n,a)}(e+1,t-1,n);return o instanceof s?new s("",e,t,o):{name:r.value,attributes:r.attributes,children:o}}function a(e){var t=f(0,e.length,e);return t}function x(e){y=e}function N(e,t,n){var r,a=A(t.children[0],t,0,n);return a.isStatic?(r=e+"=m["+n.length+"];",n.push(a)):r=""+a.prelude+e+"="+a.node+";",r}function A(e,t,n,r){var a,i=e.name,o=!0;if("if"===i)return function(e,t,n,r){var a="m"+y,i="",o=!0;if(x(y+1),i+="var "+a+";if("+e.attributes[""].value+"){"+N(a,e,r)+"}",null!==t)for(var l=t.children,u=n+1;u<l.length;){var d=l[u];if("else-if"===d.name)i+="else if("+d.attributes[""].value+"){"+N(a,d,r)+"}",l.splice(u,1);else{if("else"!==d.name)break;i+="else{"+N(a,d,r)+"}",o=!1,l.splice(u,1)}}return o&&(i+="else{"+a+"=m["+r.length+"];}",r.push({prelude:"",node:"{type:"+b.text+',name:"text",data:{"":"",children:[]}}',isStatic:!0})),{prelude:i,node:a,isStatic:!1}}(e,t,n,r);if("for"===i)return function(e,t){var n,r,a="m"+y,i=e.attributes,o=i[""].value.split(","),l=i.of,u=i.in;x(y+1);var d,s=A(e.children[0],e,0,t);return s.isStatic?(d=a+".push(m["+t.length+"]);",t.push(s)):d=s.prelude+a+".push("+s.node+");",r=void 0===l?(u=u.value,"for(var "+(n=o[0])+" in "+u+"){"+(2===o.length?"var "+o[1]+"="+u+"["+n+"];":"")+d+"}"):(l=l.value,"for(var "+(n=2===o.length?o[1]:"mi")+"=0;"+n+"<"+l+".length;"+n+"++){var "+o[0]+"="+l+"["+n+"];"+d+"}"),{prelude:"var "+a+"=[];"+r,node:"{type:"+b.element+',name:"span",data:{children:'+a+"}}",isStatic:!1}}(e,r);a="text"===i?b.text:i[0]===i[0].toLowerCase()?b.element:b.component;var l=e.attributes,u="",d="{",s="";for(var f in l){var v=l[f];"@"!==f[0]&&v.isStatic||(o=!1),d+=s+'"'+f+'":'+v.value,s=","}if(void 0===l.children){var c=e.children,p=[];d+=s+"children:[",s="";for(var h=0;h<c.length;h++){var m=A(c[h],e,h,r);m.isStatic||(o=!1),p.push(m)}for(var g=0;g<p.length;g++){var w=p[g];o||!w.isStatic?(u+=w.prelude,d+=s+w.node):(d+=s+"m["+r.length+"]",r.push(w)),s=","}d+="]"}return{prelude:u,node:"{type:"+a+',name:"'+i+'",data:'+d+"}}",isStatic:o}}function i(e){var t=[];x(0);var n=A(e,null,0,t),r=n.prelude,a=n.node;if(n.isStatic)return"if(m[0]===undefined){"+r+"m[0]="+a+";}return m[0];";if(0===t.length)return r+"return "+a+";";for(var i="if(m[0]===undefined){",o=0;o<t.length;o++){var l=t[o];i+=l.prelude+"m["+o+"]="+l.node+";"}return""+(i+="}")+r+"return "+a+";"}function d(e){return i(a(n(e)))}var v,c,p,F,o={},h={},m={};function g(e){c=e}var L=[],M={updateText:0,updateData:1,appendNode:2,removeNode:3,replaceNode:4};function $(u){var d,s=[];return u.type===b.text?d=document.createTextNode(u.data[""]):function(){var i=u.data;d=document.createElement(u.name);for(var e=i.children,t=0;t<e.length;t++){var n=$(e[t]);d.appendChild(n.element),s.push(n)}function r(n){var e=i[n];if(64===n.charCodeAt(0)){o[n]=e;var t=l[n]=function(e){var t=o[n];t[0](e,t[1])};d.addEventListener(n.slice(1),t)}else if("ariaset"===n||"dataset"===n||"style"===n){var r=d[n];for(var a in e)"ariaset"===n?d.setAttribute("aria-"+a,e[a]):r[a]=e[a]}else"children"!==n&&(d[n]=e)}var o=d.MoonEvents={},l=d.MoonListeners={};for(var a in i)r(a)}(),{element:d,node:u,children:s}}function w(e,t,n){for(;;){var r=e.pop(),a=r.node,i=t.pop();if(a!==i)if(a.name!==i.name)n.push({type:M.replaceNode,nodeOld:r,nodeNew:i,nodeParent:null});else if(a.type===b.text)a.data[""]!==i.data[""]&&n.push({type:M.updateText,nodeOld:r,nodeNew:i,nodeParent:null});else{n.push({type:M.updateData,nodeOld:r,nodeNew:i,nodeParent:null});var o=r.children,l=i.data.children,u=o.length,d=l.length;if(u===d)for(var s=0;s<u;s++)e.push(o[s]),t.push(l[s]);else if(d<u){for(var f=0;f<d;f++)e.push(o[f]),t.push(l[f]);for(var v=d;v<u;v++)n.push({type:M.removeNode,nodeOld:o[v],nodeNew:null,nodeParent:r})}else{for(var c=0;c<u;c++)e.push(o[c]),t.push(l[c]);for(var p=u;p<d;p++)n.push({type:M.appendNode,nodeOld:null,nodeNew:l[p],nodeParent:r})}}if(0===e.length){_(n);break}if(16<=performance.now()-F){requestAnimationFrame(function(){F=performance.now(),w(e,t,n)});break}}}function _(e){for(var t=0;t<e.length;t++){var n=e[t];switch(n.type){case M.updateText:var r=n.nodeOld,a=n.nodeNew;r.element.data=a.data[""],r.node=a;break;case M.updateData:var i=n.nodeOld,o=i.node.data,l=i.element,u=n.nodeNew,d=u.data;for(var s in d){var f=o[s],v=d[s];if(f!==v)if(64===s.charCodeAt(0))l.MoonEvents[s]=v;else if("ariaset"===s||"dataset"===s||"style"===s){var c=l[s];for(var p in v)"ariaset"===s?l.setAttribute("aria-"+p,v[p]):c[p]=v[p];if(void 0!==f)for(var h in f)h in v||("ariaset"===s?l.removeAttribute("aria-"+h):"dataset"===s?delete c[h]:c[h]="")}else"children"!==s&&(l[s]=v)}for(var m in o)if(!(m in d)){var g=o[m];if(64===m.charCodeAt(0))delete l.MoonEvents[m],l.removeEventListener(l.MoonListeners[m]);else if("ariaset"===m||"dataset"===m||"style"===m){var w=l[m];for(var b in g)"ariaset"===m?l.removeAttribute("aria-"+b):"dataset"===m?delete w[b]:w[b]=""}else l.removeAttribute(m)}i.node=u;break;case M.appendNode:var y=n.nodeParent,x=$(n.nodeNew);y.element.appendChild(x.element),y.children.push(x);break;case M.removeNode:var N=n.nodeParent;N.element.removeChild(N.children.pop().element);break;case M.replaceNode:var A=n.nodeOld,O=A.element,S=$(n.nodeNew),C=S.element;O.parentNode.replaceChild(C,O),A.element=C,A.node=S.node,A.children=S.children}}L.shift(),0!==L.length&&(16<=performance.now()-F?requestAnimationFrame(function(){F=performance.now(),z()}):z())}function z(){var e=L[0];for(var t in e)o[t]=e[t];var n=p(o);g(n),function e(t,n,r){for(;;){var a=t.pop(),i=n.pop(),o=r.pop();a.type===b.component&&(a=h[a.name](a.data),null===i?g(a):i.data.children[o]=a);for(var l=a.data.children,u=0;u<l.length;u++)t.push(l[u]),n.push(a),r.push(u);if(0===t.length){w([v],[c],[]);break}if(16<=performance.now()-F){requestAnimationFrame(function(){F=performance.now(),e(t,n,r)});break}}}([n],[null],[0])}function T(e){L.push(e),1===L.length&&requestAnimationFrame(function(){F=performance.now(),z()})}function e(t){var n=function(e,t){return void 0===e?t:e}(t.name,"Root");delete t.name;var r=t.view;delete t.view,"string"==typeof r&&(r=new Function("m","data",d(r))),m[n]=[];function e(e){return r(m[n],function(e,t){var n={};for(var r in e)n[r]=e[r];for(var a in t)a in e||(n[a]=t[a]);return n}(e,t))}if("Root"===n){var a="string"==typeof t.root?document.querySelector(t.root):t.root;delete t.root;for(var i=a.attributes,o={children:[]},l=0;l<i.length;l++){var u=i[l];o[u.name]=u.value}!function(e){v=e}({element:a,node:{type:b.element,name:a.tagName.toLowerCase(),data:o},children:[]}),function(e){p=e}(e),T(t)}else h[n]=e}return e.lex=n,e.parse=a,e.generate=i,e.compile=d,e.components=h,e.get=o,e.set=T,e});
\ No newline at end of file
+!function(e,t){"undefined"==typeof module?e.Moon=t():module.exports=t()}(this,function(){"use strict";var b={element:0,text:1,component:2};var y,S=/^\s+$/,C=/<([\w\d-_]+)([^>]*?)(\/?)>/g,k=/([\w\d-_:@]*)(?:=(?:("[^"]*"|'[^']*')|{([^=]*)}))?/g,t=/"[^"]*"|'[^']*'|\d+[a-zA-Z$_]\w*|\.[a-zA-Z$_]\w*|[a-zA-Z$_]\w*:|([a-zA-Z$_]\w*)/g,q=/&amp;|&gt;|&lt;|&nbsp;|&quot;|\\|"|\n|\r/g,r=["NaN","false","in","null","this","true","typeof","undefined","window"],P={"&amp;":"&","&gt;":">","&lt;":"<","&nbsp;":" ","&quot;":'\\"',"\\":"\\\\",'"':'\\"',"\n":"\\n","\r":"\\r"};function E(e){switch(e){case"class":return"className";case"for":return"htmlFor";default:return e}}function F(e){var n=!0;return{value:e.replace(t,function(e,t){return void 0===t||-1!==r.indexOf(t)?e:(n=!1,"$"===t[0]?t:"data."+t)}),isStatic:n}}function n(e){e=e.trim();for(var t,n=[],r=0;r<e.length;){var a=e[r];if("<"===a){var i=e[r+1];if("/"===i){var o=e.indexOf(">",r+2),l=e.slice(r+2,o);0,n.push({type:"tagClose",value:l}),r=o+1;continue}if("!"===i&&"-"===e[r+2]&&"-"===e[r+3]){var u=e.indexOf("--\x3e",r+4);0,r=u+3;continue}C.lastIndex=r;var d=C.exec(e);0;for(var s=d[0],f=d[1],v=d[2],c=d[3],p={},h=void 0;null!==(h=k.exec(v));){var m=h[0],g=E(h[1]),w=h[2],b=h[3];0===m.length?k.lastIndex+=1:64===g.charCodeAt(0)?p[g]={value:"["+F(b).value+",data]",isStatic:!1}:p[g]=void 0===b?{value:void 0===w?"true":w,isStatic:!0}:F(b)}n.push({type:"tagOpen",value:f,attributes:p,closed:"/"===c}),r+=s.length}else if("{"===a){var y="",x=0;for(r+=1;r<e.length;r++){var N=e[r];if("{"===N)x+=1,y+=N;else if("}"===N){if(0===x)break;x-=1,y+=N}else y+=N}n.push({type:"tagOpen",value:"text",attributes:{"":F(y)},closed:!0}),r+=1}else{for(var A="";r<e.length;r++){var O=e[r];if("<"===O||"{"===O)break;A+=O}S.test(A)||n.push({type:"tagOpen",value:"text",attributes:{"":{value:'"'+(t=A,t.replace(q,function(e){return P[e]}))+'"',isStatic:!0}},closed:!0})}}return n}function s(e,t,n,r){this.message=e,this.start=t,this.end=n,this.next=r}function f(e,t,n){var r=n[e],a=n[t-1],i=t-e;if(0==i)return new s("",e,t);if(1==i)return"tagOpen"===r.type&&!0===r.closed?{name:r.value,attributes:r.attributes,children:[]}:new s("",e,t);if("tagOpen"!==r.type||"tagClose"!==a.type||r.value!==a.value)return new s("",e,t);var o=function e(t,n,r){var a;if(0==n-t)return[];for(var i=t+1;i<=n;i++){var o=f(t,i,r);if(o instanceof s)a=o;else{var l=e(i,n,r);if(!(l instanceof s)){for(var u=[o],d=0;d<l.length;d++)u.push(l[d]);return u}}}return new s("",t,n,a)}(e+1,t-1,n);return o instanceof s?new s("",e,t,o):{name:r.value,attributes:r.attributes,children:o}}function a(e){var t=f(0,e.length,e);return t}function x(e){y=e}function N(e,t,n){var r,a=A(t.children[0],t,0,n);return a.isStatic?(r=e+"=m["+n.length+"];",n.push(a)):r=""+a.prelude+e+"="+a.node+";",r}function A(e,t,n,r){var a,i=e.name,o=!0;if("if"===i)return function(e,t,n,r){var a="m"+y,i="",o=!0;if(x(y+1),i+="var "+a+";if("+e.attributes[""].value+"){"+N(a,e,r)+"}",null!==t)for(var l=t.children,u=n+1;u<l.length;){var d=l[u];if("else-if"===d.name)i+="else if("+d.attributes[""].value+"){"+N(a,d,r)+"}",l.splice(u,1);else{if("else"!==d.name)break;i+="else{"+N(a,d,r)+"}",o=!1,l.splice(u,1)}}return o&&(i+="else{"+a+"=m["+r.length+"];}",r.push({prelude:"",node:"{type:"+b.text+',name:"text",data:{"":"",children:[]}}',isStatic:!0})),{prelude:i,node:a,isStatic:!1}}(e,t,n,r);if("for"===i)return function(e,t){var n,r,a="m"+y,i=e.attributes,o=i[""].value.split(","),l=i.of,u=i.in;x(y+1);var d,s=A(e.children[0],e,0,t);return s.isStatic?(d=a+".push(m["+t.length+"]);",t.push(s)):d=s.prelude+a+".push("+s.node+");",r=void 0===l?(u=u.value,"for(var "+(n=o[0])+" in "+u+"){"+(2===o.length?"var "+o[1]+"="+u+"["+n+"];":"")+d+"}"):(l=l.value,"for(var "+(n=2===o.length?o[1]:"mi")+"=0;"+n+"<"+l+".length;"+n+"++){var "+o[0]+"="+l+"["+n+"];"+d+"}"),{prelude:"var "+a+"=[];"+r,node:"{type:"+b.element+',name:"span",data:{children:'+a+"}}",isStatic:!1}}(e,r);a="text"===i?b.text:i[0]===i[0].toLowerCase()?b.element:b.component;var l=e.attributes,u="",d="{",s="";for(var f in l){var v=l[f];"@"!==f[0]&&v.isStatic||(o=!1),d+=s+'"'+f+'":'+v.value,s=","}if(void 0===l.children){var c=e.children,p=[];d+=s+"children:[",s="";for(var h=0;h<c.length;h++){var m=A(c[h],e,h,r);m.isStatic||(o=!1),p.push(m)}for(var g=0;g<p.length;g++){var w=p[g];o||!w.isStatic?(u+=w.prelude,d+=s+w.node):(d+=s+"m["+r.length+"]",r.push(w)),s=","}d+="]"}return{prelude:u,node:"{type:"+a+',name:"'+i+'",data:'+d+"}}",isStatic:o}}function i(e){var t=[];x(0);var n=A(e,null,0,t),r=n.prelude,a=n.node;if(n.isStatic)return"if(m[0]===undefined){"+r+"m[0]="+a+";}return m[0];";if(0===t.length)return r+"return "+a+";";for(var i="if(m[0]===undefined){",o=0;o<t.length;o++){var l=t[o];i+=l.prelude+"m["+o+"]="+l.node+";"}return""+(i+="}")+r+"return "+a+";"}function d(e){return i(a(n(e)))}var v,c,p,L,o={},h={},m={};function g(e){c=e}var M=[],$={updateText:0,updateData:1,appendNode:2,removeNode:3,replaceNode:4};function _(u){var d,s=[];return u.type===b.text?d=document.createTextNode(u.data[""]):function(){var i=u.data;d=document.createElement(u.name);for(var e=i.children,t=0;t<e.length;t++){var n=_(e[t]);d.appendChild(n.element),s.push(n)}function r(n){var e=i[n];if(64===n.charCodeAt(0)){o[n]=e;var t=l[n]=function(e){var t=o[n];t[0](e,t[1])};d.addEventListener(n.slice(1),t)}else if("ariaset"===n||"dataset"===n||"style"===n){var r=d[n];for(var a in e)"ariaset"===n?d.setAttribute("aria-"+a,e[a]):r[a]=e[a]}else"children"!==n&&(d[n]=e)}var o=d.MoonEvents={},l=d.MoonListeners={};for(var a in i)r(a)}(),{element:d,node:u,children:s}}function w(e,t,n){for(;;){var r=e.pop(),a=r.node,i=t.pop();if(a!==i)if(a.name!==i.name)n.push({type:$.replaceNode,nodeOld:r,nodeNew:i,nodeParent:null});else if(a.type===b.text)a.data[""]!==i.data[""]&&n.push({type:$.updateText,nodeOld:r,nodeNew:i,nodeParent:null});else{n.push({type:$.updateData,nodeOld:r,nodeNew:i,nodeParent:null});var o=r.children,l=i.data.children,u=o.length,d=l.length;if(u===d)for(var s=0;s<u;s++)e.push(o[s]),t.push(l[s]);else if(d<u){for(var f=0;f<d;f++)e.push(o[f]),t.push(l[f]);for(var v=d;v<u;v++)n.push({type:$.removeNode,nodeOld:o[v],nodeNew:null,nodeParent:r})}else{for(var c=0;c<u;c++)e.push(o[c]),t.push(l[c]);for(var p=u;p<d;p++)n.push({type:$.appendNode,nodeOld:null,nodeNew:l[p],nodeParent:r})}}if(0===e.length){O(n);break}if(16<=performance.now()-L){requestAnimationFrame(function(){L=performance.now(),w(e,t,n)});break}}}function O(e){for(var t=0;t<e.length;t++){var n=e[t];switch(n.type){case $.updateText:var r=n.nodeOld,a=n.nodeNew;r.element.data=a.data[""],r.node=a;break;case $.updateData:var i=n.nodeOld,o=i.node.data,l=i.element,u=n.nodeNew,d=u.data;for(var s in d){var f=o[s],v=d[s];if(f!==v)if(64===s.charCodeAt(0))l.MoonEvents[s]=v;else if("ariaset"===s||"dataset"===s||"style"===s){var c=l[s];for(var p in v)"ariaset"===s?l.setAttribute("aria-"+p,v[p]):c[p]=v[p];if(void 0!==f)for(var h in f)h in v||("ariaset"===s?l.removeAttribute("aria-"+h):"dataset"===s?delete c[h]:c[h]="")}else"children"!==s&&(l[s]=v)}for(var m in o)if(!(m in d)){var g=o[m];if(64===m.charCodeAt(0))delete l.MoonEvents[m],l.removeEventListener(l.MoonListeners[m]);else if("ariaset"===m||"dataset"===m||"style"===m){var w=l[m];for(var b in g)"ariaset"===m?l.removeAttribute("aria-"+b):"dataset"===m?delete w[b]:w[b]=""}else l.removeAttribute(m)}i.node=u;break;case $.appendNode:var y=n.nodeParent,x=_(n.nodeNew);y.element.appendChild(x.element),y.children.push(x);break;case $.removeNode:var N=n.nodeParent;N.element.removeChild(N.children.pop().element);break;case $.replaceNode:var A=n.nodeOld,O=A.element,S=_(n.nodeNew),C=S.element;O.parentNode.replaceChild(C,O),A.element=C,A.node=S.node,A.children=S.children}}M.shift(),0!==M.length&&(16<=performance.now()-L?requestAnimationFrame(function(){L=performance.now(),z()}):z())}function z(){var e=M[0];for(var t in e)o[t]=e[t];var n=p(o);g(n),function e(t,n,r){for(;;){var a=t.pop(),i=n.pop(),o=r.pop();a.type===b.component&&(a=h[a.name](a.data),null===i?g(a):i.data.children[o]=a);for(var l=a.data.children,u=0;u<l.length;u++)t.push(l[u]),n.push(a),r.push(u);if(0===t.length){w([v],[c],[]);break}if(16<=performance.now()-L){requestAnimationFrame(function(){L=performance.now(),e(t,n,r)});break}}}([n],[null],[0])}function T(e){M.push(e),1===M.length&&requestAnimationFrame(function(){L=performance.now(),z()})}function e(t){var n=function(e,t){return void 0===e?t:e}(t.name,"Root");delete t.name;var r=t.view;delete t.view,"string"==typeof r&&(r=new Function("m","data",d(r))),m[n]=[];function e(e){return r(m[n],function(e,t){var n={};for(var r in e)n[r]=e[r];for(var a in t)a in e||(n[a]=t[a]);return n}(e,t))}if("Root"===n){var a="string"==typeof t.root?document.querySelector(t.root):t.root;delete t.root;for(var i=a.attributes,o={children:[]},l=0;l<i.length;l++){var u=i[l];o[u.name]=u.value}!function(e){v=e}({element:a,node:{type:b.element,name:a.tagName.toLowerCase(),data:o},children:[]}),function(e){p=e}(e),T(t)}else h[n]=e}return e.lex=n,e.parse=a,e.generate=i,e.compile=d,e.components=h,e.get=o,e.set=T,e});
\ No newline at end of file
diff --git a/packages/moon/src/compiler/lexer/lexer.js b/packages/moon/src/compiler/lexer/lexer.js
index b1459894..45bd2a10 100644
--- a/packages/moon/src/compiler/lexer/lexer.js
+++ b/packages/moon/src/compiler/lexer/lexer.js
@@ -313,12 +313,23 @@ export function lex(input) {
 			// expression token.
 			let expression = "";
 
+			// Keep a stack of opened objects.
+			let opened = 0;
+
 			// Consume the input until the end of the expression.
 			for (i += 1; i < input.length; i++) {
 				const char = input[i];
 
-				if (char === "}") {
-					break;
+				if (char === "{") {
+					opened += 1;
+					expression += char;
+				} else if (char === "}") {
+					if (opened === 0) {
+						break;
+					} else {
+						opened -= 1;
+						expression += char;
+					}
 				} else {
 					expression += char;
 				}
diff --git a/packages/moon/test/compiler/lexer.test.js b/packages/moon/test/compiler/lexer.test.js
index f3c7b9fa..f90bc9ac 100644
--- a/packages/moon/test/compiler/lexer.test.js
+++ b/packages/moon/test/compiler/lexer.test.js
@@ -43,7 +43,7 @@ test("lex text inside tag", () => {
 })
 
 test("lex expression", () => {
-	expect(lex(`{data + 1}`)).toEqual([{"attributes": {"": {"value": "data.data + 1", isStatic: false}}, "closed": true, "type": "tagOpen", "value": "text"}]);
+	expect(lex(`{data + 1 + {foo: true, bar: false}}`)).toEqual([{"attributes": {"": {"value": "data.data + 1 + {foo: true, bar: false}", isStatic: false}}, "closed": true, "type": "tagOpen", "value": "text"}]);
 });
 
 test("lex attributes", () => {