ajo 0.1.34 → 0.1.35

package/index.js

@@ -1,401 +1,363 @@
-import { Context, current } from './context.js'
-import { isVNode } from './jsx.js'
-
-const { isArray } = Array, { assign, hasOwn, keys } = Object
-
-const Key = Symbol.for('ajo.key')
-const Keyed = Symbol.for('ajo.keyed')
-const Memo = Symbol.for('ajo.memo')
-const Cache = Symbol.for('ajo.cache')
-const Generator = Symbol.for('ajo.generator')
-const Iterator = Symbol.for('ajo.iterator')
-const Render = Symbol.for('ajo.render')
-const Args = Symbol.for('ajo.args')
-const Controller = Symbol.for('ajo.controller')
-
-export const defaults = { tag: 'div' }
-
-export const stateful = (fn, is) => (is && (fn.is = is), fn)
-
-export const render = (h, el, child = el.firstChild, ref = null) => {
-
-	walk(h, h => {
-
-		const node = typeof h == 'string' ? text(h, child, ref) : element(h, el, child, ref)
-
-		if (child == null) {
-
-			before(el, node, ref)
-
-		} else if (node == child) {
-
-			child = node.nextSibling
-
-		} else if (node == child.nextSibling) {
-
-			if (child.contains(document.activeElement)) el.insertBefore(node, child)
-
-			else el.insertBefore(child, ref)
-
-			child = node.nextSibling
-
-		} else {
-
-			before(el, node, child)
-		}
-	})
-
-	if (child && !ref && child == el.firstChild) {
-
-		const gone = [...el.children]
-
-		el[Keyed]?.clear()
-
-		el.textContent = ''
-
-		for (const node of gone) unref(node)
-
-	} else while (child && child != ref) {
-
-		const node = child.nextSibling
-
-		el.removeChild(child)
-
-		if (child.nodeType == 1) unref(child, el)
-
-		child = node
-	}
-}
-
-const walk = (h, fn) => {
-
-	const type = typeof h
-
-	if (h == null || type == 'boolean') return
-
-	if (type == 'string') fn(h)
-
-	else if (type == 'number' || type == 'bigint') fn(String(h))
-
-	else if (isVNode(h)) typeof h.nodeName == 'function' ? run(h, fn) : fn(h)
-
-	else if (Symbol.iterator in Object(h)) for (h of h) walk(h, fn)
-
-	else fn(String(h))
-}
-
-const run = ({ nodeName, ...h }, fn) => {
-
-	if (nodeName.constructor.name == 'GeneratorFunction') fn(runGenerator(nodeName, h))
-
-	else walk(nodeName(h), fn)
-}
-
-const runGenerator = (fn, h) => {
-
-	const attrs = { ...fn.attrs }, args = { ...fn.args }
-
-	for (const key of keys(h)) {
-
-		if (key.startsWith('attr:')) attrs[key.slice(5)] = h[key]
-
-		else if (key == 'key' || key == 'skip' || key == 'memo' || key == 'ref' || key.startsWith('set:')) attrs[key] = h[key]
-
-		else args[key] = h[key]
-	}
-
-	attrs.nodeName = fn.is ?? defaults.tag
-
-	attrs[Generator] = fn
-
-	attrs[Args] = args
-
-	return attrs
-}
-
-const text = (h, node, ref) => {
-
-	while (node && node != ref && node.nodeType != 3) node = node.nextSibling
-
-	if (node == null || node == ref) node = document.createTextNode(h)
-
-	else if (node.data != h) node.data = h
-
-	return node
-}
-
-const element = (h, el, node, ref) => {
-
-	const nodeName = h.nodeName, key = h.key, gen = h[Generator]
-
-	if (node && key != null && ref == null) node = el[Keyed]?.get(key) ?? node
-
-	while (node && node != ref) {
-
-		const k = node[Key], g = node[Generator]
-
-		if (node.localName == nodeName && (k == null || k == key) && (!g || g == gen)) break
-
-		node = k != null ? null : node.nextElementSibling
-	}
-
-	if (node == null || node == ref) node = document.createElementNS(h.xmlns ?? el.namespaceURI, nodeName)
-
-	if (key != null) (el[Keyed] ??= new Map()).set(node[Key] = key, node)
-
-	if (!node[Cache] || h.memo == null || some(node[Memo], h.memo)) {
-
-		attrs(node[Cache], h, node)
-
-		if (!h.skip) {
-
-			if (gen) next(gen, h[Args], node)
-
-			else if (!node[Cache] && (typeof h.children == 'string' || typeof h.children == 'number')) node.textContent = h.children + ''
-
-			else render(h.children, node)
-		}
-
-		node[Memo] = h.memo
-
-		node[Cache] = h
-	}
-
-	return node
-}
-
-const special = key => key == 'nodeName' || key == 'children' || key == 'key' || key == 'skip' || key == 'memo'
-
-const attrs = (cache, h, node) => {
-
-	if (!cache) for (let i = node.attributes.length; i--;) {
-
-		const { name } = node.attributes[i]
-
-		if (!hasOwn(h, name)) node.removeAttribute(name)
-	}
-
-	for (const key in h) if (hasOwn(h, key)) {
-
-		const value = h[key]
-
-		if (cache && cache[key] === value || special(key)) continue
-
-		if (key == 'ref' && typeof value == 'function') value(node)
-
-		else if (key.startsWith('set:')) node[key.slice(4)] = value
-
-		else if (value == null || value === false) node.removeAttribute(key)
-
-		else if (key == 'class' && typeof node.className == 'string') node.className = value === true ? '' : value
-
-		else node.setAttribute(key, value === true ? '' : value)
-	}
-
-	if (cache) for (const key in cache) if (hasOwn(cache, key)) {
-
-		if (hasOwn(h, key) || special(key)) continue
-
-		if (key.startsWith('set:')) node[key.slice(4)] = undefined
-
-		else node.removeAttribute(key)
-	}
-}
-
-const some = (a, b) => {
-
-	if (isArray(a) && isArray(b)) {
-
-		if (a.length != b.length) return true
-
-		for (let i = a.length; i--;) if (a[i] !== b[i]) return true
-
-		return false
-	}
-
-	return a !== b
-}
-
-const each = (fn, node) => {
-
-	let child = node.firstElementChild
-
-	while (child)
-
-		if (fn(child) && child.firstElementChild) child = child.firstElementChild
-
-		else {
-
-			while (child != node && !child.nextElementSibling) child = child.parentNode ?? node
-
-			child = child != node && child.nextElementSibling
-		}
-}
-
-const before = (el, node, child) => {
-
-	if (node.isConnected && node.contains(document.activeElement)) {
-
-		const ref = node.nextSibling
-
-		while (child && child != node) {
-
-			const next = child.nextSibling
-
-			el.insertBefore(child, ref)
-
-			child = next
-		}
-
-	} else el.insertBefore(node, child)
-}
-
-const unref = (root, parent) => {
-
-	if (root[Memo] == unref) return
-
-	root[Memo] = unref
-
-	let node = root
-
-	while (node.firstElementChild) node = node.firstElementChild
-
-	while (true) {
-
-		const { nextElementSibling, parentNode } = node
-
-		if (node[Key] != null) (parentNode ?? parent)?.[Keyed]?.delete(node[Key])
-
-		if (typeof node.return == 'function') node.return(false)
-
-		if (typeof node[Cache]?.ref == 'function') node[Cache].ref(null)
-
-		if (node == root) break
-
-		node = nextElementSibling ?? parentNode ?? root
-
-		if (nextElementSibling) while (node.firstElementChild) node = node.firstElementChild
-	}
-}
-
-const next = (fn, args, el) => {
-
-	if (!el[Generator]) {
-
-		watch()
-
-		assign(el, methods)[Context] = Object.create(current()?.[Context] ?? null)
-
-		el[Generator] = fn
-	}
-
-	const prev = el[Args] ??= args
-
-	for (const key of keys(prev)) if (!hasOwn(args, key)) delete prev[key]
-
-	assign(prev, args)
-
-	el[Render]()
-}
-
-let observer
-
-const watch = () => observer || (observer = new MutationObserver(records => {
-
-	for (const record of records) for (const node of record.removedNodes) if (node.nodeType == 1 && !node.isConnected) unref(node, record.target)
-
-})).observe(document, { childList: true, subtree: true })
-
-const methods = {
-
-	*[Symbol.iterator]() { while (true) yield this[Args] },
-
-	[Render]() {
-
-		const parent = current()
-
-		current(this)
-
-		try {
-
-			if (!this[Iterator]) {
-
-				this.signal = (this[Controller] = new AbortController()).signal
-
-				this[Iterator] = this[Generator].call(this, this[Args])
-			}
-
-			const { value, done } = this[Iterator].next()
-
-			render(value, this)
-
-			if (done) this.return()
-
-		} catch (e) {
-
-			this.throw(e)
-
-		} finally {
-
-			current(parent)
-		}
-	},
-
-	next(fn, result) {
-
-		if (this[Iterator] === false || !this.isConnected) return result
-
-		try {
-
-			if (typeof fn == 'function') result = fn.call(this, this[Args])
-
-		} catch (e) {
-
-			return this.throw(e)
-		}
-
-		if (!current()?.contains(this)) this[Render]()
-
-		return result
-	},
-
-	throw(value) {
-
-		for (let el = this; el; el = el.parentNode) if (el[Iterator]?.throw) try {
-
-			return render(el[Iterator].throw(value).value, el)
-
-		} catch (e) {
-
-			value = new Error(e?.message ?? e, { cause: value })
-		}
-
-		throw value
-	},
-
-	return(deep = true) {
-
-		const iterator = this[Iterator]
-
-		if (iterator === false) return
-
-		this[Iterator] = false
-
-		if (deep) each(el => typeof el.return == 'function' ? el.return() : true, this)
-
-		try {
-
-			iterator?.return()
-
-		} catch (e) {
-
-			this.throw(e)
-
-		} finally {
-
-			this[Iterator] = null
-
-			this[Controller]?.abort()
-		}
-	}
-}
+import { Context, current } from './context.js'
+import { isVNode } from './jsx.js'
+
+const { isArray } = Array, { assign, hasOwn, keys } = Object
+
+const Key = Symbol.for('ajo.key')
+const Keyed = Symbol.for('ajo.keyed')
+const Memo = Symbol.for('ajo.memo')
+const Cache = Symbol.for('ajo.cache')
+const Generator = Symbol.for('ajo.generator')
+const Iterator = Symbol.for('ajo.iterator')
+const Render = Symbol.for('ajo.render')
+const Args = Symbol.for('ajo.args')
+const Controller = Symbol.for('ajo.controller')
+
+export const defaults = { tag: 'div' }
+
+export const stateful = (fn, is) => (is && (fn.is = is), fn)
+
+export const render = (h, el, child = el.firstChild, ref = null) => {
+
+	walk(h, h => {
+
+		const node = typeof h == 'string' ? text(h, child, ref) : element(h, el, child, ref)
+
+		if (child == null) {
+
+			before(el, node, ref)
+
+		} else if (node == child) {
+
+			child = node.nextSibling
+
+		} else if (node == child.nextSibling) {
+
+			if (child.contains(document.activeElement)) el.insertBefore(node, child)
+
+			else el.insertBefore(child, ref)
+
+			child = node.nextSibling
+
+		} else {
+
+			before(el, node, child)
+		}
+	})
+
+	if (child && !ref && child == el.firstChild) {
+
+		const gone = [...el.children]
+
+		el[Keyed]?.clear()
+
+		el.textContent = ''
+
+		for (const node of gone) unref(node)
+
+	} else while (child && child != ref) {
+
+		const node = child.nextSibling
+
+		el.removeChild(child)
+
+		unref(child, el)
+
+		child = node
+	}
+}
+
+const walk = (h, fn) => {
+
+	if (h == null || typeof h == 'boolean') return
+
+	if (isVNode(h)) {
+
+		if (typeof h.nodeName != 'function') return fn(h)
+
+		const { nodeName, ...rest } = h
+
+		if (nodeName.prototype?.next) fn(runGenerator(nodeName, rest))
+
+		else walk(nodeName(rest), fn)
+
+	} else if (typeof h == 'object' && Symbol.iterator in h) for (h of h) walk(h, fn)
+
+	else fn(String(h))
+}
+
+const runGenerator = (fn, h) => {
+
+	const attrs = { ...fn.attrs }, args = { ...fn.args }
+
+	for (const key of keys(h)) {
+
+		if (key.startsWith('attr:')) attrs[key.slice(5)] = h[key]
+
+		else if (key == 'key' || key == 'skip' || key == 'memo' || key == 'ref' || key.startsWith('set:')) attrs[key] = h[key]
+
+		else args[key] = h[key]
+	}
+
+	attrs.nodeName = fn.is ?? defaults.tag
+
+	attrs[Generator] = fn
+
+	attrs[Args] = args
+
+	return attrs
+}
+
+const text = (h, node, ref) => {
+
+	while (node && node != ref && node.nodeType != 3) node = node.nextSibling
+
+	if (node == null || node == ref) node = document.createTextNode(h)
+
+	else if (node.data != h) node.data = h
+
+	return node
+}
+
+const element = (h, el, node, ref) => {
+
+	const nodeName = h.nodeName, key = h.key, gen = h[Generator]
+
+	if (node && key != null && ref == null) node = el[Keyed]?.get(key) ?? node
+
+	while (node && node != ref) {
+
+		const k = node[Key], g = node[Generator]
+
+		if (node.localName == nodeName && (k == null || k == key) && (!g || g == gen)) break
+
+		node = k != null ? null : node.nextElementSibling
+	}
+
+	if (node == null || node == ref) node = document.createElementNS(h.xmlns ?? el.namespaceURI, nodeName)
+
+	if (key != null) (el[Keyed] ??= new Map()).set(node[Key] = key, node)
+
+	if (!node[Cache] || h.memo == null || some(node[Memo], h.memo)) {
+
+		attrs(node[Cache], h, node)
+
+		if (!h.skip) {
+
+			if (gen) next(gen, h[Args], node)
+
+			else if (!node[Cache] && (typeof h.children == 'string' || typeof h.children == 'number')) node.textContent = h.children + ''
+
+			else render(h.children, node)
+		}
+
+		node[Memo] = h.memo
+
+		node[Cache] = h
+	}
+
+	return node
+}
+
+const special = key => key == 'nodeName' || key == 'children' || key == 'key' || key == 'skip' || key == 'memo'
+
+const attrs = (cache, h, node) => {
+
+	for (const key of cache ? keys(cache) : node.getAttributeNames()) {
+
+		if (hasOwn(h, key) || special(key)) continue
+
+		if (key.startsWith('set:')) node[key.slice(4)] = undefined
+
+		else node.removeAttribute(key)
+	}
+
+	for (const key of keys(h)) {
+
+		const value = h[key]
+
+		if (cache && cache[key] === value || special(key)) continue
+
+		if (key == 'ref' && typeof value == 'function') value(node)
+
+		else if (key.startsWith('set:')) node[key.slice(4)] = value
+
+		else if (value == null || value === false) node.removeAttribute(key)
+
+		else if (key == 'class' && typeof node.className == 'string') node.className = value === true ? '' : value
+
+		else node.setAttribute(key, value === true ? '' : value)
+	}
+}
+
+const some = (a, b) =>
+
+	isArray(a) && isArray(b) ? a.length != b.length || a.some((v, i) => v !== b[i]) : a !== b
+
+const each = (fn, node) => {
+
+	for (let child = node.firstElementChild; child; child = child.nextElementSibling) if (fn(child)) each(fn, child)
+}
+
+const before = (el, node, child) => {
+
+	if (node.isConnected && node.contains(document.activeElement)) {
+
+		const ref = node.nextSibling
+
+		while (child && child != node) {
+
+			const next = child.nextSibling
+
+			el.insertBefore(child, ref)
+
+			child = next
+		}
+
+	} else el.insertBefore(node, child)
+}
+
+const unref = (root, parent) => {
+
+	if (root[Memo] == unref) return
+
+	root[Memo] = unref
+
+	const clean = node => {
+
+		for (let child = node.firstElementChild, next; child; child = next) {
+
+			next = child.nextElementSibling
+
+			clean(child)
+		}
+
+		if (node[Key] != null) (node.parentNode ?? parent)?.[Keyed]?.delete(node[Key])
+
+		if (typeof node.return == 'function') node.return(false)
+
+		if (typeof node[Cache]?.ref == 'function') node[Cache].ref(null)
+	}
+
+	clean(root)
+}
+
+let observer
+
+const next = (fn, args, el) => {
+
+	if (!el[Generator]) {
+
+		if (!observer) (observer = new MutationObserver(records => {
+
+			for (const record of records) for (const node of record.removedNodes) if (node.nodeType == 1 && !node.isConnected) unref(node, record.target)
+
+		})).observe(document, { childList: true, subtree: true })
+
+		assign(el, methods)[Context] = Object.create(current()?.[Context] ?? null)
+
+		el[Generator] = fn
+	}
+
+	const prev = el[Args] ??= args
+
+	for (const key of keys(prev)) if (!hasOwn(args, key)) delete prev[key]
+
+	assign(prev, args)
+
+	el[Render]()
+}
+
+const methods = {
+
+	*[Symbol.iterator]() { while (true) yield this[Args] },
+
+	[Render]() {
+
+		const parent = current()
+
+		current(this)
+
+		try {
+
+			if (!this[Iterator]) {
+
+				this.signal = (this[Controller] = new AbortController()).signal
+
+				this[Iterator] = this[Generator].call(this, this[Args])
+			}
+
+			const { value, done } = this[Iterator].next()
+
+			render(value, this)
+
+			if (done) this.return()
+
+		} catch (e) {
+
+			this.throw(e)
+
+		} finally {
+
+			current(parent)
+		}
+	},
+
+	next(fn, result) {
+
+		if (this[Iterator] === false || !this.isConnected) return result
+
+		try {
+
+			if (typeof fn == 'function') result = fn.call(this, this[Args])
+
+		} catch (e) {
+
+			return this.throw(e)
+		}
+
+		if (!current()?.contains(this)) this[Render]()
+
+		return result
+	},
+
+	throw(value) {
+
+		for (let el = this; el; el = el.parentNode) if (el[Iterator]?.throw) try {
+
+			return render(el[Iterator].throw(value).value, el)
+
+		} catch (e) {
+
+			value = new Error(e?.message ?? e, { cause: value })
+		}
+
+		throw value
+	},
+
+	return(deep = true) {
+
+		const iterator = this[Iterator]
+
+		if (iterator === false) return
+
+		this[Iterator] = false
+
+		if (deep) each(el => typeof el.return == 'function' ? el.return() : true, this)
+
+		try {
+
+			iterator?.return()
+
+		} catch (e) {
+
+			this.throw(e)
+
+		} finally {
+
+			this[Iterator] = null
+
+			this[Controller]?.abort()
+		}
+	}
+}