@ray-js/router 0.6.21 → 0.6.22-beta-2

package/lib/Router.d.ts

@@ -18,5 +18,5 @@ export declare class Router implements TRouter {
     go(delta: number): void;
     back(): void;
     reload(to: string): void;
-    get hostHref(): string;
+    get href(): string;
 }

package/lib/Router.js

@@ -1,8 +1,8 @@
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 import "core-js/modules/es.string.starts-with.js";
+import "core-js/modules/es.object.to-string.js";
+import "core-js/modules/es.promise.js";
 import "core-js/modules/es.regexp.exec.js";
 import "core-js/modules/es.string.search.js";
 import "core-js/modules/es.string.replace.js";
@@ -19,66 +19,40 @@ export var Router = /*#__PURE__*/function () {
   function Router(options) {
     _classCallCheck(this, Router);
 
-    this.scheduler = options.scheduler;
+    this.scheduler = options.scheduler; // window.router = this
   }
 
   _createClass(Router, [{
     key: "normalizeRoute",
-    value: function () {
-      var _normalizeRoute = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(params) {
-        var to, _url$parse, pathname, search, hash;
+    value: function normalizeRoute(params) {
+      var to = params.to; // FIXME: 绝对路径是否需要支持？
 
-        return _regeneratorRuntime.wrap(function (_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                to = params.to; // FIXME: 绝对路径是否需要支持？
-
-                if (!(to.startsWith('//') || to.startsWith('http'))) {
-                  _context.next = 3;
-                  break;
-                }
-
-                return _context.abrupt("return", {
-                  to: to
-                });
-
-              case 3:
-                if (this.scheduler.basename) {
-                  to = this.scheduler.basename + to;
-                } // TODO: Web 应用下重复进入一个路由
-
-
-                if (this.$href) {
-                  _url$parse = url.parse(this.$href), pathname = _url$parse.pathname, search = _url$parse.search, hash = _url$parse.hash;
-
-                  if (url.format({
-                    pathname: pathname,
-                    search: search,
-                    hash: hash
-                  }) === to) {
-                    console.warn('duplicate route to:', to);
-                  }
-                }
+      if (to.startsWith('//') || to.startsWith('http')) {
+        return Promise.resolve({
+          to: to
+        });
+      } // TODO: Web 应用下重复进入一个路由
 
-                return _context.abrupt("return", {
-                  to: to
-                });
 
-              case 6:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
+      if (this.$href) {
+        var _url$parse = url.parse(this.$href),
+            pathname = _url$parse.pathname,
+            search = _url$parse.search,
+            hash = _url$parse.hash;
 
-      function normalizeRoute() {
-        return _normalizeRoute.apply(this, arguments);
+        if (url.format({
+          pathname: pathname,
+          search: search,
+          hash: hash
+        }) === to) {
+          console.warn('duplicate route to:', to);
+        }
       }
 
-      return normalizeRoute;
-    }()
+      return Promise.resolve({
+        to: to
+      });
+    }
   }, {
     key: "push",
     value: function push(to) {
@@ -125,7 +99,7 @@ export var Router = /*#__PURE__*/function () {
       }
     }
   }, {
-    key: "hostHref",
+    key: "href",
     get: function get() {
       return window.location.href;
     }

package/lib/RouterScheduler.d.ts

@@ -6,7 +6,7 @@ declare type EventMembers = 'routeChange';
 export declare class RouterScheduler extends IRouterScheduler<Page> {
     private $currentRoute;
     private $listeners;
-    $entityMap: Record<string, Page[]>;
+    $entityMap: Page[];
     basename: string;
     /**
      * 当前调度器的 route 地址

package/lib/RouterScheduler.js

@@ -6,6 +6,8 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import "core-js/modules/es.array.concat.js";
+import "core-js/modules/es.regexp.exec.js";
+import "core-js/modules/es.string.replace.js";
 import "core-js/modules/es.array.splice.js";
 import "core-js/modules/es.array.index-of.js";
 import "core-js/modules/es.object.to-string.js";
@@ -35,9 +37,9 @@ export var RouterScheduler = /*#__PURE__*/function (_IRouterScheduler) {
 
     _defineProperty(_assertThisInitialized(_this), "$listeners", {});
 
-    _defineProperty(_assertThisInitialized(_this), "$entityMap", {});
+    _defineProperty(_assertThisInitialized(_this), "$entityMap", []);
 
-    _defineProperty(_assertThisInitialized(_this), "basename", '');
+    _defineProperty(_assertThisInitialized(_this), "basename", '/');
 
     return _this;
   }
@@ -53,7 +55,7 @@ export var RouterScheduler = /*#__PURE__*/function (_IRouterScheduler) {
     },
     set: function set(val) {
       if (val !== this.currentRoute) {
-        this.$currentRoute = val;
+        this.$currentRoute = val.replace(/\/$/, '');
         this.emit('routeChange', this.currentRoute);
       }
     }
@@ -97,18 +99,12 @@ export var RouterScheduler = /*#__PURE__*/function (_IRouterScheduler) {
 
       var pages = params.pages,
           tabBar = params.tabBar;
-      var tabBarList = tabBar.list || [];
+      var tabBarList = (tabBar === null || tabBar === void 0 ? void 0 : tabBar.list) || [];
       pages.forEach(function (page) {
         var isTabBar = tabBarList.some(function (item) {
-          if (item.route) {
-            return page.route === item.route;
-          } else if (item.id) {
-            return page.id === item.id;
-          }
-
-          return false;
+          return page.path === item.pagePath;
         });
-        page.route = _this2.basename + page.route;
+        page.route = page.route || page.path;
         page.originalRoute = page.route;
 
         _this2.addPage(_objectSpread(_objectSpread({}, page), {}, {
@@ -119,25 +115,13 @@ export var RouterScheduler = /*#__PURE__*/function (_IRouterScheduler) {
   }, {
     key: "getMatchedPage",
     value: function getMatchedPage(pathname) {
-      // 适配 `domain.com/basename/` & `domain.com/basename`
-      // 注册首页使用的是 `/` 需预处理
-      if (this.basename === pathname) {
-        pathname = pathname + '/';
-      }
-
       this.currentRoute = pathname;
       return this.matchPageByPathname(pathname);
     }
   }, {
     key: "addPage",
     value: function addPage(page) {
-      var depth = this.slashDepth(page.route);
-
-      if (!this.$entityMap[depth]) {
-        this.$entityMap[depth] = [];
-      }
-
-      this.$entityMap[depth].push(page);
+      this.$entityMap.push(page);
     }
   }]);
 

package/lib/history/index.js

@@ -59,7 +59,6 @@ export function createHistory(options) {
 
               options.onChange(NotFound, {
                 page: {
-                  id: pathname,
                   pathname: pathname,
                   route: '*',
                   path: '*',

package/lib/index.js

@@ -24,10 +24,7 @@ export function createRouter(options) {
     }
   }); // 设置路由基准路径
 
-  if (basename) {
-    router.scheduler.basename = basename;
-  } // 调度器注册页面
-
+  router.scheduler.basename = basename || '/'; // 调度器注册页面
 
   router.scheduler.registryPages({
     routes: routes,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/router",
-  "version": "0.6.21",
+  "version": "0.6.22-beta-2",
   "description": "Ray Core",
   "keywords": [
     "ray"
@@ -20,12 +20,12 @@
     "watch": "tsc -p ./tsconfig.build.json --module esnext --outDir lib --watch"
   },
   "dependencies": {
-    "@ray-js/library": "^0.6.21",
-    "@ray-js/types": "^0.6.21",
+    "@ray-js/library": "^0.6.22-beta-2",
+    "@ray-js/types": "^0.6.22-beta-2",
     "history": "4.x"
   },
   "devDependencies": {
-    "@ray-js/cli": "^0.6.21",
+    "@ray-js/cli": "^0.6.22-beta-2",
     "@types/history": "^4.7.9"
   },
   "maintainers": [
@@ -34,6 +34,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "cbb81571d068e6997e9b1fe95198c1b0275112e7",
+  "gitHead": "5d621bf1561047175b967cdf3aa35446f7d7198a",
   "repository": {}
 }