@ray-js/router-mp 0.5.1 → 0.5.3-beta-2

package/lib/Router.d.ts

@@ -1,4 +1,4 @@
-import { Router as TRouter } from '@ray-js/types';
+import { Router as TRouter, RouteOptions } from '@ray-js/types';
 import { RouterScheduler } from './RouterScheduler';
 export declare class Router implements TRouter {
     scheduler: RouterScheduler;
@@ -6,8 +6,8 @@ export declare class Router implements TRouter {
      * 标准化路由路径，将 web 标准的地址栏转化到 小程序地址
      */
     private normalizeRoute;
-    push(to: string): void;
-    replace(to: string): void;
+    push(to: string, options?: RouteOptions): void;
+    replace(to: string, options?: RouteOptions): void;
     reload(): void;
     go(delta: number): void;
     back(): void;

package/lib/Router.js

@@ -43,19 +43,18 @@ export var Router = /*#__PURE__*/function () {
      */
     function () {
       var _normalizeRoute = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(params) {
-        var _url$parse, pathname, search, hash, matchedPage, pathUrl;
+        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;
-                matchedPage = this.scheduler.getMatchedPage(pathname);
-                console.log(matchedPage);
 
-                if (matchedPage) {
-                  // FIXME: 自主实现 tabBar UI 小程序体系下对 tabBar 页面不能传 query
-                  if (!matchedPage.isTabBar) {
+                if (params.subpackage) {
+                  matchedPage = this.scheduler.getMatchedSubpackagePage(pathname, params.subpackage);
+
+                  if (matchedPage) {
                     pathUrl = url.format({
                       pathname: matchedPage.path,
                       search: search,
@@ -64,16 +63,31 @@ export var Router = /*#__PURE__*/function () {
 
                     matchedPage.path = url.params(pathUrl, matchedPage.params);
                   }
-                } // FIXME: 智能小程序对路由 path 的跳转未支持绝对路径
+                } 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 (isTuya) {
-                  matchedPage.path = matchedPage.path.replace(/^\//, '');
+
+                  if (isTuya) {
+                    matchedPage.path = matchedPage.path.replace(/^\//, '');
+                  }
                 }
 
                 return _context.abrupt("return", matchedPage);
 
-              case 6:
+              case 3:
               case "end":
                 return _context.stop();
             }
@@ -89,9 +103,11 @@ export var Router = /*#__PURE__*/function () {
     }()
   }, {
     key: "push",
-    value: function push(to) {
+    value: function push(to, options) {
+      var subpackage = options === null || options === void 0 ? void 0 : options.subpackage;
       this.normalizeRoute({
-        to: to
+        to: to,
+        subpackage: subpackage
       }).then(function (route) {
         var path = route.path;
 
@@ -108,9 +124,11 @@ export var Router = /*#__PURE__*/function () {
     }
   }, {
     key: "replace",
-    value: function replace(to) {
+    value: function replace(to, options) {
+      var subpackage = options === null || options === void 0 ? void 0 : options.subpackage;
       this.normalizeRoute({
-        to: to
+        to: to,
+        subpackage: subpackage
       }).then(function (route) {
         if (route.isTabBar) {
           switchTab({

package/lib/RouterScheduler.d.ts

@@ -1,13 +1,19 @@
-import { RouterScheduler as IRouterScheduler, Routes, TabBar } from '@ray-js/types';
+import { RouterScheduler as IRouterScheduler, Routes, TabBar, SubPackages } from '@ray-js/types';
 export declare type Route = Routes[0] & {
     isTabBar: boolean;
 };
+export declare type SubpackgeRoute = {
+    root: string;
+    route: string;
+    path: string;
+};
 /**
  * 小程序路由别名机制，将标准化的 web pathname 转化为小程序的 path
  */
 export declare class RouterScheduler extends IRouterScheduler<Route> {
     $entityMap: Record<string, Route[]>;
     private $pathMap;
+    $subpackageRoute: Record<string, SubpackgeRoute[]>;
     /**
      * 将小程序地址栏转化为 web 地址
      * @param path - 小程序页面地址
@@ -25,6 +31,7 @@ export declare class RouterScheduler extends IRouterScheduler<Route> {
     registryPages(params: {
         routes: Routes;
         tabBar: TabBar;
+        subpackages?: SubPackages;
     }): void;
     getMatchedPage(pathname: string): import("@ray-js/types").Route & {
         isTabBar: boolean;
@@ -33,4 +40,6 @@ export declare class RouterScheduler extends IRouterScheduler<Route> {
         pathname: string;
     };
     addPage(route: Route): void;
+    addSubpackagePage(subpackgeRoute: SubpackgeRoute): void;
+    getMatchedSubpackagePage(pathname: string, subpackage: string): any;
 }

package/lib/RouterScheduler.js

@@ -11,6 +11,7 @@ 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 { match } from 'path-to-regexp';
 import { url } from '@ray-js/library';
 import { RouterScheduler as IRouterScheduler } from '@ray-js/types';
 
@@ -37,13 +38,14 @@ export var RouterScheduler = /*#__PURE__*/function (_IRouterScheduler) {
 
     _defineProperty(_assertThisInitialized(_this), "$pathMap", {});
 
+    _defineProperty(_assertThisInitialized(_this), "$subpackageRoute", {});
+
     return _this;
   }
 
   _createClass(RouterScheduler, [{
     key: "getHrefByPath",
-    value: // 以小程序路径作为键存储关系
-
+    value:
     /**
      * 将小程序地址栏转化为 web 地址
      * @param path - 小程序页面地址
@@ -102,8 +104,20 @@ export var RouterScheduler = /*#__PURE__*/function (_IRouterScheduler) {
       var _this2 = this;
 
       var routes = params.routes,
-          tabBar = params.tabBar;
+          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({
+            root: root,
+            route: page.route,
+            path: page.path
+          });
+        });
+      });
       routes.forEach(function (route) {
         var isTabBar = tabBarList.some(function (item) {
           if (item.route) {
@@ -142,6 +156,36 @@ export var RouterScheduler = /*#__PURE__*/function (_IRouterScheduler) {
       this.$entityMap[routeDepth].push(route);
       this.$pathMap[pathDepth].push(route);
     }
+  }, {
+    key: "addSubpackagePage",
+    value: function addSubpackagePage(subpackgeRoute) {
+      if (!this.$subpackageRoute[subpackgeRoute.root]) {
+        this.$subpackageRoute[subpackgeRoute.root] = [];
+      }
+
+      this.$subpackageRoute[subpackgeRoute.root].push(subpackgeRoute);
+    }
+  }, {
+    key: "getMatchedSubpackagePage",
+    value: function getMatchedSubpackagePage(pathname, subpackage) {
+      var subpackageRoute;
+      this.$subpackageRoute[subpackage].forEach(function (item) {
+        var urlMatch = match(item.route, {
+          decode: decodeURIComponent
+        });
+
+        if (urlMatch(pathname)) {
+          subpackageRoute = {
+            pathname: pathname,
+            route: item.route,
+            params: urlMatch(pathname)['params'],
+            subpackage: subpackage,
+            path: '/' + subpackage + item.path
+          };
+        }
+      });
+      return subpackageRoute;
+    }
   }]);
 
   return RouterScheduler;

package/lib/index.d.ts

@@ -1,7 +1,8 @@
-import type { Routes, TabBar } from '@ray-js/types';
+import type { Routes, TabBar, SubPackages } from '@ray-js/types';
 import { router } from './Router';
 export declare function createRouter(params: {
     routes: Routes;
     tabBar: TabBar;
+    subpackages: SubPackages;
 }): import("./Router").Router;
 export default router;

package/lib/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/router-mp",
-  "version": "0.5.1",
+  "version": "0.5.3-beta-2",
   "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.5.1",
-    "@ray-js/env": "^0.5.1",
-    "@ray-js/library": "^0.5.1",
-    "@ray-js/types": "^0.5.1",
+    "@ray-js/api": "^0.5.3-beta-2",
+    "@ray-js/env": "^0.5.3-beta-2",
+    "@ray-js/library": "^0.5.3-beta-2",
+    "@ray-js/types": "^0.5.3-beta-2",
     "@react-navigation/core": "^6.1.0",
     "path-to-regexp": "^6.2.0"
   },
   "devDependencies": {
-    "@ray-js/cli": "^0.5.1"
+    "@ray-js/cli": "^0.5.3-beta-2"
   },
   "maintainers": [
     {
@@ -36,6 +36,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "d6cf331f1dd9e36dd7df0007e70dd601429c95d5",
+  "gitHead": "027ff15bd031d99b2ab20eff1f2b7dfed242110a",
   "repository": {}
 }