@ray-js/router 1.3.22 → 1.3.23

package/LICENSE.md

@@ -0,0 +1,9 @@
+Copyright © 2014-2022 Tuya.inc
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/lib/Router.js

@@ -1,14 +1,6 @@
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-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";
 import { url } from '@ray-js/library';
 import { history } from './history';
-export var Router = /*#__PURE__*/function () {
+export class Router {
   /**
    * 页面路由调度器
    */
@@ -16,94 +8,84 @@ export var Router = /*#__PURE__*/function () {
   /**
    * 当前环境地址栏
    */
-  function Router(options) {
-    _classCallCheck(this, Router);
 
-    this.scheduler = options.scheduler; // window.router = this
+  constructor(options) {
+    this.scheduler = options.scheduler;
+    // window.router = this
   }
 
-  _createClass(Router, [{
-    key: "normalizeRoute",
-    value: function normalizeRoute(params) {
-      var to = params.to; // FIXME: 绝对路径是否需要支持？
-
-      if (to.startsWith('//') || to.startsWith('http')) {
-        return Promise.resolve({
-          to: to
-        });
-      } // TODO: Web 应用下重复进入一个路由
-
-
-      if (this.$href) {
-        var _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);
-        }
-      }
-
+  normalizeRoute(params) {
+    let {
+      to
+    } = params;
+    // FIXME: 绝对路径是否需要支持？
+    if (to.startsWith('//') || to.startsWith('http')) {
       return Promise.resolve({
-        to: to
+        to
       });
     }
-  }, {
-    key: "push",
-    value: function push(to) {
-      this.normalizeRoute({
-        to: to
-      }).then(function (_ref) {
-        var to = _ref.to;
-        history.push(to);
-      });
+
+    // TODO: Web 应用下重复进入一个路由
+    if (this.$href) {
+      const {
+        pathname,
+        search,
+        hash
+      } = url.parse(this.$href);
+      if (url.format({
+        pathname,
+        search,
+        hash
+      }) === to) {
+        console.warn('duplicate route to:', to);
+      }
     }
-  }, {
-    key: "replace",
-    value: function replace(to) {
+    return Promise.resolve({
+      to
+    });
+  }
+  push(to) {
+    this.normalizeRoute({
+      to
+    }).then(_ref => {
+      let {
+        to
+      } = _ref;
+      history.push(to);
+    });
+  }
+  replace(to) {
+    this.normalizeRoute({
+      to
+    }).then(_ref2 => {
+      let {
+        to
+      } = _ref2;
+      history.replace(to);
+    });
+  }
+  go(delta) {
+    // 在应用堆栈内进行跳转
+    history.go(delta);
+  }
+  back() {
+    history.goBack();
+  }
+  reload(to) {
+    if (to) {
       this.normalizeRoute({
-        to: to
-      }).then(function (_ref2) {
-        var to = _ref2.to;
-        history.replace(to);
+        to
+      }).then(_ref3 => {
+        let {
+          to
+        } = _ref3;
+        window.location.href = to;
       });
+    } else {
+      window.location.reload();
     }
-  }, {
-    key: "go",
-    value: function go(delta) {
-      // 在应用堆栈内进行跳转
-      history.go(delta);
-    }
-  }, {
-    key: "back",
-    value: function back() {
-      history.goBack();
-    }
-  }, {
-    key: "reload",
-    value: function reload(to) {
-      if (to) {
-        this.normalizeRoute({
-          to: to
-        }).then(function (_ref3) {
-          var to = _ref3.to;
-          window.location.href = to;
-        });
-      } else {
-        window.location.reload();
-      }
-    }
-  }, {
-    key: "href",
-    get: function get() {
-      return window.location.href;
-    }
-  }]);
-
-  return Router;
-}();
+  }
+  get href() {
+    return window.location.href;
+  }
+}

package/lib/RouterScheduler.d.ts

@@ -1,5 +1,5 @@
 import { Page, Pages, RouterScheduler as IRouterScheduler, Routes, TabBar, SubPackages } from '@ray-js/types';
-declare type EventMembers = 'routeChange';
+type EventMembers = 'routeChange';
 /**
  * web 环境下的路由协调器
  */

package/lib/RouterScheduler.js

@@ -1,129 +1,71 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
-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";
-import "core-js/modules/web.dom-collections.for-each.js";
 import { RouterScheduler as IRouterScheduler } from '@ray-js/types';
-
 /**
  * web 环境下的路由协调器
  */
-export var RouterScheduler = /*#__PURE__*/function (_IRouterScheduler) {
-  _inherits(RouterScheduler, _IRouterScheduler);
-
-  var _super = _createSuper(RouterScheduler);
-
-  function RouterScheduler() {
-    var _this;
-
-    _classCallCheck(this, RouterScheduler);
-
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
+export class RouterScheduler extends IRouterScheduler {
+  $currentRoute = '';
+  $listeners = {};
+  $entityMap = [];
+  basename = '/';
+
+  /**
+   * 当前调度器的 route 地址
+   */
+  get currentRoute() {
+    return this.$currentRoute;
+  }
+  set currentRoute(val) {
+    if (val !== this.currentRoute) {
+      this.$currentRoute = val.replace(/\/$/, '');
+      this.emit('routeChange', this.currentRoute);
     }
-
-    _this = _super.call.apply(_super, [this].concat(args));
-
-    _defineProperty(_assertThisInitialized(_this), "$currentRoute", '');
-
-    _defineProperty(_assertThisInitialized(_this), "$listeners", {});
-
-    _defineProperty(_assertThisInitialized(_this), "$entityMap", []);
-
-    _defineProperty(_assertThisInitialized(_this), "basename", '/');
-
-    return _this;
   }
-
-  _createClass(RouterScheduler, [{
-    key: "currentRoute",
-    get:
-    /**
-     * 当前调度器的 route 地址
-     */
-    function get() {
-      return this.$currentRoute;
-    },
-    set: function set(val) {
-      if (val !== this.currentRoute) {
-        this.$currentRoute = val.replace(/\/$/, '');
-        this.emit('routeChange', this.currentRoute);
-      }
+  on(event, fn) {
+    if (!this.$listeners[event]) {
+      this.$listeners[event] = [];
     }
-  }, {
-    key: "on",
-    value: function on(event, fn) {
-      if (!this.$listeners[event]) {
-        this.$listeners[event] = [];
-      }
-
-      var events = this.$listeners[event];
-      events.push(fn);
-      return function () {
-        events.splice(events.indexOf(fn), 1);
-      };
-    } // 给 TabBar 监听，用于处理当前高亮状态
-
-  }, {
-    key: "emit",
-    value: function emit(event) {
-      for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-        args[_key2 - 1] = arguments[_key2];
-      }
-
-      var fns = this.$listeners[event];
-
-      if (Array.isArray(fns)) {
-        fns.forEach(function (fn) {
-          fn.apply(void 0, args);
-        });
-      }
+    const events = this.$listeners[event];
+    events.push(fn);
+    return () => {
+      events.splice(events.indexOf(fn), 1);
+    };
+  }
+  // 给 TabBar 监听，用于处理当前高亮状态
+  emit(event) {
+    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      args[_key - 1] = arguments[_key];
     }
-    /**
-     * 初始化路由，注册应用声明的路由，并处理映射关系
-     */
-
-  }, {
-    key: "registryPages",
-    value: function registryPages(params) {
-      var _this2 = this;
-
-      var pages = params.pages,
-          tabBar = params.tabBar;
-      var tabBarList = (tabBar === null || tabBar === void 0 ? void 0 : tabBar.list) || [];
-      pages.forEach(function (page) {
-        var isTabBar = tabBarList.some(function (item) {
-          return page.path === item.pagePath;
-        });
-        page.route = page.route || page.path;
-        page.originalRoute = page.route;
-
-        _this2.addPage(_objectSpread(_objectSpread({}, page), {}, {
-          isTabBar: isTabBar
-        }));
+    const fns = this.$listeners[event];
+    if (Array.isArray(fns)) {
+      fns.forEach(fn => {
+        fn(...args);
       });
     }
-  }, {
-    key: "getMatchedPage",
-    value: function getMatchedPage(pathname) {
-      this.currentRoute = pathname;
-      return this.matchPageByPathname(pathname);
-    }
-  }, {
-    key: "addPage",
-    value: function addPage(page) {
-      this.$entityMap.push(page);
-    }
-  }]);
-
-  return RouterScheduler;
-}(IRouterScheduler);
+  }
+  /**
+   * 初始化路由，注册应用声明的路由，并处理映射关系
+   */
+  registryPages(params) {
+    const {
+      pages,
+      tabBar
+    } = params;
+    const tabBarList = (tabBar === null || tabBar === void 0 ? void 0 : tabBar.list) || [];
+    pages.forEach(page => {
+      const isTabBar = tabBarList.some(item => page.path === item.pagePath);
+      page.route = page.route || page.path;
+      page.originalRoute = page.route;
+      this.addPage(_objectSpread(_objectSpread({}, page), {}, {
+        isTabBar
+      }));
+    });
+  }
+  getMatchedPage(pathname) {
+    this.currentRoute = pathname;
+    return this.matchPageByPathname(pathname);
+  }
+  addPage(page) {
+    this.$entityMap.push(page);
+  }
+}

package/lib/history/index.js

@@ -1,86 +1,50 @@
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/es.promise.js";
 import { createBrowserHistory } from 'history';
 import React from 'react';
-export var history;
-var changeKey = '';
+export let history;
+let changeKey = '';
 export function createHistory(options) {
-  var scheduler = options.scheduler;
+  const {
+    scheduler
+  } = options;
   history = createBrowserHistory(options);
-  history.listen( /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(historyLocation) {
-      var key, pathname, matchedPage, page, NotFound;
-      return _regeneratorRuntime.wrap(function (_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              key = historyLocation.key, pathname = historyLocation.pathname;
-
-              if (!(key && key === changeKey)) {
-                _context.next = 3;
-                break;
-              }
-
-              return _context.abrupt("return");
-
-            case 3:
-              changeKey = key;
-              matchedPage = scheduler.getMatchedPage(pathname);
-
-              if (!matchedPage) {
-                // 兜底通配页面
-                matchedPage = scheduler.getMatchedPage('*');
-              }
-
-              if (!matchedPage) {
-                _context.next = 13;
-                break;
-              }
-
-              _context.next = 9;
-              return matchedPage.component();
-
-            case 9:
-              page = _context.sent;
-              options.onChange(page, {
-                page: matchedPage
-              });
-              _context.next = 16;
-              break;
-
-            case 13:
-              console.warn('Not match any route!'); // 兜底 404 页面
-
-              NotFound = function () {
-                return /*#__PURE__*/React.createElement('div', null, 'Page Not Found');
-              };
-
-              options.onChange(NotFound, {
-                page: {
-                  pathname: pathname,
-                  route: '*',
-                  path: '*',
-                  config: {},
-                  params: {},
-                  component: function component() {
-                    return Promise.resolve(NotFound);
-                  }
-                }
-              });
-
-            case 16:
-            case "end":
-              return _context.stop();
+  history.listen(async historyLocation => {
+    const {
+      key,
+      pathname
+    } = historyLocation;
+    if (key && key === changeKey) {
+      return;
+    }
+    changeKey = key;
+    let matchedPage = scheduler.getMatchedPage(pathname);
+    if (!matchedPage) {
+      // 兜底通配页面
+      matchedPage = scheduler.getMatchedPage('*');
+    }
+    if (matchedPage) {
+      const page = await matchedPage.component();
+      options.onChange(page, {
+        page: matchedPage
+      });
+    } else {
+      console.warn('Not match any route!');
+      // 兜底 404 页面
+      const NotFound = function () {
+        return /*#__PURE__*/React.createElement('div', null, 'Page Not Found');
+      };
+      options.onChange(NotFound, {
+        page: {
+          pathname: pathname,
+          route: '*',
+          path: '*',
+          config: {},
+          params: {},
+          component: () => {
+            return Promise.resolve(NotFound);
           }
         }
-      }, _callee);
-    }));
-
-    return function () {
-      return _ref.apply(this, arguments);
-    };
-  }());
+      });
+    }
+  });
   return history;
 }

package/lib/index.js

@@ -1,41 +1,42 @@
-import "core-js/modules/es.regexp.exec.js";
-import "core-js/modules/es.string.search.js";
-import "core-js/modules/es.string.replace.js";
 import { createHistory } from './history';
 import { Router } from './Router';
 import { RouterScheduler } from './RouterScheduler';
-var scheduler = window.__ray__routerScheduler__ = new RouterScheduler();
-var router = window.__ray__router__ = new Router({
-  scheduler: scheduler
+const scheduler = window.__ray__routerScheduler__ = new RouterScheduler();
+const router = window.__ray__router__ = new Router({
+  scheduler
 });
 export function createRouter(options) {
-  var basename = options.basename,
-      _onChange = options.onChange,
-      routes = options.routes,
-      tabBar = options.tabBar,
-      pages = options.pages;
-  var history = createHistory({
-    basename: basename,
-    scheduler: scheduler,
-    onChange: function onChange() {
+  const {
+    basename,
+    onChange,
+    routes,
+    tabBar,
+    pages
+  } = options;
+  const history = createHistory({
+    basename,
+    scheduler,
+    onChange: function () {
       router.$href = window.location.href;
-
-      _onChange.apply(void 0, arguments);
+      onChange(...arguments);
     }
-  }); // 设置路由基准路径
+  });
 
-  router.scheduler.basename = basename || '/'; // 调度器注册页面
+  // 设置路由基准路径
+  router.scheduler.basename = basename || '/';
 
+  // 调度器注册页面
   router.scheduler.registryPages({
-    routes: routes,
-    tabBar: tabBar,
-    pages: pages
+    routes,
+    tabBar,
+    pages
   });
-  var _history$location = history.location,
-      pathname = _history$location.pathname,
-      search = _history$location.search,
-      hash = _history$location.hash; // 首次触发 history change
-
+  const {
+    pathname,
+    search,
+    hash
+  } = history.location;
+  // 首次触发 history change
   history.replace(pathname + search + hash);
   return router;
 }

package/package.json

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