Fixes #201 - Marko v3: Don't allow "undefined" and "null" in output for placeholders

compiler/ast/HtmlAttribute.js

@@ -109,6 +109,7 @@ function generateCodeForExpressionAttr(name, value, codegen) {
 
             } else if (isNoEscapeXml(part)) {
                 part = removeEscapeFunctions(part);
+                part = codegen.builder.functionCall(codegen.builder.identifier('str'), [part]);
             } else {
                 var escapeXmlAttrVar = codegen.addStaticVar('escapeXmlAttr', '__helpers.xa');
                 part = removeEscapeFunctions(part);

compiler/ast/Text.js

@@ -42,6 +42,7 @@ class Text extends Node {
         this.normalizeText();
 
         var argument = this.argument;
+        var escape = this.escape !== false;
 
         if (argument instanceof Literal) {
             if (!argument.value) {
@@ -49,12 +50,15 @@ class Text extends Node {
             }
         } else {
             let builder = codegen.builder;
-            if (this.escape !== false) {
+
+            if (escape) {
                 // TODO Only escape the parts that need to be escaped if it is a compound expression with static
                 //      text parts
                 argument = builder.functionCall(
                     'escapeXml',
                     [argument]);
+            } else {
+                argument = builder.functionCall(builder.identifier('str'), [ argument ]);
             }
         }
 

test/fixtures/compiler/autotest/attr-escape/expected.js

@@ -15,9 +15,9 @@ function create(__helpers) {
       "b\" bar=\"a " +
       escapeXmlAttr(data.foo) +
       " b\" baz=\"a " +
-      data.foo +
+      str(data.foo) +
       " b\" nested=\"a " +
-      data.foo + ("nested " + data.bar) +
+      str(data.foo + ("nested " + data.bar)) +
       " b\"></div>");
   };
 }

test/fixtures/render/autotest/attr-placeholder-escaped-undefined/expected.html

@@ -0,0 +1 @@
+<div foo="Hello ">Hello World!</div>

test/fixtures/render/autotest/attr-placeholder-escaped-undefined/template.marko

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

test/fixtures/render/autotest/attr-placeholder-unescaped-undefined/expected.html

@@ -0,0 +1 @@
+<div foo="Hello ">Hello World!</div>

test/fixtures/render/autotest/attr-placeholder-unescaped-undefined/template.marko

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

test/fixtures/render/autotest/attr-placeholder-unescaped-undefined/test.js

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

test/fixtures/render/autotest/hello-static/test.js

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