Updated tests

test/autotests/hot-reload/component-to-template/temp/index.marko

@@ -1,3 +1,3 @@
-<div class="a">
-    Hello ${state.name}
+<div class="b">
+    Hello ${data.name}
 </div>

test/autotests/hot-reload/template-to-component/temp/index.marko

@@ -1,3 +1,3 @@
-<div class="a">
-    Hello ${data.name}
+<div class="b">
+    Hello ${state.name}
 </div>

test/autotests/render-deprecated/invoke/expected.html

@@ -0,0 +1 @@
+Hello Frank! Hello John!

test/autotests/render-deprecated/invoke/template.marko

@@ -0,0 +1,7 @@
+<script template-helpers>
+function greeting(name, out) {
+    out.write('Hello ' + name + '!');
+}
+</script>
+
+<invoke greeting('Frank', out)/> <invoke greeting('John', out)/>

test/autotests/render-deprecated/var/expected.html

@@ -0,0 +1 @@
+FRANK 3650 []

test/autotests/render-deprecated/var/template.marko

@@ -0,0 +1,3 @@
+<var name='Frank' age=10 foo/>
+
+-- ${name.toUpperCase()} ${age*365} [${foo}]

test/autotests/render-deprecated/var/test.js

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

test/autotests/render-deprecated/whitespace-var-scoped/test.js

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

test/autotests/render/attr-empty/template.marko

@@ -1,3 +1,4 @@
-<var empty=""/>
+$ var empty="";
+
 <img alt="">
 <img alt=empty>

test/autotests/render/attr-value-obj/template.marko

@@ -1,4 +1,4 @@
-var foo = {
+$ var foo = {
     name: 'Frank',
     toString: function() {
         return this.name;

test/autotests/render/attributes-dynamic-custom-tag-mixed/template.marko

@@ -1,2 +1,3 @@
-var attrs={name: 'Frank'}
+$ var attrs={name: 'Frank'};
+
 <test-hello ${attrs} adult=true/>

test/autotests/render/attributes-dynamic-custom-tag/template.marko

@@ -1,2 +1,3 @@
-var attrs={name: 'Frank', adult: true}
+$ var attrs={name: 'Frank', adult: true};
+
 <test-hello ${attrs}/>

test/autotests/render/body-only-if-custom-tag/components/test-hello/template.marko

@@ -1,6 +1,6 @@
 <div class="hello">
     <h1>test-hello</h1>
     <div class="body">
-        <invoke input.renderBody(out) />
+        $ input.renderBody(out);
     </div>
 </div>

test/autotests/render/custom-tag-data-placeholders/template.marko

@@ -1,4 +1,4 @@
-<var dynamic='<Frank>'/>
+$ var dynamic='<Frank>';
 
 <ul>
     <li>

test/autotests/render/for-native/template.marko

@@ -1,7 +1,7 @@
-<script template-helpers>
-var array1 = ['a', 'b', 'c'];
-var array2 = ['red', 'green', 'blue'];
-</script>
+static {
+    var array1 = ['a', 'b', 'c'];
+    var array2 = ['red', 'green', 'blue'];
+}
 
 <var i item>
     <for(i=0; i<array1.length; i++)>

test/autotests/render/helpers-empty-notEmpty-import/template.marko

@@ -1,7 +1,7 @@
-<script template-helpers>
-var notEmpty = require('marko/helpers/notEmpty');
-var empty = require('marko/helpers/empty');
-</script>
+static {
+    var notEmpty = require('marko/helpers/notEmpty');
+    var empty = require('marko/helpers/empty');
+}
 
 <div if(notEmpty(['a', 'b', 'c']))>
     notEmpty-YES

test/autotests/render/include-body-empty/include-target.marko

@@ -3,7 +3,7 @@
         Hello ${input.name}! You have ${input.count} new messages.
     </h1>
     <p if(input.renderBody)>
-        <invoke input.renderBody(out)/>
+        $ input.renderBody(out);
     </p>
     <p else>
         No body!

test/autotests/render/include-body/include-target.marko

@@ -3,6 +3,6 @@
         Hello ${input.name}! You have ${input.count} new messages.
     </h1>
     <p>
-        <invoke input.renderBody(out)/>
+        $ input.renderBody(out);
     </p>
 </div>

test/autotests/render/invoke/expected.html

@@ -1 +1 @@
-Hello Frank! Hello John!
+Hello Frank!Hello John!

test/autotests/render/invoke/template.marko

@@ -1,7 +1,7 @@
-<script template-helpers>
-function greeting(name, out) {
+
+static function greeting(name, out) {
     out.write('Hello ' + name + '!');
 }
-</script>
 
-<invoke greeting('Frank', out)/> <invoke greeting('John', out)/>
+$ greeting('Frank', out);
+$ greeting('John', out);

test/autotests/render/require/template.marko

@@ -1,8 +1,7 @@
----
-<script template-helpers>
+static {
     var testHelpers = require('./test-helpers')
-</script>
-
+}
+---
 Hello ${testHelpers.upperCase("world")}!
 Hello ${testHelpers.trim("   World   ")}!
 ---

test/autotests/render/script-json-stringify/template.marko

@@ -1,4 +1,4 @@
-var basePath='/abc';
+$ var basePath='/abc';
 
 <script type="application/json">
 ${JSON.stringify({

test/autotests/render/scriptlet/template.marko

@@ -1,4 +1,5 @@
-<var a=4/>
+$ var a=4;
+
 ---
 <% a=10 %>
 ${a}

test/autotests/render/simple/template.marko

@@ -1,6 +1,8 @@
-<var rootClass=input.rootClass
-     colors=input.colors
-     message=input.message />
+$ {
+    var rootClass=input.rootClass,
+         colors=input.colors,
+         message=input.message;
+}
 
 <div class="hello-world ${rootClass}">
     ${message}

test/autotests/render/space-in-complex-attr-value/template.marko

@@ -1,2 +1,3 @@
 var a = 1, b = 1 + 1, c = 4 - 1, d = 'a' instanceof Boolean, e = 5 * 5 + 5 - 2 / 2, f = typeof 'foo' === 'string';
+
 <div>${a},${b},${c},${d},${e},${f}</div>

test/autotests/render/string-expressions/template.marko

@@ -1,2 +1,3 @@
-<var name=input.name count=input.count/>
+$ var name=input.name, count=input.count;
+
 -- ${name != null ? "Hello ${name.toUpperCase()}! You have ${count} new messages." : null}

test/autotests/render/syntax-concise/tabs/template.marko

@@ -1,4 +1,4 @@
-<var tabs=input.tabs/>
+$ var tabs=input.tabs;
 
 <div class="tabs">
     <ul>
@@ -8,7 +8,11 @@
     </ul>
     <div class="tab-content">
         <div class="tab" for(tab in tabs)>
-            <invoke tab.renderBody(out) if(tab.renderBody)/>
+            $ {
+                if(tab.renderBody) {
+                    tab.renderBody(out);
+                }
+            }
         </div>
     </div>
 </div>

test/autotests/render/syntax-concise/template.marko

@@ -1,5 +1,5 @@
-var pageTitle="Marko Templating Engine"
-var currentPage='home'
+$ var pageTitle="Marko Templating Engine"
+$ var currentPage='home'
 
 <!DOCTYPE html>
 html lang="en"

test/autotests/render/syntax-mixed/tabs/template.marko

@@ -1,4 +1,4 @@
-<var tabs=input.tabs/>
+$ var tabs=input.tabs;
 
 <div class="tabs">
     <ul>
@@ -8,7 +8,11 @@
     </ul>
     <div class="tab-content">
         <div class="tab" for(tab in tabs)>
-            <invoke tab.renderBody(out) if(tab.renderBody)/>
+            $ {
+                if (tab.renderBody) {
+                    tab.renderBody(out);
+                }
+            }
         </div>
     </div>
 </div>

test/autotests/render/syntax-mixed/template.marko

@@ -1,5 +1,5 @@
-<var pageTitle="Marko Templating Engine"/>
-<var currentPage='home'/>
+$ var pageTitle="Marko Templating Engine";
+$ var currentPage='home';
 
 <!DOCTYPE html>
 html lang="en"

test/autotests/render/syntax-verbose/tabs/template.marko

@@ -1,4 +1,4 @@
-<var tabs=input.tabs/>
+$ var tabs=input.tabs;
 
 <div class="tabs">
     <ul>
@@ -8,7 +8,11 @@
     </ul>
     <div class="tab-content">
         <div class="tab" for(tab in tabs)>
-            <invoke tab.renderBody(out) if(tab.renderBody)/>
+            $ {
+                if(tab.renderBody) {
+                    tab.renderBody(out) ;
+                }
+            }
         </div>
     </div>
 </div>

test/autotests/render/syntax-verbose/template.marko

@@ -1,5 +1,5 @@
-<var pageTitle="Marko Templating Engine"/>
-<var currentPage='home'/>
+$ var pageTitle="Marko Templating Engine";
+$ var currentPage='home';
 
 <!DOCTYPE html>
 <html lang="en">

test/autotests/render/tabs-tab-new/tags/test-tabs-new/template.marko

@@ -1,4 +1,4 @@
-<var tabs=input.tabs/>
+$ var tabs=input.tabs;
 
 <div class="tabs">
     <ul class="nav nav-tabs">
@@ -10,7 +10,11 @@
     </ul>
     <div class="tab-content">
         <div id=tab.id class=tab.divClass for(tab in tabs)>
-            <invoke tab.renderBody(out) if(tab.renderBody) />
+            $ {
+                if(tab.renderBody) {
+                    tab.renderBody(out);
+                }
+            }
         </div>
     </div>
 </div>

test/autotests/render/tabs-tab-new/template.marko

@@ -1,4 +1,4 @@
-<var showConditionalTab=input.showConditionalTab/>
+$ var showConditionalTab=input.showConditionalTab;
 
 <test-tabs-new>
     <test-tab-new title="Tab 1">

test/autotests/render/tabs-tab/tags/test-tabs/template.marko

@@ -1,4 +1,4 @@
-<var tabs=input.tabs/>
+$ var tabs=input.tabs;
 
 <div class="tabs">
     <ul class="nav nav-tabs">
@@ -10,7 +10,7 @@
     </ul>
     <div class="tab-content">
         <div id=tab.id class=tab.divClass for(tab in tabs)>
-            <invoke tab.renderBody(out) />
+            $ tab.renderBody(out);
         </div>
     </div>
 </div>

test/autotests/render/tabs-tab/template.marko

@@ -1,4 +1,4 @@
-<var showConditionalTab=input.showConditionalTab/>
+$ var showConditionalTab=input.showConditionalTab;
 
 <test-tabs>
     <test-tab title="Tab 1">

test/autotests/render/text-replacement/expected.html

@@ -1 +1 @@
-Hello John. You are from San Jose, CA Zero: 0
+ Hello John. You are from San Jose, CA Zero: 0

test/autotests/render/text-replacement/template.marko

@@ -1,5 +1,4 @@
+$ var person=input.person;
 ---
-<var person=input.person/>
-
 Hello ${person.name}. You are from ${person.address.city}, ${person.address.state} Zero: ${input.zero}
 ---

test/autotests/render/toString-object/template.marko

@@ -1,4 +1,4 @@
-var foo = {
+$ var foo = {
     toString: function() {
         return 'bar';
     }

test/autotests/render/var-assign/template.marko

@@ -1,11 +1,11 @@
 
-<var colors=['red', 'green', 'blue']/>
+$ var colors=['red', 'green', 'blue']
 
 <div for(color in colors)>
     ${color}
 </div>
 
-<assign colors=['orange', 'purple', 'yellow']/>
+$ colors=['orange', 'purple', 'yellow'];
 
 <div for(color in colors)>
     ${color}

test/autotests/render/var-new-Date/template.marko

@@ -1,3 +1,3 @@
-var date = new Date('Sat Jan 01 2000 00:00:00 GMT+0000 (UTC)');
+$ var date = new Date('Sat Jan 01 2000 00:00:00 GMT+0000 (UTC)');
 
 <div>${date.toISOString()}</div>

test/autotests/render/var-tag-commas/template.marko

@@ -1,2 +1,2 @@
-var a = 1, b = 2;
+$ var a = 1, b = 2;
 <div>${a},${b}</div>

test/autotests/render/var/template.marko

@@ -1,3 +1,3 @@
-<var name='Frank' age=10 foo/>
+$ var name='Frank', age=10, foo;
 
 -- ${name.toUpperCase()} ${age*365} [${foo}]

test/autotests/render/while-attr/template.marko

@@ -1,3 +1,3 @@
-var n=0
+$ var n=0
 ul
     li while(n < 4) -- ${n++}

test/autotests/render/while-tag/template.marko

@@ -1,4 +1,4 @@
-var n=0
+$ var n=0
 ul
   while(n < 4)
     li -- ${n++}