@esportsplus/routing 0.0.31 → 0.0.32

package/build/browser.d.ts

@@ -1,4 +1,4 @@
-import { Middleware, Router } from './types';
+import { Middleware, Next, Request, Router } from './types';
 declare function back(): void;
 declare function forward(): void;
 declare const _default: <T>(instance?: Router<T> | undefined) => {
@@ -9,20 +9,7 @@ declare const _default: <T>(instance?: Router<T> | undefined) => {
             parameters?: Record<PropertyKey, unknown> | undefined;
             route?: import("./router/route").Route<T> | undefined;
         };
-        reactive(subdomain?: string): {
-            parameters?: {
-                [x: string]: unknown;
-                [x: number]: unknown;
-                [x: symbol]: unknown;
-            } | undefined;
-            route?: import("./router/route").Route<T> | undefined;
-            dispose: () => void;
-            reset: () => void;
-            nodes: {
-                parameters?: import("@esportsplus/reactivity/build/signal").default<undefined> | import("@esportsplus/reactivity/build/signal").default<Record<PropertyKey, unknown>> | undefined;
-                route?: import("@esportsplus/reactivity/build/signal").default<undefined> | import("@esportsplus/reactivity/build/signal").default<import("./router/route").Route<T>> | undefined;
-            };
-        };
+        middleware(subdomain?: string): (request: Request<T>, next: Next<T>) => import("@esportsplus/template/build/types").Template;
     };
     middleware: (...middleware: Middleware<T>[]) => () => T;
     redirect: (path: string, values?: unknown[]) => void;

package/build/browser.js

@@ -1,4 +1,5 @@
-import { effect, reactive } from '@esportsplus/reactivity';
+import { effect, reactive, root } from '@esportsplus/reactivity';
+import { html } from '@esportsplus/template';
 import pipeline from '@esportsplus/pipeline';
 import factory from './router';
 let cache = [];
@@ -54,7 +55,7 @@ export default (instance) => {
         }
         return router.match(request.method, request.path, subdomain || '');
     }
-    match.reactive = (subdomain) => {
+    match.middleware = (subdomain) => {
         let state = reactive({
             parameters: undefined,
             route: undefined
@@ -64,7 +65,18 @@ export default (instance) => {
             state.parameters = parameters;
             state.route = route;
         });
-        return state;
+        return (request, next) => {
+            return html `${() => {
+                if (state.route === undefined) {
+                    throw new Error(`Routing: route is undefined!`);
+                }
+                return root(() => {
+                    request.data.parameters = state.parameters;
+                    request.data.route = state.route;
+                    return next(request);
+                });
+            }}`;
+        };
     };
     return {
         back,

package/package.json

@@ -2,7 +2,8 @@
     "author": "ICJR",
     "dependencies": {
         "@esportsplus/pipeline": "^0.0.5",
-        "@esportsplus/reactivity": "^0.1.2"
+        "@esportsplus/reactivity": "^0.1.3",
+        "@esportsplus/template": "^0.1.5"
     },
     "devDependencies": {
         "@esportsplus/typescript": "^0.0.3"
@@ -17,5 +18,5 @@
         "prepublishOnly": "npm run build"
     },
     "types": "./build/index.d.ts",
-    "version": "0.0.31"
+    "version": "0.0.32"
 }

package/src/browser.ts

@@ -1,5 +1,6 @@
-import { effect, reactive } from '@esportsplus/reactivity';
-import { Middleware, Request, Router } from './types';
+import { effect, reactive, root } from '@esportsplus/reactivity';
+import { html } from '@esportsplus/template';
+import { Middleware, Next, Request, Router } from './types';
 import pipeline from '@esportsplus/pipeline';
 import factory from './router';
 
@@ -77,7 +78,7 @@ export default <T>(instance?: Router<T>) => {
         return router.match(request.method, request.path, subdomain || '');
     }
 
-    match.reactive = (subdomain?: string) => {
+    match.middleware = (subdomain?: string) => {
         let state = reactive<ReturnType<typeof router.match>>({
                 parameters: undefined,
                 route: undefined
@@ -90,7 +91,20 @@ export default <T>(instance?: Router<T>) => {
             state.route = route;
         });
 
-        return state;
+        return (request: Request<T>, next: Next<T>) => {
+            return html`${() => {
+                if (state.route === undefined) {
+                    throw new Error(`Routing: route is undefined!`);
+                }
+
+                return root(() => {
+                    request.data.parameters = state.parameters;
+                    request.data.route = state.route;
+
+                    return next(request);
+                });
+            }}`;
+        };
     };
 
     return {