@esportsplus/routing 0.0.28 → 0.0.30

package/build/browser.d.ts

@@ -5,43 +5,13 @@ declare const _default: <T>(instance?: Router<T> | undefined) => {
     back: typeof back;
     forward: typeof forward;
     match: (subdomain?: string) => {
-        data: {
-            [x: string]: unknown;
-            [x: number]: unknown;
-            [x: symbol]: unknown;
-            parameters?: Record<PropertyKey, unknown> | undefined;
-            route?: import("./router/route").Route<T> | undefined;
-        };
-        href: string;
-        hostname: string;
-        method: string;
-        origin: string;
-        path: string;
-        port: string;
-        protocol: string;
-        query: {
-            [x: string]: unknown;
-        };
-        subdomain?: string | undefined;
-        dispose: () => void;
-        reset: () => void;
-        nodes: {
-            data: import("@esportsplus/reactivity/build/signal").default<Record<PropertyKey, unknown> & {
-                parameters?: Record<PropertyKey, unknown> | undefined;
-                route?: import("./router/route").Route<T> | undefined;
-            }>;
-            href: import("@esportsplus/reactivity/build/signal").default<string>;
-            hostname: import("@esportsplus/reactivity/build/signal").default<string>;
-            method: import("@esportsplus/reactivity/build/signal").default<string>;
-            origin: import("@esportsplus/reactivity/build/signal").default<string>;
-            path: import("@esportsplus/reactivity/build/signal").default<string>;
-            port: import("@esportsplus/reactivity/build/signal").default<string>;
-            protocol: import("@esportsplus/reactivity/build/signal").default<string>;
-            query: import("@esportsplus/reactivity/build/signal").default<Record<string, unknown>>;
-            subdomain?: import("@esportsplus/reactivity/build/signal").default<string> | import("@esportsplus/reactivity/build/signal").default<undefined> | undefined;
-        };
+        parameters?: Record<PropertyKey, unknown> | undefined;
+        route?: import("./router/route").Route<T> | undefined;
     };
-    middleware: (...middleware: Middleware<T>[]) => () => T;
+    middleware: (...middleware: Middleware<T>[]) => ({ parameters, route }: {
+        parameters?: Record<PropertyKey, unknown> | undefined;
+        route?: import("./router/route").Route<T> | undefined;
+    }) => T;
     redirect: (path: string, values?: unknown[]) => void;
     router: Router<T>;
     uri: (path: string, values?: unknown[]) => string;

package/build/browser.js

@@ -63,14 +63,15 @@ export default (instance) => {
                     match = '';
                 }
             }
-            let { parameters, route } = router.match(state.method, state.path, match);
-            state.data.parameters = parameters;
-            state.data.route = route;
-            return state;
+            return router.match(state.method, state.path, match);
         },
         middleware: (...middleware) => {
             let instance = pipeline(...middleware);
-            return () => instance(state);
+            return ({ parameters, route }) => {
+                state.data.parameters = parameters;
+                state.data.route = route;
+                return instance(state);
+            };
         },
         redirect: (path, values = []) => {
             if (path.indexOf('://') !== -1) {

package/build/router/route.d.ts

@@ -6,6 +6,6 @@ declare class Route<T> {
     responder: Next<T>;
     subdomain: string | null;
     constructor(responder: Next<T>);
-    get dispatch(): (request: Request<T>) => T;
+    dispatch(request: Request<T>): T;
 }
 export { Route };

package/build/router/route.js

@@ -8,11 +8,11 @@ class Route {
     constructor(responder) {
         this.responder = responder;
     }
-    get dispatch() {
+    dispatch(request) {
         if (this.middleware === null) {
-            return (request) => this.responder(request);
+            return this.responder(request);
         }
-        return pipeline(...this.middleware, (request) => this.responder(request));
+        return pipeline(...this.middleware, (request) => this.responder(request))(request);
     }
 }
 export { Route };

package/package.json

@@ -17,5 +17,5 @@
         "prepublishOnly": "npm run build"
     },
     "types": "./build/index.d.ts",
-    "version": "0.0.28"
+    "version": "0.0.30"
 }

package/src/browser.ts

@@ -89,17 +89,17 @@ export default <T>(instance?: Router<T>) => {
                 }
             }
 
-            let { parameters, route } = router.match(state.method, state.path, match);
-
-            state.data.parameters = parameters;
-            state.data.route = route;
-
-            return state;
+            return router.match(state.method, state.path, match);
         },
         middleware: (...middleware: Middleware<T>[]) => {
             let instance = pipeline(...middleware);
 
-            return () => instance(state);
+            return ({ parameters, route }: ReturnType<typeof router.match>) => {
+                state.data.parameters = parameters;
+                state.data.route = route;
+
+                return instance(state);
+            };
         },
         redirect: (path: string, values: unknown[] = []) => {
             if (path.indexOf('://') !== -1) {

package/src/router/route.ts

@@ -15,12 +15,12 @@ class Route<T> {
     }
 
 
-    get dispatch() {
+    dispatch(request: Request<T>) {
         if (this.middleware === null) {
-            return (request: Request<T>) => this.responder(request);
+            return this.responder(request);
         }
 
-        return pipeline(...this.middleware, (request) => this.responder(request));
+        return pipeline(...this.middleware, (request) => this.responder(request))(request);
     }
 }