vaderjs 1.0.8 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vaderjs",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "description": "A Reactive Framework for Single-Page Applications (SPA)",
   "main": "vader.js",
   "scripts": {

package/vader.js

@@ -443,7 +443,11 @@ export const rf = (name, fn) => {
  * @param {string}  path 
  */
 
+let cache = {}
 export const include = (path) => {
+  if(cache[path]){
+    return  new Function(`return \`${cache[path]}\`;`)()
+  }
   return fetch(`./${path}`)
   .then((res) => {
     if(res.status === 404){
@@ -452,6 +456,7 @@ export const include = (path) => {
     return res.text()
   })
   .then((data) => {
+    cache[path] = data
     return new Function(`return \`${data}\`;`)()
   })
 };

package/vaderRouter.js

@@ -63,34 +63,12 @@ class VaderRouter {
    * Starts the router.
    */
   start() {
-    if (!this.routes[window.location.hash.substring(1)]) {
+    
+    if (window.location.hash === "") {
       window.location.hash = this.starturl;
     }
     window.addEventListener("hashchange", () => {
-      let hash = window.location.hash.substring(1).split("/")
-        ? window.location.hash.substring(1).split("/")
-        : window.location.hash.substring(1);
-      // remove '' from array
-      hash = hash.filter((item) => item !== "");
-      const basePath = "/" + hash[0];
-
-      if (!this.routes[basePath] && !this.customerror) {
-        window.location.hash = this.starturl;
-      } else if (!this.routes[basePath] && this.customerror) {
-        const errBody = {
-          status: 404,
-          message: "Page not found",
-        };
-        const res = {
-          return: function (data) {
-            this.hooked = false;
-          },
-          render: function (selector, data) {
-            document.querySelector(selector).innerHTML = data;
-          }
-        }
-        this.handleError("404", errBody, res);
-      }
+      this.handleRoute();
     });
   }
 
@@ -110,6 +88,41 @@ class VaderRouter {
     this.errorHandlers[type] = callback;
     this.customerror = true;
   }
+  handleRoute() {
+    if (this.hooked) {
+      return;
+    }
+    this.hooked = true;
+    const route = window.location.hash.substring(1);
+    this.currentUrl = route;
+    window.$CURRENT_URL = route;
+    window.$URL_PARAMS = {};
+    window.$URL_QUERY = {};
+    if (this.routes[route]) {
+      this.storedroutes.push(route);
+      const req = {
+        params: {},
+        query: {},
+        url: route,
+        method: "GET",
+      };
+      const res = {
+        return: function (data) {
+          this.hooked = false;
+        },
+        render: function (selector, data) {
+          document.querySelector(selector).innerHTML = data;
+        },
+      };
+      this.routes[route] === Function ? this.routes[route](req, res) : null;
+    } else {
+      if (this.customerror) {
+        this.handleError("404", route);
+      } else {
+        console.error("404: Route not found");
+      }
+    }
+  }
   /**
    *
    * @param {*} type
@@ -209,6 +222,7 @@ class VaderRouter {
 
       window.$URL_PARAMS = params;
       window.$URL_QUERY = query;
+      window.$CURRENT_URL = window.location.hash.substring(1);
 
       const res = {
         return: function (data) {
@@ -313,19 +327,22 @@ class VaderRouter {
         .join("/");
       const regex = new RegExp("^" + parsedPath + "(\\?(.*))?$");
 
-      this.currentUrl = path;
-      // replace params if preset
-      let route = "";
-      if (path.includes(":")) {
-        route = path.split(":")[0].replace(/\/$/, "");
+      let hash = window.location.hash.split("#")[1]
+          ? window.location.hash.split("#")[1]
+          : window.location.hash;
+    
+      let basePath = "";
+      if (hash.length > 1) {
+          basePath =  hash.split("/")[0] + "/" + hash.split("/")[1];
       } else {
-        route = path.replace(/\/$/, "");
+          basePath = hash[0];
       }
+      const route = basePath;
 
       window.$CURRENT_URL = route;
       window.$URL_PARAMS = {};
       if (
-        window.location.hash.substring(1).match(regex) &&
+          window.location.hash.substring(1).match(regex) &&
         this.routes[$CURRENT_URL]
       ) {
         this.storedroutes.push(window.location.hash.substring(1));