closures 0.7.8 → 0.7.10

package/dist/closures.cjs

@@ -37,13 +37,16 @@ let NIL = void 0,
   REF_ARRAY = 4, // ref with array of nodes
   REF_PARENT = 8, // ref with a child ref
   RETAIN_KEY = '=',
+  exists = x => x !== null && x !== undefined,
+  hasKey = vnode => vnode && exists(vnode.key),
+  haveMatchingKeys = (x, y) => (!exists(x) ? NIL : x.key) === (!exists(y) ? NIL : y.key),
   generateClosureId = _ => NUM++,
   isFn = x => typeof x === 'function',
   isStr = x => typeof x === 'string',
   isObj = x => x !== null && typeof x === 'object',
   isArr = x => Array.isArray(x),
   toJson = v => JSON.stringify(v),
-  isEmpty = c => c === null || c === false || c === NIL || (isArr(c) && c.length === 0) || (c && c._t === RETAIN_KEY),
+  isEmpty = c => !exists(c) || c === false || (isArr(c) && c.length === 0) || (c && c._t === RETAIN_KEY),
   isNonEmptyArray = c => isArr(c) && c.length > 0,
   isLeaf = c => isStr(c) || typeof c === 'number',
   isElement = c => c && c.vtype === VTYPE_ELEMENT,
@@ -91,8 +94,7 @@ let replaceDom = (parent, newRef, oldRef) => {
 };
 
 let setDomAttribute = (el, attr, value, isSVG) => {
-  if (attr === 'className') attr = 'class';
-  if (value === NIL) value = '';
+  if (!exists(value)) value = '';
   if (value === true) el.setAttribute(attr, '');
   else if (value === false) el.removeAttribute(attr);
   else (isSVG && NS_ATTRS[attr])
@@ -160,7 +162,7 @@ let mount = (vnode, env, closureId, closure, onRemove = noop) => {
   let baseRef = { closureId, closure, onRemove };
 
   if (isEmpty(vnode))
-    return { ...baseRef, type: REF_SINGLE, node: document.createComment('NULL') };
+    return { ...baseRef, type: REF_SINGLE, node: document.createTextNode('') };
 
   if (isLeaf(vnode))
     return { ...baseRef, type: REF_SINGLE, node: document.createTextNode(vnode) };
@@ -276,8 +278,12 @@ let patchInPlace = (parentDomNode, newVnode, oldVnode, ref, env) => {
 };
 
 let patchChildren = (parentDomNode, newChildren, oldChildren, ref, env) => {
-  // we need to retrieve the next sibling before the old children get removed from the DOM
-  let i, idx, oldVnode, newVnode, oldRef, newRef, refMap, beforeNode,
+  // we need to retrieve the next sibling before the old children get eventually removed from the current DOM document
+  let oldVnode,
+    newVnode,
+    oldRef,
+    newRef,
+    refMap,
     nextNode = getNextSibling(ref),
     children = Array(newChildren.length),
     refChildren = ref.children,
@@ -285,22 +291,22 @@ let patchChildren = (parentDomNode, newChildren, oldChildren, ref, env) => {
     oldStart = 0,
     newEnd = newChildren.length - 1,
     oldEnd = oldChildren.length - 1;
-    
+
   while (newStart <= newEnd && oldStart <= oldEnd) {
     if (refChildren[oldStart] === NIL) {
       oldStart++;
       continue;
     }
-    
+
     if (refChildren[oldEnd] === NIL) {
       oldEnd--;
       continue;
     }
-    
+
     oldVnode = oldChildren[oldStart];
     newVnode = newChildren[newStart];
-    
-    if (oldVnode && newVnode && newVnode.key === oldVnode.key) {
+
+    if (haveMatchingKeys(newVnode, oldVnode)) {
       oldRef = refChildren[oldStart];
       newRef = children[newStart] = patchInPlace(
         parentDomNode,
@@ -309,16 +315,15 @@ let patchChildren = (parentDomNode, newChildren, oldChildren, ref, env) => {
         oldRef,
         env
       );
-      
       newStart++;
       oldStart++;
       continue;
     }
-    
+
     oldVnode = oldChildren[oldEnd];
     newVnode = newChildren[newEnd];
-    
-    if (oldVnode && newVnode && newVnode.key === oldVnode.key) {
+
+    if (haveMatchingKeys(newVnode, oldVnode)) {
       oldRef = refChildren[oldEnd];
       newRef = children[newEnd] = patchInPlace(
         parentDomNode,
@@ -327,22 +332,24 @@ let patchChildren = (parentDomNode, newChildren, oldChildren, ref, env) => {
         oldRef,
         env
       );
-      
       newEnd--;
       oldEnd--;
       continue;
     }
-    
-    if (refMap === NIL)
-      for (i = oldStart, refMap = {}; i <= oldEnd; i++) {
+
+    if (!refMap) {
+      refMap = {};
+      for (let i = oldStart; i <= oldEnd; i++) {
         oldVnode = oldChildren[i];
-        if (oldVnode && oldVnode.key !== NIL)
+        if (hasKey(oldVnode)) {
           refMap[oldVnode.key] = i;
+        }
       }
-    
+    }
+
     newVnode = newChildren[newStart];
-    idx = newVnode && newVnode.key !== NIL ? refMap[newVnode.key] : NIL;
 
+    let idx = hasKey(newVnode) ? refMap[newVnode.key] : NIL;
     if (idx !== NIL) {
       oldVnode = oldChildren[idx];
       oldRef = refChildren[idx];
@@ -353,45 +360,46 @@ let patchChildren = (parentDomNode, newChildren, oldChildren, ref, env) => {
         oldRef,
         env
       );
-      
+
       insertDom(parentDomNode, newRef, getDomNode(refChildren[oldStart]));
-      
+
       if (newRef !== oldRef) {
         removeDom(parentDomNode, oldRef);
         unmount(oldVnode, oldRef, env);
       }
-      
+
       refChildren[idx] = NIL;
     } else {
       newRef = children[newStart] = mount(newVnode, env);
       insertDom(parentDomNode, newRef, getDomNode(refChildren[oldStart]));
     }
-    
+
     newStart++;
   }
-  
-  beforeNode = newEnd < newChildren.length - 1
-    ? getDomNode(children[newEnd + 1])
-    : nextNode;
-    
+
+  let beforeNode =
+    newEnd < newChildren.length - 1
+      ? getDomNode(children[newEnd + 1])
+      : nextNode;
+
   while (newStart <= newEnd) {
-    newRef = mount(newChildren[newStart], env);
+    let newRef = mount(newChildren[newStart], env);
     children[newStart] = newRef;
     insertDom(parentDomNode, newRef, beforeNode);
     newStart++;
   }
-  
+
   while (oldStart <= oldEnd) {
     oldRef = refChildren[oldStart];
-    
+
     if (oldRef !== NIL) {
       removeDom(parentDomNode, oldRef);
       unmount(oldChildren[oldStart], oldRef, env);
     }
-    
+
     oldStart++;
   }
-  
+
   ref.children = children;
 };
 
@@ -507,13 +515,30 @@ function h(_t, ...children) {
       ? { ...props, children: children[0] }
       : props;
 
-  // inline class parsing
-  if (isStr(_t) && ~(idx = _t.indexOf('.'))) {
-    let classProp = props.class || props.className,
-      className = _t.slice(idx + 1).replace(/\./g, ' ') + (classProp ? ' ' + classProp : '');
+  if (isStr(_t)) {
+    if (props.className && !props.class) {
+      props.class = props.className;
+      delete props.className;
+    }
+
+    // class parsing
+    if (isObj(props.class)) {
+      let k, tmp = '';
+
+      for (k in props.class)
+        if (props.class[k]) {
+          tmp && (tmp += ' ');
+          tmp += k
+        }
 
-    if (className) props.class = className;
-    _t = _t.slice(0, idx);
+      props.class = tmp;
+    }
+
+    if (~(idx = _t.indexOf('.'))) {
+      let className = _t.slice(idx + 1).replace(/\./g, ' ') + (props.class ? ' ' + props.class : '');
+      if (className) props.class = className;
+      _t = _t.slice(0, idx);
+    }
   }
 
   if (props.key !== props.key) throw new Error("Invalid NaN key");

package/dist/closures.js

@@ -37,13 +37,16 @@ let NIL = void 0,
   REF_ARRAY = 4, // ref with array of nodes
   REF_PARENT = 8, // ref with a child ref
   RETAIN_KEY = '=',
+  exists = x => x !== null && x !== undefined,
+  hasKey = vnode => vnode && exists(vnode.key),
+  haveMatchingKeys = (x, y) => (!exists(x) ? NIL : x.key) === (!exists(y) ? NIL : y.key),
   generateClosureId = _ => NUM++,
   isFn = x => typeof x === 'function',
   isStr = x => typeof x === 'string',
   isObj = x => x !== null && typeof x === 'object',
   isArr = x => Array.isArray(x),
   toJson = v => JSON.stringify(v),
-  isEmpty = c => c === null || c === false || c === NIL || (isArr(c) && c.length === 0) || (c && c._t === RETAIN_KEY),
+  isEmpty = c => !exists(c) || c === false || (isArr(c) && c.length === 0) || (c && c._t === RETAIN_KEY),
   isNonEmptyArray = c => isArr(c) && c.length > 0,
   isLeaf = c => isStr(c) || typeof c === 'number',
   isElement = c => c && c.vtype === VTYPE_ELEMENT,
@@ -91,8 +94,7 @@ let replaceDom = (parent, newRef, oldRef) => {
 };
 
 let setDomAttribute = (el, attr, value, isSVG) => {
-  if (attr === 'className') attr = 'class';
-  if (value === NIL) value = '';
+  if (!exists(value)) value = '';
   if (value === true) el.setAttribute(attr, '');
   else if (value === false) el.removeAttribute(attr);
   else (isSVG && NS_ATTRS[attr])
@@ -160,7 +162,7 @@ let mount = (vnode, env, closureId, closure, onRemove = noop) => {
   let baseRef = { closureId, closure, onRemove };
 
   if (isEmpty(vnode))
-    return { ...baseRef, type: REF_SINGLE, node: document.createComment('NULL') };
+    return { ...baseRef, type: REF_SINGLE, node: document.createTextNode('') };
 
   if (isLeaf(vnode))
     return { ...baseRef, type: REF_SINGLE, node: document.createTextNode(vnode) };
@@ -276,8 +278,12 @@ let patchInPlace = (parentDomNode, newVnode, oldVnode, ref, env) => {
 };
 
 let patchChildren = (parentDomNode, newChildren, oldChildren, ref, env) => {
-  // we need to retrieve the next sibling before the old children get removed from the DOM
-  let i, idx, oldVnode, newVnode, oldRef, newRef, refMap, beforeNode,
+  // we need to retrieve the next sibling before the old children get eventually removed from the current DOM document
+  let oldVnode,
+    newVnode,
+    oldRef,
+    newRef,
+    refMap,
     nextNode = getNextSibling(ref),
     children = Array(newChildren.length),
     refChildren = ref.children,
@@ -285,22 +291,22 @@ let patchChildren = (parentDomNode, newChildren, oldChildren, ref, env) => {
     oldStart = 0,
     newEnd = newChildren.length - 1,
     oldEnd = oldChildren.length - 1;
-    
+
   while (newStart <= newEnd && oldStart <= oldEnd) {
     if (refChildren[oldStart] === NIL) {
       oldStart++;
       continue;
     }
-    
+
     if (refChildren[oldEnd] === NIL) {
       oldEnd--;
       continue;
     }
-    
+
     oldVnode = oldChildren[oldStart];
     newVnode = newChildren[newStart];
-    
-    if (oldVnode && newVnode && newVnode.key === oldVnode.key) {
+
+    if (haveMatchingKeys(newVnode, oldVnode)) {
       oldRef = refChildren[oldStart];
       newRef = children[newStart] = patchInPlace(
         parentDomNode,
@@ -309,16 +315,15 @@ let patchChildren = (parentDomNode, newChildren, oldChildren, ref, env) => {
         oldRef,
         env
       );
-      
       newStart++;
       oldStart++;
       continue;
     }
-    
+
     oldVnode = oldChildren[oldEnd];
     newVnode = newChildren[newEnd];
-    
-    if (oldVnode && newVnode && newVnode.key === oldVnode.key) {
+
+    if (haveMatchingKeys(newVnode, oldVnode)) {
       oldRef = refChildren[oldEnd];
       newRef = children[newEnd] = patchInPlace(
         parentDomNode,
@@ -327,22 +332,24 @@ let patchChildren = (parentDomNode, newChildren, oldChildren, ref, env) => {
         oldRef,
         env
       );
-      
       newEnd--;
       oldEnd--;
       continue;
     }
-    
-    if (refMap === NIL)
-      for (i = oldStart, refMap = {}; i <= oldEnd; i++) {
+
+    if (!refMap) {
+      refMap = {};
+      for (let i = oldStart; i <= oldEnd; i++) {
         oldVnode = oldChildren[i];
-        if (oldVnode && oldVnode.key !== NIL)
+        if (hasKey(oldVnode)) {
           refMap[oldVnode.key] = i;
+        }
       }
-    
+    }
+
     newVnode = newChildren[newStart];
-    idx = newVnode && newVnode.key !== NIL ? refMap[newVnode.key] : NIL;
 
+    let idx = hasKey(newVnode) ? refMap[newVnode.key] : NIL;
     if (idx !== NIL) {
       oldVnode = oldChildren[idx];
       oldRef = refChildren[idx];
@@ -353,45 +360,46 @@ let patchChildren = (parentDomNode, newChildren, oldChildren, ref, env) => {
         oldRef,
         env
       );
-      
+
       insertDom(parentDomNode, newRef, getDomNode(refChildren[oldStart]));
-      
+
       if (newRef !== oldRef) {
         removeDom(parentDomNode, oldRef);
         unmount(oldVnode, oldRef, env);
       }
-      
+
       refChildren[idx] = NIL;
     } else {
       newRef = children[newStart] = mount(newVnode, env);
       insertDom(parentDomNode, newRef, getDomNode(refChildren[oldStart]));
     }
-    
+
     newStart++;
   }
-  
-  beforeNode = newEnd < newChildren.length - 1
-    ? getDomNode(children[newEnd + 1])
-    : nextNode;
-    
+
+  let beforeNode =
+    newEnd < newChildren.length - 1
+      ? getDomNode(children[newEnd + 1])
+      : nextNode;
+
   while (newStart <= newEnd) {
-    newRef = mount(newChildren[newStart], env);
+    let newRef = mount(newChildren[newStart], env);
     children[newStart] = newRef;
     insertDom(parentDomNode, newRef, beforeNode);
     newStart++;
   }
-  
+
   while (oldStart <= oldEnd) {
     oldRef = refChildren[oldStart];
-    
+
     if (oldRef !== NIL) {
       removeDom(parentDomNode, oldRef);
       unmount(oldChildren[oldStart], oldRef, env);
     }
-    
+
     oldStart++;
   }
-  
+
   ref.children = children;
 };
 
@@ -507,13 +515,30 @@ export function h(_t, ...children) {
       ? { ...props, children: children[0] }
       : props;
 
-  // inline class parsing
-  if (isStr(_t) && ~(idx = _t.indexOf('.'))) {
-    let classProp = props.class || props.className,
-      className = _t.slice(idx + 1).replace(/\./g, ' ') + (classProp ? ' ' + classProp : '');
+  if (isStr(_t)) {
+    if (props.className && !props.class) {
+      props.class = props.className;
+      delete props.className;
+    }
+
+    // class parsing
+    if (isObj(props.class)) {
+      let k, tmp = '';
+
+      for (k in props.class)
+        if (props.class[k]) {
+          tmp && (tmp += ' ');
+          tmp += k
+        }
 
-    if (className) props.class = className;
-    _t = _t.slice(0, idx);
+      props.class = tmp;
+    }
+
+    if (~(idx = _t.indexOf('.'))) {
+      let className = _t.slice(idx + 1).replace(/\./g, ' ') + (props.class ? ' ' + props.class : '');
+      if (className) props.class = className;
+      _t = _t.slice(0, idx);
+    }
   }
 
   if (props.key !== props.key) throw new Error("Invalid NaN key");

package/dist/closures.min.js

@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t(e.closures={})}(this,(function(e){let t=void 0,r=e=>{},n=e=>({mount(t,r=""){t[e]=r},patch(t,r="",n){r!==n&&(t[e]=r)},unmount(r){r[e]=t}}),i={isSVG:!1,redraw:r,directives:{selected:n("selected"),checked:n("checked"),value:n("value"),innerHTML:n("innerHTML")}},o=[],l=[],d=new WeakMap,c=1,s={},f="http://www.w3.org/1999/xlink",h={show:f,actuate:f,href:f},p=e=>"function"==typeof e,u=e=>"string"==typeof e,a=e=>null!==e&&"object"==typeof e,y=e=>Array.isArray(e),v=e=>JSON.stringify(e),w=e=>null===e||!1===e||e===t||y(e)&&0===e.length||e&&"="===e._t,m=e=>y(e)&&e.length>0,g=e=>u(e)||"number"==typeof e,k=e=>e&&1===e.vtype,R=e=>e&&2===e.vtype,_=e=>{let t=e.type;if(1===t)return e.node;if(8===t)return _(e.childRef);if(4===t)return _(e.children[0]);throw Error("Unknown ref type "+v(e))},S=e=>{let t=e.type;if(1===t)return e.node.nextSibling;if(8===t)return S(e.childRef);if(4===t)return S(e.children[e.children.length-1]);throw Error("Unknown ref type "+v(e))},E=(e,t,r)=>{let n=t.type;if(1===n)e.insertBefore(t.node,r);else if(8===n)E(e,t.childRef,r);else{if(4!==n)throw Error("Unknown ref type "+v(t));for(let n=0;n<t.children.length;n++)E(e,t.children[n],r)}},N=(e,t)=>{let r=t.type;if(1===r)e.removeChild(t.node);else if(8===r)N(e,t.childRef);else{if(4!==r)throw Error("Unknown ref type "+v(t));for(let r=0;r<t.children.length;r++)N(e,t.children[r])}},V=(e,r,n,i)=>{"className"===r&&(r="class"),n===t&&(n=""),!0===n?e.setAttribute(r,""):!1===n?e.removeAttribute(r):i&&h[r]?e.setAttributeNS(h[r],r,n):e.setAttribute(r,n)},b=(e,n,i,o,s=r)=>{let f={closureId:i,closure:o,onRemove:s};if(w(e))return{...f,type:1,node:document.createComment("NULL")};if(g(e))return{...f,type:1,node:document.createTextNode(e)};if(k(e)){let r,{_t:i,props:o}=e;"svg"!==i||n.isSVG||(n={...n,isSVG:!0}),r=n.isSVG?document.createElementNS("http://www.w3.org/2000/svg",i):document.createElement(i),p(o.oncreate)&&o.oncreate(r),((e,t,r)=>{for(let n in t)"key"===n||"children"===n||"oncreate"===n||n in r.directives||(n.startsWith("on")?e[n.toLowerCase()]=e=>{t[n](e),!r.manualRedraw&&r.rerender()}:V(e,n,t[n],r.isSVG))})(r,o,n);let l=o.children===t?o.children:b(o.children,n);return l!==t&&E(r,l),((e,t,r)=>{for(let n in t)n in r.directives&&r.directives[n].mount(e,t[n])})(r,o,n),{...f,type:1,node:r,children:l}}if(m(e)){let t=0,r=[];for(;t<e.length;t++)r.push(b(e[t],n));return{...f,type:4,children:r}}if(R(e)){let t=e._t(e.props);if(p(t)){let i=c++,o=d.get(e._t)||new Map,s=l.pop()||r;o.set(i,t),d.set(e._t,o);let f=e._t;return e._t=t,b(e,n,i,f,s)}return{...f,type:8,childRef:b(t,n),childState:t}}if(e instanceof Node)return{...f,type:1,node:e};if(e===t)throw Error("mount: vnode is undefined");throw Error("mount: Invalid vnode")},x=(e,r,n)=>{if(k(e))((e,t,r)=>{for(let n in t)n in r.directives&&r.directives[n].unmount(e,t[n])})(r.node,e.props,n),e.props.children!==t&&x(e.props.children,r.children,n);else if(m(e))for(let t=0;t<e.length;t++)x(e[t],r.children[t],n);else if(R(e)){let e=r.closure,t=r.closureId,i=r.onRemove,o=d.get(e);o&&t&&o.get(t)&&(o.delete(t),!o.size&&d.delete(e),i()),x(r.childState,r.childRef,n)}},A=(e,t,r,n,i)=>{let o=G(e,t,r,n,i);return o!==n&&(((e,t,r)=>{E(e,t,_(r)),N(e,r)})(e,o,n),x(r,n,i)),o},G=(e,r,n,o,l={...i})=>{if(r&&"="===r._t)return o;let c,s;if(a(o)&&(c=o.closure,s=o.closureId),R(r)&&R(n)&&(r._t===n._t||c&&s)){let t,n=r._t,i=d.get(c);i&&s&&(t=i.get(s))&&(n=t);let f=n(r.props),h=G(e,f,o.childState,o.childRef,l);return h!==o.childRef?{type:8,childRef:h,childState:f}:(o.childState=f,o)}if(n===r||w(r)&&w(n))return o;if(g(r)&&g(n))return o.node.nodeValue=r,o;if(k(r)&&k(n)&&r._t===n._t){"svg"!==r._t||l.isSVG||(l={...l,isSVG:!0}),((e,r,n,i)=>{let o;for(o in r){if("key"===o||"children"===o||"oncreate"===o||o in i.directives)continue;let t=n[o],l=r[o];t!==l&&(o.startsWith("on")?e[o.toLowerCase()]=e=>{l(e),!i.manualRedraw&&i.rerender()}:V(e,o,l,i.isSVG))}for(o in n)"key"===o||"children"===o||o in r||o in i.directives||(o.startsWith("on")?e[o.toLowerCase()]=t:e.removeAttribute(o))})(o.node,r.props,n.props,l);let e=n.props.children,i=r.props.children;return e===t?i!==t&&(o.children=b(i,l),E(o.node,o.children)):i===t?(o.node.textContent="",x(e,o.children,l),o.children=t):o.children=A(o.node,i,e,o.children,l),((e,t,r,n)=>{let i;for(i in t)i in n.directives&&n.directives[i].patch(e,t[i],r[i]);for(i in r)i in n.directives&&!(i in t)&&n.directives[i].unmount(e,r[i])})(o.node,r.props,n.props,l),o}return m(r)&&m(n)?(((e,r,n,i,o)=>{let l,d,c,s,f,h,p,u,a=S(i),y=Array(r.length),v=i.children,w=0,m=0,g=r.length-1,k=n.length-1;for(;w<=g&&m<=k;)if(v[m]!==t)if(v[k]!==t)if(c=n[m],s=r[w],c&&s&&s.key===c.key)f=v[m],h=y[w]=A(e,s,c,f,o),w++,m++;else if(c=n[k],s=r[g],c&&s&&s.key===c.key)f=v[k],h=y[g]=A(e,s,c,f,o),g--,k--;else{if(p===t)for(l=m,p={};l<=k;l++)c=n[l],c&&c.key!==t&&(p[c.key]=l);s=r[w],d=s&&s.key!==t?p[s.key]:t,d!==t?(c=n[d],f=v[d],h=y[w]=G(e,s,c,f,o),E(e,h,_(v[m])),h!==f&&(N(e,f),x(c,f,o)),v[d]=t):(h=y[w]=b(s,o),E(e,h,_(v[m]))),w++}else k--;else m++;for(u=g<r.length-1?_(y[g+1]):a;w<=g;)h=b(r[w],o),y[w]=h,E(e,h,u),w++;for(;m<=k;)f=v[m],f!==t&&(N(e,f),x(n[m],f,o)),m++;i.children=y})(e,r,n,o,l),o):r instanceof Node&&n instanceof Node?(o.node=r,o):b(r,l)};function C(e,...r){let n,i=r[0];if(!i||!a(i)||y(i)||i._t||i.props?i=s:r.shift(),i=r.length>1?{...i,children:r}:1===r.length?{...i,children:r[0]}:i,u(e)&&~(n=e.indexOf("."))){let t=i.class||i.className,r=e.slice(n+1).replace(/\./g," ")+(t?" "+t:"");r&&(i.class=r),e=e.slice(0,n)}if(i.key!=i.key)throw new Error("Invalid NaN key");let o=u(e)?1:p(e)?2:t;if(o===t)throw new Error("Invalid VNode type");return{vtype:o,_t:e,key:i.key,props:i}}C.retain=e=>C("=");const L=C;e.Fragment=e=>e.children,e.app=function(e,r,n={}){let l,d={...i,manualRedraw:n.manualRedraw},c=r.$_REF;if(d.directives={...d.directives,...n.directives||{}},c!==t)throw Error("App already mounted on this node");return l=b(e,d),c=r.$_REF={ref:l,vnode:e},r.textContent="",E(r,l,t),o.push(d.rerender=(t=e)=>{c.ref=A(r,t,c.vnode,c.ref,d),c.vnode=t})&&d.rerender},e.h=C,e.m=L,e.onRemove=e=>l.push(e),e.redraw=e=>{for(let e=0;e<o.length;e++)o[e]()}}));
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t(e.closures={})}(this,(function(e){let t=void 0,r=e=>{},n=e=>({mount(t,r=""){t[e]=r},patch(t,r="",n){r!==n&&(t[e]=r)},unmount(r){r[e]=t}}),i={isSVG:!1,redraw:r,directives:{selected:n("selected"),checked:n("checked"),value:n("value"),innerHTML:n("innerHTML")}},o=[],l=[],d=new WeakMap,c=1,s={},f="http://www.w3.org/1999/xlink",h={show:f,actuate:f,href:f},u=e=>null!=e,a=e=>e&&u(e.key),p=(e,r)=>(u(e)?e.key:t)===(u(r)?r.key:t),y=e=>"function"==typeof e,v=e=>"string"==typeof e,w=e=>null!==e&&"object"==typeof e,m=e=>Array.isArray(e),g=e=>JSON.stringify(e),k=e=>!u(e)||!1===e||m(e)&&0===e.length||e&&"="===e._t,R=e=>m(e)&&e.length>0,_=e=>v(e)||"number"==typeof e,S=e=>e&&1===e.vtype,N=e=>e&&2===e.vtype,E=e=>{let t=e.type;if(1===t)return e.node;if(8===t)return E(e.childRef);if(4===t)return E(e.children[0]);throw Error("Unknown ref type "+g(e))},x=e=>{let t=e.type;if(1===t)return e.node.nextSibling;if(8===t)return x(e.childRef);if(4===t)return x(e.children[e.children.length-1]);throw Error("Unknown ref type "+g(e))},V=(e,t,r)=>{let n=t.type;if(1===n)e.insertBefore(t.node,r);else if(8===n)V(e,t.childRef,r);else{if(4!==n)throw Error("Unknown ref type "+g(t));for(let n=0;n<t.children.length;n++)V(e,t.children[n],r)}},b=(e,t)=>{let r=t.type;if(1===r)e.removeChild(t.node);else if(8===r)b(e,t.childRef);else{if(4!==r)throw Error("Unknown ref type "+g(t));for(let r=0;r<t.children.length;r++)b(e,t.children[r])}},A=(e,t,r,n)=>{u(r)||(r=""),!0===r?e.setAttribute(t,""):!1===r?e.removeAttribute(t):n&&h[t]?e.setAttributeNS(h[t],t,r):e.setAttribute(t,r)},G=(e,n,i,o,s=r)=>{let f={closureId:i,closure:o,onRemove:s};if(k(e))return{...f,type:1,node:document.createTextNode("")};if(_(e))return{...f,type:1,node:document.createTextNode(e)};if(S(e)){let r,{_t:i,props:o}=e;"svg"!==i||n.isSVG||(n={...n,isSVG:!0}),r=n.isSVG?document.createElementNS("http://www.w3.org/2000/svg",i):document.createElement(i),y(o.oncreate)&&o.oncreate(r),((e,t,r)=>{for(let n in t)"key"===n||"children"===n||"oncreate"===n||n in r.directives||(n.startsWith("on")?e[n.toLowerCase()]=e=>{t[n](e),!r.manualRedraw&&r.rerender()}:A(e,n,t[n],r.isSVG))})(r,o,n);let l=o.children===t?o.children:G(o.children,n);return l!==t&&V(r,l),((e,t,r)=>{for(let n in t)n in r.directives&&r.directives[n].mount(e,t[n])})(r,o,n),{...f,type:1,node:r,children:l}}if(R(e)){let t=0,r=[];for(;t<e.length;t++)r.push(G(e[t],n));return{...f,type:4,children:r}}if(N(e)){let t=e._t(e.props);if(y(t)){let i=c++,o=d.get(e._t)||new Map,s=l.pop()||r;o.set(i,t),d.set(e._t,o);let f=e._t;return e._t=t,G(e,n,i,f,s)}return{...f,type:8,childRef:G(t,n),childState:t}}if(e instanceof Node)return{...f,type:1,node:e};if(e===t)throw Error("mount: vnode is undefined");throw Error("mount: Invalid vnode")},C=(e,r,n)=>{if(S(e))((e,t,r)=>{for(let n in t)n in r.directives&&r.directives[n].unmount(e,t[n])})(r.node,e.props,n),e.props.children!==t&&C(e.props.children,r.children,n);else if(R(e))for(let t=0;t<e.length;t++)C(e[t],r.children[t],n);else if(N(e)){let e=r.closure,t=r.closureId,i=r.onRemove,o=d.get(e);o&&t&&o.get(t)&&(o.delete(t),!o.size&&d.delete(e),i()),C(r.childState,r.childRef,n)}},I=(e,t,r,n,i)=>{let o=L(e,t,r,n,i);return o!==n&&(((e,t,r)=>{V(e,t,E(r)),b(e,r)})(e,o,n),C(r,n,i)),o},L=(e,r,n,o,l={...i})=>{if(r&&"="===r._t)return o;let c,s;if(w(o)&&(c=o.closure,s=o.closureId),N(r)&&N(n)&&(r._t===n._t||c&&s)){let t,n=r._t,i=d.get(c);i&&s&&(t=i.get(s))&&(n=t);let f=n(r.props),h=L(e,f,o.childState,o.childRef,l);return h!==o.childRef?{type:8,childRef:h,childState:f}:(o.childState=f,o)}if(n===r||k(r)&&k(n))return o;if(_(r)&&_(n))return o.node.nodeValue=r,o;if(S(r)&&S(n)&&r._t===n._t){"svg"!==r._t||l.isSVG||(l={...l,isSVG:!0}),((e,r,n,i)=>{let o;for(o in r){if("key"===o||"children"===o||"oncreate"===o||o in i.directives)continue;let t=n[o],l=r[o];t!==l&&(o.startsWith("on")?e[o.toLowerCase()]=e=>{l(e),!i.manualRedraw&&i.rerender()}:A(e,o,l,i.isSVG))}for(o in n)"key"===o||"children"===o||o in r||o in i.directives||(o.startsWith("on")?e[o.toLowerCase()]=t:e.removeAttribute(o))})(o.node,r.props,n.props,l);let e=n.props.children,i=r.props.children;return e===t?i!==t&&(o.children=G(i,l),V(o.node,o.children)):i===t?(o.node.textContent="",C(e,o.children,l),o.children=t):o.children=I(o.node,i,e,o.children,l),((e,t,r,n)=>{let i;for(i in t)i in n.directives&&n.directives[i].patch(e,t[i],r[i]);for(i in r)i in n.directives&&!(i in t)&&n.directives[i].unmount(e,r[i])})(o.node,r.props,n.props,l),o}return R(r)&&R(n)?(((e,r,n,i,o)=>{let l,d,c,s,f,h=x(i),u=Array(r.length),y=i.children,v=0,w=0,m=r.length-1,g=n.length-1;for(;v<=m&&w<=g;){if(y[w]===t){w++;continue}if(y[g]===t){g--;continue}if(l=n[w],d=r[v],p(d,l)){c=y[w],s=u[v]=I(e,d,l,c,o),v++,w++;continue}if(l=n[g],d=r[m],p(d,l)){c=y[g],s=u[m]=I(e,d,l,c,o),m--,g--;continue}if(!f){f={};for(let e=w;e<=g;e++)l=n[e],a(l)&&(f[l.key]=e)}d=r[v];let i=a(d)?f[d.key]:t;i!==t?(l=n[i],c=y[i],s=u[v]=L(e,d,l,c,o),V(e,s,E(y[w])),s!==c&&(b(e,c),C(l,c,o)),y[i]=t):(s=u[v]=G(d,o),V(e,s,E(y[w]))),v++}let k=m<r.length-1?E(u[m+1]):h;for(;v<=m;){let t=G(r[v],o);u[v]=t,V(e,t,k),v++}for(;w<=g;)c=y[w],c!==t&&(b(e,c),C(n[w],c,o)),w++;i.children=u})(e,r,n,o,l),o):r instanceof Node&&n instanceof Node?(o.node=r,o):G(r,l)};function M(e,...r){let n,i=r[0];if(!i||!w(i)||m(i)||i._t||i.props?i=s:r.shift(),i=r.length>1?{...i,children:r}:1===r.length?{...i,children:r[0]}:i,v(e)){if(i.className&&!i.class&&(i.class=i.className,delete i.className),w(i.class)){let e,t="";for(e in i.class)i.class[e]&&(t&&(t+=" "),t+=e);i.class=t}if(~(n=e.indexOf("."))){let t=e.slice(n+1).replace(/\./g," ")+(i.class?" "+i.class:"");t&&(i.class=t),e=e.slice(0,n)}}if(i.key!=i.key)throw new Error("Invalid NaN key");let o=v(e)?1:y(e)?2:t;if(o===t)throw new Error("Invalid VNode type");return{vtype:o,_t:e,key:i.key,props:i}}M.retain=e=>M("=");const T=M;e.Fragment=e=>e.children,e.app=function(e,r,n={}){let l,d={...i,manualRedraw:n.manualRedraw},c=r.$_REF;if(d.directives={...d.directives,...n.directives||{}},c!==t)throw Error("App already mounted on this node");return l=G(e,d),c=r.$_REF={ref:l,vnode:e},r.textContent="",V(r,l,t),o.push(d.rerender=(t=e)=>{c.ref=I(r,t,c.vnode,c.ref,d),c.vnode=t})&&d.rerender},e.h=M,e.m=T,e.onRemove=e=>l.push(e),e.redraw=e=>{for(let e=0;e<o.length;e++)o[e]()}}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "closures",
-  "version": "0.7.8",
+  "version": "0.7.10",
   "description": "Minimalist virtual dom library",
   "type": "module",
   "main": "dist/closures.cjs",