@esportsplus/routing 0.0.38 → 0.0.39

package/build/browser.js

@@ -10,18 +10,23 @@ function forward() {
     window.history.forward();
 }
 function href() {
-    let { hash, hostname, href, origin, port, protocol } = new URL(window.location?.href || ''), path = hash ? hash.slice(1).split('?') : ['/', ''];
-    return {
+    let data = new URL(window.location?.href || ''), path = data.hash ? data.hash.slice(1).split('?') : ['/', ''], request = {
         data: {},
-        href,
-        hostname,
+        href: data.href,
+        hostname: data.hostname,
         method: 'GET',
-        origin,
+        origin: data.origin,
         path: path[0],
-        port,
-        protocol,
-        query: path[1] ? Object.fromEntries((new URLSearchParams(path[1])).entries()) : {},
+        port: data.port,
+        protocol: data.protocol,
+        query: {}
     };
+    if (path[1]) {
+        for (let [key, value] of (new URLSearchParams(path[1])).entries()) {
+            request.query[key] = value;
+        }
+    }
+    return request;
 }
 function match(request, router, subdomain) {
     if (router.subdomains !== null) {
@@ -51,8 +56,8 @@ function middleware(request, router) {
     host.match = (fallback, scheduler, subdomain) => {
         let state = reactive({
             parameters: undefined,
-            route: undefined,
-            root: undefined
+            root: undefined,
+            route: undefined
         });
         if (fallback === undefined) {
             throw new Error('Middleware: fallback route does not exist');
@@ -70,10 +75,10 @@ function middleware(request, router) {
                 if (state.root !== undefined) {
                     state.root.dispose();
                 }
-                return root((instance) => {
+                return root((root) => {
                     request.data.parameters = state.parameters;
                     request.data.route = state.route;
-                    state.root = instance;
+                    state.root = root;
                     return next(request);
                 }, scheduler);
             }}`;

package/package.json

@@ -18,5 +18,5 @@
         "prepublishOnly": "npm run build"
     },
     "types": "./build/index.d.ts",
-    "version": "0.0.38"
+    "version": "0.0.39"
 }

package/src/browser.ts

@@ -17,20 +17,27 @@ function forward() {
 }
 
 function href<T>(): Request<T> {
-    let { hash, hostname, href, origin, port, protocol } = new URL( window.location?.href || '' ),
-        path = hash ? hash.slice(1).split('?') : ['/', ''];
+    let data = new URL( window.location?.href || '' ),
+        path = data.hash ? data.hash.slice(1).split('?') : ['/', ''],
+        request: Request<T> = {
+            data: {},
+            href: data.href,
+            hostname: data.hostname,
+            method: 'GET',
+            origin: data.origin,
+            path: path[0],
+            port: data.port,
+            protocol: data.protocol,
+            query: {}
+        };
 
-    return {
-        data: {},
-        href,
-        hostname,
-        method: 'GET',
-        origin,
-        path: path[0],
-        port,
-        protocol,
-        query: path[1] ? Object.fromEntries( (new URLSearchParams(path[1])).entries() ) : {},
-    };
+    if (path[1]) {
+        for (let [key, value] of (new URLSearchParams(path[1])).entries()) {
+            request.query[key] = value;
+        }
+    }
+
+    return request;
 }
 
 function match<T>(request: Request<T>, router: Router<T>, subdomain?: string) {
@@ -68,8 +75,8 @@ function middleware<T>(request: Request<T>, router: Router<T>) {
     host.match = (fallback: Route<T>, scheduler: Scheduler, subdomain?: string) => {
         let state = reactive<ReturnType<typeof router.match> & { root?: Root }>({
                 parameters: undefined,
-                route: undefined,
-                root: undefined
+                root: undefined,
+                route: undefined
             });
 
         if (fallback === undefined) {
@@ -93,11 +100,11 @@ function middleware<T>(request: Request<T>, router: Router<T>) {
                     state.root.dispose();
                 }
 
-                return root((instance) => {
+                return root((root) => {
                     request.data.parameters = state.parameters;
                     request.data.route = state.route;
 
-                    state.root = instance;
+                    state.root = root;
 
                     return next(request);
                 }, scheduler);