valyrian.js 7.1.0 → 7.1.2

package/dist/router/index.d.ts

@@ -1,11 +1,4 @@
 import { Component, POJOComponent, VnodeComponentInterface } from "valyrian.js";
-interface Path {
-    method: string;
-    path: string;
-    middlewares: Middlewares;
-    params: string[];
-    regexp: RegExp;
-}
 interface Request {
     params: Record<string, any>;
     query: Record<string, any>;
@@ -19,6 +12,13 @@ interface Middleware {
 }
 interface Middlewares extends Array<Middleware> {
 }
+interface Path {
+    method: string;
+    path: string;
+    middlewares: Middlewares;
+    params: string[];
+    regexp: RegExp;
+}
 interface RouterInterface {
     paths: Path[];
     container: Element | string | null;
@@ -28,8 +28,9 @@ interface RouterInterface {
     path: string;
     params: Record<string, string | number | any>;
     matches: string[];
+    pathPrefix: string;
     add(method: string, ...args: Middlewares): Router;
-    use(...args: string[] | Middlewares | Router[]): Router;
+    use(...args: (string | Middleware | Router)[]): Router;
     routes(): string[];
     go(path: string, parentComponent?: Component | POJOComponent | VnodeComponentInterface): Promise<string | void>;
 }
@@ -44,13 +45,13 @@ export declare class Router implements RouterInterface {
     matches: string[];
     pathPrefix: string;
     constructor(pathPrefix?: string);
-    add(path: string, ...args: Middlewares): Router;
-    use(...args: Middlewares | Router[] | string[]): Router;
+    add(path: string, ...middlewares: Middlewares): Router;
+    use(...middlewares: Middlewares | Router[] | string[]): Router;
     routes(): string[];
-    go(path: string, parentComponent?: Component): Promise<string | void>;
+    go(path: string, parentComponent?: Component, preventPushState?: boolean): Promise<string | void>;
     getOnClickHandler(url: string): (e: MouseEvent) => void;
 }
-export declare function redirect(url: string): any;
-export declare function mountRouter(elementContainer: any, router: any): void;
+export declare function redirect(url: string, parentComponent?: Component, preventPushState?: boolean): string | void;
+export declare function mountRouter(elementContainer: string | any, router: Router): void;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/router/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/router/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,SAAS,EACT,aAAa,EACb,uBAAuB,EAQxB,MAAM,aAAa,CAAC;AAErB,UAAU,IAAI;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,OAAO;IACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,SAAS,GAAG,aAAa,GAAG,uBAAuB,KAAK,KAAK,CAAC;CAC1G;AAED,UAAU,UAAU;IAElB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG,GACpB,OAAO,CAAC,GAAG,GAAG,SAAS,GAAG,aAAa,GAAG,uBAAuB,CAAC,GAClE,GAAG,GACH,SAAS,GACT,aAAa,GACb,uBAAuB,CAAC;CAC7B;AAED,UAAU,WAAY,SAAQ,KAAK,CAAC,UAAU,CAAC;CAAG;AAElD,UAAU,eAAe;IACvB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC,CAAC;IAC9C,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,WAAW,GAAG,MAAM,CAAC;IAElD,GAAG,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,WAAW,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC;IAExD,MAAM,IAAI,MAAM,EAAE,CAAC;IAEnB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,SAAS,GAAG,aAAa,GAAG,uBAAuB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACjH;AA2HD,qBAAa,MAAO,YAAW,eAAe;IAC5C,KAAK,EAAE,IAAI,EAAE,CAAM;IACnB,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAAQ;IAC1C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAM;IAC5C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAClC,GAAG,EAAE,MAAM,CAAM;IACjB,IAAI,EAAE,MAAM,CAAM;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC,CAAM;IACnD,OAAO,EAAE,MAAM,EAAE,CAAM;IACvB,UAAU,EAAE,MAAM,CAAM;gBAEZ,UAAU,GAAE,MAAW;IAInC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,WAAW,GAAG,MAAM;IAK/C,GAAG,CAAC,GAAG,IAAI,EAAE,WAAW,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,MAAM;IAwBvD,MAAM;IAUA,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA2C3E,iBAAiB,CAAC,GAAG,EAAE,MAAM,OAChB,UAAU;CAOxB;AAGD,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,OAKnC;AAED,wBAAgB,WAAW,CAAC,gBAAgB,KAAA,EAAE,MAAM,KAAA,QAiBnD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/router/index.ts"],"names":[],"mappings":"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"}

package/dist/router/index.js

@@ -28,15 +28,27 @@ var import_valyrian = require("valyrian.js");
 function flat(array) {
   return Array.isArray(array) ? array.flat(Infinity) : [array];
 }
-var addPath = (router, method, path, middlewares) => {
-  if (middlewares.length === 0) {
-    return;
+function getPathWithoutPrefix(path, prefix) {
+  return getPathWithoutLastSlash(path.replace(new RegExp(`^${prefix}`), ""));
+}
+function getPathWithoutLastSlash(path) {
+  let pathWithoutLastSlash = path.replace(/\/$/, "");
+  if (pathWithoutLastSlash === "") {
+    pathWithoutLastSlash = "/";
   }
-  let realpath = path.replace(/(\S)(\/+)$/, "$1");
-  let params = realpath.match(/:(\w+)?/gi) || [];
-  for (let param in params) {
-    params[param] = params[param].slice(1);
+  return pathWithoutLastSlash;
+}
+var addPath = ({
+  router,
+  method,
+  path,
+  middlewares
+}) => {
+  if (!method || !path || !Array.isArray(middlewares) || middlewares.length === 0) {
+    throw new Error(`Invalid route input: ${method} ${path} ${middlewares}`);
   }
+  let realpath = path.replace(/(\S)(\/+)$/, "$1");
+  let params = (realpath.match(/:(\w+)?/gi) || []).map((param) => param.slice(1));
   let regexpPath = "^" + realpath.replace(/:(\w+)/gi, "([^\\/\\s]+)") + "$";
   router.paths.push({
     method,
@@ -47,43 +59,29 @@ var addPath = (router, method, path, middlewares) => {
   });
 };
 function parseQuery(queryParts) {
-  let parts = queryParts ? queryParts.split("&", 20) : [];
+  let parts = queryParts ? queryParts.split("&") : [];
   let query = {};
-  let i = 0;
-  let nameValue;
-  for (; i < parts.length; i++) {
-    nameValue = parts[i].split("=", 2);
-    query[nameValue[0]] = nameValue[1];
+  for (let nameValue of parts) {
+    let [name, value] = nameValue.split("=", 2);
+    query[name] = value || "";
   }
   return query;
 }
 function searchMiddlewares(router, path) {
-  let i;
-  let k;
-  let item;
-  let match;
-  let key;
   let middlewares = [];
   let params = {};
   let matches = [];
-  router.params = {};
-  router.path = "";
-  router.matches = [];
-  for (i = 0; i < router.paths.length; i++) {
-    item = router.paths[i];
-    match = item.regexp.exec(path);
+  for (let item of router.paths) {
+    let match = item.regexp.exec(path);
     if (Array.isArray(match)) {
       middlewares.push(...item.middlewares);
       match.shift();
-      for (k = 0; k < item.params.length; k++) {
-        key = item.params[k];
-        params[key] = match.shift();
-      }
-      while (match.length) {
-        matches.push(match.shift());
+      for (let [index, key] of item.params.entries()) {
+        params[key] = match[index];
       }
+      matches.push(...match);
       if (item.method === "add") {
-        router.path = item.path;
+        router.path = getPathWithoutPrefix(item.path, router.pathPrefix);
         break;
       }
     }
@@ -93,8 +91,7 @@ function searchMiddlewares(router, path) {
   return middlewares;
 }
 async function searchComponent(router, middlewares) {
-  let response;
-  let req = {
+  const request = {
     params: router.params,
     query: router.query,
     url: router.url,
@@ -105,9 +102,9 @@ async function searchComponent(router, middlewares) {
       return false;
     }
   };
-  let i = 0;
-  for (; i < middlewares.length; i++) {
-    response = await middlewares[i](req, response);
+  let response;
+  for (const middleware of middlewares) {
+    response = await middleware(request, response);
     if (response !== void 0 && ((0, import_valyrian.isComponent)(response) || (0, import_valyrian.isVnodeComponent)(response))) {
       return response;
     }
@@ -129,50 +126,46 @@ var Router = class {
   constructor(pathPrefix = "") {
     this.pathPrefix = pathPrefix;
   }
-  add(path, ...args) {
-    addPath(this, "add", `${this.pathPrefix}${path}`, args);
+  add(path, ...middlewares) {
+    let pathWithoutLastSlash = getPathWithoutLastSlash(`${this.pathPrefix}${path}`);
+    addPath({ router: this, method: "add", path: pathWithoutLastSlash, middlewares });
     return this;
   }
-  use(...args) {
-    let path = `${this.pathPrefix}${typeof args[0] === "string" ? args.shift() : "/"}`;
-    let item;
-    let subpath;
-    for (let i = 0; i < args.length; i++) {
-      if (args[i] instanceof Router) {
-        let subrouter = args[i];
-        for (let k = 0; k < subrouter.paths.length; k++) {
-          item = subrouter.paths[k];
-          subpath = `${path}${item.path}`.replace(/^\/\//, "/");
-          addPath(this, item.method, subpath, item.middlewares);
+  use(...middlewares) {
+    let path = getPathWithoutLastSlash(
+      `${this.pathPrefix}${typeof middlewares[0] === "string" ? middlewares.shift() : "/"}`
+    );
+    for (const item of middlewares) {
+      if (item instanceof Router) {
+        const subrouter = item;
+        for (const subpath of subrouter.paths) {
+          addPath({
+            router: this,
+            method: subpath.method,
+            path: `${path}${subpath.path}`.replace(/^\/\//, "/"),
+            middlewares: subpath.middlewares
+          });
         }
         continue;
       }
-      if (typeof args[i] === "function") {
-        addPath(this, "use", `${path}.*`, [args[i]]);
+      if (typeof item === "function") {
+        addPath({ router: this, method: "use", path: `${path}.*`, middlewares: [item] });
       }
     }
     return this;
   }
   routes() {
-    let routes = [];
-    this.paths.forEach((path) => {
-      if (path.method === "add") {
-        routes.push(path.path);
-      }
-    });
-    return routes;
+    return this.paths.filter((path) => path.method === "add").map((path) => path.path);
   }
-  async go(path, parentComponent) {
+  async go(path, parentComponent, preventPushState = false) {
     if (!path) {
       throw new Error("router.url.required");
     }
-    let constructedPath = `${this.pathPrefix}${path}`;
-    let parts = constructedPath.split("?", 2);
-    let urlParts = parts[0].replace(/(.+)\/$/, "$1");
-    let queryParts = parts[1];
+    let constructedPath = getPathWithoutLastSlash(`${this.pathPrefix}${path}`);
+    const parts = constructedPath.split("?", 2);
     this.url = constructedPath;
-    this.query = parseQuery(queryParts);
-    let middlewares = searchMiddlewares(this, urlParts);
+    this.query = parseQuery(parts[1]);
+    const middlewares = searchMiddlewares(this, parts[0].replace(/(.+)\/$/, "$1"));
     let component = await searchComponent(this, middlewares);
     if (component === false) {
       return;
@@ -181,7 +174,7 @@ var Router = class {
       throw new Error(`The url ${constructedPath} requested wasn't found`);
     }
     if ((0, import_valyrian.isComponent)(parentComponent) || (0, import_valyrian.isVnodeComponent)(parentComponent)) {
-      let childComponent = (0, import_valyrian.isVnodeComponent)(component) ? component : (0, import_valyrian.v)(component, {});
+      const childComponent = (0, import_valyrian.isVnodeComponent)(component) ? component : (0, import_valyrian.v)(component, {});
       if ((0, import_valyrian.isVnodeComponent)(parentComponent)) {
         parentComponent.children.push(childComponent);
         component = parentComponent;
@@ -189,7 +182,7 @@ var Router = class {
         component = (0, import_valyrian.v)(parentComponent, {}, childComponent);
       }
     }
-    if (!import_valyrian.isNodeJs) {
+    if (!import_valyrian.isNodeJs && !preventPushState) {
       window.history.pushState(null, "", constructedPath);
     }
     if (this.container) {
@@ -206,18 +199,19 @@ var Router = class {
   }
 };
 var localRedirect;
-function redirect(url) {
+function redirect(url, parentComponent, preventPushState = false) {
   if (!localRedirect) {
     throw new Error("router.redirect.not.found");
   }
-  return localRedirect(url);
+  return localRedirect(url, parentComponent, preventPushState);
 }
 function mountRouter(elementContainer, router) {
   router.container = elementContainer;
   localRedirect = router.go.bind(router);
   if (!import_valyrian.isNodeJs) {
     let onPopStateGoToRoute = function() {
-      router.go(document.location.pathname);
+      let pathWithoutPrefix = getPathWithoutPrefix(document.location.pathname, router.pathPrefix);
+      router.go(pathWithoutPrefix, void 0, true);
     };
     window.addEventListener("popstate", onPopStateGoToRoute, false);
     onPopStateGoToRoute();

package/dist/router/index.mjs

@@ -11,15 +11,27 @@ import {
 function flat(array) {
   return Array.isArray(array) ? array.flat(Infinity) : [array];
 }
-var addPath = (router, method, path, middlewares) => {
-  if (middlewares.length === 0) {
-    return;
+function getPathWithoutPrefix(path, prefix) {
+  return getPathWithoutLastSlash(path.replace(new RegExp(`^${prefix}`), ""));
+}
+function getPathWithoutLastSlash(path) {
+  let pathWithoutLastSlash = path.replace(/\/$/, "");
+  if (pathWithoutLastSlash === "") {
+    pathWithoutLastSlash = "/";
   }
-  let realpath = path.replace(/(\S)(\/+)$/, "$1");
-  let params = realpath.match(/:(\w+)?/gi) || [];
-  for (let param in params) {
-    params[param] = params[param].slice(1);
+  return pathWithoutLastSlash;
+}
+var addPath = ({
+  router,
+  method,
+  path,
+  middlewares
+}) => {
+  if (!method || !path || !Array.isArray(middlewares) || middlewares.length === 0) {
+    throw new Error(`Invalid route input: ${method} ${path} ${middlewares}`);
   }
+  let realpath = path.replace(/(\S)(\/+)$/, "$1");
+  let params = (realpath.match(/:(\w+)?/gi) || []).map((param) => param.slice(1));
   let regexpPath = "^" + realpath.replace(/:(\w+)/gi, "([^\\/\\s]+)") + "$";
   router.paths.push({
     method,
@@ -30,43 +42,29 @@ var addPath = (router, method, path, middlewares) => {
   });
 };
 function parseQuery(queryParts) {
-  let parts = queryParts ? queryParts.split("&", 20) : [];
+  let parts = queryParts ? queryParts.split("&") : [];
   let query = {};
-  let i = 0;
-  let nameValue;
-  for (; i < parts.length; i++) {
-    nameValue = parts[i].split("=", 2);
-    query[nameValue[0]] = nameValue[1];
+  for (let nameValue of parts) {
+    let [name, value] = nameValue.split("=", 2);
+    query[name] = value || "";
   }
   return query;
 }
 function searchMiddlewares(router, path) {
-  let i;
-  let k;
-  let item;
-  let match;
-  let key;
   let middlewares = [];
   let params = {};
   let matches = [];
-  router.params = {};
-  router.path = "";
-  router.matches = [];
-  for (i = 0; i < router.paths.length; i++) {
-    item = router.paths[i];
-    match = item.regexp.exec(path);
+  for (let item of router.paths) {
+    let match = item.regexp.exec(path);
     if (Array.isArray(match)) {
       middlewares.push(...item.middlewares);
       match.shift();
-      for (k = 0; k < item.params.length; k++) {
-        key = item.params[k];
-        params[key] = match.shift();
-      }
-      while (match.length) {
-        matches.push(match.shift());
+      for (let [index, key] of item.params.entries()) {
+        params[key] = match[index];
       }
+      matches.push(...match);
       if (item.method === "add") {
-        router.path = item.path;
+        router.path = getPathWithoutPrefix(item.path, router.pathPrefix);
         break;
       }
     }
@@ -76,8 +74,7 @@ function searchMiddlewares(router, path) {
   return middlewares;
 }
 async function searchComponent(router, middlewares) {
-  let response;
-  let req = {
+  const request = {
     params: router.params,
     query: router.query,
     url: router.url,
@@ -88,9 +85,9 @@ async function searchComponent(router, middlewares) {
       return false;
     }
   };
-  let i = 0;
-  for (; i < middlewares.length; i++) {
-    response = await middlewares[i](req, response);
+  let response;
+  for (const middleware of middlewares) {
+    response = await middleware(request, response);
     if (response !== void 0 && (isComponent(response) || isVnodeComponent(response))) {
       return response;
     }
@@ -112,50 +109,46 @@ var Router = class {
   constructor(pathPrefix = "") {
     this.pathPrefix = pathPrefix;
   }
-  add(path, ...args) {
-    addPath(this, "add", `${this.pathPrefix}${path}`, args);
+  add(path, ...middlewares) {
+    let pathWithoutLastSlash = getPathWithoutLastSlash(`${this.pathPrefix}${path}`);
+    addPath({ router: this, method: "add", path: pathWithoutLastSlash, middlewares });
     return this;
   }
-  use(...args) {
-    let path = `${this.pathPrefix}${typeof args[0] === "string" ? args.shift() : "/"}`;
-    let item;
-    let subpath;
-    for (let i = 0; i < args.length; i++) {
-      if (args[i] instanceof Router) {
-        let subrouter = args[i];
-        for (let k = 0; k < subrouter.paths.length; k++) {
-          item = subrouter.paths[k];
-          subpath = `${path}${item.path}`.replace(/^\/\//, "/");
-          addPath(this, item.method, subpath, item.middlewares);
+  use(...middlewares) {
+    let path = getPathWithoutLastSlash(
+      `${this.pathPrefix}${typeof middlewares[0] === "string" ? middlewares.shift() : "/"}`
+    );
+    for (const item of middlewares) {
+      if (item instanceof Router) {
+        const subrouter = item;
+        for (const subpath of subrouter.paths) {
+          addPath({
+            router: this,
+            method: subpath.method,
+            path: `${path}${subpath.path}`.replace(/^\/\//, "/"),
+            middlewares: subpath.middlewares
+          });
         }
         continue;
       }
-      if (typeof args[i] === "function") {
-        addPath(this, "use", `${path}.*`, [args[i]]);
+      if (typeof item === "function") {
+        addPath({ router: this, method: "use", path: `${path}.*`, middlewares: [item] });
       }
     }
     return this;
   }
   routes() {
-    let routes = [];
-    this.paths.forEach((path) => {
-      if (path.method === "add") {
-        routes.push(path.path);
-      }
-    });
-    return routes;
+    return this.paths.filter((path) => path.method === "add").map((path) => path.path);
   }
-  async go(path, parentComponent) {
+  async go(path, parentComponent, preventPushState = false) {
     if (!path) {
       throw new Error("router.url.required");
     }
-    let constructedPath = `${this.pathPrefix}${path}`;
-    let parts = constructedPath.split("?", 2);
-    let urlParts = parts[0].replace(/(.+)\/$/, "$1");
-    let queryParts = parts[1];
+    let constructedPath = getPathWithoutLastSlash(`${this.pathPrefix}${path}`);
+    const parts = constructedPath.split("?", 2);
     this.url = constructedPath;
-    this.query = parseQuery(queryParts);
-    let middlewares = searchMiddlewares(this, urlParts);
+    this.query = parseQuery(parts[1]);
+    const middlewares = searchMiddlewares(this, parts[0].replace(/(.+)\/$/, "$1"));
     let component = await searchComponent(this, middlewares);
     if (component === false) {
       return;
@@ -164,7 +157,7 @@ var Router = class {
       throw new Error(`The url ${constructedPath} requested wasn't found`);
     }
     if (isComponent(parentComponent) || isVnodeComponent(parentComponent)) {
-      let childComponent = isVnodeComponent(component) ? component : v(component, {});
+      const childComponent = isVnodeComponent(component) ? component : v(component, {});
       if (isVnodeComponent(parentComponent)) {
         parentComponent.children.push(childComponent);
         component = parentComponent;
@@ -172,7 +165,7 @@ var Router = class {
         component = v(parentComponent, {}, childComponent);
       }
     }
-    if (!isNodeJs) {
+    if (!isNodeJs && !preventPushState) {
       window.history.pushState(null, "", constructedPath);
     }
     if (this.container) {
@@ -189,18 +182,19 @@ var Router = class {
   }
 };
 var localRedirect;
-function redirect(url) {
+function redirect(url, parentComponent, preventPushState = false) {
   if (!localRedirect) {
     throw new Error("router.redirect.not.found");
   }
-  return localRedirect(url);
+  return localRedirect(url, parentComponent, preventPushState);
 }
 function mountRouter(elementContainer, router) {
   router.container = elementContainer;
   localRedirect = router.go.bind(router);
   if (!isNodeJs) {
     let onPopStateGoToRoute = function() {
-      router.go(document.location.pathname);
+      let pathWithoutPrefix = getPathWithoutPrefix(document.location.pathname, router.pathPrefix);
+      router.go(pathWithoutPrefix, void 0, true);
     };
     window.addEventListener("popstate", onPopStateGoToRoute, false);
     onPopStateGoToRoute();

package/lib/router/index.ts

@@ -3,6 +3,7 @@ import {
   Component,
   POJOComponent,
   VnodeComponentInterface,
+  VnodeWithDom,
   directive,
   isComponent,
   isNodeJs,
@@ -12,14 +13,6 @@ import {
   v
 } from "valyrian.js";
 
-interface Path {
-  method: string;
-  path: string;
-  middlewares: Middlewares;
-  params: string[];
-  regexp: RegExp;
-}
-
 interface Request {
   params: Record<string, any>;
   query: Record<string, any>;
@@ -42,6 +35,14 @@ interface Middleware {
 
 interface Middlewares extends Array<Middleware> {}
 
+interface Path {
+  method: string;
+  path: string;
+  middlewares: Middlewares;
+  params: string[];
+  regexp: RegExp;
+}
+
 interface RouterInterface {
   paths: Path[];
   container: Element | string | null;
@@ -51,35 +52,62 @@ interface RouterInterface {
   path: string;
   params: Record<string, string | number | any>;
   matches: string[];
+  pathPrefix: string;
   // eslint-disable-next-line no-unused-vars
   add(method: string, ...args: Middlewares): Router;
   // eslint-disable-next-line no-unused-vars
-  use(...args: string[] | Middlewares | Router[]): Router;
+  use(...args: (string | Middleware | Router)[]): Router;
 
   routes(): string[];
   // eslint-disable-next-line no-unused-vars
   go(path: string, parentComponent?: Component | POJOComponent | VnodeComponentInterface): Promise<string | void>;
 }
 
+interface RedirectFunction {
+  // eslint-disable-next-line no-unused-vars
+  (url: string, parentComponent?: Component, preventPushState?: boolean): string | void;
+}
+
 function flat(array: any) {
   return Array.isArray(array) ? array.flat(Infinity) : [array];
 }
 
-let addPath = (router: Router, method: string, path: string, middlewares: any[]) => {
-  if (middlewares.length === 0) {
-    return;
+function getPathWithoutPrefix(path: string, prefix: string) {
+  return getPathWithoutLastSlash(path.replace(new RegExp(`^${prefix}`), ""));
+}
+
+function getPathWithoutLastSlash(path: string) {
+  let pathWithoutLastSlash = path.replace(/\/$/, "");
+  if (pathWithoutLastSlash === "") {
+    pathWithoutLastSlash = "/";
   }
+  return pathWithoutLastSlash;
+}
 
+const addPath = ({
+  router,
+  method,
+  path,
+  middlewares
+}: {
+  router: Router;
+  method: string;
+  path: string;
+  middlewares: Middleware[];
+}): void => {
+  if (!method || !path || !Array.isArray(middlewares) || middlewares.length === 0) {
+    throw new Error(`Invalid route input: ${method} ${path} ${middlewares}`);
+  }
+
+  // Trim trailing slashes from the path
   let realpath = path.replace(/(\S)(\/+)$/, "$1");
 
-  // Find the express like params
-  let params = realpath.match(/:(\w+)?/gi) || [];
-
-  // Set the names of the params found
-  for (let param in params) {
-    params[param] = params[param].slice(1);
-  }
+  // Find the express-like params in the path
+  let params = (realpath.match(/:(\w+)?/gi) || [])
+    // Set the names of the params found
+    .map((param) => param.slice(1));
 
+  // Generate a regular expression to match the path
   let regexpPath = "^" + realpath.replace(/:(\w+)/gi, "([^\\/\\s]+)") + "$";
 
   router.paths.push({
@@ -91,55 +119,46 @@ let addPath = (router: Router, method: string, path: string, middlewares: any[])
   });
 };
 
-function parseQuery(queryParts?: string) {
-  let parts = queryParts ? queryParts.split("&", 20) : [];
-  let query: Record<string, any> = {};
-  let i = 0;
-  let nameValue;
+// Parse a query string into an object
+function parseQuery(queryParts?: string): Record<string, string> {
+  // Split the query string into an array of name-value pairs
+  let parts = queryParts ? queryParts.split("&") : [];
+  let query: Record<string, string> = {};
 
-  for (; i < parts.length; i++) {
-    nameValue = parts[i].split("=", 2);
-    query[nameValue[0]] = nameValue[1];
+  // Iterate over the name-value pairs and add them to the query object
+  for (let nameValue of parts) {
+    let [name, value] = nameValue.split("=", 2);
+    query[name] = value || "";
   }
 
   return query;
 }
 
+// Search for middlewares that match a given path
 function searchMiddlewares(router: RouterInterface, path: string): Middlewares {
-  let i;
-  let k;
-  let item;
-  let match;
-  let key;
   let middlewares: Middlewares = [];
   let params: Record<string, any> = {};
   let matches = [];
-  router.params = {};
-  router.path = "";
-  router.matches = [];
 
   // Search for middlewares
-  for (i = 0; i < router.paths.length; i++) {
-    item = router.paths[i];
+  for (let item of router.paths) {
+    let match = item.regexp.exec(path);
 
-    match = item.regexp.exec(path);
     // If we found middlewares
     if (Array.isArray(match)) {
       middlewares.push(...item.middlewares);
       match.shift();
 
       // Parse params
-      for (k = 0; k < item.params.length; k++) {
-        key = item.params[k];
-        params[key] = match.shift();
+      for (let [index, key] of item.params.entries()) {
+        params[key] = match[index];
       }
 
-      while (match.length) {
-        matches.push(match.shift() as string);
-      }
+      // Add remaining matches to the array
+      matches.push(...match);
 
       if (item.method === "add") {
-        router.path = item.path;
+        router.path = getPathWithoutPrefix(item.path, router.pathPrefix);
         break;
       }
     }
@@ -155,8 +174,8 @@ async function searchComponent(
   router: RouterInterface,
   middlewares: Middlewares
 ): Promise<Component | VnodeComponentInterface | false | void> {
-  let response;
-  let req: Request = {
+  // Define request object with default values
+  const request: Request = {
     params: router.params,
     query: router.query,
     url: router.url,
@@ -164,18 +183,25 @@ async function searchComponent(
     matches: router.matches,
     redirect: (path: string, parentComponent?: Component) => {
       router.go(path, parentComponent);
+      // Return false to stop the middleware chain
       return false;
     }
   };
-  let i = 0;
 
-  for (; i < middlewares.length; i++) {
-    response = await middlewares[i](req, response);
+  // Initialize response variable
+  let response;
+
+  // Iterate through middlewares
+  for (const middleware of middlewares) {
+    // Invoke middleware and update response
+    response = await middleware(request, response);
 
+    // Return response if it's a valid component
     if (response !== undefined && (isComponent(response) || isVnodeComponent(response))) {
       return response;
     }
 
+    // Return false if response is explicitly false to stop the middleware chain
     if (response === false) {
       return false;
     }
@@ -197,59 +223,54 @@ export class Router implements RouterInterface {
     this.pathPrefix = pathPrefix;
   }
 
-  add(path: string, ...args: Middlewares): Router {
-    addPath(this, "add", `${this.pathPrefix}${path}`, args);
+  add(path: string, ...middlewares: Middlewares): Router {
+    let pathWithoutLastSlash = getPathWithoutLastSlash(`${this.pathPrefix}${path}`);
+    addPath({ router: this, method: "add", path: pathWithoutLastSlash, middlewares });
     return this;
   }
 
-  use(...args: Middlewares | Router[] | string[]): Router {
-    let path = `${this.pathPrefix}${typeof args[0] === "string" ? args.shift() : "/"}`;
-    let item;
-    let subpath;
-
-    for (let i = 0; i < args.length; i++) {
-      if (args[i] instanceof Router) {
-        let subrouter = args[i] as Router;
-        for (let k = 0; k < subrouter.paths.length; k++) {
-          item = subrouter.paths[k];
-          subpath = `${path}${item.path}`.replace(/^\/\//, "/");
-          addPath(this, item.method, subpath, item.middlewares);
+  use(...middlewares: Middlewares | Router[] | string[]): Router {
+    let path = getPathWithoutLastSlash(
+      `${this.pathPrefix}${typeof middlewares[0] === "string" ? middlewares.shift() : "/"}`
+    );
+
+    for (const item of middlewares) {
+      if (item instanceof Router) {
+        const subrouter = item as Router;
+        for (const subpath of subrouter.paths) {
+          addPath({
+            router: this,
+            method: subpath.method,
+            path: `${path}${subpath.path}`.replace(/^\/\//, "/"),
+            middlewares: subpath.middlewares
+          });
         }
         continue;
       }
 
-      if (typeof args[i] === "function") {
-        addPath(this, "use", `${path}.*`, [args[i]]);
+      if (typeof item === "function") {
+        addPath({ router: this, method: "use", path: `${path}.*`, middlewares: [item as Middleware] });
       }
     }
 
     return this;
   }
 
-  routes() {
-    let routes: string[] = [];
-    this.paths.forEach((path) => {
-      if (path.method === "add") {
-        routes.push(path.path);
-      }
-    });
-    return routes;
+  routes(): string[] {
+    return this.paths.filter((path) => path.method === "add").map((path) => path.path);
   }
 
-  async go(path: string, parentComponent?: Component): Promise<string | void> {
+  async go(path: string, parentComponent?: Component, preventPushState = false): Promise<string | void> {
     if (!path) {
       throw new Error("router.url.required");
     }
 
-    let constructedPath = `${this.pathPrefix}${path}`;
-    let parts = constructedPath.split("?", 2);
-    let urlParts = parts[0].replace(/(.+)\/$/, "$1");
-    let queryParts = parts[1];
+    let constructedPath = getPathWithoutLastSlash(`${this.pathPrefix}${path}`);
+    const parts = constructedPath.split("?", 2);
     this.url = constructedPath;
-    this.query = parseQuery(queryParts);
-
-    let middlewares = searchMiddlewares(this as RouterInterface, urlParts);
+    this.query = parseQuery(parts[1]);
 
+    const middlewares = searchMiddlewares(this as RouterInterface, parts[0].replace(/(.+)\/$/, "$1"));
     let component = await searchComponent(this as RouterInterface, middlewares);
 
     if (component === false) {
@@ -261,7 +282,7 @@ export class Router implements RouterInterface {
     }
 
     if (isComponent(parentComponent) || isVnodeComponent(parentComponent)) {
-      let childComponent = isVnodeComponent(component) ? component : v(component as Component, {});
+      const childComponent = isVnodeComponent(component) ? component : v(component as Component, {});
       if (isVnodeComponent(parentComponent)) {
         parentComponent.children.push(childComponent);
         component = parentComponent;
@@ -270,7 +291,7 @@ export class Router implements RouterInterface {
       }
     }
 
-    if (!isNodeJs) {
+    if (!isNodeJs && !preventPushState) {
       window.history.pushState(null, "", constructedPath);
     }
 
@@ -289,28 +310,29 @@ export class Router implements RouterInterface {
   }
 }
 
-let localRedirect;
-export function redirect(url: string) {
+let localRedirect: RedirectFunction;
+
+export function redirect(url: string, parentComponent?: Component, preventPushState = false): string | void {
   if (!localRedirect) {
     throw new Error("router.redirect.not.found");
   }
-  return localRedirect(url);
+  return localRedirect(url, parentComponent, preventPushState);
 }
 
-export function mountRouter(elementContainer, router) {
+export function mountRouter(elementContainer: string | any, router: Router): void {
   router.container = elementContainer;
   localRedirect = router.go.bind(router);
 
-  // Activate the use of the router
   if (!isNodeJs) {
-    function onPopStateGoToRoute() {
-      (router as unknown as Router).go(document.location.pathname);
+    function onPopStateGoToRoute(): void {
+      let pathWithoutPrefix = getPathWithoutPrefix(document.location.pathname, router.pathPrefix);
+      (router as unknown as Router).go(pathWithoutPrefix, undefined, true);
     }
     window.addEventListener("popstate", onPopStateGoToRoute, false);
     onPopStateGoToRoute();
   }
 
-  directive("route", (url, vnode, oldnode) => {
+  directive("route", (url: string, vnode: VnodeWithDom, oldnode?: VnodeWithDom): void => {
     setAttribute("href", url, vnode, oldnode);
     setAttribute("onclick", router.getOnClickHandler(url), vnode, oldnode);
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valyrian.js",
-  "version": "7.1.0",
+  "version": "7.1.2",
   "description": "Lightweight steel to forge PWAs. (Minimal Frontend Framework with server side rendering and other capabilities)",
   "repository": "git@github.com:Masquerade-Circus/valyrian.js.git",
   "author": "Masquerade <christian@masquerade-circus.net>",