ajo 0.0.7 → 0.0.8

package/index.cjs

@@ -32,10 +32,10 @@ __export(ajo_exports, {
   stx: () => stx
 });
 module.exports = __toCommonJS(ajo_exports);
-const Fragment = ({ children }) => children, h = (tagName, props, ...children) => {
+const Fragment = ({ children }) => children, h = (nodeName, props, ...children) => {
   children = children.length == 0 ? null : children.length == 1 ? children[0] : children;
-  return { children, ...props, tagName };
-}, component = (setup) => ({ is, key, ref, host, ...props }) => h(is ?? setup.is ?? "div", {
+  return { children, ...props, nodeName };
+}, component = (setup) => ({ is, key, host, ref, ...props }) => h(is ?? setup.is ?? "div", {
   key,
   ...setup.host,
   ...host,
@@ -44,26 +44,27 @@ const Fragment = ({ children }) => children, h = (tagName, props, ...children) =
 }), render = (h2, host) => {
   let child = host.firstChild, node, byKey = keyed.get(host);
   for (h2 of normalize(h2, host)) {
-    if (typeof h2 == str) {
+    if (typeof h2 == "string") {
       for (node = child; node; node = node.nextSibling)
         if (node.nodeType == 3)
           break;
       node ? node.data !== h2 && (node.data = h2) : node = document.createTextNode(h2);
-    } else if (hasOwn(h2, "tagName")) {
-      const { tagName, key, skip, ref, children, block, ...props } = h2;
+    } else if (h2 instanceof Node) {
+      node = h2;
+    } else {
+      const { key, nodeName, skip, block, children, ref, ...props } = h2;
       if (key != null && (node = byKey?.get(key)))
         ;
       else
         for (node = child; node; node = node.nextSibling)
-          if (node.localName == tagName)
+          if (node.localName == nodeName)
             break;
-      node ||= document.createElement(tagName);
-      key != null && (byKey ||= keyed.set(host, createMap(Map))).set(key, node);
+      node ||= document.createElement(nodeName);
+      key != null && (byKey ||= keyed.set(host, /* @__PURE__ */ new Map())).set(key, node);
       update(props, node);
       !(skip || block != null && every(deps.get(node), deps.set(node, block))) && render(children, node);
       isFn(ref) && ref(node);
-    } else
-      node = h2;
+    }
     node === child ? child = child.nextSibling : before(host, child, node);
   }
   while (child) {
@@ -80,7 +81,7 @@ const Fragment = ({ children }) => children, h = (tagName, props, ...children) =
   } catch (error) {
     propagate(host, error);
   }
-}, provide = (host, key, value) => (provisions.get(host) ?? provisions.set(host, createMap(Map))).set(key, value), consume = (host, key, fallback) => {
+}, provide = (host, key, value) => (provisions.get(host) ?? provisions.set(host, /* @__PURE__ */ new Map())).set(key, value), consume = (host, key, fallback) => {
   let map;
   while (host) {
     if ((map = provisions.get(host)) && map.has(key))
@@ -102,21 +103,25 @@ const Fragment = ({ children }) => children, h = (tagName, props, ...children) =
     throwTypeError("Cleaner", cleaner, fn);
   (cleaners.get(host) ?? cleaners.set(host, /* @__PURE__ */ new Set())).add(cleaner);
 }, 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 createMap = (constructor, ...args) => {
-  const instance = new constructor(...args);
+const wm = () => {
+  const instance = /* @__PURE__ */ new WeakMap();
   const { set } = instance;
   instance.set = (key, value) => (set.call(instance, key, value), value);
   return instance;
 }, throwTypeError = (name, value, expected) => {
   throw new TypeError(`Expected ${name} to be of type ${expected}, got ${typeof value} instead`);
-}, every = (a, b) => a === b || isArray(a) && isArray(b) && a.length == b.length && a.every((v, i) => v === b[i]), apply = (o, { name, value }) => (o[name] = value, o), reduce = (list) => from(list).reduce(apply, {}), isFn = (v) => typeof v == fn, search = /([a-z0-9])([A-Z])/g, replace = "$1-$2", str = "string", fn = "function", { keys, entries, hasOwn } = Object, { isArray, from } = Array, wm = WeakMap, deps = createMap(wm), memo = createMap(wm), keyed = createMap(wm), cache = createMap(wm), renders = createMap(wm), cleaners = createMap(wm), provisions = createMap(wm), interceptors = createMap(wm), normalize = function* (h2, host) {
+}, every = (a, b) => a === b || isArray(a) && isArray(b) && a.length == b.length && a.every((v, i) => v === b[i]), apply = (o, { name, value }) => (o[name] = value, o), reduce = (list) => from(list).reduce(apply, {}), isFn = (v) => typeof v == fn, { keys, entries } = Object, { isArray, from } = Array, fn = "function", search = /([a-z0-9])([A-Z])/g, replace = "$1-$2", keyed = wm(), deps = wm(), memo = wm(), renders = wm(), provisions = wm(), interceptors = wm(), cleaners = wm(), cache = wm(), normalize = function* (h2, host) {
   let type, buffer = "";
   for (h2 of isFn(h2?.[Symbol.iterator]) ? h2 : [h2]) {
     if (h2 == null || (type = typeof h2) == "boolean")
       continue;
-    if (h2 instanceof Node || hasOwn(h2, "tagName")) {
-      if (isFn(h2.tagName)) {
-        yield* normalize(h2.tagName(h2, host), host);
+    if (type == "string" || type == "number") {
+      buffer += h2;
+      continue;
+    }
+    if ("nodeName" in Object(h2)) {
+      if (isFn(h2.nodeName)) {
+        yield* normalize(h2.nodeName(h2, host), host);
         continue;
       }
       if (buffer) {
@@ -126,7 +131,7 @@ const createMap = (constructor, ...args) => {
       yield h2;
       continue;
     }
-    type == str || !isFn(h2[Symbol.iterator]) ? buffer += h2 : yield* normalize(h2, host);
+    isFn(h2[Symbol.iterator]) ? yield* normalize(h2, host) : buffer += h2;
   }
   if (buffer)
     yield buffer;

package/index.js

@@ -1,12 +1,12 @@
 export const
   Fragment = ({ children }) => children,
 
-  h = (tagName, props, ...children) => {
+  h = (nodeName, props, ...children) => {
     children = children.length == 0 ? null : children.length == 1 ? children[0] : children
-    return { children, ...props, tagName }
+    return { children, ...props, nodeName }
   },
 
-  component = setup => ({ is, key, ref, host, ...props }) => h(is ?? setup.is ?? 'div', {
+  component = setup => ({ is, key, host, ref, ...props }) => h(is ?? setup.is ?? 'div', {
     key, ...setup.host, ...host, skip: true, ref: host => (refresh(host, props, setup), isFn(ref) && ref(host))
   }),
 
@@ -16,29 +16,32 @@ export const
 
     for (h of normalize(h, host)) {
 
-      if (typeof h == str) {
+      if (typeof h == 'string') {
 
         for (node = child; node; node = node.nextSibling) if (node.nodeType == 3) break
         node ? node.data !== h && (node.data = h) : node = document.createTextNode(h)
 
-      } else if (hasOwn(h, 'tagName')) {
+      } else if (h instanceof Node) {
 
-        const { tagName, key, skip, ref, children, block, ...props } = h
+        node = h
+
+      } else {
+
+        const { key, nodeName, skip, block, children, ref, ...props } = h
 
         if (key != null && (node = byKey?.get(key)));
-        else for (node = child; node; node = node.nextSibling) if (node.localName == tagName) break
+        else for (node = child; node; node = node.nextSibling) if (node.localName == nodeName) break
 
-        node ||= document.createElement(tagName)
+        node ||= document.createElement(nodeName)
 
-        key != null && (byKey ||= keyed.set(host, createMap(Map))).set(key, node)
+        key != null && (byKey ||= keyed.set(host, new Map)).set(key, node)
 
         update(props, node)
 
         !(skip || block != null && every(deps.get(node), deps.set(node, block))) && render(children, node)
 
         isFn(ref) && ref(node)
-
-      } else node = h
+      }
 
       node === child ? child = child.nextSibling : before(host, child, node)
     }
@@ -60,7 +63,7 @@ export const
     }
   },
 
-  provide = (host, key, value) => (provisions.get(host) ?? provisions.set(host, createMap(Map))).set(key, value),
+  provide = (host, key, value) => (provisions.get(host) ?? provisions.set(host, new Map)).set(key, value),
 
   consume = (host, key, fallback) => {
     let map
@@ -92,8 +95,8 @@ export const
   keb = o => keys(o).reduce((r, k) => ((r[k.replace(search, replace).toLowerCase()] = o[k]), r), {})
 
 const
-  createMap = (constructor, ...args) => {
-    const instance = new constructor(...args)
+  wm = () => {
+    const instance = new WeakMap
     const { set } = instance
     instance.set = (key, value) => (set.call(instance, key, value), value)
     return instance
@@ -108,23 +111,11 @@ const
   reduce = list => from(list).reduce(apply, {}),
   isFn = v => typeof v == fn,
 
-  search = /([a-z0-9])([A-Z])/g,
-  replace = '$1-$2',
-  str = 'string',
-  fn = 'function',
+  { keys, entries } = Object, { isArray, from } = Array,
 
-  { keys, entries, hasOwn } = Object,
-  { isArray, from } = Array,
-  wm = WeakMap,
+  fn = 'function', search = /([a-z0-9])([A-Z])/g, replace = '$1-$2',
 
-  deps = createMap(wm),
-  memo = createMap(wm),
-  keyed = createMap(wm),
-  cache = createMap(wm),
-  renders = createMap(wm),
-  cleaners = createMap(wm),
-  provisions = createMap(wm),
-  interceptors = createMap(wm),
+  keyed = wm(), deps = wm(), memo = wm(), renders = wm(), provisions = wm(), interceptors = wm(), cleaners = wm(), cache = wm(),
 
   normalize = function* (h, host) {
 
@@ -134,10 +125,15 @@ const
 
       if (h == null || (type = typeof h) == 'boolean') continue
 
-      if (h instanceof Node || hasOwn(h, 'tagName')) {
+      if (type == 'string' || type == 'number') {
+        buffer += h
+        continue
+      }
+
+      if ('nodeName' in Object(h)) {
 
-        if (isFn(h.tagName)) {
-          yield* normalize(h.tagName(h, host), host)
+        if (isFn(h.nodeName)) {
+          yield* normalize(h.nodeName(h, host), host)
           continue
         }
 
@@ -150,7 +146,7 @@ const
         continue
       }
 
-      (type == str || !isFn(h[Symbol.iterator])) ? buffer += h : yield* normalize(h, host)
+      isFn(h[Symbol.iterator]) ? yield* normalize(h, host) : buffer += h
     }
 
     if (buffer) yield buffer

package/index.test.js

@@ -11,27 +11,27 @@ it = suite('h')
 
 it('should create empty vnode', () => {
   const vnode = h('div')
-  assert.equal(vnode, { tagName: 'div', children: null })
+  assert.equal(vnode, { nodeName: 'div', children: null })
 })
 
 it('should create vnode with props', () => {
-  assert.equal(h('div', { id: 'app' }), { tagName: 'div', children: null, id: 'app' })
+  assert.equal(h('div', { id: 'app' }), { nodeName: 'div', children: null, id: 'app' })
 })
 
 it('should create vnode with one string child', () => {
-  assert.equal(h('div', null, 'foo'), { tagName: 'div', children: 'foo' })
+  assert.equal(h('div', null, 'foo'), { nodeName: 'div', children: 'foo' })
 })
 
 it('should create vnode with one vnode child', () => {
   const child = h('span')
   const vnode = h('div', null, child)
-  assert.equal(vnode.children, { tagName: 'span', children: null })
+  assert.equal(vnode.children, { nodeName: 'span', children: null })
 })
 
 it('should allow children as prop', () => {
   const child = h('span')
   const vnode = h('div', { children: child })
-  assert.equal(vnode.children, { tagName: 'span', children: null })
+  assert.equal(vnode.children, { nodeName: 'span', children: null })
 })
 
 it.run()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ajo",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "ajo is a JavaScript view library for building user interfaces",
   "type": "module",
   "module": "index.js",