@esportsplus/routing 0.0.17 → 0.0.19

package/build/middleware/dispatch.d.ts

@@ -1,3 +1,3 @@
 import { Request, Responder } from '../types';
-declare const _default: <R>(request: Request<R>) => R | Promise<R>;
+declare const _default: <R>(request: Request<R>) => import("../types").Response<R>;
 export default _default;

package/build/middleware/index.d.ts

@@ -1,10 +1,11 @@
-import factory from '@esportsplus/middleware';
+import { Middleware, Request, Response } from '../types';
 import dispatch from './dispatch';
 import match from './match';
+declare const factory: <R>(...fns: Middleware<R>[]) => import("@esportsplus/middleware/build/types").Next<Request<R>, Response<R>>;
 declare const _default: {
-    dispatch: <R>(request: import("../types").Request<R>) => R | Promise<R>;
-    factory: <I, R_1>(...middleware: import("@esportsplus/middleware/build/types").Middleware<I, R_1>[]) => import("@esportsplus/middleware/build/types").Next<I, R_1>;
-    match: <R_2>(router: import("../router").Router<R_2>, subdomain?: string | undefined) => import("../types").Middleware<R_2>;
+    dispatch: <R>(request: Request<R>) => Response<R>;
+    factory: <R_1>(...fns: Middleware<R_1>[]) => import("@esportsplus/middleware/build/types").Next<Request<R_1>, Response<R_1>>;
+    match: <R_2>(router: import("../router").Router<R_2>, subdomain?: string | undefined) => Middleware<R_2>;
 };
 export default _default;
 export { dispatch, factory, match };

package/build/middleware/index.js

@@ -1,5 +1,8 @@
-import factory from '@esportsplus/middleware';
+import middleware from '@esportsplus/middleware';
 import dispatch from './dispatch';
 import match from './match';
+const factory = (...fns) => {
+    return middleware(...fns);
+};
 export default { dispatch, factory, match };
 export { dispatch, factory, match };

package/build/spa.d.ts

@@ -8,7 +8,7 @@ declare const _default: <R>(router: Router<R>) => {
         state?: Record<PropertyKey, unknown> | undefined;
         values?: unknown[] | undefined;
     }) => void;
-    request: Request<unknown>;
+    request: Request<R>;
     uri: (path: string, values?: unknown[]) => string;
 };
 export default _default;

package/build/spa.js

@@ -1,4 +1,3 @@
-let state = request();
 function back() {
     window.history.back();
 }
@@ -25,14 +24,14 @@ function request() {
         query: Object.fromEntries((new URLSearchParams(path[1])).entries())
     };
 }
-function update() {
-    let values = request();
-    for (let key in values) {
-        state[key] = values[key];
-    }
-}
 export default (router) => {
-    window.addEventListener('popstate', update);
+    let state = request();
+    window.addEventListener('popstate', () => {
+        let values = request();
+        for (let key in values) {
+            state[key] = values[key];
+        }
+    });
     return {
         back,
         forward,

package/build/types.d.ts

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

package/package.json

@@ -16,5 +16,5 @@
         "prepublishOnly": "npm run build"
     },
     "types": "./build/index.d.ts",
-    "version": "0.0.17"
+    "version": "0.0.19"
 }

package/src/middleware/index.ts

@@ -1,7 +1,13 @@
-import factory from '@esportsplus/middleware';
+import { Middleware, Request, Response } from '~/types';
+import middleware from '@esportsplus/middleware';
 import dispatch from './dispatch';
 import match from './match';
 
 
+const factory = <R>(...fns: Middleware<R>[]) => {
+    return middleware<Request<R>, Response<R>>(...fns);
+};
+
+
 export default { dispatch, factory, match };
 export { dispatch, factory, match };

package/src/spa.ts

@@ -1,9 +1,6 @@
 import { Request, Router } from './types';
 
 
-let state = request();
-
-
 function back() {
     window.history.back();
 }
@@ -37,18 +34,18 @@ function request<R>(): Request<R> {
     };
 }
 
-function update() {
-    let values = request();
 
-    for (let key in values) {
-        // @ts-ignore
-        state[key] = values[key];
-    }
-}
+export default <R>(router: Router<R>) => {
+    let state = request<R>();
 
+    window.addEventListener('popstate', () => {
+        let values = request<R>();
 
-export default <R>(router: Router<R>) => {
-    window.addEventListener('popstate', update);
+        for (let key in values) {
+            // @ts-ignore
+            state[key] = values[key];
+        }
+    });
 
     return {
         back,

package/src/types.ts

@@ -2,9 +2,9 @@ import { Middleware as M, Next as N } from '@esportsplus/middleware';
 import { Route, Router } from './router';
 
 
-type Middleware<R> = M<Request<R>, ReturnType<Responder<R>>>;
+type Middleware<R> = M<Request<R>, Response<R>>;
 
-type Next<R> = N<Request<R>, ReturnType<Responder<R>>>;
+type Next<R> = N<Request<R>, Response<R>>;
 
 type Options<R> = {
     middleware?: Middleware<R>[];
@@ -27,7 +27,9 @@ type Request<R> = {
     subdomain?: string;
 };
 
-type Responder<R> = (request: Request<R>) => Promise<R> | R;
+type Responder<R> = (request: Request<R>) => Response<R>;
 
+type Response<R> = Promise<R> | R;
 
-export { Middleware, Next, Options, Request, Responder, Route, Router };
+
+export { Middleware, Next, Options, Request, Responder, Response, Route, Router };