From eb3cc86a043da45a01740d7da77c2998264c250b Mon Sep 17 00:00:00 2001
From: Kabir Shah <simplecooldude1@gmail.com>
Date: Sat, 18 Mar 2017 15:36:19 -0700
Subject: [PATCH] allow $ and @ signs in templates

---
 dist/moon.js     | 2 +-
 dist/moon.min.js | 2 +-
 src/util/util.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dist/moon.js b/dist/moon.js
index 8892f094..e17db775 100644
--- a/dist/moon.js
+++ b/dist/moon.js
@@ -188,7 +188,7 @@
      * @return {String} compiled template
      */
     var compileTemplate = function (template, isString) {
-      var TEMPLATE_RE = /{{([A-Za-z0-9_]+)([A-Za-z0-9_.()'"+\-*/\s\[\]]+)?}}/gi;
+      var TEMPLATE_RE = /{{([A-Za-z0-9_$@]+)([A-Za-z0-9_.()'"+\-*/\s\[\]]+)?}}/gi;
       var compiled = template;
       template.replace(TEMPLATE_RE, function (match, key, modifiers) {
         if (!modifiers) {
diff --git a/dist/moon.min.js b/dist/moon.min.js
index d01a6beb..081f9ccf 100644
--- a/dist/moon.min.js
+++ b/dist/moon.min.js
@@ -5,4 +5,4 @@
 * Free to use under the MIT license.
 * https://kingpixil.github.io/license
 */
-!function(e,t){"object"==typeof module&&module.exports?module.exports=t():e.Moon=t()}(this,function(){"use strict";function e(e){this.instance=e,this.cache={}}function t(t){this.$opts=t||{},this.$id=s++,this.$name=this.$opts.name||"root",this.$data=this.$opts.data||{},this.$render=this.$opts.render||w,this.$hooks=this.$opts.hooks||{},this.$methods=this.$opts.methods||{},this.$events={},this.$dom={},this.$observer=new e(this),this.$destroyed=!1,this.$initialRender=!0,this.$queued=!1,this.$opts.computed&&a(this,this.$opts.computed),this.init()}var n={},r={},o={},i={stop:"event.stopPropagation();",prevent:"event.preventDefault();",ctrl:"if(!event.ctrlKey) {return;};",shift:"if(!event.shiftKey) {return;};",alt:"if(!event.altKey) {return;};",enter:"if(event.keyCode !== 13) {return;};"},s=0,a=function(e,t){var n=function(n){e.$observer.cache[n]={dirty:!0,getter:t[n].get,cache:null};var r={get:function(){return e.$observer.getComputed(n)}};t[n].set&&(r.set=function(r){return t[n].set.call(e,r)}),Object.defineProperty(e.$data,n,r)};for(var r in t)n(r)};e.prototype.getComputed=function(e){if(this.cache[e].dirty){var t=this.cache[e].getter.call(this.instance);return this.cache[e].cache=t,t}return this.cache[e].cache},e.prototype.notify=function(){u(this.instance)};var c=function(e){t.config.silent||console.log(e)},p=function(e){console.error("[Moon] ERR: "+e)},u=function(e){e.$queued||e.$destroyed||(e.$queued=!0,setTimeout(function(){e.build(),S(e,"updated"),e.$queued=!1},0))},l=function(e){for(var t={},n=e.attributes,r=n.length;r--;)t[n[r].name]=n[r].value;return e.__moon__props__=t,t},f=function(){return{shouldRender:!0,eventListeners:{}}},h=function(e){var t=/\n/g,n=/"/g,r=/\\/g;return e.replace(r,"\\\\").replace(n,'\\"').replace(t,"\\n")},d=function(e,t,n,r){var o;n.replace(/\[(\w+)\]/g,function(e,t){n=n.replace(e,"."+t)});var i=n.split(".");for(o=0;o<i.length-1;o++){var s=i[o];t=t[s]}return t[i[o]]=r,t},v=function(e,t){var n=/{{([A-Za-z0-9_]+)([A-Za-z0-9_.()'"+\-*\/\s\[\]]+)?}}/gi,r=e;return e.replace(n,function(e,n,o){o||(o=""),r=t?r.replace(e,'" + instance.get("'+n+'")'+o+' + "'):r.replace(e,'instance.get("'+n+'")'+o)}),r},m=function(e){var t={};if(!e)return t;var n="default";t[n]=[];for(var r=0;r<e.length;r++){var o=e[r],i=o.props.attrs;i.slot?(t[i.slot]?t[i.slot].push(o):t[i.slot]=[o],delete i.slot):t[n].push(o)}return t},y=function(e,t,n,r,o){return{type:e,val:t,props:n,children:r,meta:o||f()}},g=function(e,t,n,r,o){var i=o.opts.data||{};if(o.opts.props)for(var s=0;s<o.opts.props.length;s++){var a=o.opts.props[s];i[a]=t.attrs[a]}return o.opts.render($,{data:i,slots:m(r)})},$=function(e,t,n){for(var r=[],i=arguments.length-3,s=0;s<i;s++){var a=arguments[s+3];Array.isArray(a)?r=r.concat(a):"string"==typeof a||null===a?r.push(y("#text",a||"",{attrs:{}},[],f())):r.push(a)}if(o[e]){if(o[e].opts.functional)return g(e,t,n,r,o[e]);n.component=o[e]}return y(e,"",t,r,n)},_=function(e,t,n){var r=t.meta.eventListeners;for(var o in r)for(var i=0;i<r[o].length;i++){var s=r[o][i];e.addEventListener(o,s)}},x=function(e,t){var n;if("#text"===e.type)n=document.createTextNode(e.val);else{if(n=e.meta.isSVG?document.createElementNS("http://www.w3.org/2000/svg",e.type):document.createElement(e.type),1===e.children.length&&"#text"===e.children[0].type)n.textContent=e.children[0].val;else for(var r=0;r<e.children.length;r++){var o=e.children[r],i=x(e.children[r],t);n.appendChild(i),o.meta.component&&k(i,o,o.meta.component)}_(n,e,t)}return n.__moon__props__=C({},e.props.attrs),b(n,{},e,e.props.attrs),n.__moon__nodeName__=e.type,n},k=function(e,t,n){for(var r=new n.CTor,o=0;o<r.$props.length;o++){var i=r.$props[o];r.$data[i]=t.props.attrs[i]}return r.$slots=m(t.children),r.$el=e,r.build(),S(r,"mounted"),r.$el},b=function(e,t,r,o){var i=G(t,o),s=e instanceof SVGElement;for(var a in i)!o[a]||n[a]?(n[a]&&n[a](e,i[a],r),s?e.removeAttributeNS(null,a):e.removeAttribute(a),delete e.__moon__props__[a]):t[a]&&t[a]===o[a]||(s?e.setAttributeNS(null,a,o[a]):e.setAttribute(a,o[a]),e.__moon__props__[a]=o[a]);if(r.props.dom)for(var c in r.props.dom){r.props.dom[c];e[c]!==r.props.dom[c]&&(e[c]=r.props.dom[c])}},A=function(e,t,n,r){var o;if(e&&(o=e.__moon__nodeName__||e.nodeName.toLowerCase()),!e&&t){var i=x(t,r);return n.appendChild(i),t.meta.component&&k(i,t,t.meta.component),i}if(t){if(o!==t.type){var i=x(t,r);return n.replaceChild(i,e),e.__moon__&&e.__moon__.destroy(),t.meta.component&&k(i,t,t.meta.component),i}if(t.meta.shouldRender&&"#text"===t.type&&"#text"===o&&t.val!==e.textContent)return e.textContent=t.val,e;if(t&&"#text"!==t.type&&t.meta.shouldRender){if(t.meta.component){if(e.__moon__){var s=e.__moon__,a=!1;for(var c in t.props.attrs)s.$data[c]!==t.props.attrs[c]&&(s.$data[c]=t.props.attrs[c],a=!0);t.children&&(s.$slots=m(t.children),a=!0),a&&s.build()}else k(e,t,t.meta.component);return e}var p=e.__moon__props__||l(e);if(b(e,p,t,t.props.attrs),r.$initialRender&&_(e,t,r),t.props.dom&&t.props.dom.innerHTML)return e;var u=e.firstChild;if(1===t.children.length&&"#text"===t.children[0].type&&u&&!u.nextSibling&&"#text"===u.nodeName&&t.children[0].val!==u.textContent)u.textContent=t.children[0].val;else for(var f=0;f<t.children.length||u;f++){var h=u?u.nextSibling:null;A(u,t.children[f],e,r),u=h}return e}return e}return n.removeChild(e),e.__moon__&&e.__moon__.destroy(),null},C=function(e,t){for(var n in t)e[n]=t[n];return e},G=function(e,t){var n={};for(var r in e)n[r]=e[r];for(var r in t)n[r]=t[r];return n},S=function(e,t){var n=e.$hooks[t];n&&n.call(e)},w=function(){},L=function(e){var t={input:e,current:0,tokens:[]};return R(t),t.tokens},R=function(e){for(var t=e.input,n=t.length;e.current<n;)"<"===t.charAt(e.current)?"<!--"!==t.substr(e.current,4)?T(e):E(e):O(e)},O=function(e){var t=e.input,n=t.length,r=t.indexOf("<",e.current);return r===-1?(e.tokens.push({type:"text",value:t.slice(e.current)}),void(e.current=n)):void(r!==e.current&&(e.tokens.push({type:"text",value:t.slice(e.current,r)}),e.current=r))},E=function(e){var t=e.input,n=t.length;e.current+=4;var r=t.indexOf("-->",e.current);return r===-1?(e.tokens.push({type:"comment",value:t.slice(e.current)}),void(e.current=n)):(e.tokens.push({type:"comment",value:t.slice(e.current,r)}),void(e.current=r+3))},T=function(e){var t=e.input,n=(t.length,"/"===t.charAt(e.current+1));e.tokens.push({type:"tagStart",close:n}),e.current+=n?2:1;var r=j(e);N(e);var o="/"===t.charAt(e.current);e.tokens.push({type:"tagEnd",close:!1}),e.current+=o?2:1,o&&(e.tokens.push({type:"tagStart",close:!0}),e.tokens.push({type:"tag",value:r}),e.tokens.push({type:"attribute",value:{}}),e.tokens.push({type:"tagEnd",close:!1}))},j=function(e){for(var t=e.input,n=t.length,r=e.current;r<n;){var o=t.charAt(r);if("/"!==o&&">"!==o&&" "!==o)break;r++}for(var i=r;i<n;){var o=t.charAt(i);if("/"===o||">"===o||" "===o)break;i++}var s=t.slice(r,i);return e.tokens.push({type:"tag",value:s}),e.current=i,s},N=function(e){for(var t=e.input,n=t.length,r=e.current,o={},i=t.charAt(r),s=t.charAt(r+1),a=function(){r++,i=t.charAt(r),s=t.charAt(r+1)};r<n&&">"!==i&&("/"!==i||">"!==s);)if(" "!==i){for(var c="",p=!1;"="!==i&&r<n;){if(!(" "!==i&&">"!==i||"/"===i&&">"!==s)){p=!0;break}c+=i,a()}if(p)o[c]="";else{var u="",l=" ";for(a(),"'"===i||'"'===i?(l=i,a()):u+=i;(i!==l&&">"!==i||"/"===i&&">"!==s)&&r<n;)u+=i,a();o[c]=u,a()}}else a();e.current=r,e.tokens.push({type:"attribute",value:o})},D=function(e){for(var t={type:"ROOT",children:[]},n={current:0,tokens:e};n.current<e.length;){var r=V(n);r&&t.children.push(r)}return t},M=["area","base","br","command","embed","hr","img","input","keygen","link","meta","param","source","track","wbr"],q=["svg","animate","circle","clippath","cursor","defs","desc","ellipse","filter","font-face","foreignObject","g","glyph","image","line","marker","mask","missing-glyph","path","pattern","polygon","polyline","rect","switch","symbol","text","textpath","tspan","use","view"],P=function(e,t,n){return{type:e,props:t,children:n}},V=function(e){var t=e.tokens[e.current],n=e.tokens[e.current-1],r=e.tokens[e.current+1],o=e.tokens[e.current+2],i=e.tokens[e.current+3],s=function(i){e.current+=void 0===i?1:i,t=e.tokens[e.current],n=e.tokens[e.current-1],r=e.tokens[e.current+1],o=e.tokens[e.current+2]};if("text"===t.type)return s(),n.value;if("comment"===t.type)return void s();if("tagStart"===t.type&&!t.close&&!i.close){var a=P(r.value,o.value,[]);r.value;if(s(4),q.indexOf(a.type)!==-1&&(a.isSVG=!0),M.indexOf(a.type)!==-1)return a;e.current;if(t){for(;"tagStart"!==t.type||"tagStart"===t.type&&!t.close;){var c=V(e);if(c&&a.children.push(c),s(0),!t){p('The element "'+a.type+'" was left unclosed.');break}}s()}return a}s()},H=function(e){var t=e.props.attrs,o="{attrs: {";if(t){for(var i in t)if(n[i]&&(e.dynamic=!0),r[i])r[i].afterGenerate&&(e.specialDirectivesAfter?e.specialDirectivesAfter[i]=t[i]:(e.specialDirectivesAfter={},e.specialDirectivesAfter[i]=t[i])),r[i].beforeGenerate&&r[i].beforeGenerate(t[i],e),r[i].duringPropGenerate&&(o+=r[i].duringPropGenerate(t[i],e)),e.dynamic=!0,delete t[i];else{var s=JSON.stringify(t[i]),a=v(s,!0);s!==a&&(e.dynamic=!0),o+='"'+i+'": '+a+", "}Object.keys(t).length?o=o.slice(0,-2)+"}":o+="}"}var c=e.props.dom;if(c){e.dynamic=!0,o+=", dom: {";for(var p in c)o+='"'+p+'": '+c[p]+", ";o=o.slice(0,-2)+"}"}return o+="}"},K=function(e){if(0===Object.keys(e).length)return"{}";var t="{";for(var n in e)t+='"'+n+'": ['+F(e[n])+"], ";return t=t.slice(0,-2)+"}"},z=function(e){var t="{";for(var n in e)t+="eventListeners"===n?'"'+n+'": '+K(e[n])+", ":'"'+n+'": '+e[n]+", ";return t=t.slice(0,-2)+"}"},F=function(e){for(var t="",n=0;n<e.length;n++)t+=e[n]+", ";return t=t.slice(0,-2)},Z=function(e){var t='h("'+e.type+'", ';t+=H(e)+", ";var n=e.children.map(J);return 1!==e.children.length||1!==n.length||"string"!=typeof e.children[0]||'"'+e.children[0]+'"'!==n[0]||e.dynamic||(e.meta.shouldRender="instance.$initialRender"),t+=z(e.meta),t+=n.length?", "+F(n):"",t+=")"},J=function(e){var t="";if("string"==typeof e)t+='"'+v(h(e),!0)+'"';else{e.meta||(e.meta=f(),e.isSVG&&(e.meta.isSVG=!0)),e.props={attrs:e.props};var n="slot"===e.type?"instance.$slots['"+(e.props.attrs.name||"default")+"']":Z(e);if(e.specialDirectivesAfter)for(var o in e.specialDirectivesAfter)n=r[o].afterGenerate(e.specialDirectivesAfter[o],n,e);t+=n}return t},B=function(e){var t=e.children[0],n="var instance = this; return "+J(t);try{return new Function("h",n)}catch(e){return p("Could not create render function"),w}},I=function(e){var t=L(e),n=D(t);return B(n)};return t.prototype.get=function(e){return this.$data[e]},t.prototype.set=function(e,t){d(this,this.$data,e,t),this.$observer.notify()},t.prototype.destroy=function(){this.removeEvents(),this.$el=null,this.$destroyed=!0,S(this,"destroyed")},t.prototype.callMethod=function(e,t){t=t||[],this.$methods[e].apply(this,t)},t.prototype.on=function(e,t){this.$events[e]?this.$events[e].push(t):this.$events[e]=[t]},t.prototype.off=function(e,t){var n=this.$events[e].indexOf(t);n!==-1&&this.$events[e].splice(n,1)},t.prototype.removeEvents=function(){for(var e in this.$events)this.$events[e]=[]},t.prototype.emit=function(e,t){if(t=t||{},t.type=e,this.$events["*"])for(var n=0;n<this.$events["*"].length;n++){var r=this.$events["*"][n];r(t)}for(var n=0;n<this.$events[e].length;n++){var o=this.$events[e][n];o(t)}},t.prototype.renderLoop=function(e,t){for(var n=[],r=0;r<e.length;r++)n.push(t(e[r],r));return n},t.prototype.renderClass=function(e){if("string"==typeof e)return e;var t="";if(Array.isArray(e))for(var n=0;n<e.length;n++)t+=this.renderClass(e[n])+" ";else if("object"==typeof e)for(var r in e)e[r]&&(t+=r+" ");return t=t.slice(0,-1)},t.prototype.mount=function(e){this.$el=document.querySelector(e),this.$destroyed=!1,this.$el||p("Element "+this.$opts.el+" not found"),this.$el.__moon__=this,this.$template=this.$opts.template||this.$el.outerHTML,this.$render===w&&(this.$render=t.compile(this.$template)),this.build(),S(this,"mounted")},t.prototype.render=function(){return this.$render($)},t.prototype.patch=function(e,t,n){var r=A(e,t,n,this);e!==r&&(this.$el=r,this.$el.__moon__=this),this.$initialRender=!1},t.prototype.build=function(){this.$dom=this.render(),this.patch(this.$el,this.$dom,this.$el.parentNode)},t.prototype.init=function(){c("======= Moon ======="),S(this,"init"),this.$opts.el&&this.mount(this.$opts.el)},t.config={silent:"undefined"==typeof console,prefix:"m-",keyCodes:function(e){for(var t in e)i[t]="if(event.keyCode !== "+e[t]+") {return;};"}},t.version="0.6.2",t.util={noop:w,error:p,log:c,merge:G,extend:C},t.use=function(e){e.init(t)},t.compile=function(e){return I(e)},t.nextTick=function(e){setTimeout(e,0)},t.directive=function(e,r){n[t.config.prefix+e]=r},t.component=function(e,n){function r(){t.call(this,n)}var i=this;return n.name=e,r.prototype=Object.create(i.prototype),r.prototype.constructor=r,r.prototype.init=function(){S(this,"init"),this.$destroyed=!1,this.$props=this.$opts.props||[],this.$template=this.$opts.template,this.$render===w&&(this.$render=t.compile(this.$template))},o[e]={CTor:r,opts:n},r},r[t.config.prefix+"if"]={afterGenerate:function(e,t,n){return"("+v(e,!1)+") ? "+t+" : ''"}},r[t.config.prefix+"for"]={afterGenerate:function(e,t,n){var r=e.split(" in "),o=r[0].split(","),i=v(r[1],!1),s=o.join(",");return t.replace(/instance\.get\("([^"]+)"\)/g,function(e,n){o.indexOf(n)!==-1&&(t=t.replace(new RegExp('instance.get\\("'+n+'"\\)',"g"),n))}),"instance.renderLoop("+i+", function("+s+") { return "+t+"; })"}},r[t.config.prefix+"on"]={beforeGenerate:function(e,t){e=v(e,!1);var n=e.split(":"),r=n[0].split("."),o=r[0],s=n[1],a="event",c=s.split("(");c.length>1&&(s=c.shift(),a=c.join("(").slice(0,-1));var p="";r.shift();for(var u=0;u<r.length;u++)p+=i[r[u]];var l="function(event) {"+p+'instance.callMethod("'+s+'", ['+a+"])}";t.meta.eventListeners[o]?t.meta.eventListeners[o].push(l):t.meta.eventListeners[o]=[l]}},r[t.config.prefix+"model"]={beforeGenerate:function(e,t){var n=v(e,!0),r="input",o="value";"checkbox"===t.props.attrs.type&&(r="change",o="checked");var i='function(event) {instance.set("'+n+'", event.target.'+o+")}";t.meta.eventListeners[r]?t.meta.eventListeners[r].push(i):t.meta.eventListeners[r]=[i];var s=v("{{"+v(e,!1)+"}}",!1);t.props.dom||(t.props.dom={}),t.props.dom[o]=s}},r[t.config.prefix+"literal"]={duringPropGenerate:function(e,t){var n=e.split(":"),r=n.shift(),o=n.join(":");return t.props.attrs[r]=!0,"class"===r?'"class": instance.renderClass('+v(o,!1)+"), ":'"'+r+'": '+v(o,!1)+", "}},r[t.config.prefix+"once"]={beforeGenerate:function(e,t){t.meta.shouldRender="instance.$initialRender"}},r[t.config.prefix+"pre"]={beforeGenerate:function(e,t){t.meta.shouldRender=!1}},r[t.config.prefix+"html"]={beforeGenerate:function(e,t){t.props.dom||(t.props.dom={}),t.props.dom.innerHTML='"'+v(e,!0)+'"'}},r[t.config.prefix+"text"]={beforeGenerate:function(e,t){t.children=[e]}},n[t.config.prefix+"show"]=function(e,t,n){var r=new Function("return "+t);r()?e.style.display="block":e.style.display="none"},n[t.config.prefix+"mask"]=function(e,t,n){},t});
\ No newline at end of file
+!function(e,t){"object"==typeof module&&module.exports?module.exports=t():e.Moon=t()}(this,function(){"use strict";function e(e){this.instance=e,this.cache={}}function t(t){this.$opts=t||{},this.$id=s++,this.$name=this.$opts.name||"root",this.$data=this.$opts.data||{},this.$render=this.$opts.render||w,this.$hooks=this.$opts.hooks||{},this.$methods=this.$opts.methods||{},this.$events={},this.$dom={},this.$observer=new e(this),this.$destroyed=!1,this.$initialRender=!0,this.$queued=!1,this.$opts.computed&&a(this,this.$opts.computed),this.init()}var n={},r={},o={},i={stop:"event.stopPropagation();",prevent:"event.preventDefault();",ctrl:"if(!event.ctrlKey) {return;};",shift:"if(!event.shiftKey) {return;};",alt:"if(!event.altKey) {return;};",enter:"if(event.keyCode !== 13) {return;};"},s=0,a=function(e,t){var n=function(n){e.$observer.cache[n]={dirty:!0,getter:t[n].get,cache:null};var r={get:function(){return e.$observer.getComputed(n)}};t[n].set&&(r.set=function(r){return t[n].set.call(e,r)}),Object.defineProperty(e.$data,n,r)};for(var r in t)n(r)};e.prototype.getComputed=function(e){if(this.cache[e].dirty){var t=this.cache[e].getter.call(this.instance);return this.cache[e].cache=t,t}return this.cache[e].cache},e.prototype.notify=function(){u(this.instance)};var c=function(e){t.config.silent||console.log(e)},p=function(e){console.error("[Moon] ERR: "+e)},u=function(e){e.$queued||e.$destroyed||(e.$queued=!0,setTimeout(function(){e.build(),S(e,"updated"),e.$queued=!1},0))},l=function(e){for(var t={},n=e.attributes,r=n.length;r--;)t[n[r].name]=n[r].value;return e.__moon__props__=t,t},f=function(){return{shouldRender:!0,eventListeners:{}}},h=function(e){var t=/\n/g,n=/"/g,r=/\\/g;return e.replace(r,"\\\\").replace(n,'\\"').replace(t,"\\n")},d=function(e,t,n,r){var o;n.replace(/\[(\w+)\]/g,function(e,t){n=n.replace(e,"."+t)});var i=n.split(".");for(o=0;o<i.length-1;o++){var s=i[o];t=t[s]}return t[i[o]]=r,t},v=function(e,t){var n=/{{([A-Za-z0-9_$@]+)([A-Za-z0-9_.()'"+\-*\/\s\[\]]+)?}}/gi,r=e;return e.replace(n,function(e,n,o){o||(o=""),r=t?r.replace(e,'" + instance.get("'+n+'")'+o+' + "'):r.replace(e,'instance.get("'+n+'")'+o)}),r},m=function(e){var t={};if(!e)return t;var n="default";t[n]=[];for(var r=0;r<e.length;r++){var o=e[r],i=o.props.attrs;i.slot?(t[i.slot]?t[i.slot].push(o):t[i.slot]=[o],delete i.slot):t[n].push(o)}return t},y=function(e,t,n,r,o){return{type:e,val:t,props:n,children:r,meta:o||f()}},g=function(e,t,n,r,o){var i=o.opts.data||{};if(o.opts.props)for(var s=0;s<o.opts.props.length;s++){var a=o.opts.props[s];i[a]=t.attrs[a]}return o.opts.render($,{data:i,slots:m(r)})},$=function(e,t,n){for(var r=[],i=arguments.length-3,s=0;s<i;s++){var a=arguments[s+3];Array.isArray(a)?r=r.concat(a):"string"==typeof a||null===a?r.push(y("#text",a||"",{attrs:{}},[],f())):r.push(a)}if(o[e]){if(o[e].opts.functional)return g(e,t,n,r,o[e]);n.component=o[e]}return y(e,"",t,r,n)},_=function(e,t,n){var r=t.meta.eventListeners;for(var o in r)for(var i=0;i<r[o].length;i++){var s=r[o][i];e.addEventListener(o,s)}},x=function(e,t){var n;if("#text"===e.type)n=document.createTextNode(e.val);else{if(n=e.meta.isSVG?document.createElementNS("http://www.w3.org/2000/svg",e.type):document.createElement(e.type),1===e.children.length&&"#text"===e.children[0].type)n.textContent=e.children[0].val;else for(var r=0;r<e.children.length;r++){var o=e.children[r],i=x(e.children[r],t);n.appendChild(i),o.meta.component&&k(i,o,o.meta.component)}_(n,e,t)}return n.__moon__props__=C({},e.props.attrs),b(n,{},e,e.props.attrs),n.__moon__nodeName__=e.type,n},k=function(e,t,n){for(var r=new n.CTor,o=0;o<r.$props.length;o++){var i=r.$props[o];r.$data[i]=t.props.attrs[i]}return r.$slots=m(t.children),r.$el=e,r.build(),S(r,"mounted"),r.$el},b=function(e,t,r,o){var i=G(t,o),s=e instanceof SVGElement;for(var a in i)!o[a]||n[a]?(n[a]&&n[a](e,i[a],r),s?e.removeAttributeNS(null,a):e.removeAttribute(a),delete e.__moon__props__[a]):t[a]&&t[a]===o[a]||(s?e.setAttributeNS(null,a,o[a]):e.setAttribute(a,o[a]),e.__moon__props__[a]=o[a]);if(r.props.dom)for(var c in r.props.dom){r.props.dom[c];e[c]!==r.props.dom[c]&&(e[c]=r.props.dom[c])}},A=function(e,t,n,r){var o;if(e&&(o=e.__moon__nodeName__||e.nodeName.toLowerCase()),!e&&t){var i=x(t,r);return n.appendChild(i),t.meta.component&&k(i,t,t.meta.component),i}if(t){if(o!==t.type){var i=x(t,r);return n.replaceChild(i,e),e.__moon__&&e.__moon__.destroy(),t.meta.component&&k(i,t,t.meta.component),i}if(t.meta.shouldRender&&"#text"===t.type&&"#text"===o&&t.val!==e.textContent)return e.textContent=t.val,e;if(t&&"#text"!==t.type&&t.meta.shouldRender){if(t.meta.component){if(e.__moon__){var s=e.__moon__,a=!1;for(var c in t.props.attrs)s.$data[c]!==t.props.attrs[c]&&(s.$data[c]=t.props.attrs[c],a=!0);t.children&&(s.$slots=m(t.children),a=!0),a&&s.build()}else k(e,t,t.meta.component);return e}var p=e.__moon__props__||l(e);if(b(e,p,t,t.props.attrs),r.$initialRender&&_(e,t,r),t.props.dom&&t.props.dom.innerHTML)return e;var u=e.firstChild;if(1===t.children.length&&"#text"===t.children[0].type&&u&&!u.nextSibling&&"#text"===u.nodeName&&t.children[0].val!==u.textContent)u.textContent=t.children[0].val;else for(var f=0;f<t.children.length||u;f++){var h=u?u.nextSibling:null;A(u,t.children[f],e,r),u=h}return e}return e}return n.removeChild(e),e.__moon__&&e.__moon__.destroy(),null},C=function(e,t){for(var n in t)e[n]=t[n];return e},G=function(e,t){var n={};for(var r in e)n[r]=e[r];for(var r in t)n[r]=t[r];return n},S=function(e,t){var n=e.$hooks[t];n&&n.call(e)},w=function(){},L=function(e){var t={input:e,current:0,tokens:[]};return R(t),t.tokens},R=function(e){for(var t=e.input,n=t.length;e.current<n;)"<"===t.charAt(e.current)?"<!--"!==t.substr(e.current,4)?T(e):E(e):O(e)},O=function(e){var t=e.input,n=t.length,r=t.indexOf("<",e.current);return r===-1?(e.tokens.push({type:"text",value:t.slice(e.current)}),void(e.current=n)):void(r!==e.current&&(e.tokens.push({type:"text",value:t.slice(e.current,r)}),e.current=r))},E=function(e){var t=e.input,n=t.length;e.current+=4;var r=t.indexOf("-->",e.current);return r===-1?(e.tokens.push({type:"comment",value:t.slice(e.current)}),void(e.current=n)):(e.tokens.push({type:"comment",value:t.slice(e.current,r)}),void(e.current=r+3))},T=function(e){var t=e.input,n=(t.length,"/"===t.charAt(e.current+1));e.tokens.push({type:"tagStart",close:n}),e.current+=n?2:1;var r=j(e);N(e);var o="/"===t.charAt(e.current);e.tokens.push({type:"tagEnd",close:!1}),e.current+=o?2:1,o&&(e.tokens.push({type:"tagStart",close:!0}),e.tokens.push({type:"tag",value:r}),e.tokens.push({type:"attribute",value:{}}),e.tokens.push({type:"tagEnd",close:!1}))},j=function(e){for(var t=e.input,n=t.length,r=e.current;r<n;){var o=t.charAt(r);if("/"!==o&&">"!==o&&" "!==o)break;r++}for(var i=r;i<n;){var o=t.charAt(i);if("/"===o||">"===o||" "===o)break;i++}var s=t.slice(r,i);return e.tokens.push({type:"tag",value:s}),e.current=i,s},N=function(e){for(var t=e.input,n=t.length,r=e.current,o={},i=t.charAt(r),s=t.charAt(r+1),a=function(){r++,i=t.charAt(r),s=t.charAt(r+1)};r<n&&">"!==i&&("/"!==i||">"!==s);)if(" "!==i){for(var c="",p=!1;"="!==i&&r<n;){if(!(" "!==i&&">"!==i||"/"===i&&">"!==s)){p=!0;break}c+=i,a()}if(p)o[c]="";else{var u="",l=" ";for(a(),"'"===i||'"'===i?(l=i,a()):u+=i;(i!==l&&">"!==i||"/"===i&&">"!==s)&&r<n;)u+=i,a();o[c]=u,a()}}else a();e.current=r,e.tokens.push({type:"attribute",value:o})},D=function(e){for(var t={type:"ROOT",children:[]},n={current:0,tokens:e};n.current<e.length;){var r=V(n);r&&t.children.push(r)}return t},M=["area","base","br","command","embed","hr","img","input","keygen","link","meta","param","source","track","wbr"],q=["svg","animate","circle","clippath","cursor","defs","desc","ellipse","filter","font-face","foreignObject","g","glyph","image","line","marker","mask","missing-glyph","path","pattern","polygon","polyline","rect","switch","symbol","text","textpath","tspan","use","view"],P=function(e,t,n){return{type:e,props:t,children:n}},V=function(e){var t=e.tokens[e.current],n=e.tokens[e.current-1],r=e.tokens[e.current+1],o=e.tokens[e.current+2],i=e.tokens[e.current+3],s=function(i){e.current+=void 0===i?1:i,t=e.tokens[e.current],n=e.tokens[e.current-1],r=e.tokens[e.current+1],o=e.tokens[e.current+2]};if("text"===t.type)return s(),n.value;if("comment"===t.type)return void s();if("tagStart"===t.type&&!t.close&&!i.close){var a=P(r.value,o.value,[]);r.value;if(s(4),q.indexOf(a.type)!==-1&&(a.isSVG=!0),M.indexOf(a.type)!==-1)return a;e.current;if(t){for(;"tagStart"!==t.type||"tagStart"===t.type&&!t.close;){var c=V(e);if(c&&a.children.push(c),s(0),!t){p('The element "'+a.type+'" was left unclosed.');break}}s()}return a}s()},H=function(e){var t=e.props.attrs,o="{attrs: {";if(t){for(var i in t)if(n[i]&&(e.dynamic=!0),r[i])r[i].afterGenerate&&(e.specialDirectivesAfter?e.specialDirectivesAfter[i]=t[i]:(e.specialDirectivesAfter={},e.specialDirectivesAfter[i]=t[i])),r[i].beforeGenerate&&r[i].beforeGenerate(t[i],e),r[i].duringPropGenerate&&(o+=r[i].duringPropGenerate(t[i],e)),e.dynamic=!0,delete t[i];else{var s=JSON.stringify(t[i]),a=v(s,!0);s!==a&&(e.dynamic=!0),o+='"'+i+'": '+a+", "}Object.keys(t).length?o=o.slice(0,-2)+"}":o+="}"}var c=e.props.dom;if(c){e.dynamic=!0,o+=", dom: {";for(var p in c)o+='"'+p+'": '+c[p]+", ";o=o.slice(0,-2)+"}"}return o+="}"},K=function(e){if(0===Object.keys(e).length)return"{}";var t="{";for(var n in e)t+='"'+n+'": ['+F(e[n])+"], ";return t=t.slice(0,-2)+"}"},z=function(e){var t="{";for(var n in e)t+="eventListeners"===n?'"'+n+'": '+K(e[n])+", ":'"'+n+'": '+e[n]+", ";return t=t.slice(0,-2)+"}"},F=function(e){for(var t="",n=0;n<e.length;n++)t+=e[n]+", ";return t=t.slice(0,-2)},Z=function(e){var t='h("'+e.type+'", ';t+=H(e)+", ";var n=e.children.map(J);return 1!==e.children.length||1!==n.length||"string"!=typeof e.children[0]||'"'+e.children[0]+'"'!==n[0]||e.dynamic||(e.meta.shouldRender="instance.$initialRender"),t+=z(e.meta),t+=n.length?", "+F(n):"",t+=")"},J=function(e){var t="";if("string"==typeof e)t+='"'+v(h(e),!0)+'"';else{e.meta||(e.meta=f(),e.isSVG&&(e.meta.isSVG=!0)),e.props={attrs:e.props};var n="slot"===e.type?"instance.$slots['"+(e.props.attrs.name||"default")+"']":Z(e);if(e.specialDirectivesAfter)for(var o in e.specialDirectivesAfter)n=r[o].afterGenerate(e.specialDirectivesAfter[o],n,e);t+=n}return t},B=function(e){var t=e.children[0],n="var instance = this; return "+J(t);try{return new Function("h",n)}catch(e){return p("Could not create render function"),w}},I=function(e){var t=L(e),n=D(t);return B(n)};return t.prototype.get=function(e){return this.$data[e]},t.prototype.set=function(e,t){d(this,this.$data,e,t),this.$observer.notify()},t.prototype.destroy=function(){this.removeEvents(),this.$el=null,this.$destroyed=!0,S(this,"destroyed")},t.prototype.callMethod=function(e,t){t=t||[],this.$methods[e].apply(this,t)},t.prototype.on=function(e,t){this.$events[e]?this.$events[e].push(t):this.$events[e]=[t]},t.prototype.off=function(e,t){var n=this.$events[e].indexOf(t);n!==-1&&this.$events[e].splice(n,1)},t.prototype.removeEvents=function(){for(var e in this.$events)this.$events[e]=[]},t.prototype.emit=function(e,t){if(t=t||{},t.type=e,this.$events["*"])for(var n=0;n<this.$events["*"].length;n++){var r=this.$events["*"][n];r(t)}for(var n=0;n<this.$events[e].length;n++){var o=this.$events[e][n];o(t)}},t.prototype.renderLoop=function(e,t){for(var n=[],r=0;r<e.length;r++)n.push(t(e[r],r));return n},t.prototype.renderClass=function(e){if("string"==typeof e)return e;var t="";if(Array.isArray(e))for(var n=0;n<e.length;n++)t+=this.renderClass(e[n])+" ";else if("object"==typeof e)for(var r in e)e[r]&&(t+=r+" ");return t=t.slice(0,-1)},t.prototype.mount=function(e){this.$el=document.querySelector(e),this.$destroyed=!1,this.$el||p("Element "+this.$opts.el+" not found"),this.$el.__moon__=this,this.$template=this.$opts.template||this.$el.outerHTML,this.$render===w&&(this.$render=t.compile(this.$template)),this.build(),S(this,"mounted")},t.prototype.render=function(){return this.$render($)},t.prototype.patch=function(e,t,n){var r=A(e,t,n,this);e!==r&&(this.$el=r,this.$el.__moon__=this),this.$initialRender=!1},t.prototype.build=function(){this.$dom=this.render(),this.patch(this.$el,this.$dom,this.$el.parentNode)},t.prototype.init=function(){c("======= Moon ======="),S(this,"init"),this.$opts.el&&this.mount(this.$opts.el)},t.config={silent:"undefined"==typeof console,prefix:"m-",keyCodes:function(e){for(var t in e)i[t]="if(event.keyCode !== "+e[t]+") {return;};"}},t.version="0.6.2",t.util={noop:w,error:p,log:c,merge:G,extend:C},t.use=function(e){e.init(t)},t.compile=function(e){return I(e)},t.nextTick=function(e){setTimeout(e,0)},t.directive=function(e,r){n[t.config.prefix+e]=r},t.component=function(e,n){function r(){t.call(this,n)}var i=this;return n.name=e,r.prototype=Object.create(i.prototype),r.prototype.constructor=r,r.prototype.init=function(){S(this,"init"),this.$destroyed=!1,this.$props=this.$opts.props||[],this.$template=this.$opts.template,this.$render===w&&(this.$render=t.compile(this.$template))},o[e]={CTor:r,opts:n},r},r[t.config.prefix+"if"]={afterGenerate:function(e,t,n){return"("+v(e,!1)+") ? "+t+" : ''"}},r[t.config.prefix+"for"]={afterGenerate:function(e,t,n){var r=e.split(" in "),o=r[0].split(","),i=v(r[1],!1),s=o.join(",");return t.replace(/instance\.get\("([^"]+)"\)/g,function(e,n){o.indexOf(n)!==-1&&(t=t.replace(new RegExp('instance.get\\("'+n+'"\\)',"g"),n))}),"instance.renderLoop("+i+", function("+s+") { return "+t+"; })"}},r[t.config.prefix+"on"]={beforeGenerate:function(e,t){e=v(e,!1);var n=e.split(":"),r=n[0].split("."),o=r[0],s=n[1],a="event",c=s.split("(");c.length>1&&(s=c.shift(),a=c.join("(").slice(0,-1));var p="";r.shift();for(var u=0;u<r.length;u++)p+=i[r[u]];var l="function(event) {"+p+'instance.callMethod("'+s+'", ['+a+"])}";t.meta.eventListeners[o]?t.meta.eventListeners[o].push(l):t.meta.eventListeners[o]=[l]}},r[t.config.prefix+"model"]={beforeGenerate:function(e,t){var n=v(e,!0),r="input",o="value";"checkbox"===t.props.attrs.type&&(r="change",o="checked");var i='function(event) {instance.set("'+n+'", event.target.'+o+")}";t.meta.eventListeners[r]?t.meta.eventListeners[r].push(i):t.meta.eventListeners[r]=[i];var s=v("{{"+v(e,!1)+"}}",!1);t.props.dom||(t.props.dom={}),t.props.dom[o]=s}},r[t.config.prefix+"literal"]={duringPropGenerate:function(e,t){var n=e.split(":"),r=n.shift(),o=n.join(":");return t.props.attrs[r]=!0,"class"===r?'"class": instance.renderClass('+v(o,!1)+"), ":'"'+r+'": '+v(o,!1)+", "}},r[t.config.prefix+"once"]={beforeGenerate:function(e,t){t.meta.shouldRender="instance.$initialRender"}},r[t.config.prefix+"pre"]={beforeGenerate:function(e,t){t.meta.shouldRender=!1}},r[t.config.prefix+"html"]={beforeGenerate:function(e,t){t.props.dom||(t.props.dom={}),t.props.dom.innerHTML='"'+v(e,!0)+'"'}},r[t.config.prefix+"text"]={beforeGenerate:function(e,t){t.children=[e]}},n[t.config.prefix+"show"]=function(e,t,n){var r=new Function("return "+t);r()?e.style.display="block":e.style.display="none"},n[t.config.prefix+"mask"]=function(e,t,n){},t});
\ No newline at end of file
diff --git a/src/util/util.js b/src/util/util.js
index 13b82cae..4fd0934e 100644
--- a/src/util/util.js
+++ b/src/util/util.js
@@ -96,7 +96,7 @@ var resolveKeyPath = function(instance, obj, keypath, val) {
  * @return {String} compiled template
  */
 var compileTemplate = function(template, isString) {
-  var TEMPLATE_RE = /{{([A-Za-z0-9_]+)([A-Za-z0-9_.()'"+\-*/\s\[\]]+)?}}/gi;
+  var TEMPLATE_RE = /{{([A-Za-z0-9_$@]+)([A-Za-z0-9_.()'"+\-*/\s\[\]]+)?}}/gi;
   var compiled = template;
   template.replace(TEMPLATE_RE, function(match, key, modifiers) {
     if(!modifiers) {