Deservicify core (#2458)

* De-servicify router (mostly)

Still uses the redraw service, but it no longer has an intermediate
service of its own.

Also, did a *lot* of test deduplication in this. About 30-40% of the
router service tests were already tested on the main router API instance
itself.

Bundle size decreased from 9560 to 9548 bytes min+gzip.

* Merge `m.mount` + `m.redraw`, update router

Simplifies the router and redraw mechanism, and makes it much easier to
keep predictable.

Bundle size down to 9433 bytes min+gzip, docs updated accordingly.

* Make `mithril/render` just return the `m.render` function directly.

* Deservicify `m.render`, revise `m.route`

- You now have to use `mithril/render/render` directly if you want an
  implicit redraw function. (This will likely be going away in v3.)
- Revise `m.route` to only `key` components

* Add `redraw` to `m.render`, deservicify requests

* Test error logging

* Update docs + changelog [skip ci]

render/render.js

@@ -4,15 +4,13 @@ var Vnode = require("../render/vnode")
 
 module.exports = function($window) {
 	var $doc = $window.document
+	var currentRedraw
 
 	var nameSpace = {
 		svg: "http://www.w3.org/2000/svg",
 		math: "http://www.w3.org/1998/Math/MathML"
 	}
 
-	var redraw
-	function setRedraw(callback) {return redraw = callback}
-
 	function getNameSpace(vnode) {
 		return vnode.attrs && vnode.attrs.xmlns || nameSpace[vnode.tag]
 	}
@@ -797,15 +795,17 @@ module.exports = function($window) {
 	//    that below.
 	// 6. In function-based event handlers, `return false` prevents the default
 	//    action and stops event propagation. We replicate that below.
-	function EventDict() {}
+	function EventDict() {
+		// Save this, so the current redraw is correctly tracked.
+		this._ = currentRedraw
+	}
 	EventDict.prototype = Object.create(null)
 	EventDict.prototype.handleEvent = function (ev) {
 		var handler = this["on" + ev.type]
 		var result
 		if (typeof handler === "function") result = handler.call(ev.currentTarget, ev)
 		else if (typeof handler.handleEvent === "function") handler.handleEvent(ev)
-		if (ev.redraw === false) ev.redraw = undefined
-		else if (typeof redraw === "function") redraw()
+		if (this._ && ev.redraw !== false) (0, this._)()
 		if (result === false) {
 			ev.preventDefault()
 			ev.stopPropagation()
@@ -866,8 +866,8 @@ module.exports = function($window) {
 		return true
 	}
 
-	function render(dom, vnodes) {
-		if (!dom) throw new Error("Ensure the DOM element being passed to m.route/m.mount/m.render is not undefined.")
+	return function(dom, vnodes, redraw) {
+		if (!dom) throw new TypeError("Ensure the DOM element being passed to m.route/m.mount/m.render is not undefined.")
 		var hooks = []
 		var active = activeElement()
 		var namespace = dom.namespaceURI
@@ -876,12 +876,16 @@ module.exports = function($window) {
 		if (dom.vnodes == null) dom.textContent = ""
 
 		vnodes = Vnode.normalizeChildren(Array.isArray(vnodes) ? vnodes : [vnodes])
-		updateNodes(dom, dom.vnodes, vnodes, hooks, null, namespace === "http://www.w3.org/1999/xhtml" ? undefined : namespace)
+		var prevRedraw = currentRedraw
+		try {
+			currentRedraw = typeof redraw === "function" ? redraw : undefined
+			updateNodes(dom, dom.vnodes, vnodes, hooks, null, namespace === "http://www.w3.org/1999/xhtml" ? undefined : namespace)
+		} finally {
+			currentRedraw = prevRedraw
+		}
 		dom.vnodes = vnodes
 		// `document.activeElement` can return null: https://html.spec.whatwg.org/multipage/interaction.html#dom-document-activeelement
 		if (active != null && activeElement() !== active && typeof active.focus === "function") active.focus()
 		for (var i = 0; i < hooks.length; i++) hooks[i]()
 	}
-
-	return {render: render, setRedraw: setRedraw}
 }

render/tests/test-attributes.js

@@ -9,7 +9,7 @@ o.spec("attributes", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.body
-		render = vdom($window).render
+		render = vdom($window)
 	})
 	o.spec("basics", function() {
 		o("works (create/update/remove)", function() {
@@ -255,7 +255,7 @@ o.spec("attributes", function() {
 		o("isn't set when equivalent to the previous value and focused", function() {
 			var $window = domMock({spy: o.spy})
 			var root = $window.document.body
-			var render = vdom($window).render
+			var render = vdom($window)
 
 			var a = {tag: "input"}
 			var b = {tag: "input", attrs: {value: "1"}}
@@ -294,7 +294,7 @@ o.spec("attributes", function() {
 		o("the input.type setter is never used", function() {
 			var $window = domMock({spy: o.spy})
 			var root = $window.document.body
-			var render = vdom($window).render
+			var render = vdom($window)
 
 			var a = {tag: "input", attrs: {type: "radio"}}
 			var b = {tag: "input", attrs: {type: "text"}}
@@ -334,7 +334,7 @@ o.spec("attributes", function() {
 		o("isn't set when equivalent to the previous value and focused", function() {
 			var $window = domMock({spy: o.spy})
 			var root = $window.document.body
-			var render = vdom($window).render
+			var render = vdom($window)
 
 			var a = {tag: "textarea"}
 			var b = {tag: "textarea", attrs: {value: "1"}}
@@ -480,7 +480,7 @@ o.spec("attributes", function() {
 		o("isn't set when equivalent to the previous value", function() {
 			var $window = domMock({spy: o.spy})
 			var root = $window.document.body
-			var render = vdom($window).render
+			var render = vdom($window)
 
 			var a = {tag: "option"}
 			var b = {tag: "option", attrs: {value: "1"}}
@@ -618,7 +618,7 @@ o.spec("attributes", function() {
 		o("updates with the same value do not re-set the attribute if the select has focus", function() {
 			var $window = domMock({spy: o.spy})
 			var root = $window.document.body
-			var render = vdom($window).render
+			var render = vdom($window)
 
 			var a = makeSelect()
 			var b = makeSelect("1")

render/tests/test-component.js

@@ -11,7 +11,7 @@ o.spec("component", function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
 
-		render = vdom($window).render
+		render = vdom($window)
 	})
 
 	components.forEach(function(cmp){

render/tests/test-createElement.js

@@ -9,7 +9,7 @@ o.spec("createElement", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
-		render = vdom($window).render
+		render = vdom($window)
 	})
 
 	o("creates element", function() {

render/tests/test-createFragment.js

@@ -9,7 +9,7 @@ o.spec("createFragment", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
-		render = vdom($window).render
+		render = vdom($window)
 	})
 
 	o("creates fragment", function() {

render/tests/test-createHTML.js

@@ -9,7 +9,7 @@ o.spec("createHTML", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
-		render = vdom($window).render
+		render = vdom($window)
 	})
 
 	o("creates HTML", function() {

render/tests/test-createNodes.js

@@ -9,7 +9,7 @@ o.spec("createNodes", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
-		render = vdom($window).render
+		render = vdom($window)
 	})
 
 	o("creates nodes", function() {

render/tests/test-createText.js

@@ -9,7 +9,7 @@ o.spec("createText", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
-		render = vdom($window).render
+		render = vdom($window)
 	})
 
 	o("creates string", function() {

render/tests/test-event.js

@@ -11,8 +11,9 @@ o.spec("event", function() {
 		root = $window.document.body
 		redraw = o.spy()
 		var renderer = vdom($window)
-		renderer.setRedraw(redraw)
-		render = renderer.render
+		render = function(dom, vnode) {
+			return renderer(dom, vnode, redraw)
+		}
 	})
 
 	o("handles onclick", function() {

render/tests/test-input.js

@@ -8,7 +8,7 @@ o.spec("form inputs", function() {
 	var $window, root, render
 	o.beforeEach(function() {
 		$window = domMock()
-		render = vdom($window).render
+		render = vdom($window)
 		root = $window.document.createElement("div")
 		$window.document.body.appendChild(root)
 	})

render/tests/test-normalizeComponentChildren.js

@@ -8,7 +8,7 @@ var vdom = require("../../render/render")
 o.spec("component children", function () {
 	var $window = domMock()
 	var root = $window.document.createElement("div")
-	var render = vdom($window).render
+	var render = vdom($window)
 
 	o.spec("component children", function () {
 		var component = {

render/tests/test-onbeforeremove.js

@@ -12,7 +12,7 @@ o.spec("onbeforeremove", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
-		render = vdom($window).render
+		render = vdom($window)
 	})
 
 	o("does not call onbeforeremove when creating", function() {

render/tests/test-onbeforeupdate.js

@@ -10,7 +10,7 @@ o.spec("onbeforeupdate", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
-		render = vdom($window).render
+		render = vdom($window)
 	})
 
 	o("prevents update in element", function() {

render/tests/test-oncreate.js

@@ -9,7 +9,7 @@ o.spec("oncreate", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
-		render = vdom($window).render
+		render = vdom($window)
 	})
 
 	o("calls oncreate when creating element", function() {

render/tests/test-oninit.js

@@ -9,7 +9,7 @@ o.spec("oninit", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
-		render = vdom($window).render
+		render = vdom($window)
 	})
 
 	o("calls oninit when creating element", function() {

render/tests/test-onremove.js

@@ -11,7 +11,7 @@ o.spec("onremove", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
-		render = vdom($window).render
+		render = vdom($window)
 	})
 
 	o("does not call onremove when creating", function() {

render/tests/test-onupdate.js

@@ -9,7 +9,7 @@ o.spec("onupdate", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
-		render = vdom($window).render
+		render = vdom($window)
 	})
 
 	o("does not call onupdate when creating element", function() {

render/tests/test-render-hyperscript-integration.js

@@ -10,7 +10,7 @@ o.spec("render/hyperscript integration", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
-		render = vdom($window).render
+		render = vdom($window)
 	})
 	o.spec("setting class", function() {
 		o("selector only", function() {

render/tests/test-render.js

@@ -9,7 +9,7 @@ o.spec("render", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
-		render = vdom($window).render
+		render = vdom($window)
 	})
 
 	o("renders plain text", function() {

render/tests/test-textContent.js

@@ -9,7 +9,7 @@ o.spec("textContent", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
-		render = vdom($window).render
+		render = vdom($window)
 	})
 
 	o("ignores null", function() {

render/tests/test-updateElement.js

@@ -9,7 +9,7 @@ o.spec("updateElement", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
-		render = vdom($window).render
+		render = vdom($window)
 	})
 
 	o("updates attr", function() {

render/tests/test-updateFragment.js

@@ -9,7 +9,7 @@ o.spec("updateFragment", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
-		render = vdom($window).render
+		render = vdom($window)
 	})
 
 	o("updates fragment", function() {

render/tests/test-updateHTML.js

@@ -9,7 +9,7 @@ o.spec("updateHTML", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
-		render = vdom($window).render
+		render = vdom($window)
 	})
 
 	o("updates html", function() {

render/tests/test-updateNodes.js

@@ -10,7 +10,7 @@ o.spec("updateNodes", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
-		render = vdom($window).render
+		render = vdom($window)
 	})
 
 	o("handles el noop", function() {

render/tests/test-updateNodesFuzzer.js

@@ -10,7 +10,7 @@ o.spec("updateNodes keyed list Fuzzer", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
-		render = vdom($window).render
+		render = vdom($window)
 	})
 
 	

render/tests/test-updateText.js

@@ -9,7 +9,7 @@ o.spec("updateText", function() {
 	o.beforeEach(function() {
 		$window = domMock()
 		root = $window.document.createElement("div")
-		render = vdom($window).render
+		render = vdom($window)
 	})
 
 	o("updates to string", function() {