ajo 0.1.14 → 0.1.15

package/dist/index.cjs

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

package/dist/index.js

@@ -1,4 +1,4 @@
-const j = ({ children: e }) => e, z = function(e, t) {
+const W = ({ children: e }) => e, j = function(e, t) {
   const { length: i } = arguments;
   return (t ?? (t = A(null))).nodeName = e, "children" in t || i < 3 || (t.children = i === 3 ? arguments[2] : b.call(arguments, 2)), t;
 }, d = (e, t) => {
@@ -16,14 +16,14 @@ const j = ({ children: e }) => e, z = function(e, t) {
       for (; n && !(n.localName === o && (n.$key ?? (n.$key = a)) == a); )
         n = n.nextSibling;
       if (n ?? (n = g(document.createElementNS(e.xmlns ?? o === "svg" ? O : t.namespaceURI, o), { $key: a })), r == null || F(n.$memo, n.$memo = r)) {
-        const { $props: y } = n, $ = {};
-        for (const c of w(g({}, y, e))) {
-          if (q.has(c))
+        const { $props: y } = n, w = {};
+        for (const l of h(g({}, y, e))) {
+          if (q.has(l))
             continue;
-          const f = $[c] = e[c];
-          f !== (y == null ? void 0 : y[c]) && (c.startsWith("set:") ? n[c.slice(4)] = f : f == null || f === !1 ? n.removeAttribute(c) : n.setAttribute(c, f === !0 ? "" : f));
+          const f = w[l] = e[l];
+          f !== (y == null ? void 0 : y[l]) && (l.startsWith("set:") ? n[l.slice(4)] = f : f == null || f === !1 ? n.removeAttribute(l) : n.setAttribute(l, f === !0 ? "" : f));
         }
-        n.$props = $, m || d(u, n), typeof s == "function" && (n.$ref = s)(n);
+        n.$props = w, m || d(u, n), typeof s == "function" && (n.$ref = s)(n);
       }
     }
     n === i ? i = i.nextSibling : E(t, n, i);
@@ -32,7 +32,7 @@ const j = ({ children: e }) => e, z = function(e, t) {
     const n = i.nextSibling;
     i.nodeType === 1 && k(i), t.removeChild(i), i = n;
   }
-}, { isArray: h, prototype: { slice: b } } = Array, { create: A, keys: w, assign: g, hasOwn: C, setPrototypeOf: x, getPrototypeOf: v } = Object, O = "http://www.w3.org/2000/svg", q = new Set("nodeName,key,skip,memo,ref,children".split(",")), N = (e) => typeof e != "string" && typeof (e == null ? void 0 : e[Symbol.iterator]) == "function", F = (e, t) => h(e) && h(t) ? e.some((i, n) => i !== t[n]) : e !== t, p = function* (e, t = { value: "" }, i = !0) {
+}, { isArray: $, prototype: { slice: b } } = Array, { create: A, keys: h, assign: g, hasOwn: C, setPrototypeOf: x, getPrototypeOf: v } = Object, O = "http://www.w3.org/2000/svg", q = new Set("nodeName,key,skip,memo,ref,children".split(",")), N = (e) => typeof e != "string" && typeof (e == null ? void 0 : e[Symbol.iterator]) == "function", F = (e, t) => $(e) && $(t) ? e.some((i, n) => i !== t[n]) : e !== t, p = function* (e, t = { value: "" }, i = !0) {
   for (e of N(e) ? e : [e])
     if (!(e == null || typeof e == "boolean"))
       if (C(e, "nodeName")) {
@@ -40,7 +40,7 @@ const j = ({ children: e }) => e, z = function(e, t) {
         if (n && (yield n, t.value = ""), a === "function")
           if (delete e.nodeName, o.constructor.name === "GeneratorFunction") {
             const m = {}, r = g({}, o.attrs);
-            for (const s of w(e)) {
+            for (const s of h(e)) {
               const u = e[s];
               s.startsWith("attr:") && (r[s.slice(5)] = u), s === "key" || s === "memo" ? r[s] = u : m[s] = u;
             }
@@ -53,7 +53,7 @@ const j = ({ children: e }) => e, z = function(e, t) {
         N(e) ? yield* p(e, t, !1) : t.value += e;
   i && t.value && (yield t.value);
 }, T = (e, t, i) => {
-  i && (i.$gen ?? (i.$gen = (new I(i), e)), i.$ref = B.bind(null, i), i.$args = t, i.next());
+  i && (i.$gen ?? (i.$gen = (new P(i), e)), i.$ref = B.bind(null, i), i.$args = t, i.next());
 }, B = (e, t) => t ?? e.return(), E = (e, t, i) => {
   if (t.contains(document.activeElement)) {
     const n = t.nextSibling;
@@ -68,10 +68,16 @@ const j = ({ children: e }) => e, z = function(e, t) {
     k(i);
   const { $ref: t } = e;
   typeof t == "function" && t(null);
-  for (const i of w(e))
+  for (const i of h(e))
     e[i] = null;
 };
-class I {
+let c, S;
+const I = () => {
+  for (const e of c)
+    e.isConnected && e.next();
+  c.clear(), S = null;
+};
+class P {
   constructor(t) {
     x(t, x(v(this), v(t)));
   }
@@ -80,7 +86,13 @@ class I {
       yield this.$args ?? {};
   }
   refresh() {
-    P(this);
+    (c ?? (c = /* @__PURE__ */ new Set())).has(this) && c.delete(this);
+    for (const t of c) {
+      if (t.contains(this))
+        return;
+      this.contains(t) && c.delete(t);
+    }
+    c.add(this), S ?? (S = requestAnimationFrame(I));
   }
   next() {
     try {
@@ -110,22 +122,8 @@ class I {
     }
   }
 }
-let l, S;
-const P = (e) => {
-  (l ?? (l = /* @__PURE__ */ new Set())).has(e) && l.delete(e);
-  for (const t of l) {
-    if (t.contains(e))
-      return;
-    e.contains(t) && l.delete(t);
-  }
-  l.add(e), S ?? (S = requestAnimationFrame(W));
-}, W = () => {
-  for (const e of l)
-    e.isConnected && e.next();
-  l.clear(), S = null;
-};
 export {
-  j as Fragment,
-  z as h,
+  W as Fragment,
+  j as h,
   d as render
 };

package/package.json

@@ -1,19 +1,18 @@
 {
   "name": "ajo",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "ajo is a JavaScript view library for building user interfaces",
   "type": "module",
-  "module": "./dist/index.js",
-  "main": "./dist/index.cjs",
-  "types": "./types.ts",
   "exports": {
     ".": {
       "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "require": "./dist/index.cjs",
+      "types": "./types.ts"
     },
     "./html": {
       "import": "./dist/html.js",
-      "require": "./dist/html.umd.cjs"
+      "require": "./dist/html.cjs",
+      "types": "./types.ts"
     }
   },
   "files": [
@@ -21,9 +20,10 @@
     "types.ts"
   ],
   "devDependencies": {
+    "@types/node": "^20.12.7",
     "jsdom": "24.0.0",
-    "vite": "5.0.12",
-    "vitest": "1.2.1"
+    "vite": "5.2.8",
+    "vitest": "1.5.0"
   },
   "keywords": [
     "ui",

package/types.ts

@@ -1,69 +1,82 @@
-declare namespace Ajo {
-
-    interface VNode<TTag = Tag> extends Partial<AjoProps<ElementType<TTag>>> {
-        nodeName: TTag,
-        [key: string]: unknown,     
-    }
-
-    type Child = null | undefined | boolean | bigint | number | string | symbol | Node | VNode | Iterable<Child>
-
-    type Tag = keyof (HTMLElementTagNameMap & SVGElementTagNameMap)
-
-    type ElementType<TTag> =
-        TTag extends keyof HTMLElementTagNameMap
-        ? HTMLElementTagNameMap[TTag]
-        : TTag extends keyof SVGElementTagNameMap
-        ? SVGElementTagNameMap[TTag]
-        : HTMLElement
-
-    type AjoProps<TElement> = {
-        key: unknown,
-        skip: boolean,
-        memo: unknown,
-        ref: (el: TElement | null) => void,
-        children: Child,
-    }
-
-    type SetProps<TTag> = {
-        [K in keyof ElementType<TTag> as `set:${Exclude<K, symbol>}`]: ElementType<TTag>[K]
-    }
-
-    type AttrProps<T> = {
-        [K in keyof T as `attr:${Exclude<K, symbol>}`]: T[K]
-    }
-
-    type Context<TArgs> = {
-        $args: TArgs
-        next: () => void
-        throw: (error?: unknown) => void
-        return: () => void
-        refresh: () => void
-        [Symbol.iterator]: () => Generator<TArgs, void, TArgs>
-    }
-
-    type Function<TArgs = {}> = (args: TArgs) => Child
-
-    type Component<TArgs = {}, TTag extends Tag = 'div'> = {
-        (this: ElementType<TTag> & Context<TArgs>, args: TArgs): Generator<Child, void, Child>
-    } & (TTag extends 'div' ? { is?: TTag } : { is: TTag })
-}
+declare module 'ajo' {
 
-declare namespace JSX {
+  type Tag = keyof (HTMLElementTagNameMap & SVGElementTagNameMap)
+
+  type Props = Record<string, unknown>
+
+  type AjoNode<TTag = Tag> = { nodeName: TTag } & AjoProps<ElementType<TTag>> & Props
+
+  type Children =
+    | null
+    | undefined
+    | boolean
+    | bigint
+    | number
+    | string
+    | symbol
+    | Node
+    | AjoNode
+    | Iterable<Children>
+
+  type ElementType<TTag = Tag> = TTag extends keyof HTMLElementTagNameMap
+    ? HTMLElementTagNameMap[TTag]
+    : TTag extends keyof SVGElementTagNameMap
+    ? SVGElementTagNameMap[TTag]
+    : never
+
+  type AjoProps<TElement> = {
+    key: unknown
+    skip: boolean
+    memo: unknown
+    ref: (el: TElement | null) => void
+  } & ElementChildrenAttribute
+
+  type SetProps<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 IntrinsicElements = {
-        [TTag in Ajo.Tag]: Partial<Ajo.SetProps<TTag> & Ajo.AjoProps<Ajo.ElementType<TTag>>>
-    }
+  type Context<TArguments = Props> = {
+    $args: TArguments
+    next: () => void
+    throw: (value?: unknown) => void
+    return: () => void
+    refresh: () => void
+    [Symbol.iterator]: () => Generator<TArguments, unknown, unknown>
+  }
 
-    type IntrinsicAttributes = Partial<Ajo.AttrProps<any> & Omit<Ajo.AjoProps<any>, "skip" | "ref">>
+  type Function<TArguments = Props> = (args: TArguments) => Children
+
+  type Component<TArguments = Props, TTag extends Tag = 'div'> = {
+    (this: ComponentElement<TArguments, TTag>, args: TArguments): Generator<Children, unknown, unknown>
+  } & (TTag extends 'div' ? { is?: TTag } : { is: TTag })
+
+  type ComponentElement<TArguments = Props, TTag = Tag> = Context<TArguments> & ElementType<TTag>
+
+  type IntrinsicElements = {
+    [TTag in Tag]: Partial<SetProps<TTag> & AjoProps<ElementType<TTag>>> & Props
+  }
+
+  type IntrinsicAttributes = Partial<Omit<AjoProps<ElementType<Tag>>, 'skip' | 'ref'>> & AttrProps
+
+  type ElementChildrenAttribute = { children: Children }
+
+  function Fragment({ children }: ElementChildrenAttribute): typeof children
+  function h<TProps = Props>(type: Tag | Function<TProps> | Component<TProps>, props?: TProps | null, ...children: Children[]): AjoNode<typeof type>
+  function render(h: Children, el: Element): void
 }
 
-declare namespace React {
-    export const createElement: typeof import('ajo').h
-    export const Fragment: typeof import('ajo').Fragment
+declare namespace JSX {
+  type ElementChildrenAttribute = import('ajo').ElementChildrenAttribute
+  type IntrinsicElements = import('ajo').IntrinsicElements
+  type IntrinsicAttributes = import('ajo').IntrinsicAttributes
 }
 
-declare module 'ajo' {
-    function Fragment({ children }: { children: Ajo.Child }): typeof children
-    function h<TProps = {}>(type: Ajo.Tag | Ajo.Function<TProps> | Ajo.Component<TProps>, props?: TProps | null, ...children: Ajo.Child[]): Ajo.VNode<typeof type>
-    function render(h: Ajo.Child, el: Element): void
+declare namespace React {
+  const createElement: typeof import('ajo').h
+  const Fragment: typeof import('ajo').Fragment
+  type ReactNode = import('ajo').Children
 }