@esportsplus/routing 0.0.36 → 0.0.37

package/build/browser.js

@@ -51,7 +51,8 @@ function middleware(request, router) {
     host.match = (fallback, scheduler, subdomain) => {
         let state = reactive({
             parameters: undefined,
-            route: undefined
+            route: undefined,
+            root: undefined
         });
         if (fallback === undefined) {
             throw new Error('Middleware: fallback route does not exist');
@@ -66,11 +67,15 @@ function middleware(request, router) {
                 if (state.route === undefined) {
                     throw new Error('Routing: route is undefined');
                 }
-                return root(() => {
+                if (state.root !== undefined) {
+                    state.root.dispose();
+                }
+                return root((instance) => {
                     request.data.parameters = state.parameters;
                     request.data.route = state.route;
+                    state.root = instance;
                     return next(request);
-                }, { scheduler });
+                }, scheduler);
             }}`;
         };
     };

package/package.json

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

package/src/browser.ts

@@ -1,4 +1,4 @@
-import { effect, reactive, root, Scheduler } from '@esportsplus/reactivity';
+import { effect, reactive, root, Root, Scheduler } from '@esportsplus/reactivity';
 import { html } from '@esportsplus/template';
 import { Middleware, Next, Request, Route, Router } from './types';
 import pipeline from '@esportsplus/pipeline';
@@ -66,9 +66,10 @@ function middleware<T>(request: Request<T>, router: Router<T>) {
     };
 
     host.match = (fallback: Route<T>, scheduler: Scheduler, subdomain?: string) => {
-        let state = reactive<ReturnType<typeof router.match>>({
+        let state = reactive<ReturnType<typeof router.match> & { root?: Root }>({
                 parameters: undefined,
-                route: undefined
+                route: undefined,
+                root: undefined
             });
 
         if (fallback === undefined) {
@@ -88,13 +89,18 @@ function middleware<T>(request: Request<T>, router: Router<T>) {
                     throw new Error('Routing: route is undefined');
                 }
 
-                // @ts-ignore
-                return root(() => {
+                if (state.root !== undefined) {
+                    state.root.dispose();
+                }
+
+                return root((instance) => {
                     request.data.parameters = state.parameters;
                     request.data.route = state.route;
 
+                    state.root = instance;
+
                     return next(request);
-                }, { scheduler });
+                }, scheduler);
             }}`;
         };
     };