@viewfly/router 0.6.2 → 1.0.0-alpha.0

package/bundles/index.esm.js

@@ -1,5 +1,5 @@
 import { jsx, Fragment } from '@viewfly/core/jsx-runtime';
-import { Injectable, inject, createSignal, onUnmounted, provide } from '@viewfly/core';
+import { Injectable, inject, createSignal, onUnmounted, withAnnotation, SkipSelf, InjectFlags } from '@viewfly/core';
 import { Subject, Subscription, fromEvent } from '@tanbo/stream';
 
 /******************************************************************************
@@ -268,14 +268,21 @@ function Link(props) {
     };
 }
 
-function RouterOutlet(props) {
+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);
-    const childRouter = new Router(inject(Navigator), router, '');
-    provide({
-        provide: Router,
-        useValue: childRouter
-    });
+    const router = inject(Router, InjectFlags.SkipSelf);
+    const childRouter = inject(Router);
     const subscription = router.onRefresh.subscribe(() => {
         updateChildren();
     });
@@ -311,7 +318,7 @@ function RouterOutlet(props) {
     return () => {
         return jsx(Fragment, { children: children() });
     };
-}
+});
 
 class RouterModule {
     constructor(baseUrl = '') {

package/bundles/index.js

@@ -270,14 +270,21 @@ function Link(props) {
     };
 }
 
-function RouterOutlet(props) {
+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);
-    const childRouter = new Router(core.inject(Navigator), router, '');
-    core.provide({
-        provide: Router,
-        useValue: childRouter
-    });
+    const router = core.inject(Router, core.InjectFlags.SkipSelf);
+    const childRouter = core.inject(Router);
     const subscription = router.onRefresh.subscribe(() => {
         updateChildren();
     });
@@ -313,7 +320,7 @@ function RouterOutlet(props) {
     return () => {
         return jsxRuntime.jsx(jsxRuntime.Fragment, { children: children() });
     };
-}
+});
 
 class RouterModule {
     constructor(baseUrl = '') {

package/bundles/router-outlet.d.ts

@@ -3,4 +3,4 @@ import { RouteConfig } from './providers/_api';
 export interface RouterOutletProps extends Props {
     config: RouteConfig[];
 }
-export declare function RouterOutlet(props: RouterOutletProps): () => any;
+export declare const RouterOutlet: (props: RouterOutletProps) => () => any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/router",
-  "version": "0.6.2",
+  "version": "1.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",
@@ -13,7 +13,7 @@
   "keywords": [],
   "dependencies": {
     "@tanbo/stream": "^1.2.3",
-    "@viewfly/core": "^0.6.2",
+    "@viewfly/core": "^1.0.0-alpha.0",
     "url": "^0.11.1"
   },
   "devDependencies": {
@@ -34,5 +34,5 @@
   "bugs": {
     "url": "https://github.com/viewfly/viewfly.git/issues"
   },
-  "gitHead": "f3db648a596358d6966d006a24fb85b3b7d993d1"
+  "gitHead": "49d0f91818ce7bf9474ae386d8eb52624b31dbde"
 }