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

package/lib/Router.d.ts

@@ -11,7 +11,6 @@ export declare class Router implements TRouter {
     reload(): void;
     go(delta: number): void;
     back(): void;
-    get hostHref(): string;
-    get hostPath(): string;
+    get href(): string;
 }
 export declare const router: Router;

package/lib/Router.js

@@ -1,15 +1,16 @@
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+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 _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
+import "core-js/modules/es.object.to-string.js";
+import "core-js/modules/es.promise.js";
+import "core-js/modules/es.array.slice.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 { navigateBack, navigateTo, reLaunch, switchTab, redirectTo, getLaunchOptionsSync } from '@ray-js/api';
-import { RouterScheduler } from './RouterScheduler';
 import { isThing } from '@ray-js/env';
+import { RouterScheduler } from './RouterScheduler';
 
 function currentPage() {
   var pages = getCurrentPages();
@@ -41,66 +42,41 @@ export var Router = /*#__PURE__*/function () {
     /**
      * 标准化路由路径，将 web 标准的地址栏转化到 小程序地址
      */
-    function () {
-      var _normalizeRoute = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(params) {
-        var _url$parse, pathname, search, hash, matchedPage, pathUrl, _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;
-
-                if (params.subpackage) {
-                  matchedPage = this.scheduler.getMatchedSubpackagePage(pathname, params.subpackage);
-
-                  if (matchedPage) {
-                    pathUrl = url.format({
-                      pathname: matchedPage.path,
-                      search: search,
-                      hash: hash
-                    }); // params 的优先级高于 search 参数，此处进行覆盖处理
-
-                    matchedPage.path = url.params(pathUrl, matchedPage.params);
-                  }
-                } else {
-                  matchedPage = this.scheduler.getMatchedPage(pathname);
-
-                  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 (isThing) {
-                    matchedPage.path = matchedPage.path.replace(/^\//, '');
-                  }
-                }
-
-                return _context.abrupt("return", matchedPage);
-
-              case 3:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function normalizeRoute() {
-        return _normalizeRoute.apply(this, arguments);
+    function normalizeRoute(params) {
+      var _url$parse = url.parse(params.to),
+          pathname = _url$parse.pathname,
+          query = _url$parse.query,
+          hash = _url$parse.hash;
+
+      var subPackage = params.subpackage;
+      var matchedPage = subPackage ? this.scheduler.getMatchedSubPackagePage(pathname, subPackage) : this.scheduler.getMatchedPage(pathname);
+
+      if (!matchedPage) {
+        return Promise.reject(undefined);
+      }
+
+      var finalPath = matchedPage.path; // FIXME: tabBar.list里的页面不能有query，也不能有hash
+
+      if (!matchedPage.isTabBar) {
+        finalPath = url.format({
+          pathname: matchedPage.path,
+          query: _objectSpread(_objectSpread(_objectSpread({}, query), matchedPage.params), {}, {
+            // 模式匹配得到的参数，如/xxx/:id 可以匹配路径 /xxx/123 得参数id: 123
+            ____h_a_s_h____: hash.slice(1) // 小程序中不能传递hash参数，用query辅助传递
+
+          })
+        });
       }
+      /**
+       * 坑点之一
+       * 微信小程序: app.json 里的页面配置不能以`/`开头，wx.navigatorTo 却需要
+       * 涂药小程序: 都不能以`/`开头
+       */
 
-      return normalizeRoute;
-    }()
+
+      matchedPage.path = isThing ? finalPath.replace(/^\//, '') : finalPath;
+      return Promise.resolve(matchedPage);
+    }
   }, {
     key: "push",
     value: function push(to, options) {
@@ -163,23 +139,21 @@ export var Router = /*#__PURE__*/function () {
     } // 获取宿主环境上的 href ，小程序端需要通过 path 进行转换
 
   }, {
-    key: "hostHref",
+    key: "href",
     get: function get() {
-      var _url$parse2 = url.parse(this.hostPath),
+      var page = currentPage();
+      var path = url.params("/".concat(page.route), page.options);
+
+      var _url$parse2 = url.parse(path),
           pathname = _url$parse2.pathname,
-          query = _url$parse2.query;
+          query = _url$parse2.query,
+          hash = _url$parse2.hash;
 
-      var href = this.scheduler.getHrefByPath({
+      return this.scheduler.getHrefByPath({
         path: pathname,
-        query: query
+        query: query,
+        hash: hash
       });
-      return href;
-    }
-  }, {
-    key: "hostPath",
-    get: function get() {
-      var page = currentPage();
-      return url.params("/".concat(page.route), page.options);
     }
   }]);
 

package/lib/RouterScheduler.d.ts

@@ -1,8 +1,8 @@
 import { RouterScheduler as IRouterScheduler, Routes, TabBar, SubPackages } from '@ray-js/types';
-export declare type Route = Routes[0] & {
+export declare type Route = Routes[number] & {
     isTabBar: boolean;
 };
-export declare type SubpackgeRoute = {
+export declare type SubPackageRoute = {
     root: string;
     route: string;
     path: string;
@@ -11,16 +11,17 @@ export declare type SubpackgeRoute = {
  * 小程序路由别名机制，将标准化的 web pathname 转化为小程序的 path
  */
 export declare class RouterScheduler extends IRouterScheduler<Route> {
-    $entityMap: Record<string, Route[]>;
+    $entityMap: Route[];
     private $pathMap;
-    $subpackageRoute: Record<string, SubpackgeRoute[]>;
+    $subPackageRoute: Record<string, SubPackageRoute[]>;
     /**
      * 将小程序地址栏转化为 web 地址
      * @param path - 小程序页面地址
      */
-    getHrefByPath(params: {
+    getHrefByPath(opts: {
         path: string;
         query: object;
+        hash: string;
     }): string;
     /**
      * 以小程序地址进行匹配页面
@@ -40,6 +41,12 @@ export declare class RouterScheduler extends IRouterScheduler<Route> {
         pathname: string;
     };
     addPage(route: Route): void;
-    addSubpackagePage(subpackgeRoute: SubpackgeRoute): void;
-    getMatchedSubpackagePage(pathname: string, subpackage: string): any;
+    addSubPackagePage(subPackageRoute: SubPackageRoute): void;
+    getMatchedSubPackagePage(pathname: string, subPackage: string): {
+        pathname: string;
+        route: string;
+        params: any;
+        subPackage: string;
+        path: string;
+    } | undefined;
 }

package/lib/RouterScheduler.js

@@ -9,9 +9,9 @@ import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.object.to-string.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 { match } from 'path-to-regexp';
+import { match, compile, pathToRegexp } from 'path-to-regexp';
 import { url } from '@ray-js/library';
+import slash from 'slash';
 import { RouterScheduler as IRouterScheduler } from '@ray-js/types';
 
 /**
@@ -33,11 +33,11 @@ export var RouterScheduler = /*#__PURE__*/function (_IRouterScheduler) {
 
     _this = _super.call.apply(_super, [this].concat(args));
 
-    _defineProperty(_assertThisInitialized(_this), "$entityMap", {});
+    _defineProperty(_assertThisInitialized(_this), "$entityMap", []);
 
-    _defineProperty(_assertThisInitialized(_this), "$pathMap", {});
+    _defineProperty(_assertThisInitialized(_this), "$pathMap", []);
 
-    _defineProperty(_assertThisInitialized(_this), "$subpackageRoute", {});
+    _defineProperty(_assertThisInitialized(_this), "$subPackageRoute", {});
 
     return _this;
   }
@@ -49,29 +49,37 @@ export var RouterScheduler = /*#__PURE__*/function (_IRouterScheduler) {
      * 将小程序地址栏转化为 web 地址
      * @param path - 小程序页面地址
      */
-    function getHrefByPath(params) {
-      var query = params.query,
-          path = params.path;
+    function getHrefByPath(opts) {
+      var query = opts.query,
+          path = opts.path,
+          _opts$hash = opts.hash,
+          hash = _opts$hash === void 0 ? '' : _opts$hash;
       var route = this.matchPageByPath(path);
 
       if (route) {
         var keys = [];
         pathToRegexp(route.route, keys);
 
-        var restQuery = _objectSpread({}, query);
-
         if (keys.length > 0) {
+          var restQuery = _objectSpread({}, query);
+
           keys.forEach(function (_ref) {
             var name = _ref.name;
             delete restQuery[name];
+          }); // 兼容小程序tab页，因tab页不能携带参数
+
+          keys.forEach(function (k) {
+            var _query$k$name;
+
+            return query[k.name] = (_query$k$name = query[k.name]) !== null && _query$k$name !== void 0 ? _query$k$name : '';
           });
           var href = compile(route.route, {
-            validate: true
-          })(query);
+            validate: false
+          })(query) + hash;
           return url.params(href, restQuery);
         }
 
-        return url.params(route.route, query);
+        return url.params(route.route + hash, query);
       }
 
       return '';
@@ -85,17 +93,16 @@ export var RouterScheduler = /*#__PURE__*/function (_IRouterScheduler) {
   }, {
     key: "matchPageByPath",
     value: function matchPageByPath(path) {
-      var depth = this.slashDepth(path);
-      var routeList = this.$pathMap[depth];
+      var route = this.$pathMap.find(function (route) {
+        return route.path === path;
+      });
 
-      if (!routeList || routeList.length < 0) {
+      if (!route) {
         console.warn('Not match route by:', path);
         return undefined;
       }
 
-      return routeList.find(function (route) {
-        return route.path === path;
-      });
+      return route;
     }
   }, {
     key: "registryPages",
@@ -106,30 +113,26 @@ export var RouterScheduler = /*#__PURE__*/function (_IRouterScheduler) {
           tabBar = params.tabBar,
           _params$subpackages = params.subpackages,
           subpackages = _params$subpackages === void 0 ? [] : _params$subpackages;
-      var tabBarList = tabBar.list || [];
-      subpackages.forEach(function (subpackage) {
-        var root = subpackage.root;
-        subpackage.pages.forEach(function (page) {
-          _this2.addSubpackagePage({
+      var tabBarList = (tabBar === null || tabBar === void 0 ? void 0 : tabBar.list) || [];
+      subpackages.forEach(function (subPackage) {
+        var root = subPackage.root;
+        subPackage.pages.forEach(function (page) {
+          _this2.addSubPackagePage({
             root: root,
-            route: page.route,
+            route: page.route || page.path,
             path: page.path
           });
         });
       });
-      routes.forEach(function (route) {
+      routes.forEach(function (r) {
         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;
+          return r.path === item.pagePath;
         });
+        var route = r.route || r.path;
 
-        _this2.addPage(_objectSpread(_objectSpread({}, route), {}, {
-          isTabBar: isTabBar
+        _this2.addPage(_objectSpread(_objectSpread({}, r), {}, {
+          isTabBar: isTabBar,
+          route: route
         }));
       });
     }
@@ -141,49 +144,39 @@ export var RouterScheduler = /*#__PURE__*/function (_IRouterScheduler) {
   }, {
     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);
+      this.$entityMap.push(route);
+      this.$pathMap.push(route);
     }
   }, {
-    key: "addSubpackagePage",
-    value: function addSubpackagePage(subpackgeRoute) {
-      if (!this.$subpackageRoute[subpackgeRoute.root]) {
-        this.$subpackageRoute[subpackgeRoute.root] = [];
+    key: "addSubPackagePage",
+    value: function addSubPackagePage(subPackageRoute) {
+      if (!this.$subPackageRoute[subPackageRoute.root]) {
+        this.$subPackageRoute[subPackageRoute.root] = [];
       }
 
-      this.$subpackageRoute[subpackgeRoute.root].push(subpackgeRoute);
+      this.$subPackageRoute[subPackageRoute.root].push(subPackageRoute);
     }
   }, {
-    key: "getMatchedSubpackagePage",
-    value: function getMatchedSubpackagePage(pathname, subpackage) {
-      var subpackageRoute;
-      this.$subpackageRoute[subpackage].forEach(function (item) {
+    key: "getMatchedSubPackagePage",
+    value: function getMatchedSubPackagePage(pathname, subPackage) {
+      var subs = this.$subPackageRoute[subPackage] || [];
+
+      for (var index = 0; index < subs.length; index++) {
+        var item = subs[index];
         var urlMatch = match(item.route, {
           decode: decodeURIComponent
         });
 
         if (urlMatch(pathname)) {
-          subpackageRoute = {
+          return {
             pathname: pathname,
             route: item.route,
             params: urlMatch(pathname)['params'],
-            subpackage: subpackage,
-            path: '/' + subpackage + item.path
+            subPackage: subPackage,
+            path: slash('/' + subPackage + item.path)
           };
         }
-      });
-      return subpackageRoute;
+      }
     }
   }]);
 

package/lib/index.js

@@ -1,13 +1,23 @@
+import "core-js/modules/es.array.map.js";
 import { router } from './Router';
+import { normalizeTabBar } from '@ray-js/framework-shared';
 export function createRouter(params) {
-  var routes = params.routes,
-      _params$tabBar = params.tabBar,
+  var _params$tabBar = params.tabBar,
       tabBar = _params$tabBar === void 0 ? {} : _params$tabBar,
       subpackages = params.subpackages;
+  var routes = params.routes.map(function (item) {
+    var _item$route;
+
+    item.route = (_item$route = item.route) !== null && _item$route !== void 0 ? _item$route : item.path;
+    return item;
+  });
+
+  var _tabBar = normalizeTabBar(tabBar, routes);
+
   router.scheduler.registryPages({
     routes: routes,
-    tabBar: tabBar,
-    subpackages: subpackages
+    subpackages: subpackages,
+    tabBar: _tabBar
   });
   return router;
 }

package/package.json

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