@ray-js/router-mp 0.4.15-beta-0 → 0.5.0

package/lib/Router.js

@@ -1,95 +1,170 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
+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 _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+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 { navigateBack, navigateTo, reLaunch, switchTab, redirectTo, getLaunchOptionsSync, } from '@ray-js/api';
+import { navigateBack, navigateTo, reLaunch, switchTab, redirectTo, getLaunchOptionsSync } from '@ray-js/api';
 import { RouterScheduler } from './RouterScheduler';
 import { isTuya } from '@ray-js/env';
+
 function currentPage() {
-    const pages = getCurrentPages();
-    if (pages.length > 0) {
-        return pages[pages.length - 1];
-    }
-    else {
-        const { path, query } = getLaunchOptionsSync();
-        return { route: path, options: query };
-    }
+  var pages = getCurrentPages();
+
+  if (pages.length > 0) {
+    return pages[pages.length - 1];
+  } else {
+    var _getLaunchOptionsSync = getLaunchOptionsSync(),
+        path = _getLaunchOptionsSync.path,
+        query = _getLaunchOptionsSync.query;
+
+    return {
+      route: path,
+      options: query
+    };
+  }
 }
-export class Router {
-    constructor() {
-        this.scheduler = new RouterScheduler();
-    }
+
+export var Router = /*#__PURE__*/function () {
+  function Router() {
+    _classCallCheck(this, Router);
+
+    _defineProperty(this, "scheduler", new RouterScheduler());
+  }
+
+  _createClass(Router, [{
+    key: "normalizeRoute",
+    value:
     /**
      * 标准化路由路径，将 web 标准的地址栏转化到 小程序地址
      */
-    normalizeRoute(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { pathname, search, hash } = url.parse(params.to);
-            const matchedPage = this.scheduler.getMatchedPage(pathname);
-            console.log(matchedPage);
-            if (matchedPage) {
-                // FIXME: 自主实现 tabBar UI 小程序体系下对 tabBar 页面不能传 query
-                if (!matchedPage.isTabBar) {
-                    const pathUrl = url.format({ pathname: matchedPage.path, search, hash });
-                    // params 的优先级高于 search 参数，此处进行覆盖处理
+    function () {
+      var _normalizeRoute = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(params) {
+        var _url$parse, pathname, search, hash, matchedPage, pathUrl;
+
+        return _regeneratorRuntime.wrap(function (_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _url$parse = url.parse(params.to), pathname = _url$parse.pathname, search = _url$parse.search, hash = _url$parse.hash;
+                matchedPage = this.scheduler.getMatchedPage(pathname);
+                console.log(matchedPage);
+
+                if (matchedPage) {
+                  // FIXME: 自主实现 tabBar UI 小程序体系下对 tabBar 页面不能传 query
+                  if (!matchedPage.isTabBar) {
+                    pathUrl = url.format({
+                      pathname: matchedPage.path,
+                      search: search,
+                      hash: hash
+                    }); // params 的优先级高于 search 参数，此处进行覆盖处理
+
                     matchedPage.path = url.params(pathUrl, matchedPage.params);
+                  }
+                } // FIXME: 智能小程序对路由 path 的跳转未支持绝对路径
+
+
+                if (isTuya) {
+                  matchedPage.path = matchedPage.path.replace(/^\//, '');
                 }
+
+                return _context.abrupt("return", matchedPage);
+
+              case 6:
+              case "end":
+                return _context.stop();
             }
-            // FIXME: 智能小程序对路由 path 的跳转未支持绝对路径
-            if (isTuya) {
-                matchedPage.path = matchedPage.path.replace(/^\//, '');
-            }
-            return matchedPage;
-        });
+          }
+        }, _callee, this);
+      }));
+
+      function normalizeRoute() {
+        return _normalizeRoute.apply(this, arguments);
+      }
+
+      return normalizeRoute;
+    }()
+  }, {
+    key: "push",
+    value: function push(to) {
+      this.normalizeRoute({
+        to: to
+      }).then(function (route) {
+        var path = route.path;
+
+        if (route.isTabBar) {
+          switchTab({
+            url: path
+          });
+        } else {
+          navigateTo({
+            url: path
+          });
+        }
+      });
     }
-    push(to) {
-        this.normalizeRoute({ to }).then((route) => {
-            const path = route.path;
-            if (route.isTabBar) {
-                switchTab({ url: path });
-            }
-            else {
-                navigateTo({ url: path });
-            }
-        });
+  }, {
+    key: "replace",
+    value: function replace(to) {
+      this.normalizeRoute({
+        to: to
+      }).then(function (route) {
+        if (route.isTabBar) {
+          switchTab({
+            url: route.path
+          });
+        } else {
+          redirectTo({
+            url: route.path
+          });
+        }
+      });
     }
-    replace(to) {
-        this.normalizeRoute({ to }).then((route) => {
-            if (route.isTabBar) {
-                switchTab({ url: route.path });
-            }
-            else {
-                redirectTo({ url: route.path });
-            }
-        });
-    }
-    reload() {
-        const page = currentPage();
-        reLaunch({
-            url: url.params(page.route, page.options),
-        });
+  }, {
+    key: "reload",
+    value: function reload() {
+      var page = currentPage();
+      reLaunch({
+        url: url.params(page.route, page.options)
+      });
     }
-    go(delta) {
-        throw new Error('Method not implemented.');
+  }, {
+    key: "go",
+    value: function go() {
+      throw new Error('Method not implemented.');
     }
-    back() {
-        navigateBack({ delta: 1 });
+  }, {
+    key: "back",
+    value: function back() {
+      navigateBack({
+        delta: 1
+      });
+    } // 获取宿主环境上的 href ，小程序端需要通过 path 进行转换
+
+  }, {
+    key: "hostHref",
+    get: function get() {
+      var _url$parse2 = url.parse(this.hostPath),
+          pathname = _url$parse2.pathname,
+          query = _url$parse2.query;
+
+      var href = this.scheduler.getHrefByPath({
+        path: pathname,
+        query: query
+      });
+      return href;
     }
-    // 获取宿主环境上的 href ，小程序端需要通过 path 进行转换
-    get hostHref() {
-        const { pathname, query } = url.parse(this.hostPath);
-        const href = this.scheduler.getHrefByPath({ path: pathname, query });
-        return href;
+  }, {
+    key: "hostPath",
+    get: function get() {
+      var page = currentPage();
+      return url.params("/".concat(page.route), page.options);
     }
-    get hostPath() {
-        const page = currentPage();
-        return url.params(`/${page.route}`, page.options);
-    }
-}
-export const router = new Router();
+  }]);
+
+  return Router;
+}();
+export var router = new Router();

package/lib/RouterScheduler.js

@@ -1,80 +1,148 @@
+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.object.to-string.js";
+import "core-js/modules/es.function.name.js";
+import "core-js/modules/es.array.find.js";
+import "core-js/modules/web.dom-collections.for-each.js";
 import { compile, pathToRegexp } from 'path-to-regexp';
 import { url } from '@ray-js/library';
 import { RouterScheduler as IRouterScheduler } from '@ray-js/types';
+
 /**
  * 小程序路由别名机制，将标准化的 web pathname 转化为小程序的 path
  */
-export class RouterScheduler extends IRouterScheduler {
-    constructor() {
-        super(...arguments);
-        this.$entityMap = {};
-        this.$pathMap = {}; // 以小程序路径作为键存储关系
+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];
     }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+
+    _defineProperty(_assertThisInitialized(_this), "$entityMap", {});
+
+    _defineProperty(_assertThisInitialized(_this), "$pathMap", {});
+
+    return _this;
+  }
+
+  _createClass(RouterScheduler, [{
+    key: "getHrefByPath",
+    value: // 以小程序路径作为键存储关系
+
     /**
      * 将小程序地址栏转化为 web 地址
      * @param path - 小程序页面地址
      */
-    getHrefByPath(params) {
-        const { query, path } = params;
-        const route = this.matchPageByPath(path);
-        if (route) {
-            let keys = [];
-            pathToRegexp(route.route, keys);
-            const restQuery = Object.assign({}, query);
-            if (keys.length > 0) {
-                keys.forEach(({ name }) => {
-                    delete restQuery[name];
-                });
-                const href = compile(route.route, { validate: true })(query);
-                return url.params(href, restQuery);
-            }
-            return url.params(route.route, query);
+    function getHrefByPath(params) {
+      var query = params.query,
+          path = params.path;
+      var route = this.matchPageByPath(path);
+
+      if (route) {
+        var keys = [];
+        pathToRegexp(route.route, keys);
+
+        var restQuery = _objectSpread({}, query);
+
+        if (keys.length > 0) {
+          keys.forEach(function (_ref) {
+            var name = _ref.name;
+            delete restQuery[name];
+          });
+          var href = compile(route.route, {
+            validate: true
+          })(query);
+          return url.params(href, restQuery);
         }
-        return '';
+
+        return url.params(route.route, query);
+      }
+
+      return '';
     }
     /**
      * 以小程序地址进行匹配页面
      * @param path - 小程序页面地址 /pages/home/index
      * @returns
      */
-    matchPageByPath(path) {
-        const depth = this.slashDepth(path);
-        const routeList = this.$pathMap[depth];
-        if (!routeList || routeList.length < 0) {
-            console.warn('Not match route by:', path);
-            return undefined;
-        }
-        return routeList.find((route) => route.path === path);
+
+  }, {
+    key: "matchPageByPath",
+    value: function matchPageByPath(path) {
+      var depth = this.slashDepth(path);
+      var routeList = this.$pathMap[depth];
+
+      if (!routeList || routeList.length < 0) {
+        console.warn('Not match route by:', path);
+        return undefined;
+      }
+
+      return routeList.find(function (route) {
+        return route.path === path;
+      });
     }
-    registryPages(params) {
-        const { routes, tabBar } = params;
-        const tabBarList = tabBar.list || [];
-        routes.forEach((route) => {
-            const isTabBar = tabBarList.some((item) => {
-                if (item.route) {
-                    return route.route === item.route;
-                }
-                else if (item.id) {
-                    return route.id === item.id;
-                }
-                return false;
-            });
-            this.addPage(Object.assign(Object.assign({}, route), { isTabBar }));
+  }, {
+    key: "registryPages",
+    value: function registryPages(params) {
+      var _this2 = this;
+
+      var routes = params.routes,
+          tabBar = params.tabBar;
+      var tabBarList = tabBar.list || [];
+      routes.forEach(function (route) {
+        var isTabBar = tabBarList.some(function (item) {
+          if (item.route) {
+            return route.route === item.route;
+          } else if (item.id) {
+            return route.id === item.id;
+          }
+
+          return false;
         });
+
+        _this2.addPage(_objectSpread(_objectSpread({}, route), {}, {
+          isTabBar: isTabBar
+        }));
+      });
     }
-    getMatchedPage(pathname) {
-        return this.matchPageByPathname(pathname);
+  }, {
+    key: "getMatchedPage",
+    value: function getMatchedPage(pathname) {
+      return this.matchPageByPathname(pathname);
     }
-    addPage(route) {
-        const routeDepth = this.slashDepth(route.route);
-        const pathDepth = this.slashDepth(route.path);
-        if (!this.$entityMap[routeDepth]) {
-            this.$entityMap[routeDepth] = [];
-        }
-        if (!this.$pathMap[pathDepth]) {
-            this.$pathMap[pathDepth] = [];
-        }
-        this.$entityMap[routeDepth].push(route);
-        this.$pathMap[pathDepth].push(route);
+  }, {
+    key: "addPage",
+    value: function addPage(route) {
+      var routeDepth = this.slashDepth(route.route);
+      var pathDepth = this.slashDepth(route.path);
+
+      if (!this.$entityMap[routeDepth]) {
+        this.$entityMap[routeDepth] = [];
+      }
+
+      if (!this.$pathMap[pathDepth]) {
+        this.$pathMap[pathDepth] = [];
+      }
+
+      this.$entityMap[routeDepth].push(route);
+      this.$pathMap[pathDepth].push(route);
     }
-}
+  }]);
+
+  return RouterScheduler;
+}(IRouterScheduler);

package/lib/index.js

@@ -1,7 +1,12 @@
 import { router } from './Router';
 export function createRouter(params) {
-    const { routes, tabBar = {} } = params;
-    router.scheduler.registryPages({ routes, tabBar });
-    return router;
+  var routes = params.routes,
+      _params$tabBar = params.tabBar,
+      tabBar = _params$tabBar === void 0 ? {} : _params$tabBar;
+  router.scheduler.registryPages({
+    routes: routes,
+    tabBar: tabBar
+  });
+  return router;
 }
-export default router;
+export default router;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/router-mp",
-  "version": "0.4.15-beta-0",
+  "version": "0.5.0",
   "description": "Ray Core",
   "keywords": [
     "ray"
@@ -20,15 +20,15 @@
     "watch": "tsc -p ./tsconfig.build.json --module esnext --outDir lib --watch"
   },
   "dependencies": {
-    "@ray-js/api": "^0.4.15-beta-0",
-    "@ray-js/env": "^0.4.15-beta-0",
-    "@ray-js/library": "^0.4.15-beta-0",
-    "@ray-js/types": "^0.4.15-beta-0",
+    "@ray-js/api": "^0.5.0",
+    "@ray-js/env": "^0.5.0",
+    "@ray-js/library": "^0.5.0",
+    "@ray-js/types": "^0.5.0",
     "@react-navigation/core": "^6.1.0",
     "path-to-regexp": "^6.2.0"
   },
   "devDependencies": {
-    "@ray-js/cli": "^0.4.15-beta-0"
+    "@ray-js/cli": "^0.5.0"
   },
   "maintainers": [
     {
@@ -36,6 +36,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "c9b5b2e847299ecbd30c8b1feb2413045c139bf7",
+  "gitHead": "5f49ac5a276532472d10aa60ec21c9a5f0b28ce8",
   "repository": {}
 }