cradova 3.3.9 → 3.3.11

package/dist/index.js

@@ -124,7 +124,7 @@ var makeElement = (element, ElementChildrenAndPropertyList) => {
         if (!href.includes("://")) {
           element.addEventListener("click", (e) => {
             e.preventDefault();
-            Router.navigate(element.pathname);
+            Router.navigate(element.href);
             if (href.includes("#")) {
               const l = href.split("#").at(-1);
               document.getElementById("#" + l)?.scrollIntoView();
@@ -555,7 +555,7 @@ class Page {
     this._deCallBack = cb;
   }
   async _deActivate() {
-    this._deCallBack && await this._deCallBack(localTree.globalTree["doc"]);
+    this._deCallBack && await this._deCallBack();
   }
   drop(state) {
     if (typeof state === "boolean") {
@@ -587,7 +587,7 @@ class Page {
       left: 0,
       behavior: "instant"
     });
-    this._callBack && await this._callBack(localTree.globalTree["doc"]);
+    this._callBack && await this._callBack();
   }
 }
 
@@ -621,7 +621,7 @@ class RouterBoxClass {
     return;
   }
   async router(_e, _force) {
-    let url = window.location.pathname, route, params;
+    let url = window.location.href, route, params;
     if (this.paused) {
       window.location.hash = "paused";
       return;
@@ -682,17 +682,16 @@ class RouterBoxClass {
     if (this.routes[url]) {
       return [this.routes[url], { path: url }];
     }
-    if (this.routes[url + "/"]) {
-      return [this.routes[url + "/"], { path: url }];
-    }
-    if (url.includes("/?")) {
-      const sraw = [...new URLSearchParams(url).entries()];
-      const search = {};
-      for (const idx in sraw) {
-        search[sraw[idx][0].includes("?") ? sraw[idx][0].split("?")[1] : sraw[idx][0]] = sraw[idx][1];
+    if (url.includes("?")) {
+      let search;
+      const params = {};
+      [url, search] = url.split("?");
+      new URLSearchParams(search).forEach((val, key) => {
+        params[key] = val;
+      });
+      if (this.routes[url]) {
+        return [this.routes[url], { data: params, path: url }];
       }
-      const path = url.slice(0, url.indexOf("/?") + 2);
-      return [this.routes[path], { path, search }];
     }
     for (const path in this.routes) {
       if (path.includes(":")) {
@@ -774,7 +773,7 @@ class Router {
     if (href.includes(".")) {
       window.location.href = href;
     } else {
-      if (href === window.location.pathname) {
+      if (href === window.location.href) {
         return;
       }
       [route, params] = RouterBox.checker(href);

package/dist/primitives/classes.d.ts

@@ -1,4 +1,4 @@
-import { type CradovaPageType } from "./types";
+import { type CradovaPageType, type promisedPage } from "./types";
 /**
  * Cradova event
  */
@@ -240,7 +240,7 @@ export declare class Router {
      *
      * accepts an object containing pat and page
      */
-    static BrowserRoutes(obj: Record<string, any>): void;
+    static BrowserRoutes(obj: Record<string, Page | promisedPage>): void;
     /**
       Go back in Navigation history
       */

package/dist/primitives/types.d.ts

@@ -30,7 +30,7 @@ type Attributes = {
     recall?: (P: any) => void;
     onmount?: (this: HTMLElement & Attributes) => void;
 };
-export type VJS_params_TYPE<E = HTMLElement> = (Comp | Comp[] | string | undefined | HTMLElement | HTMLElement[] | DocumentFragment | Attributes | (() => HTMLElement) | Partial<Attributes> | Partial<E> | Record<string, (this: E) => void> | Partial<DataAttributes> | Partial<AriaAttributes> | CSS.Properties<string | number>)[];
+export type VJS_params_TYPE<E = HTMLElement> = (Comp | Comp[] | string | undefined | HTMLElement | HTMLElement[] | DocumentFragment | DocumentFragment[] | Attributes | (() => HTMLElement) | Partial<Attributes> | Partial<E> | Record<string, (this: E) => void> | Partial<DataAttributes> | Partial<AriaAttributes> | CSS.Properties<string | number>)[];
 export interface RouterRouteObject {
     _html: ((this: Page, data?: unknown) => HTMLElement | DocumentFragment) | HTMLElement | DocumentFragment;
     _delegatedRoutes: number | boolean;
@@ -67,4 +67,5 @@ export type CradovaPageType = {
      */
     template: (this: Page) => HTMLElement;
 };
+export type promisedPage = (() => Promise<Page>);
 export {};

package/package.json

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