cradova 3.3.20 → 3.3.35

package/dist/index.js

@@ -1,230 +1,23 @@
-// src/primitives/functions.ts
-function Rhoda(l) {
-  const fg = new DocumentFragment;
-  for (let ch of l) {
-    if (Array.isArray(ch)) {
-      fg.appendChild(Rhoda(ch));
-    } else {
-      if (ch instanceof Comp) {
-        ch = ch.render();
-      }
-      if (typeof ch === "function") {
-        ch = ch();
-        if (typeof ch === "function") {
-          ch = ch();
-        }
-      }
-      if (ch instanceof HTMLElement || ch instanceof DocumentFragment) {
-        fg.appendChild(ch);
-        continue;
-      }
-      if (typeof ch === "string") {
-        fg.appendChild(document.createTextNode(ch));
-      }
-    }
-  }
-  return fg;
-}
-function $if(condition, ...elements) {
-  if (condition) {
-    return elements;
-  }
-}
-function $ifelse(condition, ifTrue, ifFalse) {
-  if (condition) {
-    return ifTrue;
-  }
-  return ifFalse;
-}
-function $case(value, ...elements) {
-  return (key) => {
-    if (key === value) {
-      return elements;
-    }
-    return;
-  };
-}
-function $switch(key, ...cases) {
-  let elements;
-  if (cases.length) {
-    for (let i = 0;i < cases.length; i++) {
-      elements = cases[i](key);
-      if (elements) {
-        break;
-      }
-    }
-  }
-  return elements;
-}
-function loop(datalist, component) {
-  return Array.isArray(datalist) ? datalist.map(component) : undefined;
-}
-function useState(newState, Comp2) {
-  Comp2._state_index += 1;
-  const idx = Comp2._state_index;
-  if (idx >= Comp2._state.length) {
-    Comp2._state[idx] = newState;
-  }
-  function setState(newState2) {
-    Comp2._state[idx] = newState2;
-    Comp2.recall();
-  }
-  return [Comp2._state[idx], setState];
-}
-function useEffect(effect, Comp2) {
-  Comp2._effect(effect);
-}
-function useRef() {
-  return new __raw_ref;
-}
-var makeElement = (element, ElementChildrenAndPropertyList) => {
-  const props = {};
-  let text = undefined;
-  if (ElementChildrenAndPropertyList.length !== 0) {
-    for (let i = 0;i < ElementChildrenAndPropertyList.length; i++) {
-      let child = ElementChildrenAndPropertyList[i];
-      if (typeof child === "function") {
-        child = child();
-      }
-      if (child instanceof Comp) {
-        child = child.render();
-      }
-      if (child instanceof HTMLElement || child instanceof DocumentFragment) {
-        element.appendChild(child);
-        continue;
-      }
-      if (Array.isArray(child)) {
-        element.appendChild(Rhoda(child));
-        continue;
-      }
-      if (typeof child === "string") {
-        text = child;
-        continue;
-      }
-      if (typeof child === "object") {
-        Object.assign(props, child);
-        continue;
-      }
-    }
-  } else {
-    return element;
-  }
-  if (typeof props === "object" && element) {
-    for (const [prop, value] of Object.entries(props)) {
-      if (prop === "style" && typeof value === "object") {
-        Object.assign(element.style, value);
-        continue;
-      }
-      if (prop === "href") {
-        const href = value || "";
-        if (!href.includes("://")) {
-          element.addEventListener("click", (e) => {
-            e.preventDefault();
-            Router.navigate(element.href);
-            if (href.includes("#")) {
-              const l = href.split("#").at(-1);
-              document.getElementById("#" + l)?.scrollIntoView();
-            }
-          });
-        }
-        element.setAttribute(prop, value);
-        continue;
-      }
-      if (Array.isArray(value)) {
-        if (prop == "reference" && value[0] instanceof __raw_ref) {
-          value[0]._appendDomForce(value[1], element);
-          continue;
-        }
-        if (value[0] instanceof createSignal) {
-          value[0].bindRef(element, {
-            _element_property: prop,
-            signalProperty: value[1]
-          });
-          continue;
-        }
-      }
-      if (prop === "onmount" && typeof props["onmount"] === "function") {
-        const ev = () => {
-          props["onmount"]?.apply(element);
-          props["onmount"] = undefined;
-        };
-        CradovaEvent.addAfterMount(ev);
-        continue;
-      }
-      if (prop.includes("data-")) {
-        element.setAttribute(prop, value);
-        continue;
-      }
-      if (prop.includes("aria-")) {
-        element.setAttribute(prop, value);
-        continue;
-      }
-      element[prop] = value;
-    }
-  }
-  if (text !== undefined) {
-    element.appendChild(document.createTextNode(text));
-  }
-  return element;
-};
-var cra = (tag) => {
-  return (...Children_and_Properties) => makeElement(document.createElement(tag), Children_and_Properties);
-};
-var SNRU = {
-  snru: "",
-  memo_SNRU() {
-    let key = 0;
-    const url = window.location.href;
-    for (let i = 0;i < url.length; i++) {
-      key += url.charCodeAt(i);
-    }
-    this.snru = key.toString();
-  }
-};
-var frag = function(children) {
-  const par = document.createDocumentFragment();
-  for (let i = 0;i < children.length; i++) {
-    let html = children[i];
-    if (typeof html === "function") {
-      html = html();
-    }
-    if (html instanceof HTMLElement || html instanceof DocumentFragment) {
-      par.appendChild(html);
-      continue;
-    }
-    if (html instanceof String) {
-      par.appendChild(document.createTextNode(html));
-      continue;
-    }
-    console.error(" \u2718  Cradova err:   wrong element type" + html);
-  }
-  return par;
-};
-
 // src/primitives/classes.ts
 class cradovaEvent {
   afterMount = [];
   beforeMountActive = [];
   async addAfterMount(callback) {
-    if (!this.addAfterMount) {
-      this.afterMount = [];
-    }
     this.afterMount.push(callback);
   }
   async addBeforeMountActive(callback) {
-    if (!this.beforeMountActive) {
-      this.beforeMountActive = [];
-    }
     this.beforeMountActive.push(callback);
   }
   dispatchEvent(eventName) {
-    const eventListeners = this[eventName] || [];
-    for (let i = 0;i < eventListeners.length; i++) {
-      if (eventName.includes("Active")) {
+    const eventListeners = this[eventName];
+    if (eventName.includes("Active")) {
+      for (let i = 0;i < eventListeners.length; i++) {
         eventListeners[i]();
-      } else {
-        eventListeners.shift()();
       }
+      return;
+    }
+    while (eventListeners.length !== 0) {
+      eventListeners.shift()();
     }
   }
 }
@@ -237,17 +30,13 @@ class Comp {
   rendered = false;
   published = false;
   preRendered = null;
-  reference = new __raw_ref;
+  reference = null;
   Signal;
   _state = [];
   _state_index = 0;
   test;
   constructor(component) {
     this.component = component.bind(this);
-    CradovaEvent.addBeforeMountActive(() => {
-      this._state_index = 0;
-      this._state = [];
-    });
   }
   preRender() {
     this.preRendered = this.render();
@@ -256,9 +45,11 @@ class Comp {
     this.effects = [];
     this.rendered = false;
     if (!this.preRendered) {
+      this._state_index = 0;
+      this._state = [];
       const html = this.component();
-      if (html instanceof HTMLElement || html instanceof DocumentFragment) {
-        this.reference._appendDomForce("html", html);
+      if (html instanceof HTMLElement) {
+        this.reference = html;
         this.effector.apply(this);
         this.rendered = true;
         this.published = true;
@@ -302,20 +93,20 @@ class Comp {
     }
   }
   async activate() {
-    this._state_index = 0;
     this.published = false;
     if (!this.rendered) {
       return;
     }
+    this._state_index = 0;
     const html = this.component();
-    if (html instanceof HTMLElement || html instanceof DocumentFragment) {
-      const node = this.reference.current("html");
+    if (html instanceof HTMLElement) {
+      const node = this.reference;
       if (node) {
         node.insertAdjacentElement("beforebegin", html);
         node.remove();
       }
       this.published = true;
-      this.reference._appendDomForce("html", html);
+      this.reference = html;
       CradovaEvent.dispatchEvent("afterMount");
       (async () => {
         if (!document.contains(html)) {
@@ -348,32 +139,6 @@ class lazy {
   }
 }
 
-class __raw_ref {
-  tree = {};
-  globalTree = {};
-  bindAs(name) {
-    return [this, name];
-  }
-  current(name) {
-    if (this.tree[SNRU.snru]) {
-      return this.tree[SNRU.snru][name];
-    }
-    return null;
-  }
-  _appendDomForce(name, Element) {
-    if (this.tree[SNRU.snru]) {
-      this.tree[SNRU.snru][name] = Element;
-    } else {
-      this.tree[SNRU.snru] = {};
-      this.tree[SNRU.snru][name] = Element;
-    }
-  }
-  _appendDomForceGlobal(name, Element) {
-    this.globalTree[name] = Element;
-  }
-}
-var localTree = new __raw_ref;
-
 class createSignal {
   callback;
   persistName = "";
@@ -445,10 +210,10 @@ class createSignal {
       }
     }
   }
-  fireAction(key, data) {
+  fireAction(key) {
     if (typeof this.actions[key] === "function") {
-      this.updateState(key, data);
-      return this.actions[key].call(this, data);
+      this.updateState(key);
+      return this.actions[key].call(this);
     } else {
       throw Error("\u2718  Cradova err : action " + key + "  does not exist!");
     }
@@ -460,49 +225,24 @@ class createSignal {
       throw new Error("\u2718  Cradova err : can't bind an unavailable property!  " + prop);
     }
   }
-  updateState(name, data) {
-    if (name && data) {
-      this.comp.map((ent) => {
-        if (ent._event === name) {
-          if (ent._element_property && ent._signalProperty) {
-            ent.comp.recall();
-            return;
-          }
-          if (ent._element_property) {
-            ent.comp.recall();
-            return;
-          }
-          if (ent._signalProperty) {
-            ent.comp.recall();
-            return;
-          }
-        }
-      });
-    } else {
-      for (let i = 0;i < this.comp.length; i++) {
-        const ent = this.comp[i];
-        if (ent._element_property && ent._signalProperty) {
-          ent.comp.recall();
-          continue;
-        }
-        if (ent._element_property) {
-          ent.comp.recall();
-          continue;
-        }
-        if (ent._signalProperty) {
-          ent.comp.recall();
-          continue;
-        }
-        if (!ent._element_property && !ent._signalProperty) {
-          ent.comp.recall();
-          continue;
-        }
+  updateState(name) {
+    for (let i = 0;i < this.comp.length; i++) {
+      const ent = this.comp[i];
+      if (ent._event && ent._event === name) {
+        continue;
       }
+      if (ent._element_property && ent._signalProperty) {
+        ent.comp[ent._element_property] = this.value[ent._signalProperty];
+        continue;
+      }
+      ent.comp.recall();
     }
   }
   bindRef(comp, binding = { signalProperty: "", _element_property: "" }) {
-    comp.render = comp.render.bind(comp);
-    comp._setExtra(this);
+    if (comp instanceof Comp) {
+      comp.render = comp.render.bind(comp);
+      comp._setExtra(this);
+    }
     this.comp.push({
       comp,
       _signalProperty: binding.signalProperty,
@@ -558,7 +298,6 @@ class Page {
       history.go(-1);
       return;
     }
-    SNRU.memo_SNRU();
     let html = this._html.apply(this);
     if (html instanceof HTMLElement) {
       this._template.innerHTML = "";
@@ -567,9 +306,9 @@ class Page {
       throw new Error(` \u2718  Cradova err:  template function for the page returned ${html} instead of html`);
     }
     document.title = this._name;
-    localTree.globalTree["doc"].innerHTML = "";
+    RouterBox.doc.innerHTML = "";
     CradovaEvent.dispatchEvent("beforeMountActive");
-    localTree.globalTree["doc"].appendChild(this._template);
+    RouterBox.doc.appendChild(this._template);
     CradovaEvent.dispatchEvent("afterMount");
     window.scrollTo({
       top: 0,
@@ -581,6 +320,7 @@ class Page {
 }
 
 class RouterBoxClass {
+  doc = null;
   lastNavigatedRouteController;
   nextRouteController;
   lastNavigatedRoute;
@@ -798,9 +538,9 @@ class Router {
       doc = document.createElement("div");
       doc.setAttribute("data-wrapper", "app");
       document.body.appendChild(doc);
-      localTree._appendDomForceGlobal("doc", doc);
+      RouterBox.doc = doc;
     } else {
-      localTree._appendDomForceGlobal("doc", doc);
+      RouterBox.doc = doc;
     }
     window.addEventListener("pageshow", () => RouterBox.router());
     window.addEventListener("popstate", (_e) => {
@@ -809,6 +549,207 @@ class Router {
     });
   }
 }
+// src/primitives/functions.ts
+function Rhoda(l) {
+  const fg = new DocumentFragment;
+  for (let ch of l) {
+    if (Array.isArray(ch)) {
+      fg.appendChild(Rhoda(ch));
+    } else {
+      if (ch instanceof Comp) {
+        ch = ch.render();
+      }
+      if (typeof ch === "function") {
+        ch = ch();
+        if (typeof ch === "function") {
+          ch = ch();
+        }
+      }
+      if (ch instanceof HTMLElement || ch instanceof DocumentFragment) {
+        fg.appendChild(ch);
+        continue;
+      }
+      if (typeof ch === "string") {
+        fg.appendChild(document.createTextNode(ch));
+      }
+    }
+  }
+  return fg;
+}
+function $if(condition, ...elements) {
+  if (condition) {
+    return elements;
+  }
+}
+function $ifelse(condition, ifTrue, ifFalse) {
+  if (condition) {
+    return ifTrue;
+  }
+  return ifFalse;
+}
+function $case(value, ...elements) {
+  return (key) => {
+    if (key === value) {
+      return elements;
+    }
+    return;
+  };
+}
+function $switch(key, ...cases) {
+  let elements;
+  if (cases.length) {
+    for (let i = 0;i < cases.length; i++) {
+      elements = cases[i](key);
+      if (elements) {
+        break;
+      }
+    }
+  }
+  return elements;
+}
+function loop(datalist, component) {
+  return Array.isArray(datalist) ? datalist.map(component) : undefined;
+}
+function useState(newState, Comp2) {
+  Comp2._state_index += 1;
+  const idx = Comp2._state_index;
+  if (idx >= Comp2._state.length) {
+    Comp2._state[idx] = newState;
+  }
+  function setState(newState2) {
+    if (typeof newState2 === "function") {
+      newState2 = newState2(Comp2._state[idx]);
+    }
+    Comp2._state[idx] = newState2;
+    Comp2.recall();
+  }
+  return [Comp2._state[idx], setState];
+}
+function useEffect(effect, Comp2) {
+  Comp2._effect(effect);
+}
+function useRef() {
+  return new __raw_ref;
+}
+
+class __raw_ref {
+  tree = {};
+  bindAs(name) {
+    return [this, name];
+  }
+  current(name) {
+    return this.tree[name];
+  }
+  _append(name, Element) {
+    this.tree[name] = Element;
+  }
+}
+var makeElement = (element, ElementChildrenAndPropertyList) => {
+  const props = {};
+  let text = undefined;
+  if (ElementChildrenAndPropertyList.length !== 0) {
+    for (let i = 0;i < ElementChildrenAndPropertyList.length; i++) {
+      let child = ElementChildrenAndPropertyList[i];
+      if (typeof child === "function") {
+        child = child();
+      }
+      if (child instanceof Comp) {
+        child = child.render();
+      }
+      if (child instanceof HTMLElement || child instanceof DocumentFragment) {
+        element.appendChild(child);
+        continue;
+      }
+      if (Array.isArray(child)) {
+        element.appendChild(Rhoda(child));
+        continue;
+      }
+      if (typeof child === "string") {
+        text = child;
+        continue;
+      }
+      if (typeof child === "object") {
+        Object.assign(props, child);
+        continue;
+      }
+    }
+  } else {
+    return element;
+  }
+  if (typeof props === "object" && element) {
+    for (const [prop, value] of Object.entries(props)) {
+      if (prop === "style" && typeof value === "object") {
+        Object.assign(element.style, value);
+        continue;
+      }
+      if (prop === "href") {
+        const href = value || "";
+        if (!href.includes("://")) {
+          element.addEventListener("click", (e) => {
+            e.preventDefault();
+            Router.navigate(element.href);
+            if (href.includes("#")) {
+              const l = href.split("#").at(-1);
+              document.getElementById("#" + l)?.scrollIntoView();
+            }
+          });
+        }
+        element.setAttribute(prop, value);
+        continue;
+      }
+      if (Array.isArray(value)) {
+        if (prop == "reference" && value[0] instanceof __raw_ref) {
+          value[0]._append(value[1], element);
+          continue;
+        }
+        if (value[0] instanceof createSignal) {
+          value[0].bindRef(element, {
+            _element_property: prop,
+            signalProperty: value[1]
+          });
+          continue;
+        }
+      }
+      if (prop === "onmount") {
+        CradovaEvent.addAfterMount(() => {
+          typeof props["onmount"] === "function" && props["onmount"].apply(element);
+        });
+        continue;
+      }
+      if (prop.includes("data-") || prop.includes("aria-")) {
+        element.setAttribute(prop, value);
+        continue;
+      }
+      element[prop] = value;
+    }
+  }
+  if (text !== undefined) {
+    element.appendChild(document.createTextNode(text));
+  }
+  return element;
+};
+var cra = (tag) => {
+  return (...Children_and_Properties) => makeElement(document.createElement(tag), Children_and_Properties);
+};
+var frag = function(children) {
+  const par = document.createDocumentFragment();
+  for (let i = 0;i < children.length; i++) {
+    let html = children[i];
+    if (typeof html === "function") {
+      html = html();
+    }
+    if (html instanceof HTMLElement || html instanceof DocumentFragment) {
+      par.appendChild(html);
+      continue;
+    }
+    if (html instanceof String) {
+      par.appendChild(document.createTextNode(html));
+      continue;
+    }
+    console.error(" \u2718  Cradova err:   wrong element type" + html);
+  }
+  return par;
+};
 // src/primitives/dom-objects.ts
 var a = cra("a");
 var audio = cra("audio");
@@ -942,8 +883,6 @@ export {
   br,
   audio,
   a,
-  __raw_ref,
-  SNRU,
   Router,
   Rhoda,
   Page,

package/dist/primitives/classes.d.ts

@@ -3,8 +3,8 @@ import { type CradovaPageType, type promisedPage } from "./types";
  * Cradova event
  */
 declare class cradovaEvent {
-    private afterMount;
-    private beforeMountActive;
+    afterMount: Function[];
+    beforeMountActive: Function[];
     /**
      *  add an event to an exhaustible list of events
      * the events runs only once and removed.
@@ -78,32 +78,6 @@ export declare class lazy<Type> {
     constructor(cb: () => Promise<unknown>);
     load(): Promise<void>;
 }
-/**
- * Cradova
- * ---
- * make reference to dom elements
- */
-export declare class __raw_ref {
-    tree: Record<string, any>;
-    globalTree: Record<string, HTMLElement>;
-    /**
-     * Bind a DOM element to a reference name.
-     * @param name - The name to reference the DOM element by.
-     */
-    bindAs(name: string): __raw_ref;
-    /**
-     * Retrieve a referenced DOM element.
-     * @param name - The name of the referenced DOM element.
-     */
-    current<ElementType extends HTMLElement = HTMLElement>(name: string): ElementType;
-    /**
-     * Append a DOM element to the reference, overwriting any existing reference.
-     * @param name - The name to reference the DOM element by.
-     * @param element - The DOM element to reference.
-     */
-    _appendDomForce(name: string, Element: HTMLElement): void;
-    _appendDomForceGlobal(name: string, Element: HTMLElement): void;
-}
 /**
  *  Cradova Signal
  * ----
@@ -167,7 +141,7 @@ export declare class createSignal<Type extends Record<string, any>> {
      * @param key - string key of the action
      * @param data - data for the action
      */
-    fireAction(key: string, data?: unknown): void;
+    fireAction(key: string): void;
     /**
      * Cradova
      * ---

package/dist/primitives/functions.d.ts

@@ -1,5 +1,29 @@
 import { type VJS_params_TYPE } from "./types";
-import { Comp, __raw_ref } from "./classes";
+import { Comp } from "./classes";
+/**
+ * Cradova
+ * ---
+ * make reference to dom elements
+ */
+declare class __raw_ref {
+    tree: Record<string, any>;
+    /**
+     * Bind a DOM element to a reference name.
+     * @param name - The name to reference the DOM element by.
+     */
+    bindAs(name: string): __raw_ref;
+    /**
+     * Retrieve a referenced DOM element.
+     * @param name - The name of the referenced DOM element.
+     */
+    current<ElementType extends HTMLElement = HTMLElement>(name: string): ElementType | undefined;
+    /**
+     * Append a DOM element to the reference, overwriting any existing reference.
+     * @param name - The name to reference the DOM element by.
+     * @param element - The DOM element to reference.
+     */
+    _append(name: string, Element: HTMLElement): void;
+}
 export declare const makeElement: <E extends HTMLElement>(element: E & HTMLElement, ElementChildrenAndPropertyList: VJS_params_TYPE<E>) => E;
 export declare const cra: <E extends HTMLElement>(tag: string) => (...Children_and_Properties: VJS_params_TYPE<E>) => E;
 export declare function Rhoda(l: VJS_params_TYPE<HTMLElement>): DocumentFragment;
@@ -14,11 +38,6 @@ export declare function $case<E = HTMLElement>(value: any, ...elements: VJS_para
 export declare function $switch(key: unknown, ...cases: ((key: any) => any)[]): any;
 type LoopData<Type> = Type[];
 export declare function loop<Type>(datalist: LoopData<Type>, component: (value: Type, index?: number, array?: LoopData<Type>) => HTMLElement | DocumentFragment | undefined): HTMLElement[] | undefined;
-/**  Calculate a simple numerical representation of the URL */
-export declare const SNRU: {
-    snru: string;
-    memo_SNRU(): void;
-};
 /**
  * Document fragment
  * @param children
@@ -33,7 +52,7 @@ export declare const frag: (children: VJS_params_TYPE<HTMLElement>) => DocumentF
  * @param Comp
  * @returns [state, setState]
  */
-export declare function useState<S = unknown>(newState: S, Comp: Comp): [S, (newState: S) => void];
+export declare function useState<S = unknown>(newState: S, Comp: Comp): [S, (newState: S | ((preS: S) => S)) => void];
 /**
  * Cradova
  * ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cradova",
-  "version": "3.3.20",
+  "version": "3.3.35",
   "description": "Build Powerful ⚡ Web Apps with Ease",
   "main": "dist/index.js",
   "type": "module",