@viewfly/router 1.1.9 → 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';
 
 /******************************************************************************
@@ -37,7 +37,12 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
 
 class Navigator {
     constructor(baseUrl) {
-        this.baseUrl = baseUrl;
+        Object.defineProperty(this, "baseUrl", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: baseUrl
+        });
     }
 }
 function formatUrl(pathname, urlFormatParams) {
@@ -66,8 +71,24 @@ let BrowserNavigator = class BrowserNavigator extends Navigator {
     }
     constructor(baseUrl) {
         super(baseUrl);
-        this.urlChangeEvent = new Subject();
-        this.subscription = new Subscription();
+        Object.defineProperty(this, "onUrlChanged", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "urlChangeEvent", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Subject()
+        });
+        Object.defineProperty(this, "subscription", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Subscription()
+        });
         this.onUrlChanged = this.urlChangeEvent.asObservable();
         this.subscription.add(fromEvent(window, 'popstate').subscribe(() => {
             this.urlChangeEvent.next();
@@ -157,10 +178,36 @@ class Router {
         return '';
     }
     constructor(navigator, parent, path) {
-        this.navigator = navigator;
-        this.parent = parent;
-        this.path = path;
-        this.refreshEvent = new Subject();
+        Object.defineProperty(this, "navigator", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: navigator
+        });
+        Object.defineProperty(this, "parent", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: parent
+        });
+        Object.defineProperty(this, "path", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: path
+        });
+        Object.defineProperty(this, "onRefresh", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "refreshEvent", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Subject()
+        });
         this.onRefresh = this.refreshEvent.asObservable();
     }
     navigateTo(path, params, fragment) {
@@ -269,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();
     });
@@ -320,14 +361,30 @@ const RouterOutlet = withAnnotation({
     }
     updateChildren();
     return () => {
-        return jsx(Fragment, { children: children() });
+        return jsx(Context, { children: children() });
     };
-});
+}
 
 class RouterModule {
     constructor(baseUrl = '') {
-        this.baseUrl = baseUrl;
-        this.subscription = new Subscription();
+        Object.defineProperty(this, "baseUrl", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: baseUrl
+        });
+        Object.defineProperty(this, "subscription", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Subscription()
+        });
+        Object.defineProperty(this, "navigator", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.navigator = new BrowserNavigator(this.baseUrl);
     }
     setup(app) {

package/bundles/index.js

@@ -39,7 +39,12 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
 
 class Navigator {
     constructor(baseUrl) {
-        this.baseUrl = baseUrl;
+        Object.defineProperty(this, "baseUrl", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: baseUrl
+        });
     }
 }
 function formatUrl(pathname, urlFormatParams) {
@@ -68,8 +73,24 @@ exports.BrowserNavigator = class BrowserNavigator extends Navigator {
     }
     constructor(baseUrl) {
         super(baseUrl);
-        this.urlChangeEvent = new stream.Subject();
-        this.subscription = new stream.Subscription();
+        Object.defineProperty(this, "onUrlChanged", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "urlChangeEvent", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new stream.Subject()
+        });
+        Object.defineProperty(this, "subscription", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new stream.Subscription()
+        });
         this.onUrlChanged = this.urlChangeEvent.asObservable();
         this.subscription.add(stream.fromEvent(window, 'popstate').subscribe(() => {
             this.urlChangeEvent.next();
@@ -159,10 +180,36 @@ class Router {
         return '';
     }
     constructor(navigator, parent, path) {
-        this.navigator = navigator;
-        this.parent = parent;
-        this.path = path;
-        this.refreshEvent = new stream.Subject();
+        Object.defineProperty(this, "navigator", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: navigator
+        });
+        Object.defineProperty(this, "parent", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: parent
+        });
+        Object.defineProperty(this, "path", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: path
+        });
+        Object.defineProperty(this, "onRefresh", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "refreshEvent", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new stream.Subject()
+        });
         this.onRefresh = this.refreshEvent.asObservable();
     }
     navigateTo(path, params, fragment) {
@@ -271,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();
     });
@@ -322,14 +363,30 @@ const RouterOutlet = core.withAnnotation({
     }
     updateChildren();
     return () => {
-        return jsxRuntime.jsx(jsxRuntime.Fragment, { children: children() });
+        return jsxRuntime.jsx(Context, { children: children() });
     };
-});
+}
 
 class RouterModule {
     constructor(baseUrl = '') {
-        this.baseUrl = baseUrl;
-        this.subscription = new stream.Subscription();
+        Object.defineProperty(this, "baseUrl", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: baseUrl
+        });
+        Object.defineProperty(this, "subscription", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new stream.Subscription()
+        });
+        Object.defineProperty(this, "navigator", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.navigator = new exports.BrowserNavigator(this.baseUrl);
     }
     setup(app) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/router",
-  "version": "1.1.9",
+  "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.9",
+    "@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": "eb5d5ce380467cb05637ef42fdb539c327b19feb"
+  "gitHead": "5fdcdcdca224d1eecdfd6a68abb1c3fb9c01d88a"
 }