@viewfly/router 1.1.10 → 2.0.0-alpha.0

package/bundles/index.d.ts

@@ -81,7 +81,7 @@ declare function Link(props: LinkProps): () => _viewfly_core_jsx_runtime.JSX.Ele
 interface RouterOutletProps extends Props {
     config: RouteConfig[];
 }
-declare const RouterOutlet: (props: RouterOutletProps) => () => _viewfly_core_jsx_runtime.JSX.Element;
+declare function RouterOutlet(props: RouterOutletProps): () => _viewfly_core_jsx_runtime.JSX.Element;
 
 declare class RouterModule implements Module {
     baseUrl: string;

package/bundles/index.esm.js

@@ -1,5 +1,5 @@
-import { jsx, Fragment } from '@viewfly/core/jsx-runtime';
-import { Injectable, inject, createSignal, onUnmounted, makeError, withAnnotation, SkipSelf, InjectFlags } from '@viewfly/core';
+import { jsx } from '@viewfly/core/jsx-runtime';
+import { Injectable, inject, createSignal, onUnmounted, makeError, createContext } from '@viewfly/core';
 import { Subject, Subscription, fromEvent } from '@tanbo/stream';
 
 /******************************************************************************
@@ -316,24 +316,18 @@ function Link(props) {
 }
 
 const routerErrorFn = makeError('RouterOutlet');
-const RouterOutlet = withAnnotation({
-    providers: [{
-            provide: Router,
-            useFactory(navigator, router) {
-                return new Router(navigator, router, '');
-            },
-            deps: [
-                [Navigator],
-                [Router, new SkipSelf()]
-            ]
-        }]
-}, function RouterOutlet(props) {
-    const children = createSignal(null);
-    const router = inject(Router, null, InjectFlags.SkipSelf);
-    const childRouter = inject(Router);
+function RouterOutlet(props) {
+    const router = inject(Router, null);
     if (router === null) {
         throw routerErrorFn('cannot found parent Router.');
     }
+    const navigator = inject(Navigator);
+    const childRouter = new Router(navigator, router, '');
+    const Context = createContext([{
+            provide: Router,
+            useValue: childRouter
+        }]);
+    const children = createSignal(null);
     const subscription = router.onRefresh.subscribe(() => {
         updateChildren();
     });
@@ -367,9 +361,9 @@ const RouterOutlet = withAnnotation({
     }
     updateChildren();
     return () => {
-        return jsx(Fragment, { children: children() });
+        return jsx(Context, { children: children() });
     };
-});
+}
 
 class RouterModule {
     constructor(baseUrl = '') {

package/bundles/index.js

@@ -318,24 +318,18 @@ function Link(props) {
 }
 
 const routerErrorFn = core.makeError('RouterOutlet');
-const RouterOutlet = core.withAnnotation({
-    providers: [{
-            provide: Router,
-            useFactory(navigator, router) {
-                return new Router(navigator, router, '');
-            },
-            deps: [
-                [Navigator],
-                [Router, new core.SkipSelf()]
-            ]
-        }]
-}, function RouterOutlet(props) {
-    const children = core.createSignal(null);
-    const router = core.inject(Router, null, core.InjectFlags.SkipSelf);
-    const childRouter = core.inject(Router);
+function RouterOutlet(props) {
+    const router = core.inject(Router, null);
     if (router === null) {
         throw routerErrorFn('cannot found parent Router.');
     }
+    const navigator = core.inject(Navigator);
+    const childRouter = new Router(navigator, router, '');
+    const Context = core.createContext([{
+            provide: Router,
+            useValue: childRouter
+        }]);
+    const children = core.createSignal(null);
     const subscription = router.onRefresh.subscribe(() => {
         updateChildren();
     });
@@ -369,9 +363,9 @@ const RouterOutlet = core.withAnnotation({
     }
     updateChildren();
     return () => {
-        return jsxRuntime.jsx(jsxRuntime.Fragment, { children: children() });
+        return jsxRuntime.jsx(Context, { children: children() });
     };
-});
+}
 
 class RouterModule {
     constructor(baseUrl = '') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/router",
-  "version": "1.1.10",
+  "version": "2.0.0-alpha.0",
   "description": "A routing library based on the Viewfly framework that can be run in the browser or Nodejs background.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",
@@ -15,7 +15,7 @@
   "keywords": [],
   "dependencies": {
     "@tanbo/stream": "^1.2.4",
-    "@viewfly/core": "^1.1.10",
+    "@viewfly/core": "^2.0.0-alpha.0",
     "url": "^0.11.1"
   },
   "devDependencies": {
@@ -37,5 +37,5 @@
   "bugs": {
     "url": "https://github.com/viewfly/viewfly.git/issues"
   },
-  "gitHead": "08cdabe11ffa8fb6c9c4bc53898881af2396f735"
+  "gitHead": "5fdcdcdca224d1eecdfd6a68abb1c3fb9c01d88a"
 }