@esportsplus/routing 0.0.27 → 0.0.29

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 | Promise<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,17 +63,18 @@ 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.startsWith('https://') || path.startsWith('http://')) {
+            if (path.indexOf('://') !== -1) {
                 return window.location.replace(path);
             }
             window.location.hash = normalize(router.uri(path, values));

package/build/router/route.d.ts

@@ -1,11 +1,11 @@
-import { Middleware, Request, Responder } from '../types';
+import { Middleware, Next, Request } from '../types';
 declare class Route<T> {
     middleware: Middleware<T>[] | null;
     name: string | null;
     path: string | null;
-    responder: Responder<T>;
+    responder: Next<T>;
     subdomain: string | null;
-    constructor(responder: Responder<T>);
-    get dispatch(): (request: Request<T>) => T | Promise<T>;
+    constructor(responder: Next<T>);
+    get dispatch(): (request: Request<T>) => T;
 }
 export { Route };

package/build/types.d.ts

@@ -1,12 +1,12 @@
 import { Next as N, Stage } from '@esportsplus/pipeline';
 import { Route, Router } from './router';
-type Middleware<T> = Stage<Request<T>, Response<T>>;
-type Next<T> = N<Request<T>, Response<T>>;
+type Middleware<T> = Stage<Request<T>, T>;
+type Next<T> = N<Request<T>, T>;
 type Options<T> = {
     middleware?: Middleware<T>[];
     name?: string;
     path?: string;
-    responder: Responder<T>;
+    responder: Next<T>;
     subdomain?: string;
 };
 type Request<T> = {
@@ -21,6 +21,4 @@ type Request<T> = {
     query: Record<string, unknown>;
     subdomain?: string;
 };
-type Responder<T> = (request: Request<T>) => Response<T>;
-type Response<T> = Promise<T> | T;
-export { Middleware, Next, Options, Request, Responder, Route, Router };
+export { Middleware, Next, Options, Request, Route, Router };

package/package.json

@@ -1,7 +1,7 @@
 {
     "author": "ICJR",
     "dependencies": {
-        "@esportsplus/pipeline": "^0.0.1",
+        "@esportsplus/pipeline": "^0.0.5",
         "@esportsplus/reactivity": "^0.1.2"
     },
     "devDependencies": {
@@ -17,5 +17,5 @@
         "prepublishOnly": "npm run build"
     },
     "types": "./build/index.d.ts",
-    "version": "0.0.27"
+    "version": "0.0.29"
 }

package/src/browser.ts

@@ -89,20 +89,20 @@ 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.startsWith('https://') || path.startsWith('http://')) {
+            if (path.indexOf('://') !== -1) {
                 return window.location.replace(path);
             }
 

package/src/router/route.ts

@@ -1,4 +1,4 @@
-import { Middleware, Request, Responder } from '~/types';
+import { Middleware, Next, Request } from '~/types';
 import pipeline from '@esportsplus/pipeline';
 
 
@@ -6,11 +6,11 @@ class Route<T> {
     middleware: Middleware<T>[] | null = null;
     name: string | null = null;
     path: string | null = null;
-    responder: Responder<T>;
+    responder: Next<T>;
     subdomain: string | null = null;
 
 
-    constructor(responder: Responder<T>) {
+    constructor(responder: Next<T>) {
         this.responder = responder;
     }
 
@@ -20,7 +20,7 @@ class Route<T> {
             return (request: Request<T>) => this.responder(request);
         }
 
-        return pipeline(...this.middleware, (request: Request<T>) => this.responder(request));
+        return pipeline(...this.middleware, (request) => this.responder(request));
     }
 }
 

package/src/types.ts

@@ -2,15 +2,15 @@ import { Next as N, Stage } from '@esportsplus/pipeline';
 import { Route, Router } from './router';
 
 
-type Middleware<T> = Stage<Request<T>, Response<T>>;
+type Middleware<T> = Stage<Request<T>, T>;
 
-type Next<T> = N<Request<T>, Response<T>>;
+type Next<T> = N<Request<T>, T>;
 
 type Options<T> = {
     middleware?: Middleware<T>[];
     name?: string;
     path?: string;
-    responder: Responder<T>;
+    responder: Next<T>;
     subdomain?: string;
 };
 
@@ -27,9 +27,5 @@ type Request<T> = {
     subdomain?: string;
 };
 
-type Responder<T> = (request: Request<T>) => Response<T>;
 
-type Response<T> = Promise<T> | T;
-
-
-export { Middleware, Next, Options, Request, Responder, Route, Router };
+export { Middleware, Next, Options, Request, Route, Router };