Re-add spread attribute optimization and bail out when repeated @tags …

…present. Prevent dynamic tag from cloning non object attributes.
marko-js · Nov 21, 2018 · ac676d7 · ac676d7
1 parent df26873
commit ac676d7
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 23 deletions.
diff --git a/src/compiler/ast/CustomTag.js b/src/compiler/ast/CustomTag.js
@@ -377,8 +377,10 @@ class CustomTag extends HtmlElement {
             }
 
             if (attr.spread) {
-                let isFirst = i === 0;
-                if (explicitAttrs || isFirst) {
+                let isFirstOfMany =
+                    i === 0 &&
+                    (this._hasDynamicNestedTags || this.attributes.length > 1);
+                if (explicitAttrs || isFirstOfMany) {
                     attrs.push(builder.objectExpression(explicitAttrs || {}));
                 }
                 attrs.push(attr.value);

diff --git a/src/runtime/helpers.js b/src/runtime/helpers.js
@@ -152,10 +152,13 @@ var helpers = {
                     );
                 }
             } else {
-                attrs = Object.keys(attrs).reduce(function(r, key) {
-                    r[removeDashes(key)] = attrs[key];
-                    return r;
-                }, {});
+                if (typeof attrs === "object") {
+                    attrs = Object.keys(attrs).reduce(function(r, key) {
+                        r[removeDashes(key)] = attrs[key];
+                        return r;
+                    }, {});
+                }
+
                 if (tag._ || tag.renderer || tag.render) {
                     var renderer = tag._ || tag.renderer || tag.render;
                     out.c(componentDef, key, customEvents);

diff --git a/src/runtime/html/helper-attrs.js b/src/runtime/html/helper-attrs.js
@@ -12,7 +12,7 @@ module.exports = function attrs(arg) {
         }
         return out;
     } else if (typeof arg === "string") {
-        return arg;
+        return attrHelper(arg, true);
     }
     return "";
 };

diff --git a/src/runtime/vdom/VElement.js b/src/runtime/vdom/VElement.js
@@ -206,22 +206,26 @@ VElement.prototype = {
         if (flags & FLAG_CUSTOM_ELEMENT) {
             assign(el, attributes);
         } else {
-            for (var attrName in attributes) {
-                var attrValue = attributes[attrName];
-
-                if (attrValue !== false && attrValue != null) {
-                    var type = typeof attrValue;
-
-                    if (type !== "string") {
-                        // Special attributes aren't copied to the real DOM. They are only
-                        // kept in the virtual attributes map
-                        attrValue = convertAttrValue(type, attrValue);
-                    }
-
-                    if (attrName == ATTR_XLINK_HREF) {
-                        setAttribute(el, NS_XLINK, ATTR_HREF, attrValue);
-                    } else {
-                        el.setAttribute(attrName, attrValue);
+            if (typeof attributes === "string") {
+                el.setAttribute(attributes, "");
+            } else {
+                for (var attrName in attributes) {
+                    var attrValue = attributes[attrName];
+
+                    if (attrValue !== false && attrValue != null) {
+                        var type = typeof attrValue;
+
+                        if (type !== "string") {
+                            // Special attributes aren't copied to the real DOM. They are only
+                            // kept in the virtual attributes map
+                            attrValue = convertAttrValue(type, attrValue);
+                        }
+
+                        if (attrName == ATTR_XLINK_HREF) {
+                            setAttribute(el, NS_XLINK, ATTR_HREF, attrValue);
+                        } else {
+                            el.setAttribute(attrName, attrValue);
+                        }
                     }
                 }
             }

diff --git a/test/render/fixtures/spread-attribute-literal/expected.html b/test/render/fixtures/spread-attribute-literal/expected.html
@@ -0,0 +1 @@
+<link test>
diff --git a/test/render/fixtures/spread-attribute-literal/template.marko b/test/render/fixtures/spread-attribute-literal/template.marko
@@ -0,0 +1 @@
+<link ..."test" />