[render/hyperscript] have the attrs take precedence over the selector, improve class normalization

fix #1773
fix #2172

render/hyperscript.js

@@ -31,7 +31,8 @@ function compileSelector(selector) {
 
 function execSelector(state, attrs, children) {
 	var hasAttrs = false, childList, text
-	var className = attrs.className || attrs.class
+	var classAttr = hasOwn.call(attrs, "class") ? "class" : "className"
+	var className = attrs[classAttr]
 
 	if (!isEmpty(state.attrs) && !isEmpty(attrs)) {
 		var newAttrs = {}
@@ -46,21 +47,18 @@ function execSelector(state, attrs, children) {
 	}
 
 	for (var key in state.attrs) {
-		if (hasOwn.call(state.attrs, key)) {
+		if (hasOwn.call(state.attrs, key) && key !== "className" && !hasOwn.call(attrs, key)){
 			attrs[key] = state.attrs[key]
 		}
 	}
-
+	if (className || state.attrs.className) attrs[classAttr] =
-	if (className !== undefined) {
+		className
-		if (attrs.class !== undefined) {
+			? state.attrs.className
-			attrs.class = undefined
+				? state.attrs.className + " " + className
-			attrs.className = className
+				: className
-		}
+			: state.attrs.className
-
+				? state.attrs.className
-		if (state.attrs.className != null) {
+				: null
-			attrs.className = state.attrs.className + " " + className
-		}
-	}
 
 	for (var key in attrs) {
 		if (hasOwn.call(attrs, key) && key !== "key") {
@@ -75,7 +73,7 @@ function execSelector(state, attrs, children) {
 		childList = children
 	}
 
-	return Vnode(state.tag, attrs.key, hasAttrs ? attrs : undefined, childList, text)
+	return Vnode(state.tag, attrs.key, hasAttrs ? attrs : null, childList, text)
 }
 
 function hyperscript(selector) {

render/tests/test-hyperscript.js

@@ -16,53 +16,46 @@ o.spec("hyperscript", function() {
 
 			o(vnode.tag).equals("a")
 		})
-		o("v1.0.1 bug-for-bug regression suite", function(){
+		o("class and className normalization", function(){
 			o(m("a", {
 				class: null
 			}).attrs).deepEquals({
-				class: undefined,
+				class: null
-				className: null
 			})
 			o(m("a", {
 				class: undefined
 			}).attrs).deepEquals({
-				class: undefined,
+				class: undefined
 			})
 			o(m("a", {
 				class: false
 			}).attrs).deepEquals({
-				class: undefined,
+				class: false
-				className: false
 			})
 			o(m("a", {
 				class: true
 			}).attrs).deepEquals({
-				class: undefined,
+				class: true
-				className: true
 			})
 			o(m("a.x", {
 				class: null
 			}).attrs).deepEquals({
-				class: undefined,
+				class: "x"
-				className: "x null"
 			})
 			o(m("a.x", {
 				class: undefined
 			}).attrs).deepEquals({
-				class: undefined,
+				class: "x"
-				className: "x"
 			})
 			o(m("a.x", {
 				class: false
 			}).attrs).deepEquals({
-				class: undefined,
+				class: "x"
-				className: "x false"
 			})
 			o(m("a.x", {
 				class: true
 			}).attrs).deepEquals({
-				class: undefined,
+				class: "x true"
-				className: "x true"
 			})
 			o(m("a", {
 				className: null
@@ -272,7 +265,7 @@ o.spec("hyperscript", function() {
 			var vnode = m("div", {key:"a"})
 
 			o(vnode.tag).equals("div")
-			o(vnode.attrs).equals(undefined)
+			o(vnode.attrs).equals(null)
 			o(vnode.key).equals("a")
 		})
 		o("handles many attrs", function() {
@@ -295,7 +288,7 @@ o.spec("hyperscript", function() {
 		o("handles merging classes w/ class property", function() {
 			var vnode = m(".a", {class: "b"})
 
-			o(vnode.attrs.className).equals("a b")
+			o(vnode.attrs.class).equals("a b")
 		})
 		o("handles merging classes w/ className property", function() {
 			var vnode = m(".a", {className: "b"})
@@ -490,20 +483,20 @@ o.spec("hyperscript", function() {
 		o("handles children without attr", function() {
 			var vnode = m("div", [m("i"), m("s")])
 
-			o(vnode.attrs).equals(undefined)
+			o(vnode.attrs).equals(null)
 			o(vnode.children[0].tag).equals("i")
 			o(vnode.children[1].tag).equals("s")
 		})
 		o("handles child without attr unwrapped", function() {
 			var vnode = m("div", m("i"))
 
-			o(vnode.attrs).equals(undefined)
+			o(vnode.attrs).equals(null)
 			o(vnode.children[0].tag).equals("i")
 		})
 		o("handles children without attr unwrapped", function() {
 			var vnode = m("div", m("i"), m("s"))
 
-			o(vnode.attrs).equals(undefined)
+			o(vnode.attrs).equals(null)
 			o(vnode.children[0].tag).equals("i")
 			o(vnode.children[1].tag).equals("s")
 		})
@@ -524,6 +517,15 @@ o.spec("hyperscript", function() {
 			m(".a", attrs)
 			o(attrs).deepEquals({a: "b"})
 		})
+		o("non-nullish attr takes precedence over selector", function() {
+			o(m("[a=b]", {a: "c"}).attrs).deepEquals({a: "c"})
+		})
+		o("null attr takes precedence over selector", function() {
+			o(m("[a=b]", {a: null}).attrs).deepEquals({a: null})
+		})
+		o("undefined attr takes precedence over selector", function() {
+			o(m("[a=b]", {a: undefined}).attrs).deepEquals({a: undefined})
+		})
 		o("handles fragment children without attr unwrapped", function() {
 			var vnode = m("div", [m("i")], [m("s")])