@esportsplus/routing 0.0.34 → 0.0.36

package/build/browser.d.ts

@@ -1,13 +1,13 @@
 import { Scheduler } from '@esportsplus/reactivity';
-import { Middleware, Next, NeverAsync, Request, Route, Router } from './types';
+import { Middleware, Next, Request, Route, 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>[]): () => NeverAsync<T>;
-        dispatch(request: Request<T>): NeverAsync<T>;
+        (...middleware: Middleware<T>[]): () => T;
+        dispatch(request: Request<T>): T;
         match(fallback: Route<T>, scheduler: Scheduler, subdomain?: string | undefined): (request: Request<T>, next: Next<T>) => import("@esportsplus/template/build/types").Template;
     };
     redirect: (path: string, values?: unknown[]) => void;

package/build/router/route.d.ts

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

package/build/types.d.ts

@@ -1,8 +1,7 @@
 import { NeverAsync } from '@esportsplus/typescript';
-import { Next as N, Stage } from '@esportsplus/pipeline';
 import { Route, Router } from './router';
-type Middleware<T> = Stage<Request<T>, NeverAsync<T>>;
-type Next<T> = N<Request<T>, NeverAsync<T>>;
+type Middleware<T> = NeverAsync<(input: Request<T>, next: Next<T>) => T>;
+type Next<T> = NeverAsync<(input: Request<T>) => T>;
 type Options<T> = {
     middleware?: Middleware<T>[];
     name?: string;
@@ -22,4 +21,4 @@ type Request<T> = {
     query: Record<string, unknown>;
     subdomain?: string;
 };
-export { Middleware, Next, NeverAsync, Options, Request, Route, Router };
+export { Middleware, Next, Options, Request, Route, Router };

package/package.json

@@ -2,11 +2,11 @@
     "author": "ICJR",
     "dependencies": {
         "@esportsplus/pipeline": "^0.0.5",
-        "@esportsplus/reactivity": "^0.1.7",
-        "@esportsplus/template": "^0.1.5"
+        "@esportsplus/reactivity": "^0.1.9",
+        "@esportsplus/template": "^0.1.7"
     },
     "devDependencies": {
-        "@esportsplus/typescript": "^0.0.7"
+        "@esportsplus/typescript": "^0.0.11"
     },
     "main": "./build/index.js",
     "name": "@esportsplus/routing",
@@ -18,5 +18,5 @@
         "prepublishOnly": "npm run build"
     },
     "types": "./build/index.d.ts",
-    "version": "0.0.34"
+    "version": "0.0.36"
 }

package/src/browser.ts

@@ -1,6 +1,6 @@
 import { effect, reactive, root, Scheduler } from '@esportsplus/reactivity';
 import { html } from '@esportsplus/template';
-import { Middleware, Next, NeverAsync, Request, Route, Router } from './types';
+import { Middleware, Next, Request, Route, Router } from './types';
 import pipeline from '@esportsplus/pipeline';
 import factory from './router';
 
@@ -55,7 +55,7 @@ function middleware<T>(request: Request<T>, router: Router<T>) {
         return () => instance(request);
     };
 
-    host.dispatch = (request: Request<T>): NeverAsync<T> => {
+    host.dispatch = (request: Request<T>) => {
         let { route } = request.data;
 
         if (route === undefined) {
@@ -88,6 +88,7 @@ function middleware<T>(request: Request<T>, router: Router<T>) {
                     throw new Error('Routing: route is undefined');
                 }
 
+                // @ts-ignore
                 return root(() => {
                     request.data.parameters = state.parameters;
                     request.data.route = state.route;

package/src/router/route.ts

@@ -1,4 +1,4 @@
-import { Middleware, Next, NeverAsync, Request } from '~/types';
+import { Middleware, Next, Request } from '~/types';
 import pipeline from '@esportsplus/pipeline';
 
 
@@ -15,7 +15,7 @@ class Route<T> {
     }
 
 
-    dispatch(request: Request<T>): NeverAsync<T> {
+    dispatch(request: Request<T>) {
         if (this.middleware === null) {
             return this.responder(request);
         }

package/src/types.ts

@@ -1,11 +1,10 @@
 import { NeverAsync } from '@esportsplus/typescript';
-import { Next as N, Stage } from '@esportsplus/pipeline';
 import { Route, Router } from './router';
 
 
-type Middleware<T> = Stage<Request<T>, NeverAsync<T>>;
+type Middleware<T> = NeverAsync<(input: Request<T>, next: Next<T>) => T>;
 
-type Next<T> = N<Request<T>, NeverAsync<T>>;
+type Next<T> = NeverAsync<(input: Request<T>) => T>;
 
 type Options<T> = {
     middleware?: Middleware<T>[];
@@ -29,4 +28,4 @@ type Request<T> = {
 };
 
 
-export { Middleware, Next, NeverAsync, Options, Request, Route, Router };
+export { Middleware, Next, Options, Request, Route, Router };