Fixes #549 - Migrate from "data" to "input"

compiler/ast/TemplateRoot.js

@@ -38,7 +38,9 @@ class TemplateRoot extends Node {
 
         var builder = codegen.builder;
 
-        let renderStatements = [];
+        let renderStatements = [
+            builder.var('data', builder.identifier('input'))
+        ];
         var vars = createVarsArray(context.getVars());
         if (vars.length) {
             renderStatements.push(builder.vars(vars));
@@ -56,7 +58,7 @@ class TemplateRoot extends Node {
                     builder.functionDeclaration(
                         null,
                         [
-                            builder.identifier('data'),
+                            builder.identifier('input'),
                             builder.identifierOut()
                         ],
                         renderStatements)
@@ -89,7 +91,7 @@ class TemplateRoot extends Node {
                 body = body.concat(staticNodes);
             }
 
-            var renderParams = [builder.identifier('data'), builder.identifierOut()];
+            var renderParams = [builder.identifier('input'), builder.identifierOut()];
             if (this.extraRenderParams) {
                 renderParams = renderParams.concat(this.extraRenderParams);
             }

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

@@ -0,0 +1 @@
+Hello Frank! data===input ? true

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

@@ -0,0 +1 @@
+-- Hello ${data.name}! data===input ? ${data === input}

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

@@ -0,0 +1,3 @@
+exports.templateData = {
+    name: 'Frank'
+};

test/autotests/render/attr-boolean-dynamic/template.marko

@@ -1,5 +1,5 @@
 <select multiple>
     <option value="red">Red</option>
-    <option value="green" selected=(data.isGreenSelected)>Green</option>
+    <option value="green" selected=(input.isGreenSelected)>Green</option>
-    <option value="blue" selected=(data.isBlueSelected)>Blue</option>
+    <option value="blue" selected=(input.isBlueSelected)>Blue</option>
 </select>

test/autotests/render/attr-boolean-placeholder/template.marko

@@ -1,11 +1,11 @@
-<input type="checkbox" checked=data.checked>
+<input type="checkbox" checked=input.checked>
 
 <button disabled>Button</button>
 
 <select>
     <option value="${option.value}"
         selected=option.selected
-        for(option in data.options)>
+        for(option in input.options)>
 
         ${option.value}
 

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

@@ -1 +1 @@
-<img alt=(data.myAlt || true)>
+<img alt=(input.myAlt || true)>

test/autotests/render/attr-object-dynamic/template.marko

@@ -1 +1 @@
-<div value=data.myObject/>
+<div value=input.myObject/>

test/autotests/render/attr-placeholder-escaped-undefined/template.marko

@@ -1,3 +1,3 @@
-<div foo='Hello ${data.foo || ''}'>
+<div foo='Hello ${input.foo || ''}'>
     Hello World!
 </div>

test/autotests/render/attr-placeholder-unescaped-undefined/template.marko

@@ -1,3 +1,3 @@
-<div foo='Hello $!{data.foo || ''}'>
+<div foo='Hello $!{input.foo || ''}'>
     Hello World!
 </div>

test/autotests/render/attr-special-object-expression-circular/template.marko

@@ -1 +1 @@
-<div data-_onclick=data.parent/>
+<div data-_onclick=input.parent/>

test/autotests/render/attr-special-object-expression/template.marko

@@ -1 +1 @@
-<div data-_onclick=data.specialData/>
+<div data-_onclick=input.specialData/>

test/autotests/render/attrs/template.marko

@@ -1,3 +1,3 @@
-<div ${data.myAttrs} data-encoding='"hello"'>
+<div ${input.myAttrs} data-encoding='"hello"'>
     Hello World!
 </div>

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 data.renderBody(out) />
+        <invoke input.renderBody(out) />
     </div>
 </div>

test/autotests/render/body-only-if/template.marko

@@ -1,6 +1,6 @@
-<a href=data.url body-only-if(!data.url)>
+<a href=input.url body-only-if(!input.url)>
     Some Link
 </a>
-<a href=data.invalidUrl body-only-if(!data.invalidUrl)>
+<a href=input.invalidUrl body-only-if(!input.invalidUrl)>
     Another Link
 </a>

test/autotests/render/circular-tags-no-write-to-disk/tags/navigation-item/template.marko

@@ -1,5 +1,5 @@
 <ul>
-    <li for(item in data.items)>
+    <li for(item in input.items)>
         <b>${item.label}</b>
         <navigation-item items=item.children if(item.children)/>
     </li>

test/autotests/render/circular-tags-no-write-to-disk/template.marko

@@ -1 +1 @@
-<navigation-item items=data.items/>
+<navigation-item items=input.items/>

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

@@ -1,6 +1,6 @@
-div -- Hello ${data.name}
+div -- Hello ${input.name}
-    <span if(data.name)>
+    <span if(input.name)>
-        ${data.name}
+        ${input.name}
     </span>
     <p else>
         No name!

test/autotests/render/concise/template.marko

@@ -1,4 +1,4 @@
-div -- Hello ${data.name}
+div -- Hello ${input.name}
-    span if(data.name)
+    span if(input.name)
-        -- ${data.name}
+        -- ${input.name}
     p else -- No name!

test/autotests/render/conditional-attributes/template.marko

@@ -1,3 +1,3 @@
 <div class=( false ? 'some-class' : undefined )></div>
 <div class=( true ? 'some-class' : false )></div>
-<div class=data.name></div>
+<div class=input.name></div>

test/autotests/render/custom-tag-as-template/tags/test-template-as-tag/template.marko

@@ -1,3 +1,3 @@
 ---
-Hello ${data.name}!
+Hello ${input.name}!
 ---

test/autotests/render/custom-tag-template-index/tags/test-tag/index.marko

@@ -1,3 +1,3 @@
 ---
-Hello ${data.name}!
+Hello ${input.name}!
 ---

test/autotests/render/dynamic-attributes-string/template.marko

@@ -1 +1 @@
-<div ${data.attrs}>Hello World</div>
+<div ${input.attrs}>Hello World</div>

test/autotests/render/dynamic-tag-name-concise/template.marko

@@ -1,5 +1,5 @@
-hello-${data.myTagName} class="my-class" foo="bar"
+hello-${input.myTagName} class="my-class" foo="bar"
     -- My nested content
 
-${data.foo ? 'foo' : 'bar'} class="my-class" foo="bar"
+${input.foo ? 'foo' : 'bar'} class="my-class" foo="bar"
     -- My nested content

test/autotests/render/dynamic-tag-name/template.marko

@@ -1,7 +1,7 @@
-<hello-${data.myTagName} class="my-class" foo="bar">
+<hello-${input.myTagName} class="my-class" foo="bar">
     My nested content
 </>
 
-<${data.foo ? 'foo' : 'bar'} class="my-class" foo="bar">
+<${input.foo ? 'foo' : 'bar'} class="my-class" foo="bar">
     My nested content
 </>

test/autotests/render/empty-close-tag/template.marko

@@ -1,6 +1,6 @@
 p
     <span>
         <a>
-            Hello ${data.name}!
+            Hello ${input.name}!
         </>
     </>

test/autotests/render/error-invalid-if-else-attr/template.marko

@@ -1,4 +1,4 @@
-<div if(data.foo === dasda 0)>
+<div if(input.foo === dasda 0)>
     A
 </div>
 <div else>

test/autotests/render/error-invalid-if-else-attr/test.js

@@ -5,5 +5,5 @@ exports.templateData = {};
 exports.checkError = function(e) {
     var message = e.toString();
     // expect(message).to.contain('Error: Unable to compile template at path');
-    expect(message).to.contain('Unexpected number: (data.foo === dasda 0)');
+    expect(message).to.contain('Unexpected number: (input.foo === dasda 0)');
 };

test/autotests/render/error-invalid-if-else-if-attr/template.marko

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

test/autotests/render/error-invalid-if-else-if-else-attr/template.marko

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

test/autotests/render/error-invalid-if-else-if-else-attr/test.js

@@ -4,5 +4,5 @@ exports.templateData = {};
 
 exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('Unexpected token =: (data.foo ==== 1)');
+    expect(message).to.contain('Unexpected token =: (input.foo ==== 1)');
 };

test/autotests/render/escape-script/template.marko

@@ -1,4 +1,4 @@
 <script>
-    var foo = ${JSON.stringify(data.foo)};
+    var foo = ${JSON.stringify(input.foo)};
 </script>
-<pre>${JSON.stringify(data.foo)}</pre>
+<pre>${JSON.stringify(input.foo)}</pre>

test/autotests/render/for-iterator-as-target/template.marko

@@ -1,3 +1,3 @@
-<for(item in data.myIterator)>
+<for(item in input.myIterator)>
     ${item}
 </for>

test/autotests/render/for-iterator-attr/template.marko

@@ -1,3 +1,3 @@
-<div for(item in ['a', 'b', 'c'] | iterator=data.reverseIterator)>
+<div for(item in ['a', 'b', 'c'] | iterator=input.reverseIterator)>
     ${item}
 </div>

test/autotests/render/for-iterator-status-var-attr/template.marko

@@ -1,3 +1,3 @@
-<div for(item in ['a', 'b', 'c'] | iterator=data.reverseIterator  status-var=status )>
+<div for(item in ['a', 'b', 'c'] | iterator=input.reverseIterator  status-var=status )>
     ${status.index}-${item}
 </div>

test/autotests/render/for-iterator-status-var/template.marko

@@ -1,3 +1,3 @@
-<for (item in ['a', 'b', 'c'] | iterator=data.reverseIterator status-var=status )>
+<for (item in ['a', 'b', 'c'] | iterator=input.reverseIterator status-var=status )>
     ${status.index}-${item}
 </for>

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

@@ -1,3 +1,3 @@
-<for(item in ['a', 'b', 'c'] | iterator=data.reverseIterator)>
+<for(item in ['a', 'b', 'c'] | iterator=input.reverseIterator)>
     ${item}
 </for>

test/autotests/render/for-props-map/template.marko

@@ -1,3 +1,3 @@
-<for(name,value in data.myMap)>
+<for(name,value in input.myMap)>
     [${name}=${value}]
 </for>

test/autotests/render/for-tag-array-expression/template.marko

@@ -1,4 +1,4 @@
-<for(color in data.colors | array)>
+<for(color in input.colors | array)>
     <div>
         ${color}
     </div>

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

@@ -1,5 +1,5 @@
 function getName() {
-    return data.firstName + ' ' + data.lastName;
+    return input.firstName + ' ' + input.lastName;
 }
 
 -- Hello ${getName()}

test/autotests/render/hello-dynamic/template.marko

@@ -1 +1 @@
--- Hello ${data.name}! Hello $!{data.name}! Hello $!{data.missing}!
+-- Hello ${input.name}! Hello $!{input.name}! Hello $!{input.missing}!

test/autotests/render/if-else-attr/template.marko

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

test/autotests/render/if-else-if-attr/template.marko

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

test/autotests/render/if-else-if-else-attr/template.marko

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

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

@@ -1 +1 @@
--- Hello ${data.name}! You have ${data.count} new messages.
+-- Hello ${input.name}! You have ${input.count} new messages.

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

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

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

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

test/autotests/render/include-component/template.marko

@@ -1 +1 @@
-<include(data.component, {name: 'Frank'})/>
+<include(input.component, {name: 'Frank'})/>

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

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

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

@@ -1 +1 @@
--- Hello ${data.name}! You have ${data.count} new messages.
+-- Hello ${input.name}! You have ${input.count} new messages.

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

@@ -1 +1 @@
--- Hello ${data.name}! You have ${data.count} new messages.
+-- Hello ${input.name}! You have ${input.count} new messages.

test/autotests/render/include-dynamic/template.marko

@@ -1 +1 @@
-<include(data.includeTarget) name='Frank' count=20/>
+<include(input.includeTarget) name='Frank' count=20/>

test/autotests/render/include-hyphen-attrs-multiple/include-target.marko

@@ -1 +1 @@
--- Hello ${data.firstName} ${data.lastName}!
+-- Hello ${input.firstName} ${input.lastName}!

test/autotests/render/include-hyphen-attrs/include-target.marko

@@ -1 +1 @@
--- Hello ${data.firstName}! You have ${data.count} new messages.
+-- Hello ${input.firstName}! You have ${input.count} new messages.

test/autotests/render/include-layout-data-attrs/layout-default.marko

@@ -1,17 +1,17 @@
-<h1 if(data.showHeader !== false)>
+<h1 if(input.showHeader !== false)>
-    <if(data.header)>
+    <if(input.header)>
-        <include(data.header)/>
+        <include(input.header)/>
     </if>
     <else>
         DEFAULT TITLE
     </else>
 </h1>
 <div>
-    <include(data.body)/>
+    <include(input.body)/>
 </div>
-<h1 if(data.showFooter !== false)>
+<h1 if(input.showFooter !== false)>
-    <if(data.footer)>
+    <if(input.footer)>
-        <include(data.footer)/>
+        <include(input.footer)/>
     </if>
     <else>
         DEFAULT FOOTER

test/autotests/render/include-layout-data/layout-default.marko

@@ -1,13 +1,13 @@
-<h1 if(data.showHeader !== false)>
+<h1 if(input.showHeader !== false)>
-    <if(data.header)>
+    <if(input.header)>
-        <include(data.header)/>
+        <include(input.header)/>
     </if>
     <else>
         DEFAULT TITLE
     </else>
 </h1>
 <div>
-    <include(data.body)/>
+    <include(input.body)/>
 </div>
-<include(data.footer)/>
+<include(input.footer)/>
-<include(data.empty)/>
+<include(input.empty)/>

test/autotests/render/include-layout/layout-default.marko

@@ -1,13 +1,13 @@
-<h1 if(data.showHeader !== false)>
+<h1 if(input.showHeader !== false)>
-    <if(data.header)>
+    <if(input.header)>
-        <include(data.header)/>
+        <include(input.header)/>
     </if>
     <else>
         DEFAULT TITLE
     </else>
 </h1>
 <div>
-    <include(data.body)/>
+    <include(input.body)/>
 </div>
-<include(data.footer)/>
+<include(input.footer)/>
-<include(data.empty)/>
+<include(input.empty)/>

test/autotests/render/include-layout/template.marko

@@ -12,7 +12,7 @@
     <@body>BODY CONTENT</@body>
     <@footer>FOOTER CONTENT</@footer>
 </include>
-<include(data.layoutDynamic) show-header=true>
+<include(input.layoutDynamic) show-header=true>
     <@body>BODY CONTENT</@body>
     <@footer>FOOTER CONTENT</@footer>
 </include>

test/autotests/render/include-renderBody-data-and-attrs/template.marko

@@ -1 +1 @@
-<include(data.renderBody, {name: 'Frank'}) age=10/>
+<include(input.renderBody, {name: 'Frank'}) age=10/>

test/autotests/render/include-renderBody-no-data/template.marko

@@ -1 +1 @@
-<include(data.renderBody)/>
+<include(input.renderBody)/>

test/autotests/render/include-renderBody-string-arg/template.marko

@@ -1 +1 @@
-<include(data.renderBody, 'Frank')/>
+<include(input.renderBody, 'Frank')/>

test/autotests/render/include-renderBody/template.marko

@@ -1 +1 @@
-<include(data.renderBody, {name: 'Frank'})/>
+<include(input.renderBody, {name: 'Frank'})/>

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

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

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

@@ -1 +1 @@
--- Hello ${data.name}! You have ${data.count} new messages.
+-- Hello ${input.name}! You have ${input.count} new messages.

test/autotests/render/inline-script/template.marko

@@ -1,4 +1,4 @@
-<var name="name" value="data.name"/>
+<var name="name" value="input.name"/>
 
 <html>
     <head>
@@ -10,7 +10,7 @@
         <script type="text/javascript">
         <div if(foo)></div>
         $(function() {
-            alert('${data.name}');
+            alert('${input.name}');
         })
         </script>
     </body>

test/autotests/render/marko-body-attr-parsed-text/template.marko

@@ -1,5 +1,5 @@
 <div marko-body="parsed-text">
     <span if(foo)>
-            Hello ${data.name}!
+            Hello ${input.name}!
     </span>
 </div>

test/autotests/render/nested-tag-bad/components/test-message/template.marko

@@ -1,11 +1,11 @@
 <div class="message">
     <h1>
-        <include(data.title)/>
+        <include(input.title)/>
     </h1>
     <div>
-        <include(data.body)/>
+        <include(input.body)/>
     </div>
     <div>
-        <include(data.renderBody)/>
+        <include(input.renderBody)/>
     </div>
 </div>

test/autotests/render/nested-tag-shorthand-complex-logic-repeated/components/test-message/template.marko

@@ -1,5 +1,5 @@
 <ul>
-    <li for(item in data.items)>
+    <li for(item in input.items)>
         <h1>${item.title}</h1>
         <include(item.renderBody)/>
     </li>

test/autotests/render/nested-tag-shorthand-complex-logic/components/test-message/template.marko

@@ -1,8 +1,8 @@
 <div class="message">
     <h1>
-        <include(data.title)/>
+        <include(input.title)/>
     </h1>
     <div>
-        <include(data.body)/>
+        <include(input.body)/>
     </div>
 </div>

test/autotests/render/nested-tag-shorthand-simple-conditional/components/test-message/template.marko

@@ -1,8 +1,8 @@
 <div class="message">
     <h1>
-        <include(data.title)/>
+        <include(input.title)/>
     </h1>
     <div>
-        <include(data.body)/>
+        <include(input.body)/>
     </div>
 </div>

test/autotests/render/nested-tag-shorthand-simple-declared-invalid-attribute/components/test-message/template.marko

@@ -1,8 +1,8 @@
 <div class="message">
     <h1>
-        <b>${data.header.label}:</b> <include(data.header)/>
+        <b>${input.header.label}:</b> <include(input.header)/>
     </h1>
     <div>
-        <b>${data.body.label}:</b> <include(data.body)/>
+        <b>${input.body.label}:</b> <include(input.body)/>
     </div>
 </div>

test/autotests/render/nested-tag-shorthand-simple-declared/components/test-message/template.marko

@@ -1,8 +1,8 @@
 <div class="message">
     <h1>
-        <b>${data.header.label}:</b> <include(data.header)/>
+        <b>${input.header.label}:</b> <include(input.header)/>
     </h1>
     <div>
-        <b>${data.body.label}:</b> <include(data.body)/>
+        <b>${input.body.label}:</b> <include(input.body)/>
     </div>
 </div>

test/autotests/render/nested-tag-shorthand-simple-repeated-conditional/components/test-message/template.marko

@@ -1,5 +1,5 @@
 <ul>
-    <li for(item in data.items)>
+    <li for(item in input.items)>
         <h1>${item.title}</h1>
         <include(item.renderBody)/>
     </li>

test/autotests/render/nested-tag-shorthand-simple-repeated/components/test-message/template.marko

@@ -1,5 +1,5 @@
 <ul>
-    <li for(item in data.items)>
+    <li for(item in input.items)>
         <h1>${item.title}</h1>
         <include(item.renderBody)/>
     </li>

test/autotests/render/nested-tag-shorthand-simple/components/test-message/template.marko

@@ -1,8 +1,8 @@
 <div class="message">
     <h1>
-        ${data.title.label}: <include(data.title)/>
+        ${input.title.label}: <include(input.title)/>
     </h1>
     <div>
-        ${data.body.label}: <include(data.body)/>
+        ${input.body.label}: <include(input.body)/>
     </div>
 </div>

test/autotests/render/nested-tags-concise/tags/test-nested-tags-tabs/template.marko

@@ -1,4 +1,4 @@
-<var tabs=data.tabs/>
+<var tabs=input.tabs/>
 
 <div class="tabs">
     <ul>

test/autotests/render/nested-tags-deep/tags/test-nested-tags-deep/template.marko

@@ -1,4 +1,4 @@
-<div for(item in data.items)>
+<div for(item in input.items)>
     Foo: ${item.foo}
     Body: <invoke item.body.renderBody(out) if(item.body)/>
 </div>

test/autotests/render/nested-tags-empty-body/tags/test-nested-tags-tabs/template.marko

@@ -1,4 +1,4 @@
-<var tabs=data.tabs/>
+<var tabs=input.tabs/>
 
 <div class="tabs">
     <ul>

test/autotests/render/nested-tags-repeated-parent/tags/test-nested-tags-overlay/template.marko

@@ -1,13 +1,13 @@
 <div class="overlay">
-    <div class="overlay-header ${data.header.className || ''}" if(data.header)>
+    <div class="overlay-header ${input.header.className || ''}" if(input.header)>
-        <invoke data.header.renderBody(out)/>
+        <invoke input.header.renderBody(out)/>
     </div>
 
-    <div class="overlay-body ${data.body.className}" if(data.body)>
+    <div class="overlay-body ${input.body.className}" if(input.body)>
-        <invoke data.body.renderBody(out)/>
+        <invoke input.body.renderBody(out)/>
     </div>
 
-    <div class="overlay-footer ${data.footer.className}" if(data.footer)>
+    <div class="overlay-footer ${input.footer.className}" if(input.footer)>
-        <invoke data.footer.renderBody(out)/>
+        <invoke input.footer.renderBody(out)/>
     </div>
 </div>

test/autotests/render/nested-tags-repeated-parent/template.marko

@@ -1,4 +1,4 @@
-<test-nested-tags-overlay header=data.header>
+<test-nested-tags-overlay header=input.header>
 
     <test-nested-tags-overlay:body class="my-body">
         Body content

test/autotests/render/nested-tags-repeated/tags/test-nested-tags-tabs/template.marko

@@ -1,4 +1,4 @@
-<var tabs=data.tabs/>
+<var tabs=input.tabs/>
 
 <div class="tabs">
     <ul>

test/autotests/render/nested-tags-self-closing/tags/test-nested-tags-tabs/template.marko

@@ -1,4 +1,4 @@
-<var tabs=data.tabs/>
+<var tabs=input.tabs/>
 
 <div class="tabs">
     <ul>

test/autotests/render/nested-tags/tags/test-nested-tags-overlay/template.marko

@@ -1,13 +1,13 @@
 <div class="overlay">
-    <div class="overlay-header" if(data.header)>
+    <div class="overlay-header" if(input.header)>
-        <invoke data.header.renderBody(out)/>
+        <invoke input.header.renderBody(out)/>
     </div>
 
-    <div class="overlay-body ${data.body.className}" if(data.body)>
+    <div class="overlay-body ${input.body.className}" if(input.body)>
-        <invoke data.body.renderBody(out)/>
+        <invoke input.body.renderBody(out)/>
     </div>
 
-    <div class="overlay-footer ${data.footer.className}" if(data.footer)>
+    <div class="overlay-footer ${input.footer.className}" if(input.footer)>
-        <invoke data.footer.renderBody(out)/>
+        <invoke input.footer.renderBody(out)/>
     </div>
 </div>

test/autotests/render/nested-tags/template.marko

@@ -1,4 +1,4 @@
-<test-nested-tags-overlay header=data.header>
+<test-nested-tags-overlay header=input.header>
 
     <test-nested-tags-overlay:body class="my-body">
         Body content

test/autotests/render/reserved-words/template.marko

@@ -1,3 +1,3 @@
 <my-custom-tag short="World"/>
 
--- Hello ${data.short}
+-- Hello ${input.short}

test/autotests/render/scanned-tags/tags/scanned-b/template.marko

@@ -1,3 +1,3 @@
 ---
-scanned-b: Hello ${data.name}
+scanned-b: Hello ${input.name}
 ---

test/autotests/render/scanned-tags/tags/scanned-d/template.marko

@@ -9,5 +9,5 @@ TAG = {
 }
 -->
 ---
-scanned-d: Hello ${data.NAME}
+scanned-d: Hello ${input.NAME}
 ---

test/autotests/render/script-nonce/template.marko

@@ -1,3 +1,3 @@
-<script foo="bar" ${data.myAttrs} csp-nonce>
+<script foo="bar" ${input.myAttrs} csp-nonce>
 console.log('foo')
 </script>

test/autotests/render/script-tag-entities/template.marko

@@ -1 +1 @@
-<script>document.write('<div>Hello ${data.name}</div>');</script>
+<script>document.write('<div>Hello ${input.name}</div>');</script>

test/autotests/render/shorthand-class-merge2/template.marko

@@ -1 +1 @@
-div.foo.${data.missing} class="baz"
+div.foo.${input.missing} class="baz"

test/autotests/render/shorthand-classes-many-classes/template.marko

@@ -1,3 +1,3 @@
 .foo.bar.baz.bat
-.foo.bar.${data.cls}.baz
+.foo.bar.${input.cls}.baz
 .foo.bar.baz class="test"

test/autotests/render/shorthand-div-id-dynamic/template.marko

@@ -1,2 +1,2 @@
-div#foo-${data.name} style="color: red;"
+div#foo-${input.name} style="color: red;"
-    -- Hello ${data.name}!
+    -- Hello ${input.name}!

test/autotests/render/shorthand-div-id/template.marko

@@ -1,2 +1,2 @@
 div#foo style="color: red;"
-    -- Hello ${data.name}!
+    -- Hello ${input.name}!

test/autotests/render/shorthand-div.foo/template.marko

@@ -1,2 +1,2 @@
 div.foo style="color: red;"
-    -- Hello ${data.name}!
+    -- Hello ${input.name}!

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

@@ -1,3 +1,3 @@
 <#foo.bar.baz>
-    Hello ${data.name}!
+    Hello ${input.name}!
 </>

test/autotests/render/simple-conditionals/template.marko

@@ -1,4 +1,4 @@
-<var name=data.name count=data.count/>
+<var name=input.name count=input.count/>
 
 <div class=( count>50 ? 'over-50' : null)></div>
 <div class=( count<50 ? 'under-50' : null)></div>

test/autotests/render/simple/template.marko

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

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

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

test/autotests/render/style-attr-string-dynamic/template.marko

@@ -1 +1 @@
-div style=data.style
+div style=input.style

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

@@ -1,4 +1,4 @@
-<var tabs=data.tabs/>
+<var tabs=input.tabs/>
 
 <div class="tabs">
     <ul>