ajo 0.0.21 → 0.0.22

package/index.cjs

@@ -17,29 +17,22 @@ var __copyProps = (to, from2, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var ajo_exports = {};
 __export(ajo_exports, {
-  For: () => For,
   Fragment: () => Fragment,
-  cleanup: () => cleanup,
-  clx: () => clx,
   component: () => component,
-  consume: () => consume,
   h: () => h,
-  intercept: () => intercept,
-  keb: () => keb,
-  propagate: () => propagate,
-  provide: () => provide,
-  refresh: () => refresh,
   render: () => render,
-  stx: () => stx
+  useCallback: () => useCallback,
+  useCatch: () => useCatch,
+  useEffect: () => useEffect,
+  useHost: () => useHost,
+  useLayout: () => useLayout,
+  useMemo: () => useMemo,
+  useReducer: () => useReducer,
+  useRef: () => useRef,
+  useState: () => useState
 });
 module.exports = __toCommonJS(ajo_exports);
-const Fragment = ({ children }) => children, For = ({ is, key, block, each, by, children, ref, ...props }) => h(is ?? "div", {
-  ...props,
-  key,
-  block,
-  skip: true,
-  ref: iterate.bind(null, each, by, children, ref)
-}), h = (nodeName, props, ...children) => {
+const Fragment = ({ children }) => children, h = (nodeName, props, ...children) => {
   const { length } = children;
   children = length == 0 ? null : length == 1 ? children[0] : children;
   return { children, ...props, nodeName };
@@ -54,14 +47,17 @@ const Fragment = ({ children }) => children, For = ({ is, key, block, each, by,
         node = node.nextSibling;
       node ? node.data != h2 && (node.data = h2) : node = document.createTextNode(h2);
     } else {
-      const { xmlns = ns, nodeName, key, block, skip, children, ref, ...props } = h2;
+      const { xmlns = ns, nodeName, key, ref, memo, children, [FN]: fn, ...props } = h2;
       while (node && !(node.localName == nodeName && (node.$key ??= key) == key))
         node = node.nextSibling;
       node ??= create(xmlns, nodeName, key);
-      if (block == null || some(node.$deps, node.$deps = block)) {
+      if (isObject(ref)) {
+        ref.current = node;
+        node.$ref = ref;
+      }
+      if (memo == null || some(node.$memo, node.$memo = memo)) {
         update(props, node);
-        skip || render(children, node, xmlns);
-        isFunction(ref) && ref(node);
+        isFunction(fn) ? fn(node) : render(children, node, xmlns);
       }
     }
     node == child ? child = child.nextSibling : before(host, node, child);
@@ -71,55 +67,61 @@ const Fragment = ({ children }) => children, For = ({ is, key, block, each, by,
     dispose(host.removeChild(child));
     child = next;
   }
-}, component = (setup) => ({ is, props, key, block, ref, ...params }) => h(is ?? setup.is ?? "div", {
-  ...setup.props,
+}, component = (fn) => ({ nodeName, as, props, key, ref, memo, ...args }) => h(as ?? fn?.as ?? "c-host", {
+  ...fn?.props,
   ...props,
   key,
-  block,
-  skip: true,
-  ref: run.bind(null, setup, params, ref)
-}), refresh = (host) => {
-  try {
-    render((host.$render ??= host.$setup(host))(host.$params), host);
-  } catch (error) {
-    propagate(host, error);
+  ref,
+  memo,
+  [FN]: (host) => {
+    host.$fn = isFunction(fn) ? fn : noop;
+    host.$args = { ...fn?.args, ...args };
+    schedule(host);
   }
-}, provide = (host, key, value) => (host.$provisions ??= /* @__PURE__ */ new Map()).set(key, value), consume = (host, key, fallback) => {
-  for (let map2; host; host = host.parentNode)
-    if ((map2 = host.$provisions) && map2.has(key))
-      return map2.get(key);
-  return fallback;
-}, intercept = (host, fn) => isFunction(fn) && (host.$interceptor = fn), propagate = (host, error) => {
-  for (let fn; host; host = host.parentNode)
-    if (isFunction(fn = host.$interceptor))
-      return render(fn(error), host);
-  throw error;
-}, cleanup = (host, fn) => isFunction(fn) && (host.$cleanups ??= /* @__PURE__ */ new Set()).add(fn), clx = (o) => keys(o).filter((k) => o[k]).join(" ") || null, stx = (o) => entries(o).map((t) => t.join(":")).join(";") || null, keb = (o) => keys(o).reduce((r, k) => (r[k.replace(search, replace).toLowerCase()] = o[k], r), {});
-const { isArray, from } = Array, { keys, entries } = Object, isFunction = (v) => typeof v == "function", noop = () => {
-}, map = (list) => list.reduce(set, /* @__PURE__ */ new Map()), set = (m, v, i) => (m.set(v, i), m), some = (a, b) => isArray(a) && isArray(b) ? a.some((v, i) => v !== b[i]) : a !== b, reduce = (v) => from(v).reduce(assign, {}), assign = (v, { name, value }) => (v[name] = value, v), create = (ns, name, key) => {
+}), useReducer = (fn, init) => {
+  const host = useHost(), hooks = useHooks(), [i, stack] = hooks;
+  if (i == stack.length)
+    stack[i] = [
+      isFunction(init) ? init() : init,
+      (value) => {
+        const prev = stack[i][0], next = isFunction(value) ? value(prev) : value;
+        if (is(prev, stack[i][0] = isFunction(fn) ? fn(prev, next) : next))
+          return;
+        runMutations(host);
+      }
+    ];
+  return stack[hooks[0]++];
+}, useMemo = (fn, deps) => {
+  const hooks = useHooks(), [i, stack] = hooks;
+  if (i == stack.length || deps == null || some(deps, stack[i][1]))
+    stack[i] = [fn(), deps];
+  return stack[hooks[0]++][0];
+}, useCatch = (fn) => {
+  const host = useHost(), [value, setValue] = useReducer(), hooks = useHooks(), [i, stack] = hooks;
+  stack[hooks[0]++] = fn;
+  host.$catch ??= (value2) => {
+    isFunction(stack[i]) && stack[i](value2);
+    setValue(value2);
+  };
+  return [value, () => setValue()];
+}, useHost = () => current, useState = (init) => useReducer(null, init), useRef = (current2) => useMemo(() => ({ current: current2 }), []), useCallback = (fn, deps) => useMemo(() => fn, deps), useLayout = (fn, deps) => useFx(fn, deps, "$layout"), useEffect = (fn, deps) => useFx(fn, deps, "$effect");
+const microtask = globalThis.queueMicrotask ?? ((fn) => fn()), task = globalThis.requestAnimationFrame ?? microtask, { isArray, from } = Array, { is } = Object, noop = () => {
+}, FN = Symbol(), isObject = (v) => v && typeof v == "object", isFunction = (v) => typeof v == "function", some = (a, b) => isArray(a) && isArray(b) ? a.some((v, i) => !is(v, b[i])) : !is(a, b), reduce = (v) => from(v).reduce(assign, {}), assign = (v, { name, value }) => (v[name] = value, v), create = (ns, name, key) => {
   const node = ns ? document.createElementNS(ns, name) : document.createElement(name);
   return node.$key = key, node;
-}, proxy = { firstChild: null, insertBefore: (node) => proxy.firstChild ??= node }, handler = {
-  get(target, key) {
-    const value = key == "nextSibling" ? null : Reflect.get(target, key);
-    return isFunction(value) ? value.bind(target) : value;
-  },
-  set(target, key, value) {
-    return Reflect.set(target, key, value);
-  }
-}, search = /([a-z0-9])([A-Z])/g, replace = "$1-$2", normalize = function* (h2, buffer = { t: "" }, root = true) {
-  let t;
+}, normalize = function* (h2, buffer = { data: "" }, root = true) {
+  let data;
   for (h2 of isArray(h2) ? h2 : [h2]) {
     if (h2 == null || typeof h2 == "boolean")
       continue;
     if (typeof h2.nodeName == "string")
-      (t = buffer.t) && (buffer.t = "", yield t), yield h2;
+      (data = buffer.data) && (buffer.data = "", yield data), yield h2;
     else if (isFunction(h2.nodeName))
       yield* normalize(h2.nodeName(h2), buffer, false);
     else
-      isArray(h2) ? yield* normalize(h2, buffer, false) : buffer.t += h2;
+      isArray(h2) ? yield* normalize(h2, buffer, false) : buffer.data += h2;
   }
-  root && (t = buffer.t) && (yield t);
+  root && (data = buffer.data) && (yield data);
 }, update = (props, host) => {
   const prev = host.$props ??= host.hasAttributes() ? reduce(host.attributes) : {};
   for (const name in { ...prev, ...host.$props = props }) {
@@ -142,66 +144,111 @@ const { isArray, from } = Array, { keys, entries } = Object, isFunction = (v) =>
     }
   } else
     host.insertBefore(node, child);
-}, iterate = (each, by, fn, ref, host) => {
-  each = isArray(each) ? each : [];
-  by = isFunction(by) ? by : (v) => v;
-  fn = isFunction(fn) ? fn : noop;
-  const map2 = host.$for ??= /* @__PURE__ */ new Map(), del = (node) => {
-    map2.delete(node.$by);
-    dispose(node);
-  }, clr = each !== host.$each, len = (host.$each = each).length, a = from(host.childNodes), b = new Array(len);
-  clr && map2.clear();
-  for (let child, index = 0; index < len; index++) {
-    const item = each[index], key = by(item, index);
-    child = clr ? a[index] : map2.get(key);
-    proxy.firstChild = child ? new Proxy(child, handler) : null;
-    render(fn(item, index), proxy);
-    child ??= proxy.firstChild;
-    proxy.firstChild = null;
-    map2.set(child.$by = key, b[index] = child);
+}, useHooks = () => current.$hooks ??= [0, []], useFx = (fn, deps, key) => {
+  const host = useHost(), hooks = useHooks(), [i, stack] = hooks, init = i == stack.length;
+  if (init)
+    (host[key] ??= /* @__PURE__ */ new Set()).add(stack[i] = [null, fn, deps]);
+  else if (deps == null || some(deps, stack[i][2])) {
+    stack[i][1] = fn;
+    stack[i][2] = deps;
+  }
+  hooks[0]++;
+}, schedule = (host) => {
+  if (host.$idle)
+    return;
+  if (globalThis.navigator?.scheduling?.isInputPending()) {
+    host.$idle = requestIdleCallback(() => {
+      host.$idle = null;
+      schedule(host);
+    });
+    return;
   }
-  arrange(host, a, b, del);
-  isFunction(ref) && ref(host);
-}, arrange = (host, a, b, dispose2 = noop) => {
-  const aLen = a.length, bLen = b.length;
-  let aIndex = 0, bIndex = 0, aValue, bValue, aMap, bMap, i;
-  while (aIndex !== aLen || bIndex !== bLen) {
-    aValue = a[aIndex], bValue = b[bIndex];
-    if (aValue === null)
-      aIndex++;
-    else if (bLen <= bIndex)
-      aIndex++, dispose2(host.removeChild(aValue));
-    else if (aLen <= aIndex)
-      bIndex++, host.appendChild(bValue);
-    else if (aValue === bValue)
-      aIndex++, bIndex++;
-    else {
-      aMap ??= map(a), bMap ??= map(b);
-      if (bMap.get(aValue) == null)
-        aIndex++, dispose2(host.removeChild(aValue));
-      else {
-        host.insertBefore(bValue, aValue), bIndex++;
-        if ((i = aMap.get(bValue)) != null) {
-          if (i > aIndex + 1)
-            aIndex++;
-          a[i] = null;
+  runComponent(host);
+}, runMutations = (host) => {
+  if (host.$queued)
+    return;
+  host.$queued = true;
+  microtask(() => {
+    host.$queued = false;
+    runComponent(host);
+  });
+}, runComponent = (host) => {
+  if (host.$idle) {
+    cancelIdleCallback(host.$idle);
+    host.$idle = null;
+  }
+  current = host;
+  if (current.$hooks)
+    current.$hooks[0] = 0;
+  try {
+    host.$h = host.$fn(host.$args);
+  } catch (value) {
+    propagate(value, host.parentNode);
+  } finally {
+    current = null;
+    layoutsQueue.add(host);
+    layoutsId ??= task(runLayouts);
+  }
+}, runLayouts = () => {
+  layoutsId = null;
+  for (const host of layoutsQueue) {
+    layoutsQueue.delete(host);
+    try {
+      render(host.$h, host);
+      host.$h = null;
+    } catch (value) {
+      propagate(value, host);
+    } finally {
+      runFx(host, "$layout");
+      effectsQueue.add(host);
+      effectsId ??= task(runEffects);
+    }
+  }
+}, runEffects = () => {
+  effectsId = null;
+  for (const host of effectsQueue) {
+    effectsQueue.delete(host);
+    runFx(host, "$effect");
+  }
+}, runFx = (host, key) => {
+  if (host[key])
+    for (const fx of host[key]) {
+      const [cleanup, setup] = fx;
+      if (isFunction(setup)) {
+        try {
+          if (isFunction(cleanup))
+            cleanup();
+          fx[0] = setup();
+        } catch (value) {
+          fx[0] = null;
+          propagate(value, host.parentNode);
+        } finally {
+          fx[1] = null;
         }
       }
     }
-  }
-}, run = (setup, params, ref, host) => {
-  host.$setup ??= isFunction(setup) ? setup : noop;
-  host.$params = { ...setup.params, ...params };
-  refresh(host);
-  isFunction(ref) && ref(host);
 }, dispose = (host) => {
   if (host.nodeType != 1)
     return;
   for (const child of host.children)
     dispose(child);
-  if ("$cleanups" in host)
-    for (const fn of host.$cleanups) {
-      host.$cleanups.delete(fn);
-      fn(host);
+  if (host.$ref)
+    host.$ref.current = null;
+  layoutsQueue.delete(host);
+  effectsQueue.delete(host);
+  for (const key of ["$layout", "$effect"])
+    if (host[key]) {
+      for (const fx of host[key])
+        try {
+          isFunction(fx[0]) && fx[0]();
+        } catch {
+        }
+      host[key].clear();
     }
+}, propagate = (value, host) => {
+  for (let fn; host; host = host.parentNode)
+    if (isFunction(fn = host.$catch))
+      return void fn(value);
+  throw value;
 };
+let current = null, layoutsQueue = /* @__PURE__ */ new Set(), layoutsId = null, effectsQueue = /* @__PURE__ */ new Set(), effectsId = null;

package/index.js

@@ -1,9 +1,6 @@
 export const
-	Fragment = ({ children }) => children,
 
-	For = ({ is, key, block, each, by, children, ref, ...props }) => h(is ?? 'div', {
-		...props, key, block, skip: true, ref: iterate.bind(null, each, by, children, ref)
-	}),
+	Fragment = ({ children }) => children,
 
 	h = (nodeName, props, ...children) => {
 		const { length } = children
@@ -28,15 +25,19 @@ export const
 
 			} else {
 
-				const { xmlns = ns, nodeName, key, block, skip, children, ref, ...props } = h
+				const { xmlns = ns, nodeName, key, ref, memo, children, [FN]: fn, ...props } = h
 
 				while (node && !(node.localName == nodeName && (node.$key ??= key) == key)) node = node.nextSibling
 				node ??= create(xmlns, nodeName, key)
 
-				if (block == null || some(node.$deps, node.$deps = block)) {
+				if (isObject(ref)) {
+					ref.current = node
+					node.$ref = ref
+				}
+
+				if (memo == null || some(node.$memo, node.$memo = memo)) {
 					update(props, node)
-					skip || render(children, node, xmlns)
-					isFunction(ref) && ref(node)
+					isFunction(fn) ? fn(node) : render(children, node, xmlns)
 				}
 			}
 
@@ -50,80 +51,103 @@ export const
 		}
 	},
 
-	component = setup => ({ is, props, key, block, ref, ...params }) => h(is ?? setup.is ?? 'div', {
-		...setup.props, ...props, key, block, skip: true, ref: run.bind(null, setup, params, ref)
-	}),
+	component = fn => ({ nodeName, as, props, key, ref, memo, ...args }) =>
 
-	refresh = host => {
-		try {
-			render((host.$render ??= host.$setup(host))(host.$params), host)
-		} catch (error) {
-			propagate(host, error)
-		}
-	},
+		h(as ?? fn?.as ?? 'c-host', {
+
+			...fn?.props, ...props, key, ref, memo, [FN]: host => {
+
+				host.$fn = isFunction(fn) ? fn : noop
+				host.$args = { ...fn?.args, ...args }
+
+				schedule(host)
+			}
+		}),
+
+	useReducer = (fn, init) => {
+
+		const host = useHost(), hooks = useHooks(), [i, stack] = hooks
+
+		if (i == stack.length) stack[i] = [
+
+			isFunction(init) ? init() : init,
+
+			value => {
+
+				const prev = stack[i][0], next = isFunction(value) ? value(prev) : value
 
-	provide = (host, key, value) => (host.$provisions ??= new Map).set(key, value),
+				if (is(prev, stack[i][0] = isFunction(fn) ? fn(prev, next) : next)) return
 
-	consume = (host, key, fallback) => {
-		for (let map; host; host = host.parentNode) if ((map = host.$provisions) && map.has(key)) return map.get(key)
-		return fallback
+				runMutations(host)
+			}
+		]
+
+		return stack[hooks[0]++]
 	},
 
-	intercept = (host, fn) => isFunction(fn) && (host.$interceptor = fn),
+	useMemo = (fn, deps) => {
+
+		const hooks = useHooks(), [i, stack] = hooks
+
+		if (i == stack.length || deps == null || some(deps, stack[i][1])) stack[i] = [fn(), deps]
 
-	propagate = (host, error) => {
-		for (let fn; host; host = host.parentNode) if (isFunction(fn = host.$interceptor)) return render(fn(error), host)
-		throw error
+		return stack[hooks[0]++][0]
 	},
 
-	cleanup = (host, fn) => isFunction(fn) && (host.$cleanups ??= new Set).add(fn),
+	useCatch = fn => {
+
+		const host = useHost(), [value, setValue] = useReducer(), hooks = useHooks(), [i, stack] = hooks
+
+		stack[hooks[0]++] = fn
+
+		host.$catch ??= value => {
+			isFunction(stack[i]) && stack[i](value)
+			setValue(value)
+		}
+
+		return [value, () => setValue()]
+	},
 
-	clx = o => keys(o).filter(k => o[k]).join(' ') || null,
+	useHost = () => current,
+	useState = init => useReducer(null, init),
 
-	stx = o => entries(o).map(t => t.join(':')).join(';') || null,
+	useRef = current => useMemo(() => ({ current }), []),
+	useCallback = (fn, deps) => useMemo(() => fn, deps),
 
-	keb = o => keys(o).reduce((r, k) => ((r[k.replace(search, replace).toLowerCase()] = o[k]), r), {})
+	useLayout = (fn, deps) => useFx(fn, deps, '$layout'),
+	useEffect = (fn, deps) => useFx(fn, deps, '$effect')
 
 const
-	{ isArray, from } = Array, { keys, entries } = Object,
 
-	isFunction = v => typeof v == 'function', noop = () => { },
+	microtask = globalThis.queueMicrotask ?? (fn => fn()),
+
+	task = globalThis.requestAnimationFrame ?? microtask,
+
+	{ isArray, from } = Array, { is } = Object,  noop = () => { }, FN = Symbol(),
 
-	map = list => list.reduce(set, new Map), set = (m, v, i) => (m.set(v, i), m),
+	isObject = v => v && typeof v == 'object', isFunction = v => typeof v == 'function',
 
-	some = (a, b) => (isArray(a) && isArray(b)) ? a.some((v, i) => v !== b[i]) : a !== b,
+	some = (a, b) => (isArray(a) && isArray(b)) ? a.some((v, i) => !is(v, b[i])) : !is(a, b),
 
 	reduce = v => from(v).reduce(assign, {}), assign = (v, { name, value }) => ((v[name] = value), v),
 
 	create = (ns, name, key) => {
 		const node = ns ? document.createElementNS(ns, name) : document.createElement(name)
-		return ((node.$key = key), node)
+		return node.$key = key, node
 	},
 
-	proxy = { firstChild: null, insertBefore: node => proxy.firstChild ??= node }, handler = {
-		get(target, key) {
-			const value = key == 'nextSibling' ? null : Reflect.get(target, key)
-			return isFunction(value) ? value.bind(target) : value
-		},
-		set(target, key, value) {
-			return Reflect.set(target, key, value)
-		}
-	},
-
-	search = /([a-z0-9])([A-Z])/g, replace = '$1-$2',
-
-	normalize = function* (h, buffer = { t: '' }, root = true) {
+	normalize = function* (h, buffer = { data: '' }, root = true) {
 
-		let t
+		let data
 
 		for (h of isArray(h) ? h : [h]) {
 			if (h == null || typeof h == 'boolean') continue
-			if (typeof h.nodeName == 'string') ((t = buffer.t) && (buffer.t = '', yield t)), yield h
+			if (typeof h.nodeName == 'string') ((data = buffer.data) && (buffer.data = '', yield data)), yield h
 			else if (isFunction(h.nodeName)) yield* normalize(h.nodeName(h), buffer, false)
-			else isArray(h) ? yield* normalize(h, buffer, false) : buffer.t += h
+			else isArray(h) ? yield* normalize(h, buffer, false) : buffer.data += h
 		}
 
-		root && (t = buffer.t) && (yield t)
+		root && (data = buffer.data) && (yield data)
 	},
 
 	update = (props, host) => {
@@ -142,6 +166,7 @@ const
 	},
 
 	before = (host, node, child) => {
+
 		if (node.contains?.(document.activeElement)) {
 
 			const ref = node.nextSibling
@@ -155,90 +180,145 @@ const
 		} else host.insertBefore(node, child)
 	},
 
-	iterate = (each, by, fn, ref, host) => {
+	useHooks = () => current.$hooks ??= [0, []],
+
+	useFx = (fn, deps, key) => {
 
-		each = isArray(each) ? each : []
-		by = isFunction(by) ? by : v => v
-		fn = isFunction(fn) ? fn : noop
+		const host = useHost(), hooks = useHooks(), [i, stack] = hooks, init = i == stack.length
 
-		const
-			map = host.$for ??= new Map,
-			del = node => {
-				map.delete(node.$by)
-				dispose(node)
-			},
-			clr = each !== host.$each,
-			len = (host.$each = each).length,
-			a = from(host.childNodes),
-			b = new Array(len)
+		if (init) (host[key] ??= new Set).add(stack[i] = [null, fn, deps])
 
-		clr && map.clear()
+		else if (deps == null || some(deps, stack[i][2])) {
+			stack[i][1] = fn
+			stack[i][2] = deps
+		}
 
-		for (let child, index = 0; index < len; index++) {
+		hooks[0]++
+	},
 
-			const item = each[index], key = by(item, index)
+	schedule = host => {
 
-			child = (clr ? a[index] : map.get(key))
+		if (host.$idle) return
 
-			proxy.firstChild = child ? new Proxy(child, handler) : null
-			render(fn(item, index), proxy)
+		if (globalThis.navigator?.scheduling?.isInputPending()) {
 
-			child ??= proxy.firstChild
-			proxy.firstChild = null
+			host.$idle = requestIdleCallback(() => {
+				host.$idle = null
+				schedule(host)
+			})
 
-			map.set(child.$by = key, b[index] = child)
+			return
 		}
 
-		arrange(host, a, b, del)
-		isFunction(ref) && ref(host)
+		runComponent(host)
+	},
+
+	runMutations = host => {
+
+		if (host.$queued) return
+
+		host.$queued = true
+		microtask(() => {
+			host.$queued = false
+			runComponent(host)
+		})
 	},
 
-	arrange = (host, a, b, dispose = noop) => {
+	runComponent = host => {
 
-		const aLen = a.length, bLen = b.length
+		if (host.$idle) {
+			cancelIdleCallback(host.$idle)
+			host.$idle = null
+		}
 
-		let aIndex = 0, bIndex = 0, aValue, bValue, aMap, bMap, i
+		current = host
 
-		while (aIndex !== aLen || bIndex !== bLen) {
+		if (current.$hooks) current.$hooks[0] = 0
 
-			aValue = a[aIndex], bValue = b[bIndex]
+		try {
+			host.$h = host.$fn(host.$args)
+		} catch (value) {
+			propagate(value, host.parentNode)
+		} finally {
+			current = null
+			layoutsQueue.add(host)
+			layoutsId ??= task(runLayouts)
+		}
+	},
 
-			if (aValue === null) aIndex++
-			else if (bLen <= bIndex) aIndex++, dispose(host.removeChild(aValue))
-			else if (aLen <= aIndex) bIndex++, host.appendChild(bValue)
-			else if (aValue === bValue) aIndex++, bIndex++
-			else {
+	runLayouts = () => {
 
-				aMap ??= map(a), bMap ??= map(b)
+		layoutsId = null
 
-				if (bMap.get(aValue) == null) aIndex++, dispose(host.removeChild(aValue))
-				else {
+		for (const host of layoutsQueue) {
 
-					host.insertBefore(bValue, aValue), bIndex++
+			layoutsQueue.delete(host)
 
-					if ((i = aMap.get(bValue)) != null) {
-						if (i > aIndex + 1) aIndex++
-						a[i] = null
-					}
-				}
+			try {
+				render(host.$h, host)
+				host.$h = null
+			} catch (value) {
+				propagate(value, host)
+			} finally {
+				runFx(host, '$layout')
+				effectsQueue.add(host)
+				effectsId ??= task(runEffects)
 			}
 		}
 	},
 
-	run = (setup, params, ref, host) => {
+	runEffects = () => {
+
+		effectsId = null
+
+		for (const host of effectsQueue) {
+			effectsQueue.delete(host)
+			runFx(host, '$effect')
+		}
+	},
+
+	runFx = (host, key) => {
 
-		host.$setup ??= isFunction(setup) ? setup : noop
-		host.$params = { ...setup.params, ...params }
+		if (host[key]) for (const fx of host[key]) {
 
-		refresh(host)
-		isFunction(ref) && ref(host)
+			const [cleanup, setup] = fx
+
+			if (isFunction(setup)) {
+				try {
+					if (isFunction(cleanup)) cleanup()
+					fx[0] = setup()
+				} catch (value) {
+					fx[0] = null
+					propagate(value, host.parentNode)
+				} finally {
+					fx[1] = null
+				}
+			}
+		}
 	},
 
 	dispose = host => {
+
 		if (host.nodeType != 1) return
+
 		for (const child of host.children) dispose(child)
-		if ('$cleanups' in host) for (const fn of host.$cleanups) {
-			host.$cleanups.delete(fn)
-			fn(host)
+
+		if (host.$ref) host.$ref.current = null
+
+		layoutsQueue.delete(host)
+		effectsQueue.delete(host)
+
+		for (const key of ['$layout', '$effect']) if (host[key]) {
+
+			for (const fx of host[key]) try { isFunction(fx[0]) && fx[0]() } catch { }
+
+			host[key].clear()
 		}
+	},
+
+	propagate = (value, host) => {
+		for (let fn; host; host = host.parentNode) if (isFunction(fn = host.$catch)) return void fn(value)
+		throw value
 	}
+
+let current = null, layoutsQueue = new Set, layoutsId = null, effectsQueue = new Set, effectsId = null

package/index.min.js

@@ -1 +1 @@
-var ajo=(()=>{var x=Object.defineProperty;var B=Object.getOwnPropertyDescriptor;var E=Object.getOwnPropertyNames;var F=Object.prototype.hasOwnProperty;var L=(e,n)=>{for(var l in n)x(e,l,{get:n[l],enumerable:!0})},T=(e,n,l,i)=>{if(n&&typeof n=="object"||typeof n=="function")for(let t of E(n))!F.call(e,t)&&t!==l&&x(e,t,{get:()=>n[t],enumerable:!(i=B(n,t))||i.enumerable});return e};var z=e=>T(x({},"__esModule",{value:!0}),e);var re={};L(re,{For:()=>R,Fragment:()=>I,cleanup:()=>Z,clx:()=>q,component:()=>V,consume:()=>P,h:()=>b,intercept:()=>W,keb:()=>G,propagate:()=>A,provide:()=>O,refresh:()=>k,render:()=>g,stx:()=>D});const I=({children:e})=>e,R=({is:e,key:n,block:l,each:i,by:t,children:s,ref:r,...o})=>b(e??"div",{...o,key:n,block:l,skip:!0,ref:le.bind(null,i,t,s,r)}),b=(e,n,...l)=>{const{length:i}=l;return l=i==0?null:i==1?l[0]:l,{children:l,...n,nodeName:e}},g=(e,n,l)=>{let i=n.firstChild;for(e of y(e)){let t=i;if(e instanceof Node)t=e;else if(typeof e=="string"){for(;t&&t.nodeType!=3;)t=t.nextSibling;t?t.data!=e&&(t.data=e):t=document.createTextNode(e)}else{const{xmlns:s=l,nodeName:r,key:o,block:c,skip:f,children:u,ref:a,...d}=e;for(;t&&!(t.localName==r&&(t.$key??=o)==o);)t=t.nextSibling;t??=X(s,r,o),(c==null||K(t.$deps,t.$deps=c))&&(ee(d,t),f||g(u,t,s),p(a)&&a(t))}t==i?i=i.nextSibling:ne(n,t,i)}for(;i;){const t=i.nextSibling;v(n.removeChild(i)),i=t}},V=e=>({is:n,props:l,key:i,block:t,ref:s,...r})=>b(n??e.is??"div",{...e.props,...l,key:i,block:t,skip:!0,ref:te.bind(null,e,r,s)}),k=e=>{try{g((e.$render??=e.$setup(e))(e.$params),e)}catch(n){A(e,n)}},O=(e,n,l)=>(e.$provisions??=new Map).set(n,l),P=(e,n,l)=>{for(let i;e;e=e.parentNode)if((i=e.$provisions)&&i.has(n))return i.get(n);return l},W=(e,n)=>p(n)&&(e.$interceptor=n),A=(e,n)=>{for(let l;e;e=e.parentNode)if(p(l=e.$interceptor))return g(l(n),e);throw n},Z=(e,n)=>p(n)&&(e.$cleanups??=new Set).add(n),q=e=>j(e).filter(n=>e[n]).join(" ")||null,D=e=>H(e).map(n=>n.join(":")).join(";")||null,G=e=>j(e).reduce((n,l)=>(n[l.replace(_,h).toLowerCase()]=e[l],n),{}),{isArray:$,from:M}=Array,{keys:j,entries:H}=Object,p=e=>typeof e=="function",w=()=>{},S=e=>e.reduce(J,new Map),J=(e,n,l)=>(e.set(n,l),e),K=(e,n)=>$(e)&&$(n)?e.some((l,i)=>l!==n[i]):e!==n,Q=e=>M(e).reduce(U,{}),U=(e,{name:n,value:l})=>(e[n]=l,e),X=(e,n,l)=>{const i=e?document.createElementNS(e,n):document.createElement(n);return i.$key=l,i},m={firstChild:null,insertBefore:e=>m.firstChild??=e},Y={get(e,n){const l=n=="nextSibling"?null:Reflect.get(e,n);return p(l)?l.bind(e):l},set(e,n,l){return Reflect.set(e,n,l)}},_=/([a-z0-9])([A-Z])/g,h="$1-$2",y=function*(e,n={t:""},l=!0){let i;for(e of $(e)?e:[e])e==null||typeof e=="boolean"||(typeof e.nodeName=="string"?((i=n.t)&&(n.t="",yield i),yield e):p(e.nodeName)?yield*y(e.nodeName(e),n,!1):$(e)?yield*y(e,n,!1):n.t+=e);l&&(i=n.t)&&(yield i)},ee=(e,n)=>{const l=n.$props??=n.hasAttributes()?Q(n.attributes):{};for(const i in{...l,...n.$props=e}){let t=e[i];t!==l[i]&&(i.startsWith("set:")?n[i.slice(4)]=t:t==null||t===!1?n.removeAttribute(i):n.setAttribute(i,t===!0?"":t))}},ne=(e,n,l)=>{if(n.contains?.(document.activeElement)){const i=n.nextSibling;for(;l&&l!=n;){const t=l.nextSibling;e.insertBefore(l,i),l=t}}else e.insertBefore(n,l)},le=(e,n,l,i,t)=>{e=$(e)?e:[],n=p(n)?n:a=>a,l=p(l)?l:w;const s=t.$for??=new Map,r=a=>{s.delete(a.$by),v(a)},o=e!==t.$each,c=(t.$each=e).length,f=M(t.childNodes),u=new Array(c);o&&s.clear();for(let a,d=0;d<c;d++){const C=e[d],N=n(C,d);a=o?f[d]:s.get(N),m.firstChild=a?new Proxy(a,Y):null,g(l(C,d),m),a??=m.firstChild,m.firstChild=null,s.set(a.$by=N,u[d]=a)}ie(t,f,u,r),p(i)&&i(t)},ie=(e,n,l,i=w)=>{const t=n.length,s=l.length;let r=0,o=0,c,f,u,a,d;for(;r!==t||o!==s;)c=n[r],f=l[o],c===null?r++:s<=o?(r++,i(e.removeChild(c))):t<=r?(o++,e.appendChild(f)):c===f?(r++,o++):(u??=S(n),a??=S(l),a.get(c)==null?(r++,i(e.removeChild(c))):(e.insertBefore(f,c),o++,(d=u.get(f))!=null&&(d>r+1&&r++,n[d]=null)))},te=(e,n,l,i)=>{i.$setup??=p(e)?e:w,i.$params={...e.params,...n},k(i),p(l)&&l(i)},v=e=>{if(e.nodeType==1){for(const n of e.children)v(n);if("$cleanups"in e)for(const n of e.$cleanups)e.$cleanups.delete(n),n(e)}};return z(re);})();
+var ajo=(()=>{var g=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var z=Object.getOwnPropertyNames;var P=Object.prototype.hasOwnProperty;var V=(e,t)=>{for(var l in t)g(e,l,{get:t[l],enumerable:!0})},W=(e,t,l,r)=>{if(t&&typeof t=="object"||typeof t=="function")for(let n of z(t))!P.call(e,n)&&n!==l&&g(e,n,{get:()=>t[n],enumerable:!(r=R(t,n))||r.enumerable});return e};var D=e=>W(g({},"__esModule",{value:!0}),e);var fe={};V(fe,{Fragment:()=>G,component:()=>J,h:()=>v,render:()=>x,useCallback:()=>Y,useCatch:()=>K,useEffect:()=>_,useHost:()=>m,useLayout:()=>Z,useMemo:()=>N,useReducer:()=>b,useRef:()=>X,useState:()=>U});const G=({children:e})=>e,v=(e,t,...l)=>{const{length:r}=l;return l=r==0?null:r==1?l[0]:l,{children:l,...t,nodeName:e}},x=(e,t,l)=>{let r=t.firstChild;for(e of k(e)){let n=r;if(e instanceof Node)n=e;else if(typeof e=="string"){for(;n&&n.nodeType!=3;)n=n.nextSibling;n?n.data!=e&&(n.data=e):n=document.createTextNode(e)}else{const{xmlns:a=l,nodeName:i,key:o,ref:c,memo:C,children:O,[T]:q,...Q}=e;for(;n&&!(n.localName==i&&(n.$key??=o)==o);)n=n.nextSibling;n??=re(a,i,o),te(c)&&(c.current=n,n.$ref=c),(C==null||S(n.$memo,n.$memo=C))&&(ae(Q,n),u(q)?q(n):x(O,n,a))}n==r?r=r.nextSibling:ie(t,n,r)}for(;r;){const n=r.nextSibling;B(t.removeChild(r)),r=n}},J=e=>({nodeName:t,as:l,props:r,key:n,ref:a,memo:i,...o})=>v(l??e?.as??"c-host",{...e?.props,...r,key:n,ref:a,memo:i,[T]:c=>{c.$fn=u(e)?e:ee,c.$args={...e?.args,...o},I(c)}}),b=(e,t)=>{const l=m(),r=y(),[n,a]=r;return n==a.length&&(a[n]=[u(t)?t():t,i=>{const o=a[n][0],c=u(i)?i(o):i;p(o,a[n][0]=u(e)?e(o,c):c)||oe(l)}]),a[r[0]++]},N=(e,t)=>{const l=y(),[r,n]=l;return(r==n.length||t==null||S(t,n[r][1]))&&(n[r]=[e(),t]),n[l[0]++][0]},K=e=>{const t=m(),[l,r]=b(),n=y(),[a,i]=n;return i[n[0]++]=e,t.$catch??=o=>{u(i[a])&&i[a](o),r(o)},[l,()=>r()]},m=()=>f,U=e=>b(null,e),X=e=>N(()=>({current:e}),[]),Y=(e,t)=>N(()=>e,t),Z=(e,t)=>E(e,t,"$layout"),_=(e,t)=>E(e,t,"$effect"),A=globalThis.queueMicrotask??(e=>e()),F=globalThis.requestAnimationFrame??A,{isArray:s,from:h}=Array,{is:p}=Object,ee=()=>{},T=Symbol(),te=e=>e&&typeof e=="object",u=e=>typeof e=="function",S=(e,t)=>s(e)&&s(t)?e.some((l,r)=>!p(l,t[r])):!p(e,t),ne=e=>h(e).reduce(le,{}),le=(e,{name:t,value:l})=>(e[t]=l,e),re=(e,t,l)=>{const r=e?document.createElementNS(e,t):document.createElement(t);return r.$key=l,r},k=function*(e,t={data:""},l=!0){let r;for(e of s(e)?e:[e])e==null||typeof e=="boolean"||(typeof e.nodeName=="string"?((r=t.data)&&(t.data="",yield r),yield e):u(e.nodeName)?yield*k(e.nodeName(e),t,!1):s(e)?yield*k(e,t,!1):t.data+=e);l&&(r=t.data)&&(yield r)},ae=(e,t)=>{const l=t.$props??=t.hasAttributes()?ne(t.attributes):{};for(const r in{...l,...t.$props=e}){let n=e[r];n!==l[r]&&(r.startsWith("set:")?t[r.slice(4)]=n:n==null||n===!1?t.removeAttribute(r):t.setAttribute(r,n===!0?"":n))}},ie=(e,t,l)=>{if(t.contains?.(document.activeElement)){const r=t.nextSibling;for(;l&&l!=t;){const n=l.nextSibling;e.insertBefore(l,r),l=n}}else e.insertBefore(t,l)},y=()=>f.$hooks??=[0,[]],E=(e,t,l)=>{const r=m(),n=y(),[a,i]=n;a==i.length?(r[l]??=new Set).add(i[a]=[null,e,t]):(t==null||S(t,i[a][2]))&&(i[a][1]=e,i[a][2]=t),n[0]++},I=e=>{if(!e.$idle){if(globalThis.navigator?.scheduling?.isInputPending()){e.$idle=requestIdleCallback(()=>{e.$idle=null,I(e)});return}j(e)}},oe=e=>{e.$queued||(e.$queued=!0,A(()=>{e.$queued=!1,j(e)}))},j=e=>{e.$idle&&(cancelIdleCallback(e.$idle),e.$idle=null),f=e,f.$hooks&&(f.$hooks[0]=0);try{e.$h=e.$fn(e.$args)}catch(t){w(t,e.parentNode)}finally{f=null,d.add(e),H??=F(ue)}},ue=()=>{H=null;for(const e of d){d.delete(e);try{x(e.$h,e),e.$h=null}catch(t){w(t,e)}finally{M(e,"$layout"),$.add(e),L??=F(ce)}}},ce=()=>{L=null;for(const e of $)$.delete(e),M(e,"$effect")},M=(e,t)=>{if(e[t])for(const l of e[t]){const[r,n]=l;if(u(n))try{u(r)&&r(),l[0]=n()}catch(a){l[0]=null,w(a,e.parentNode)}finally{l[1]=null}}},B=e=>{if(e.nodeType==1){for(const t of e.children)B(t);e.$ref&&(e.$ref.current=null),d.delete(e),$.delete(e);for(const t of["$layout","$effect"])if(e[t]){for(const l of e[t])try{u(l[0])&&l[0]()}catch{}e[t].clear()}}},w=(e,t)=>{for(let l;t;t=t.parentNode)if(u(l=t.$catch))return void l(e);throw e};let f=null,d=new Set,H=null,$=new Set,L=null;return D(fe);})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ajo",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "description": "ajo is a JavaScript view library for building user interfaces",
   "type": "module",
   "module": "index.js",
@@ -38,7 +38,7 @@
   "homepage": "https://github.com/cristianfalcone/ajo#readme",
   "devDependencies": {
     "backdom": "^0.0.8",
-    "esbuild": "^0.15.9",
+    "esbuild": "^0.15.10",
     "uvu": "^0.5.6"
   }
 }

package/readme.md

@@ -33,49 +33,21 @@ render(<Greet name="World" />, document.body)
 
 ```jsx
 /** @jsx h */
-import { h, component, refresh, render } from 'ajo'
+import { h, component, useState, render } from 'ajo'
 
-const Counter = component(host => {
+const Counter = component(() => {
 
-  let count = 0
+  const [count, setCount] = useState(0)
 
-  const increment = () => {
-    count++
-    refresh(host)
-  }
-
-  return () =>
-    <button set:onclick={increment}>
+  return (
+    <button set:onclick={() => setCount(count + 1)}>
       Current: {count}
     </button>
+	)
 })
 
 render(<Counter />, document.body)
 ```
 
-## rendering lists
-
-```jsx
-/** @jsx h */
-import { h, render, component, For } from 'ajo'
-
-const products = [
-  { title: 'Cabbage', isFruit: false, id: 1 },
-  { title: 'Garlic', isFruit: false, id: 2 },
-  { title: 'Apple', isFruit: true, id: 3 },
-];
-
-const ShoppingList = component(() => {
-  const listItem = product =>
-    <li style={stx({ color: product.isFruit ? 'magenta' : 'darkgreen' })}>
-      {product.title}
-    </li>
-
-  return ({ products }) => <For each={products} is="ul">{listItem}</For>
-})
-
-render(<ShoppingList producst={products} />, document.body)
-```
-
 ## acknowledgments
-ajo takes heavy inspiration from [Incremental DOM](https://github.com/google/incremental-dom) and [Crank.js](https://github.com/bikeshaving/crank)
+ajo takes heavy inspiration from [Incremental DOM](https://github.com/google/incremental-dom) and [React](https://github.com/facebook/react)