@esportsplus/routing 0.1.31 → 0.1.32

package/build/browser.js

@@ -1,7 +1,7 @@
 import { effect, reactive, root } from '@esportsplus/reactivity';
 import { next } from '@esportsplus/pipeline';
 import factory from './router/index.js';
-let cache = [];
+let cache = [], location = window.location;
 function back() {
     window.history.back();
 }
@@ -9,30 +9,32 @@ function forward() {
     window.history.forward();
 }
 function href() {
-    let data = new URL(window.location?.href || ''), path = data.hash ? data.hash.slice(1).split('?') : ['/', ''], request = {
-        href: data.href,
-        hostname: data.hostname,
+    let hash = location.hash || '#/', path = hash ? hash.slice(1).split('?') : ['/', ''], request = {
+        href: location.href,
+        hostname: location.hostname,
         method: 'GET',
-        origin: data.origin,
+        origin: location.origin,
         path: path[0],
-        port: data.port,
-        protocol: data.protocol,
+        port: location.port,
+        protocol: location.protocol,
         query: {}
     };
     if (path[1]) {
-        for (let [key, value] of (new URLSearchParams(path[1])).entries()) {
-            request.query[key] = value;
+        let query = request.query, params = new URLSearchParams(path[1]);
+        for (let [key, value] of params.entries()) {
+            query[key] = value;
         }
     }
     return request;
 }
 function match(request, router, subdomain) {
     if (router.subdomains !== null) {
-        for (let i = 0, n = router.subdomains.length; i < n; i++) {
-            if (!request.hostname.startsWith(router.subdomains[i])) {
+        let subdomains = router.subdomains;
+        for (let i = 0, n = subdomains.length; i < n; i++) {
+            if (!request.hostname.startsWith(subdomains[i])) {
                 continue;
             }
-            subdomain = router.subdomains[i];
+            subdomain = subdomains[i];
             break;
         }
     }

package/build/router/index.js

@@ -2,11 +2,13 @@ import { ON_DELETE, ON_GET, ON_POST, ON_PUT, STATIC } from '../constants.js';
 import { Node } from './node.js';
 import pipeline from '@esportsplus/pipeline';
 function normalize(path) {
-    if (path[0] !== '/') {
-        path = '/' + path;
-    }
-    if (path.at(-1) === '/') {
-        path = path.slice(0, -1);
+    if (path) {
+        if (path[0] !== '/') {
+            path = '/' + path;
+        }
+        if (path.at(-1) === '/') {
+            path = path.slice(0, -1);
+        }
     }
     return path || '/';
 }
@@ -40,7 +42,7 @@ class Router {
     }
     add(radixkey, route) {
         if (radixkey.indexOf(':') === -1 || this.root.add(radixkey, route).type === STATIC) {
-            if (this.static[radixkey]) {
+            if (radixkey in this.static) {
                 throw new Error(`Routing: static path '${radixkey}' is already in use`);
             }
             this.static[radixkey] = route;
@@ -113,11 +115,12 @@ class Router {
             }
         }
         if (route.subdomain) {
+            let subdomain = route.subdomain.toLowerCase();
             if (!this.subdomains) {
-                this.subdomains = [route.subdomain];
+                this.subdomains = [subdomain];
             }
             else {
-                this.subdomains.push(route.subdomain);
+                this.subdomains.push(subdomain);
             }
         }
         return this;

package/package.json

@@ -2,7 +2,7 @@
   "author": "ICJR",
   "dependencies": {
     "@esportsplus/pipeline": "^1.1.5",
-    "@esportsplus/reactivity": "^0.12.3",
+    "@esportsplus/reactivity": "^0.12.4",
     "@esportsplus/utilities": "^0.21.1"
   },
   "devDependencies": {
@@ -13,7 +13,7 @@
   "private": false,
   "type": "module",
   "types": "./build/index.d.ts",
-  "version": "0.1.31",
+  "version": "0.1.32",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/browser.ts

@@ -4,7 +4,8 @@ import { next } from '@esportsplus/pipeline';
 import factory from './router';
 
 
-let cache: Request<any>[] = [];
+let cache: Request<any>[] = [],
+    location = window.location;
 
 
 function back() {
@@ -16,22 +17,25 @@ function forward() {
 }
 
 function href<T>() {
-    let data = new URL( window.location?.href || '' ),
-        path = data.hash ? data.hash.slice(1).split('?') : ['/', ''],
+    let hash = location.hash || '#/',
+        path = hash ? hash.slice(1).split('?') : ['/', ''],
         request = {
-            href: data.href,
-            hostname: data.hostname,
+            href: location.href,
+            hostname: location.hostname,
             method: 'GET',
-            origin: data.origin,
+            origin: location.origin,
             path: path[0],
-            port: data.port,
-            protocol: data.protocol,
+            port: location.port,
+            protocol: location.protocol,
             query: {} as Record<PropertyKey, unknown>
         };
 
     if (path[1]) {
-        for (let [key, value] of (new URLSearchParams(path[1])).entries()) {
-            request.query[key] = value;
+        let query = request.query,
+            params = new URLSearchParams(path[1]);
+
+        for (let [key, value] of params.entries()) {
+            query[key] = value;
         }
     }
 
@@ -40,12 +44,14 @@ function href<T>() {
 
 function match<T>(request: Request<T>, router: Router<T>, subdomain?: string) {
     if (router.subdomains !== null) {
-        for (let i = 0, n = router.subdomains.length; i < n; i++) {
-            if (!request.hostname.startsWith(router.subdomains[i])) {
+        let subdomains = router.subdomains;
+
+        for (let i = 0, n = subdomains.length; i < n; i++) {
+            if (!request.hostname.startsWith(subdomains[i])) {
                 continue;
             }
 
-            subdomain = router.subdomains[i];
+            subdomain = subdomains[i];
             break;
         }
     }

package/src/router/index.ts

@@ -5,12 +5,14 @@ import pipeline from '@esportsplus/pipeline';
 
 
 function normalize(path: string) {
-    if (path[0] !== '/') {
-        path = '/' + path;
-    }
+    if (path) {
+        if (path[0] !== '/') {
+            path = '/' + path;
+        }
 
-    if (path.at(-1) === '/') {
-        path = path.slice(0, -1);
+        if (path.at(-1) === '/') {
+            path = path.slice(0, -1);
+        }
     }
 
     return path || '/';
@@ -55,7 +57,7 @@ class Router<T> {
 
     private add(radixkey: string, route: Route<T>) {
         if (radixkey.indexOf(':') === -1 || this.root.add(radixkey, route).type === STATIC) {
-            if (this.static[radixkey]) {
+            if (radixkey in this.static) {
                 throw new Error(`Routing: static path '${radixkey}' is already in use`);
             }
 
@@ -152,11 +154,13 @@ class Router<T> {
         }
 
         if (route.subdomain) {
+            let subdomain = route.subdomain.toLowerCase();
+
             if (!this.subdomains) {
-                this.subdomains = [route.subdomain];
+                this.subdomains = [subdomain];
             }
             else {
-                this.subdomains.push(route.subdomain);
+                this.subdomains.push(subdomain);
             }
         }