@esportsplus/routing 0.0.24 → 0.0.26

package/build/browser.d.ts

@@ -1,14 +1,53 @@
-import { Middleware, Response, Router } from './types';
+import { Middleware, Router } from './types';
 declare function back(): void;
 declare function forward(): void;
 declare const _default: <T>(instance?: Router<T> | undefined) => {
     back: typeof back;
     forward: typeof forward;
-    middleware: (...middleware: Middleware<T>[]) => () => Response<T>;
-    redirect: (path: string, { state, values }: {
-        state?: Record<PropertyKey, unknown> | undefined;
-        values?: unknown[] | undefined;
-    }) => void;
+    middleware: (...middleware: Middleware<T>[]) => {
+        pipeline: () => T;
+        request: {
+            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<{
+                    [x: string]: unknown;
+                    [x: number]: unknown;
+                    [x: symbol]: 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;
+            };
+        };
+    };
+    redirect: (path: string, values?: unknown[]) => void;
     router: Router<T>;
     uri: (path: string, values?: unknown[]) => string;
 };

package/build/browser.js

@@ -18,7 +18,7 @@ function onpopstate() {
     let values = request();
     for (let i = 0, n = cache.length; i < n; i++) {
         let state = cache[i];
-        for (let key in state) {
+        for (let key in values) {
             state[key] = values[key];
         }
     }
@@ -42,24 +42,27 @@ export default (instance) => {
     cache.push(state);
     if (!registered) {
         registered = true;
-        window.addEventListener('popstate', onpopstate);
+        window.addEventListener('hashchange', onpopstate);
     }
     return {
         back,
         forward,
         middleware: (...middleware) => {
             let instance = pipeline(...middleware);
-            return () => instance(state);
+            return {
+                pipeline: () => instance(state),
+                request: state
+            };
         },
-        redirect: (path, { state, values }) => {
+        redirect: (path, values = []) => {
             if (path.startsWith('https://') || path.startsWith('http://')) {
                 return window.location.replace(path);
             }
-            window.history.pushState((state || {}), '', normalize(router.uri(path, values || [])));
+            window.location.hash = normalize(router.uri(path, values));
         },
         router,
         uri: (path, values = []) => {
-            return normalize(router.uri(path, values || []));
+            return normalize(router.uri(path, values));
         }
     };
 };

package/build/types.d.ts

@@ -1,7 +1,8 @@
+import { Prettify } from '@esportsplus/typescript';
 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;
@@ -10,7 +11,7 @@ type Options<T> = {
     subdomain?: string;
 };
 type Request<T> = {
-    data: Record<PropertyKey, unknown> & ReturnType<Router<T>['match']>;
+    data: Prettify<Record<PropertyKey, unknown> & ReturnType<Router<T>['match']>>;
     href: string;
     hostname: string;
     method: string;
@@ -21,6 +22,5 @@ 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, Response, Route, Router };
+type Responder<T> = (request: Request<T>) => T;
+export { Middleware, Next, Options, Request, Responder, Route, Router };

package/package.json

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

package/src/browser.ts

@@ -1,5 +1,5 @@
 import { reactive } from '@esportsplus/reactivity';
-import { Middleware, Request, Response, Router } from './types';
+import { Middleware, Request, Router } from './types';
 import pipeline from '@esportsplus/pipeline';
 import factory from './router';
 
@@ -30,7 +30,7 @@ function onpopstate() {
     for (let i = 0, n = cache.length; i < n; i++) {
         let state = cache[i];
 
-        for (let key in state) {
+        for (let key in values) {
             // @ts-ignore
             state[key] = values[key];
         }
@@ -63,27 +63,30 @@ export default <T>(instance?: Router<T>) => {
 
     if (!registered) {
         registered = true;
-        window.addEventListener('popstate', onpopstate);
+        window.addEventListener('hashchange', onpopstate);
     }
 
     return {
         back,
         forward,
         middleware: (...middleware: Middleware<T>[]) => {
-            let instance = pipeline<Request<T>, Response<T>>(...middleware);
+            let instance = pipeline(...middleware);
 
-            return () => instance(state);
+            return {
+                pipeline: () => instance(state),
+                request: state
+            };
         },
-        redirect: (path: string, { state, values }: { state?: Record<PropertyKey, unknown>; values?: unknown[] }) => {
+        redirect: (path: string, values: unknown[] = []) => {
             if (path.startsWith('https://') || path.startsWith('http://')) {
                 return window.location.replace(path);
             }
 
-            window.history.pushState( (state || {}), '', normalize(router.uri(path, values || [])) );
+            window.location.hash = normalize( router.uri(path, values) );
         },
         router,
         uri: (path: string, values: unknown[] = []) => {
-            return normalize( router.uri(path, values || []) );
+            return normalize( router.uri(path, values) );
         }
     };
 };

package/src/types.ts

@@ -1,10 +1,11 @@
+import { Prettify } from '@esportsplus/typescript';
 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>[];
@@ -15,7 +16,7 @@ type Options<T> = {
 };
 
 type Request<T> = {
-    data: Record<PropertyKey, unknown> & ReturnType<Router<T>['match']>;
+    data: Prettify<Record<PropertyKey, unknown> & ReturnType<Router<T>['match']>>;
     href: string;
     hostname: string;
     method: string;
@@ -27,9 +28,7 @@ type Request<T> = {
     subdomain?: string;
 };
 
-type Responder<T> = (request: Request<T>) => Response<T>;
+type Responder<T> = (request: Request<T>) => T;
 
-type Response<T> = Promise<T> | T;
 
-
-export { Middleware, Next, Options, Request, Responder, Response, Route, Router };
+export { Middleware, Next, Options, Request, Responder, Route, Router };