ajo 0.1.20 → 0.1.21

package/dist/html.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const{isArray:$,from:p}=Array,m="
",{create:g,assign:v,entries:x,prototype:{hasOwnProperty:w},hasOwn:S=(e,t)=>w.call(e,t)}=Object,c=e=>p(d(e)).join(""),d=function*(e){for(e of u(e))if(typeof e=="string")yield f(e);else{const{nodeName:t,skip:o,children:r=""}=e;let n="";for(const[i,s]of x(e))k.has(i)||i.startsWith("set:")||s==null||s===!1||(n+=s===!0?` ${i}`:` ${i}="${f(String(s))}"`);N.has(t)?yield`<${t}${n}>`:o?yield`<${t}${n}></${t}>`:(yield`<${t}${n}>`,typeof r=="string"&&r.startsWith(m)?yield r.slice(1):yield*d(r),yield`</${t}>`)}},u=function*(e,t={value:""},o=!0){for(e of $(e)?e:[e])if(!(e==null||typeof e=="boolean"))if(S(e,"nodeName")){const{value:r}=t,{nodeName:n}=e;if(r&&(yield r,t.value=""),typeof n=="function")if(n.constructor.name==="GeneratorFunction"){const i={},s=v({},n.attrs);for(const a in e){const y=e[a];a.startsWith("attr:")?s[a.slice(5)]=y:i[a]=y}s.nodeName=n.is??"div",s.children=O(n,i),yield s}else yield*u(n(e),t,!1);else yield e}else $(e)?yield*u(e,t,!1):t.value+=e;o&&t.value&&(yield t.value)},N=new Set("area,base,br,col,command,embed,hr,img,input,keygen,link,meta,param,source,track,wbr".split(",")),k=new Set("nodeName,key,skip,memo,ref,children".split(",")),f=e=>e.replace(/[&<>"']/g,t=>`&#${t.charCodeAt(0)};`);let l=null;const O=(e,t)=>{let o,r;try{const n=e.call(o={$args:t,$context:g((l==null?void 0:l.$context)??null),render(){l!==o&&o.$next()},$next(){const i=l;l=o,r=c(n.next().value),l=i},$throw(i){r=c(n.throw(i).value)},$return(){n.return()}},t);o.$next()}catch(n){o.$throw(n)}finally{o.$return()}return m+r},j=(e,t=Symbol())=>function(o,r){return arguments.length===0?l&&t in l.$context?l.$context[t]:e:arguments.length===1?t in o.$context?o.$context[t]:e:o.$context[t]=r};exports.context=j;exports.html=d;exports.render=c;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const{isArray:m,from:$}=Array,p="
",{create:v,assign:g,entries:x,prototype:{hasOwnProperty:w},hasOwn:k=(e,t)=>w.call(e,t)}=Object,c=e=>$(d(e)).join(""),d=function*(e){for(e of u(e))if(typeof e=="string")yield f(e);else{const{nodeName:t,skip:o,children:r=""}=e;let n="";for(const[l,i]of x(e))N.has(l)||l.startsWith("set:")||i==null||i===!1||(n+=i===!0?` ${l}`:` ${l}="${f(String(i))}"`);S.has(t)?yield`<${t}${n}>`:o?yield`<${t}${n}></${t}>`:(yield`<${t}${n}>`,typeof r=="string"&&r.startsWith(p)?yield r.slice(1):yield*d(r),yield`</${t}>`)}},u=function*(e,t={value:""},o=!0){for(e of m(e)?e:[e])if(!(e==null||typeof e=="boolean"))if(k(e,"nodeName")){const{value:r}=t,{nodeName:n}=e;if(r&&(yield r,t.value=""),typeof n=="function")if(n.constructor.name==="GeneratorFunction"){const l={},i=g({},n.attrs);for(const a in e){const y=e[a];a.startsWith("attr:")?i[a.slice(5)]=y:l[a]=y}i.nodeName=n.is??"div",i.children=O(n,l),yield i}else yield*u(n(e),t,!1);else yield e}else m(e)?yield*u(e,t,!1):t.value+=e;o&&t.value&&(yield t.value)},S=new Set("area,base,br,col,command,embed,hr,img,input,keygen,link,meta,param,source,track,wbr".split(",")),N=new Set("nodeName,key,skip,memo,ref,children".split(",")),f=e=>e.replace(/[&<>"']/g,t=>`&#${t.charCodeAt(0)};`);let s=null;const O=(e,t)=>{let o,r;try{const n=e.call(o={$args:t,$context:v((s==null?void 0:s.$context)??null),render(){s!==o&&o.next()},next(){const l=s;s=o,r=c(n.next().value),s=l},throw(l){r=c(n.throw(l).value)},return(){n.return()}},t);o.next()}catch(n){o.throw(n)}finally{o.return()}return p+r},j=(e,t=Symbol())=>function(){const o=this??s;return o?arguments.length===0?t in o.$context?o.$context[t]:e:o.$context[t]=arguments[0]:e};exports.context=j;exports.html=d;exports.render=c;

package/dist/html.js

@@ -1,64 +1,65 @@
-const { isArray: d, from: p } = Array, f = "
", { create: x, assign: v, entries: g, prototype: { hasOwnProperty: w }, hasOwn: N = (e, t) => w.call(e, t) } = Object, $ = (e) => p(m(e)).join(""), m = function* (e) {
+const { isArray: d, from: $ } = Array, m = "
", { create: v, assign: x, entries: g, prototype: { hasOwnProperty: w }, hasOwn: k = (e, t) => w.call(e, t) } = Object, y = (e) => $(p(e)).join(""), p = function* (e) {
   for (e of c(e))
-    if (typeof e == "string") yield y(e);
+    if (typeof e == "string") yield f(e);
     else {
-      const { nodeName: t, skip: o, children: r = "" } = e;
+      const { nodeName: t, skip: o, children: l = "" } = e;
       let n = "";
-      for (const [i, s] of g(e))
-        S.has(i) || i.startsWith("set:") || s == null || s === !1 || (n += s === !0 ? ` ${i}` : ` ${i}="${y(String(s))}"`);
-      k.has(t) ? yield `<${t}${n}>` : o ? yield `<${t}${n}></${t}>` : (yield `<${t}${n}>`, typeof r == "string" && r.startsWith(f) ? yield r.slice(1) : yield* m(r), yield `</${t}>`);
+      for (const [r, i] of g(e))
+        S.has(r) || r.startsWith("set:") || i == null || i === !1 || (n += i === !0 ? ` ${r}` : ` ${r}="${f(String(i))}"`);
+      N.has(t) ? yield `<${t}${n}>` : o ? yield `<${t}${n}></${t}>` : (yield `<${t}${n}>`, typeof l == "string" && l.startsWith(m) ? yield l.slice(1) : yield* p(l), yield `</${t}>`);
     }
 }, c = function* (e, t = { value: "" }, o = !0) {
   for (e of d(e) ? e : [e])
     if (!(e == null || typeof e == "boolean"))
-      if (N(e, "nodeName")) {
-        const { value: r } = t, { nodeName: n } = e;
-        if (r && (yield r, t.value = ""), typeof n == "function")
+      if (k(e, "nodeName")) {
+        const { value: l } = t, { nodeName: n } = e;
+        if (l && (yield l, t.value = ""), typeof n == "function")
           if (n.constructor.name === "GeneratorFunction") {
-            const i = {}, s = v({}, n.attrs);
+            const r = {}, i = x({}, n.attrs);
             for (const a in e) {
               const u = e[a];
-              a.startsWith("attr:") ? s[a.slice(5)] = u : i[a] = u;
+              a.startsWith("attr:") ? i[a.slice(5)] = u : r[a] = u;
             }
-            s.nodeName = n.is ?? "div", s.children = A(n, i), yield s;
+            i.nodeName = n.is ?? "div", i.children = A(n, r), yield i;
           } else yield* c(n(e), t, !1);
         else yield e;
       } else d(e) ? yield* c(e, t, !1) : t.value += e;
   o && t.value && (yield t.value);
-}, k = new Set("area,base,br,col,command,embed,hr,img,input,keygen,link,meta,param,source,track,wbr".split(",")), S = new Set("nodeName,key,skip,memo,ref,children".split(",")), y = (e) => e.replace(/[&<>"']/g, (t) => `&#${t.charCodeAt(0)};`);
-let l = null;
+}, N = new Set("area,base,br,col,command,embed,hr,img,input,keygen,link,meta,param,source,track,wbr".split(",")), S = new Set("nodeName,key,skip,memo,ref,children".split(",")), f = (e) => e.replace(/[&<>"']/g, (t) => `&#${t.charCodeAt(0)};`);
+let s = null;
 const A = (e, t) => {
-  let o, r;
+  let o, l;
   try {
     const n = e.call(o = {
       $args: t,
-      $context: x((l == null ? void 0 : l.$context) ?? null),
+      $context: v((s == null ? void 0 : s.$context) ?? null),
       render() {
-        l !== o && o.$next();
+        s !== o && o.next();
       },
-      $next() {
-        const i = l;
-        l = o, r = $(n.next().value), l = i;
+      next() {
+        const r = s;
+        s = o, l = y(n.next().value), s = r;
       },
-      $throw(i) {
-        r = $(n.throw(i).value);
+      throw(r) {
+        l = y(n.throw(r).value);
       },
-      $return() {
+      return() {
         n.return();
       }
     }, t);
-    o.$next();
+    o.next();
   } catch (n) {
-    o.$throw(n);
+    o.throw(n);
   } finally {
-    o.$return();
+    o.return();
   }
-  return f + r;
-}, O = (e, t = Symbol()) => function(o, r) {
-  return arguments.length === 0 ? l && t in l.$context ? l.$context[t] : e : arguments.length === 1 ? t in o.$context ? o.$context[t] : e : o.$context[t] = r;
+  return m + l;
+}, O = (e, t = Symbol()) => function() {
+  const o = this ?? s;
+  return o ? arguments.length === 0 ? t in o.$context ? o.$context[t] : e : o.$context[t] = arguments[0] : e;
 };
 export {
   O as context,
-  m as html,
-  $ as render
+  p as html,
+  y as render
 };

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const S=({children:t})=>t,N=function(t,n){const{length:e}=arguments;return(n??(n=h(null))).nodeName=t,"children"in n||e<3||(n.children=e===3?arguments[2]:b.call(arguments,2)),n},d=(t,n)=>{let e=n.firstChild;for(t of g(t)){let i=e;if(typeof t=="string"){for(;i&&i.nodeType!=3;)i=i.nextSibling;i?i.data!=t&&(i.data=t):i=document.createTextNode(t)}else{const{nodeName:o,key:l,skip:c,memo:r,ref:f,children:w}=t;for(;i&&!(i.localName===o&&(i.$key??(i.$key=l))==l);)i=i.nextSibling;if(i??(i=m(document.createElementNS(t.xmlns??o==="svg"?O:n.namespaceURI,o),{$key:l})),r==null||F(i.$memo,i.$memo=r)){const{$props:$}=i,x={};for(const a of p(m({},$,t))){if(T.has(a))continue;const u=x[a]=t[a];u!==($==null?void 0:$[a])&&(a.startsWith("set:")?i[a.slice(4)]=u:u==null||u===!1?i.removeAttribute(a):i.setAttribute(a,u===!0?"":u))}i.$props=x,c||d(w,i),typeof f=="function"&&(i.$ref=f)(i)}}i===e?e=e.nextSibling:C(n,i,e)}for(;e;){const i=e.nextSibling;e.nodeType===1&&v(e),n.removeChild(e),e=i}},{isArray:y,prototype:{slice:b}}=Array,{create:h,assign:m,keys:p,prototype:{hasOwnProperty:k},hasOwn:A=(t,n)=>k.call(t,n)}=Object,O="http://www.w3.org/2000/svg",T=new Set("nodeName,key,skip,memo,ref,children".split(",")),F=(t,n)=>y(t)&&y(n)?t.some((e,i)=>e!==n[i]):t!==n,g=function*(t,n={value:""},e=!0){for(t of y(t)?t:[t])if(!(t==null||typeof t=="boolean"))if(A(t,"nodeName")){const{value:i}=n,{nodeName:o}=t;if(i&&(yield i,n.value=""),typeof o=="function")if(o.constructor.name==="GeneratorFunction"){const l={},c=m({},o.attrs);for(const r of p(t)){const f=t[r];r.startsWith("attr:")?c[r.slice(5)]=f:r==="key"||r==="memo"?c[r]=f:l[r]=f}c.nodeName=o.is??"div",c.skip=!0,c.ref=j.bind(null,o,l),yield c}else yield*g(o(t),n,!1);else yield t}else y(t)?yield*g(t,n,!1):n.value+=t;e&&n.value&&(yield n.value)},j=(t,n,e)=>{if(!e)return;e.$gen??(e.$gen=(m(e,E),e.$context??(e.$context=h((s==null?void 0:s.$context)??null)),t)),e.$ref=B.bind(null,e);const{skip:i,...o}=n;m(e.$args??(e.$args={}),o),i||e.$next()},B=(t,n)=>n??t.$return(),C=(t,n,e)=>{if(n.contains(document.activeElement)){const i=n.nextSibling;for(;e&&e!=n;){const o=e.nextSibling;t.insertBefore(e,i),e=o}}else t.insertBefore(n,e)},v=t=>{for(const e of t.children)v(e);const{$ref:n}=t;typeof n=="function"&&n(null)};let s=null;const E={render(){s!=null&&s.contains(this)||this.$next()},$next(){const t=s;s=this;try{d((this.$it??(this.$it=this.$gen.call(this,this.$args))).next().value,this),typeof this.$ref=="function"&&this.$ref(this)}catch(n){this.$throw(n)}finally{s=t}},$throw(t){var n;for(let e=this;e;e=e.parentNode)if(typeof((n=e.$it)==null?void 0:n.throw)=="function")try{return d(e.$it.throw(t).value,e)}catch{}throw t},$return(){var t;try{(t=this.$it)==null||t.return()}catch(n){this.$throw(n)}finally{this.$it=null}}},P=(t,n=Symbol())=>function(e,i){return arguments.length===0?s&&n in s.$context?s.$context[n]:t:arguments.length===1?n in e.$context?e.$context[n]:t:e.$context[n]=i};exports.Fragment=S;exports.context=P;exports.h=N;exports.render=d;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const S=({children:t})=>t,N=function(t,n){return(n??(n=$(null))).nodeName=t,"children"in n||arguments.length<3||(n.children=arguments.length===3?arguments[2]:k.call(arguments,2)),n},d=(t,n)=>{let e=n.firstChild;for(t of h(t)){let o=e;if(typeof t=="string"){for(;o&&o.nodeType!=3;)o=o.nextSibling;o?o.data!=t&&(o.data=t):o=document.createTextNode(t)}else{const{nodeName:i,key:a,skip:c,memo:s,ref:f,children:w}=t;for(;o&&!(o.localName===i&&(o.$key??(o.$key=a))==a);)o=o.nextSibling;if(o??(o=m(document.createElementNS(t.xmlns??i==="svg"?O:n.namespaceURI,i),{$key:a})),s==null||F(o.$memo,o.$memo=s)){const{$props:y}=o,x={};for(const l of p(m({},y,t))){if(T.has(l))continue;const u=x[l]=t[l];u!==(y==null?void 0:y[l])&&(l.startsWith("set:")?o[l.slice(4)]=u:u==null||u===!1?o.removeAttribute(l):o.setAttribute(l,u===!0?"":u))}o.$props=x,c||d(w,o),typeof f=="function"&&(o.$ref=f)(o)}}o===e?e=e.nextSibling:C(n,o,e)}for(;e;){const o=e.nextSibling;e.nodeType===1&&v(e),n.removeChild(e),e=o}},{isArray:g,prototype:{slice:k}}=Array,{create:$,assign:m,keys:p,prototype:{hasOwnProperty:b},hasOwn:A=(t,n)=>b.call(t,n)}=Object,O="http://www.w3.org/2000/svg",T=new Set("nodeName,key,skip,memo,ref,children".split(",")),F=(t,n)=>g(t)&&g(n)?t.some((e,o)=>e!==n[o]):t!==n,h=function*(t,n={value:""},e=!0){for(t of g(t)?t:[t])if(!(t==null||typeof t=="boolean"))if(A(t,"nodeName")){const{value:o}=n,{nodeName:i}=t;if(o&&(yield o,n.value=""),typeof i=="function")if(i.constructor.name==="GeneratorFunction"){const a={},c=m({},i.attrs);for(const s of p(t)){const f=t[s];s.startsWith("attr:")?c[s.slice(5)]=f:s==="key"||s==="memo"?c[s]=f:a[s]=f}c.nodeName=i.is??"div",c.skip=!0,c.ref=j.bind(null,i,a),yield c}else yield*h(i(t),n,!1);else yield t}else g(t)?yield*h(t,n,!1):n.value+=t;e&&n.value&&(yield n.value)},j=(t,n,e)=>{if(!e)return;e.$generator??(e.$generator=(m(e,E),e.$context??(e.$context=$((r==null?void 0:r.$context)??null)),t));const{skip:o,ref:i,...a}=n;e.$ref=B.bind(null,i,e),m(e.$args??(e.$args={}),a),o||e.next()},B=(t,n,e)=>{typeof t=="function"&&t(e),e||n.return()},C=(t,n,e)=>{if(n.contains(document.activeElement)){const o=n.nextSibling;for(;e&&e!=n;){const i=e.nextSibling;t.insertBefore(e,o),e=i}}else t.insertBefore(n,e)},v=t=>{for(const e of t.children)v(e);const{$ref:n}=t;typeof n=="function"&&n(null)};let r=null;const E={render(){r!=null&&r.contains(this)||this.next()},next(){const t=r;r=this;try{d((this.$iterator??(this.$iterator=this.$generator.call(this,this.$args))).next().value,this),typeof this.$ref=="function"&&this.$ref(this)}catch(n){this.throw(n)}finally{r=t}},throw(t){var n;for(let e=this;e;e=e.parentNode)if(typeof((n=e.$iterator)==null?void 0:n.throw)=="function")try{return d(e.$iterator.throw(t).value,e)}catch{}throw t},return(){var t;try{(t=this.$iterator)==null||t.return()}catch(n){this.throw(n)}finally{this.$iterator=null}}},P=(t,n=Symbol())=>function(){const e=this??r;return e?arguments.length===0?n in e.$context?e.$context[n]:t:e.$context[n]=arguments[0]:t};exports.Fragment=S;exports.context=P;exports.h=N;exports.render=d;

package/dist/index.js

@@ -1,24 +1,23 @@
 const F = ({ children: t }) => t, W = function(t, n) {
-  const { length: e } = arguments;
-  return (n ?? (n = h(null))).nodeName = t, "children" in n || e < 3 || (n.children = e === 3 ? arguments[2] : N.call(arguments, 2)), n;
-}, d = (t, n) => {
+  return (n ?? (n = h(null))).nodeName = t, "children" in n || arguments.length < 3 || (n.children = arguments.length === 3 ? arguments[2] : N.call(arguments, 2)), n;
+}, g = (t, n) => {
   let e = n.firstChild;
-  for (t of g(t)) {
+  for (t of x(t)) {
     let i = e;
     if (typeof t == "string") {
       for (; i && i.nodeType != 3; ) i = i.nextSibling;
       i ? i.data != t && (i.data = t) : i = document.createTextNode(t);
     } else {
-      const { nodeName: o, key: l, skip: c, memo: r, ref: f, children: w } = t;
-      for (; i && !(i.localName === o && (i.$key ?? (i.$key = l)) == l); ) i = i.nextSibling;
-      if (i ?? (i = m(document.createElementNS(t.xmlns ?? o === "svg" ? b : n.namespaceURI, o), { $key: l })), r == null || O(i.$memo, i.$memo = r)) {
-        const { $props: $ } = i, x = {};
-        for (const a of p(m({}, $, t))) {
-          if (A.has(a)) continue;
-          const u = x[a] = t[a];
-          u !== ($ == null ? void 0 : $[a]) && (a.startsWith("set:") ? i[a.slice(4)] = u : u == null || u === !1 ? i.removeAttribute(a) : i.setAttribute(a, u === !0 ? "" : u));
+      const { nodeName: o, key: a, skip: c, memo: s, ref: f, children: w } = t;
+      for (; i && !(i.localName === o && (i.$key ?? (i.$key = a)) == a); ) i = i.nextSibling;
+      if (i ?? (i = m(document.createElementNS(t.xmlns ?? o === "svg" ? b : n.namespaceURI, o), { $key: a })), s == null || O(i.$memo, i.$memo = s)) {
+        const { $props: y } = i, $ = {};
+        for (const l of p(m({}, y, t))) {
+          if (A.has(l)) continue;
+          const u = $[l] = t[l];
+          u !== (y == null ? void 0 : y[l]) && (l.startsWith("set:") ? i[l.slice(4)] = u : u == null || u === !1 ? i.removeAttribute(l) : i.setAttribute(l, u === !0 ? "" : u));
         }
-        i.$props = x, c || d(w, i), typeof f == "function" && (i.$ref = f)(i);
+        i.$props = $, c || g(w, i), typeof f == "function" && (i.$ref = f)(i);
       }
     }
     i === e ? e = e.nextSibling : C(n, i, e);
@@ -27,29 +26,31 @@ const F = ({ children: t }) => t, W = function(t, n) {
     const i = e.nextSibling;
     e.nodeType === 1 && v(e), n.removeChild(e), e = i;
   }
-}, { isArray: y, prototype: { slice: N } } = Array, { create: h, assign: m, keys: p, prototype: { hasOwnProperty: S }, hasOwn: k = (t, n) => S.call(t, n) } = Object, b = "http://www.w3.org/2000/svg", A = new Set("nodeName,key,skip,memo,ref,children".split(",")), O = (t, n) => y(t) && y(n) ? t.some((e, i) => e !== n[i]) : t !== n, g = function* (t, n = { value: "" }, e = !0) {
-  for (t of y(t) ? t : [t])
+}, { isArray: d, prototype: { slice: N } } = Array, { create: h, assign: m, keys: p, prototype: { hasOwnProperty: S }, hasOwn: k = (t, n) => S.call(t, n) } = Object, b = "http://www.w3.org/2000/svg", A = new Set("nodeName,key,skip,memo,ref,children".split(",")), O = (t, n) => d(t) && d(n) ? t.some((e, i) => e !== n[i]) : t !== n, x = function* (t, n = { value: "" }, e = !0) {
+  for (t of d(t) ? t : [t])
     if (!(t == null || typeof t == "boolean"))
       if (k(t, "nodeName")) {
         const { value: i } = n, { nodeName: o } = t;
         if (i && (yield i, n.value = ""), typeof o == "function")
           if (o.constructor.name === "GeneratorFunction") {
-            const l = {}, c = m({}, o.attrs);
-            for (const r of p(t)) {
-              const f = t[r];
-              r.startsWith("attr:") ? c[r.slice(5)] = f : r === "key" || r === "memo" ? c[r] = f : l[r] = f;
+            const a = {}, c = m({}, o.attrs);
+            for (const s of p(t)) {
+              const f = t[s];
+              s.startsWith("attr:") ? c[s.slice(5)] = f : s === "key" || s === "memo" ? c[s] = f : a[s] = f;
             }
-            c.nodeName = o.is ?? "div", c.skip = !0, c.ref = T.bind(null, o, l), yield c;
-          } else yield* g(o(t), n, !1);
+            c.nodeName = o.is ?? "div", c.skip = !0, c.ref = T.bind(null, o, a), yield c;
+          } else yield* x(o(t), n, !1);
         else yield t;
-      } else y(t) ? yield* g(t, n, !1) : n.value += t;
+      } else d(t) ? yield* x(t, n, !1) : n.value += t;
   e && n.value && (yield n.value);
 }, T = (t, n, e) => {
   if (!e) return;
-  e.$gen ?? (e.$gen = (m(e, E), e.$context ?? (e.$context = h((s == null ? void 0 : s.$context) ?? null)), t)), e.$ref = B.bind(null, e);
-  const { skip: i, ...o } = n;
-  m(e.$args ?? (e.$args = {}), o), i || e.$next();
-}, B = (t, n) => n ?? t.$return(), C = (t, n, e) => {
+  e.$generator ?? (e.$generator = (m(e, E), e.$context ?? (e.$context = h((r == null ? void 0 : r.$context) ?? null)), t));
+  const { skip: i, ref: o, ...a } = n;
+  e.$ref = B.bind(null, o, e), m(e.$args ?? (e.$args = {}), a), i || e.next();
+}, B = (t, n, e) => {
+  typeof t == "function" && t(e), e || n.return();
+}, C = (t, n, e) => {
   if (n.contains(document.activeElement)) {
     const i = n.nextSibling;
     for (; e && e != n; ) {
@@ -62,46 +63,47 @@ const F = ({ children: t }) => t, W = function(t, n) {
   const { $ref: n } = t;
   typeof n == "function" && n(null);
 };
-let s = null;
+let r = null;
 const E = {
   render() {
-    s != null && s.contains(this) || this.$next();
+    r != null && r.contains(this) || this.next();
   },
-  $next() {
-    const t = s;
-    s = this;
+  next() {
+    const t = r;
+    r = this;
     try {
-      d((this.$it ?? (this.$it = this.$gen.call(this, this.$args))).next().value, this), typeof this.$ref == "function" && this.$ref(this);
+      g((this.$iterator ?? (this.$iterator = this.$generator.call(this, this.$args))).next().value, this), typeof this.$ref == "function" && this.$ref(this);
     } catch (n) {
-      this.$throw(n);
+      this.throw(n);
     } finally {
-      s = t;
+      r = t;
     }
   },
-  $throw(t) {
+  throw(t) {
     var n;
-    for (let e = this; e; e = e.parentNode) if (typeof ((n = e.$it) == null ? void 0 : n.throw) == "function") try {
-      return d(e.$it.throw(t).value, e);
+    for (let e = this; e; e = e.parentNode) if (typeof ((n = e.$iterator) == null ? void 0 : n.throw) == "function") try {
+      return g(e.$iterator.throw(t).value, e);
     } catch {
     }
     throw t;
   },
-  $return() {
+  return() {
     var t;
     try {
-      (t = this.$it) == null || t.return();
+      (t = this.$iterator) == null || t.return();
     } catch (n) {
-      this.$throw(n);
+      this.throw(n);
     } finally {
-      this.$it = null;
+      this.$iterator = null;
     }
   }
-}, j = (t, n = Symbol()) => function(e, i) {
-  return arguments.length === 0 ? s && n in s.$context ? s.$context[n] : t : arguments.length === 1 ? n in e.$context ? e.$context[n] : t : e.$context[n] = i;
+}, j = (t, n = Symbol()) => function() {
+  const e = this ?? r;
+  return e ? arguments.length === 0 ? n in e.$context ? e.$context[n] : t : e.$context[n] = arguments[0] : t;
 };
 export {
   F as Fragment,
   j as context,
   W as h,
-  d as render
+  g as render
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ajo",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "description": "ajo is a JavaScript view library for building user interfaces",
   "type": "module",
   "module": "./dist/index.js",
@@ -23,10 +23,10 @@
     "types.ts"
   ],
   "devDependencies": {
-    "@types/node": "^20.14.10",
-    "jsdom": "24.1.0",
-    "vite": "5.3.3",
-    "vitest": "2.0.1"
+    "@types/node": "^22.2.0",
+    "jsdom": "24.1.1",
+    "vite": "5.4.0",
+    "vitest": "2.0.5"
   },
   "keywords": [
     "ui",

package/readme.md

@@ -264,14 +264,14 @@ const StatelessComponent = () => {
 // In a stateful component:
 function* StatefulComponent() {
   while (true) {
-    const theme = ThemeContext(this)
+    const theme = ThemeContext()
     yield <div>Current theme: {theme}</div>
   }
 }
 
 // Setting context value:
 function* App() {
-  ThemeContext(this, 'dark')
+  ThemeContext('dark')
   while (true) {
     yield (
       <>
@@ -313,9 +313,9 @@ Component methods:
   }
   ```
 
-- `this.$next()`: Advances the generator to the next yield point. It's automatically called by `this.render()` and is rarely used directly.
+- `this.next()`: Advances the generator to the next yield point. It's automatically called by `this.render()` and is rarely used directly.
 
-- `this.$throw(error)`: Throws an error in the generator. Useful for error propagation and creating error boundaries. Ajo automatically calls this method when an error occurs during rendering.
+- `this.throw(error)`: Throws an error in the generator. Useful for error propagation and creating error boundaries. Ajo automatically calls this method when an error occurs during rendering.
 
   ```javascript
   function* ErrorBoundary(props) {
@@ -329,14 +329,14 @@ Component methods:
   }
   ```
 
-- `this.$return()`: Completes the generator execution. It's automatically called by Ajo when a component is unmounted, but can be used manually to reset a component's state.
+- `this.return()`: Completes the generator execution. It's automatically called by Ajo when a component is unmounted, but can be used manually to reset a component's state.
 
   ```javascript
   function* ResetableComponent() {
     let count = 0
     const reset = () => {
-      this.$return()  // Reset the generator
-      this.render()   // Re-render from the beginning
+      this.return()  // Reset the generator
+      this.render()  // Re-render from the beginning
     }
     while (true) {
       yield (
@@ -360,7 +360,7 @@ Component methods:
   }
   ```
 
-These methods provide powerful control over the component's lifecycle and state management, allowing for efficient and flexible UI updates. Note that `this.$throw()` and `this.$return()` are often called automatically by Ajo in response to errors or component unmounting, respectively, but can also be used manually when needed.
+These methods provide powerful control over the component's lifecycle and state management, allowing for efficient and flexible UI updates. Note that `this.throw()` and `this.return()` are often called automatically by Ajo in response to errors or component unmounting, respectively, but can also be used manually when needed.
 
 ### `ajo/html` module
 

package/types.ts

@@ -4,9 +4,9 @@ declare module 'ajo' {
 
   type Type = Tag | Function | Component
 
-  type Props = Record<string, unknown>
+  type Attrs = Record<string, unknown>
 
-  type VNode<TTag extends Type> = { nodeName: TTag } & TagProps<TTag>
+  type VNode<TTag extends Type> = { nodeName: TTag } & Attrs
 
   type Children = any
 
@@ -16,66 +16,56 @@ declare module 'ajo' {
     ? SVGElementTagNameMap[TTag]
     : never
 
-  type AjoProps<TElement> = {
+  type AjoAttrs<TElement> = {
     key: unknown
     skip: boolean
     memo: unknown
     ref: (el: TElement | null) => void
   } & ElementChildrenAttribute
 
-  type SetProps<TTag = Tag> = {
+  type PropSetter<TTag = Tag> = {
     [K in keyof ElementType<TTag> as `set:${Exclude<K, symbol>}`]: ElementType<TTag>[K]
   }
 
-  type AttrProps<TAttribute = Props> = {
-    [K in keyof TAttribute as `attr:${Exclude<K, symbol>}`]: TAttribute[K]
+  type AttrSetter = {
+    [key: `attr:${string}`]: unknown
   }
 
-  type ComponentThis<TArguments = Props> = {
+  type Function<TArguments extends Attrs = Attrs> = (args: TArguments) => Children
+
+  type Component<TArguments extends Attrs = Attrs, TTag extends Tag = 'div'> = {
+    (this: ComponentElement<TArguments, TTag>, args: ComponentProps<TArguments, TTag>): Iterator<Children, unknown, unknown>
+  } & (TTag extends 'div' ? { is?: TTag } : { is: TTag })
+
+  type ComponentProps<TArguments extends Attrs = Attrs, TTag extends Tag = 'div'> =
+    Partial<PropSetter<TTag> & AjoAttrs<ComponentElement<TArguments, TTag>>> &
+    AttrSetter &
+    TArguments
+
+  type ComponentElement<TArguments extends Attrs = Attrs, TTag extends Tag = Tag> = ElementType<TTag> & {
     $args: TArguments,
     $context: { [key: symbol]: unknown },
     render: () => void,
-    $next: () => void
-    $throw: (value?: unknown) => void
-    $return: () => void
+    next: () => void
+    throw: (value?: unknown) => void
+    return: () => void
   }
 
-  type Function<TArguments = Props> = (args: TArguments) => Children
-
-  type Component<TArguments = Props, TTag extends Tag = 'div'> = {
-    (this: ElementType<TTag> & ComponentThis<TArguments>, args: TArguments): Iterator<Children, unknown, unknown>
-  } & (TTag extends 'div' ? { is?: TTag } : { is: TTag })
-
-  type Ref<TComponent> = TComponent extends Component<infer TArguments, infer TTag>
-    ? Component<TArguments & { ref: (el: ThisParameterType<Ref<TComponent>> | null) => void }, TTag>
-    : never 
-
   type IntrinsicElements = {
-    [TTag in Tag]: Partial<SetProps<TTag> & AjoProps<ElementType<TTag>>> & Props
+    [TTag in Tag]: Partial<PropSetter<TTag> & AjoAttrs<ElementType<TTag>>> & Attrs
   }
 
-  type IntrinsicAttributes = Partial<Omit<AjoProps<ElementType<Tag>>, 'skip' | 'ref'>> & AttrProps
-
   type ElementChildrenAttribute = { children: Children }
 
-  type TagProps<TTag extends Type> = TTag extends Tag
-    ? IntrinsicElements[TTag] & IntrinsicAttributes
-    : TTag extends Function<infer TArguments>
-    ? TArguments
-    : TTag extends Component<infer TArguments>
-    ? TArguments
-    : never
-
   function Fragment({ children }: ElementChildrenAttribute): typeof children
-  function h<TTag extends Tag>(tag: TTag, props?: TagProps<TTag> | null, ...children: Array<unknown>): VNode<TTag>
+  function h<TTag extends Tag>(tag: TTag, props?: Attrs | null, ...children: Array<unknown>): VNode<TTag>
   function render(h: Children, el: Element): void
-  function context<T>(fallback?: T): (el?: ThisParameterType<Component<unknown, Tag>>, value?: T) => T
+  function context<T>(fallback?: T): (value?: T) => T
 }
 
 declare namespace JSX {
   type ElementChildrenAttribute = import('ajo').ElementChildrenAttribute
   type IntrinsicElements = import('ajo').IntrinsicElements
-  type IntrinsicAttributes = import('ajo').IntrinsicAttributes
 }
 
 declare namespace React {