ziko 0.38.0 → 0.39.0

package/src/ui/tags/index.d.ts.txt

@@ -1,140 +1,140 @@
-import ZikoUIElement from "../elements/ZikoUIElement.js";
+import UIElement from "../elements/UIElement.js";
 interface HtmlTags {
-    a: ZikoUIElement;
-    abbr: ZikoUIElement;
-    address: ZikoUIElement;
-    area: ZikoUIElement;
-    article: ZikoUIElement;
-    aside: ZikoUIElement;
-    audio: ZikoUIElement;
-    b: ZikoUIElement;
-    base: ZikoUIElement;
-    bdi: ZikoUIElement;
-    bdo: ZikoUIElement;
-    blockquote: ZikoUIElement;
-    body: ZikoUIElement;
-    br: ZikoUIElement;
-    button: ZikoUIElement;
-    canvas: ZikoUIElement;
-    caption: ZikoUIElement;
-    cite: ZikoUIElement;
-    code: ZikoUIElement;
-    col: ZikoUIElement;
-    colgroup: ZikoUIElement;
-    data: ZikoUIElement;
-    datalist: ZikoUIElement;
-    dd: ZikoUIElement;
-    del: ZikoUIElement;
-    details: ZikoUIElement;
-    dfn: ZikoUIElement;
-    dialog: ZikoUIElement;
-    div: ZikoUIElement;
-    dl: ZikoUIElement;
-    dt: ZikoUIElement;
-    em: ZikoUIElement;
-    embed: ZikoUIElement;
-    fieldset: ZikoUIElement;
-    figcaption: ZikoUIElement;
-    figure: ZikoUIElement;
-    footer: ZikoUIElement;
-    form: ZikoUIElement;
-    h1: ZikoUIElement;
-    h2: ZikoUIElement;
-    h3: ZikoUIElement;
-    h4: ZikoUIElement;
-    h5: ZikoUIElement;
-    h6: ZikoUIElement;
-    head: ZikoUIElement;
-    header: ZikoUIElement;
-    hgroup: ZikoUIElement;
-    hr: ZikoUIElement;
-    html: ZikoUIElement;
-    i: ZikoUIElement;
-    iframe: ZikoUIElement;
-    img: ZikoUIElement;
-    input: ZikoUIElement;
-    ins: ZikoUIElement;
-    kbd: ZikoUIElement;
-    label: ZikoUIElement;
-    legend: ZikoUIElement;
-    li: ZikoUIElement;
-    link: ZikoUIElement;
-    main: ZikoUIElement;
-    map: ZikoUIElement;
-    mark: ZikoUIElement;
-    meta: ZikoUIElement;
-    meter: ZikoUIElement;
-    nav: ZikoUIElement;
-    noscript: ZikoUIElement;
-    object: ZikoUIElement;
-    ol: ZikoUIElement;
-    optgroup: ZikoUIElement;
-    option: ZikoUIElement;
-    output: ZikoUIElement;
-    p: ZikoUIElement;
-    param: ZikoUIElement;
-    picture: ZikoUIElement;
-    pre: ZikoUIElement;
-    progress: ZikoUIElement;
-    q: ZikoUIElement;
-    rp: ZikoUIElement;
-    rt: ZikoUIElement;
-    ruby: ZikoUIElement;
-    s: ZikoUIElement;
-    samp: ZikoUIElement;
-    script: ZikoUIElement;
-    section: ZikoUIElement;
-    select: ZikoUIElement;
-    small: ZikoUIElement;
-    source: ZikoUIElement;
-    span: ZikoUIElement;
-    strong: ZikoUIElement;
-    style: ZikoUIElement;
-    sub: ZikoUIElement;
-    summary: ZikoUIElement;
-    sup: ZikoUIElement;
-    table: ZikoUIElement;
-    tbody: ZikoUIElement;
-    td: ZikoUIElement;
-    template: ZikoUIElement;
-    textarea: ZikoUIElement;
-    tfoot: ZikoUIElement;
-    th: ZikoUIElement;
-    thead: ZikoUIElement;
-    time: ZikoUIElement;
-    title: ZikoUIElement;
-    tr: ZikoUIElement;
-    track: ZikoUIElement;
-    u: ZikoUIElement;
-    ul: ZikoUIElement;
-    var: ZikoUIElement;
-    video: ZikoUIElement;
-    wbr: ZikoUIElement;
+    a: UIElement;
+    abbr: UIElement;
+    address: UIElement;
+    area: UIElement;
+    article: UIElement;
+    aside: UIElement;
+    audio: UIElement;
+    b: UIElement;
+    base: UIElement;
+    bdi: UIElement;
+    bdo: UIElement;
+    blockquote: UIElement;
+    body: UIElement;
+    br: UIElement;
+    button: UIElement;
+    canvas: UIElement;
+    caption: UIElement;
+    cite: UIElement;
+    code: UIElement;
+    col: UIElement;
+    colgroup: UIElement;
+    data: UIElement;
+    datalist: UIElement;
+    dd: UIElement;
+    del: UIElement;
+    details: UIElement;
+    dfn: UIElement;
+    dialog: UIElement;
+    div: UIElement;
+    dl: UIElement;
+    dt: UIElement;
+    em: UIElement;
+    embed: UIElement;
+    fieldset: UIElement;
+    figcaption: UIElement;
+    figure: UIElement;
+    footer: UIElement;
+    form: UIElement;
+    h1: UIElement;
+    h2: UIElement;
+    h3: UIElement;
+    h4: UIElement;
+    h5: UIElement;
+    h6: UIElement;
+    head: UIElement;
+    header: UIElement;
+    hgroup: UIElement;
+    hr: UIElement;
+    html: UIElement;
+    i: UIElement;
+    iframe: UIElement;
+    img: UIElement;
+    input: UIElement;
+    ins: UIElement;
+    kbd: UIElement;
+    label: UIElement;
+    legend: UIElement;
+    li: UIElement;
+    link: UIElement;
+    main: UIElement;
+    map: UIElement;
+    mark: UIElement;
+    meta: UIElement;
+    meter: UIElement;
+    nav: UIElement;
+    noscript: UIElement;
+    object: UIElement;
+    ol: UIElement;
+    optgroup: UIElement;
+    option: UIElement;
+    output: UIElement;
+    p: UIElement;
+    param: UIElement;
+    picture: UIElement;
+    pre: UIElement;
+    progress: UIElement;
+    q: UIElement;
+    rp: UIElement;
+    rt: UIElement;
+    ruby: UIElement;
+    s: UIElement;
+    samp: UIElement;
+    script: UIElement;
+    section: UIElement;
+    select: UIElement;
+    small: UIElement;
+    source: UIElement;
+    span: UIElement;
+    strong: UIElement;
+    style: UIElement;
+    sub: UIElement;
+    summary: UIElement;
+    sup: UIElement;
+    table: UIElement;
+    tbody: UIElement;
+    td: UIElement;
+    template: UIElement;
+    textarea: UIElement;
+    tfoot: UIElement;
+    th: UIElement;
+    thead: UIElement;
+    time: UIElement;
+    title: UIElement;
+    tr: UIElement;
+    track: UIElement;
+    u: UIElement;
+    ul: UIElement;
+    var: UIElement;
+    video: UIElement;
+    wbr: UIElement;
 }
 
 interface SvgTags {
-    svg: ZikoUIElement;
-    circle: ZikoUIElement;
-    rect: ZikoUIElement;
-    line: ZikoUIElement;
-    path: ZikoUIElement;
-    g: ZikoUIElement;
-    text: ZikoUIElement;
+    svg: UIElement;
+    circle: UIElement;
+    rect: UIElement;
+    line: UIElement;
+    path: UIElement;
+    g: UIElement;
+    text: UIElement;
     //...
 }
 
 interface MathTags {
-    math: ZikoUIElement;
-    mrow: ZikoUIElement;
-    mi: ZikoUIElement;
-    mo: ZikoUIElement;
-    mn: ZikoUIElement;
-    ms: ZikoUIElement;
+    math: UIElement;
+    mrow: UIElement;
+    mi: UIElement;
+    mo: UIElement;
+    mn: UIElement;
+    ms: UIElement;
     //...
 }
 
 export type Tags = HtmlTags & SvgTags & MathTags & {
-  [key: string]: ZikoUIElement;
+  [key: string]: UIElement;
 };
 
 declare const tags: Tags;

package/src/ui/tags/index.js

@@ -1,8 +1,9 @@
-import ZikoUIElement from "../constructors/ZikoUIElement.js";
+import UIElement from "../constructors/UIElement.js";
 import { HTMLTags, SVGTags } from "./tags-list.js";
+import { isStateGetter } from "../../hooks/use-state.js";
 const _h=(tag, type, attributes, ...children)=>{
     const { name, style, ...attrs } = attributes;
-    let element = new ZikoUIElement(tag, name, type);
+    let element = new UIElement(tag, name, type);
     style && element.style(style);
     attrs && element.setAttr(attrs);
     children && element.append(...children);
@@ -15,23 +16,32 @@ const tags = new Proxy({}, {
   get(target, prop) {
     if (typeof prop !== 'string') return undefined;
     let tag = prop.replaceAll("_","-").toLowerCase();
+    let type ;
+    if(HTMLTags.includes(tag)) type = 'html'
+    if(SVGTags.includes(tag)) type = 'svg'
     if(HTMLTags.includes(tag)) return (...args)=>{
-      if(!(args[0] instanceof ZikoUIElement) && args[0] instanceof Object){
-        let attributes = args.shift()
-        // console.log(args)
-        return new ZikoUIElement(tag).setAttr(attributes).append(...args)
-      }
-      return new ZikoUIElement(tag).append(...args);
+      console.log(isStateGetter(args[0]))
+    //  if(typeof args[0] === 'function') {
+    //   console.log(args[0], args[0]?.() instanceof StateGetter)
+    //   globalThis.a = args[0]
+    //   console.log({t : a.constructor})
+    //  }
+      if(
+        ['string', 'number'].includes(typeof args[0]) 
+        || args[0] instanceof UIElement 
+        || (typeof args[0] === 'function' && args[0]().isStateGetter())
+      ) return new UIElement({element :tag, name : tag, type}).append(...args);
+      return new UIElement({element : tag}).setAttr(args.shift()).append(...args)
     }
-    if(SVGTags.includes(tag)) return (...args)=>new ZikoUIElement(tag,"",{el_type : "svg"}).append(...args);
-    return (...args)=>{
-      if(!(args[0] instanceof ZikoUIElement) && args[0] instanceof Object){
-        let attributes = args.shift()
-        return new ZikoUIElement(tag).setAttr(attributes).append(...args)
-      }
-      return new ZikoUIElement(tag).append(...args);
-    }
-    // switch(tag){
+    // if(SVGTags.includes(tag)) return (...args) => new UIElement(tag,"",{el_type : "svg"}).append(...args);
+    // return (...args)=>{
+    //   if(!(args[0] instanceof UIElement) && args[0] instanceof Object){
+    //     let attributes = args.shift()
+    //     return new UIElement(tag).setAttr(attributes).append(...args)
+    //   }
+    //   return new UIElement(tag).append(...args);
+    // }
+    // // switch(tag){
     //   case "html"  : globalThis?.document?.createElement("html")
     //   case "head"  :
     //   case "style" :
@@ -39,7 +49,7 @@ const tags = new Proxy({}, {
     //   case "meta"  :
     //   case "srcipt":
     //   case "body"  : return null; break;
-    //   default : return new ZikoUIElement(tag);
+    //   default : return new UIElement(tag);
     // }
   }
 });

package/src/ui/text/index.js

@@ -1,5 +1,5 @@
-import ZikoUINode from "../constructors/ZikoUINode.js";
-class ZikoUIText extends ZikoUINode {
+import UINode from "../constructors/UINode.js";
+class ZikoUIText extends UINode {
     constructor(...value) {
       super("span", "text", false, ...value);
       this.element = globalThis?.document?.createTextNode(...value)

package/src/ui/wrapper/index.js

@@ -1,7 +1,7 @@
-import ZikoUIElement from "../constructors/ZikoUIElement.js";
-class ZikoUIXMLWrapper extends ZikoUIElement{
+import UIElement from "../constructors/UIElement.js";
+class ZikoUIXMLWrapper extends UIElement{
     constructor(XMLContent, type){
-        super("div", "")
+        super({element : "div", name : ""})
         this.element.append(type==="svg"?svg2dom(XMLContent):html2dom(XMLContent))
     }
 }

package/src/__helpers__/composition/compose-class.js

@@ -1,28 +0,0 @@
-export function composeClass(Class, mixin) {
-  const descriptors = Object.getOwnPropertyDescriptors(mixin);
-
-  class Composed extends Class {
-    constructor(...args) {
-      super(...args);
-      for (const key of Reflect.ownKeys(descriptors)) {
-        const desc = descriptors[key];
-
-        if (typeof desc.value === 'function') {
-          this[key] = desc.value.bind(this);
-        }
-      }
-    }
-  }
-
-  for (const key of Reflect.ownKeys(descriptors)) {
-    const desc = descriptors[key];
-
-    if ('get' in desc || 'set' in desc) {
-      Object.defineProperty(Composed.prototype, key, desc);
-    } else if (typeof desc.value !== 'function') {
-      Object.defineProperty(Composed.prototype, key, desc);
-    }
-  }
-
-  return Composed;
-}