@ray-js/router-mp 1.4.0-alpha.1 → 1.4.0-alpha.11

package/lib/Router.d.ts

@@ -2,10 +2,18 @@ import { Router as TRouter, RouteOptions } from '@ray-js/types';
 import { RouterScheduler } from './RouterScheduler';
 export declare class Router implements TRouter {
     private urlPrefix;
+    /**
+     * 功能页模式为 functional，使用相对路径模式
+     * 如果是绝对路径，表示跳转到宿主小程序
+     *
+     * @private
+     */
+    private mode;
     /**
      * setUrlPrefix
      */
     setUrlPrefix(prefix: string): void;
+    setMode(mode: string): void;
     scheduler: RouterScheduler;
     /**
      * 标准化路由路径，将 web 标准的地址栏转化到 小程序地址

package/lib/Router.js

@@ -1,192 +1,192 @@
 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 "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.replace.js";
-import "core-js/modules/es.regexp.constructor.js";
-import "core-js/modules/es.regexp.dot-all.js";
-import "core-js/modules/es.regexp.sticky.js";
-import "core-js/modules/es.regexp.to-string.js";
 import { url } from '@ray-js/library';
-import { navigateBack, navigateTo, reLaunch, switchTab, redirectTo, getLaunchOptionsSync } from '@ray-js/api';
-import { isThing } from '@ray-js/env';
-import { RouterScheduler } from './RouterScheduler';
-
-function currentPage() {
-  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
-    };
+import { navigateBack, navigateTo, reLaunch, switchTab, redirectTo } from '@ray-js/api';
+import { RouterScheduler, currentPage } from './RouterScheduler';
+function pathRelative(fromPath, toPath) {
+  const from = fromPath.split('/');
+  const to = toPath.split('/');
+  let i = 0;
+
+  // 找到两个路径第一个不同的目录
+  while (from[i] === to[i]) {
+    i++;
   }
-}
+  let result = '';
 
-export var Router = /*#__PURE__*/function () {
-  function Router() {
-    _classCallCheck(this, Router);
-
-    _defineProperty(this, "urlPrefix", '');
-
-    _defineProperty(this, "scheduler", new RouterScheduler());
+  // 在 from 中添加 '..' 直到达到相同的目录
+  for (let j = i; j < from.length - 1; j++) {
+    result += '../';
   }
 
-  _createClass(Router, [{
-    key: "setUrlPrefix",
-    value:
-    /**
-     * setUrlPrefix
-     */
-    function setUrlPrefix(prefix) {
-      this.urlPrefix = prefix;
+  // 在 result 中添加 to 中剩余的目录
+  for (let j = i; j < to.length; j++) {
+    result += to[j];
+    if (j < to.length - 1) {
+      result += '/';
     }
-  }, {
-    key: "normalizeRoute",
-    value:
+  }
+  return result;
+}
+export class Router {
+  constructor() {
+    // 只有作为其他小程序的子包时，才设置urlPrefix
+    _defineProperty(this, "urlPrefix", '');
     /**
-     * 标准化路由路径，将 web 标准的地址栏转化到 小程序地址
+     * 功能页模式为 functional，使用相对路径模式
+     * 如果是绝对路径，表示跳转到宿主小程序
+     *
+     * @private
      */
-    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);
-      } // 作为其他小程序时不能作为tabBar
-
-
-      if (this.urlPrefix) {
-        matchedPage.isTabBar = false;
-      }
-
-      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 却需要
-       * 涂鸦小程序: 都不能以`/`开头
-       */
-
-
-      if (this.urlPrefix) {
-        finalPath = ('/' + this.urlPrefix + '/' + finalPath).replace(/\/+/g, '/');
-      }
-
-      if (isThing) {
-        finalPath = finalPath.replace(/^\//, '');
+    _defineProperty(this, "mode", 'miniprogram');
+    _defineProperty(this, "scheduler", new RouterScheduler());
+  }
+  // functional
+  /**
+   * setUrlPrefix
+   */
+  setUrlPrefix(prefix) {
+    this.urlPrefix = prefix;
+  }
+  setMode(mode) {
+    this.mode = mode;
+  }
+  /**
+   * 标准化路由路径，将 web 标准的地址栏转化到 小程序地址
+   */
+  normalizeRoute(params) {
+    let {
+      pathname,
+      query,
+      hash
+    } = url.parse(params.to);
+    const subPackage = params.subpackage;
+    const currentRoute = this.scheduler.getCurrentRoute();
+    const isRelativePath = pathname.startsWith('.');
+    if (isRelativePath) {
+      const currentPathname = currentRoute.route;
+      // 如果是相对路径，修正为绝对路径
+      const absolutePathSegments = (currentPathname + '/' + pathname).split('/');
+      const normalizedPathSegments = [];
+      for (let i = 0; i < absolutePathSegments.length; i++) {
+        const segment = absolutePathSegments[i];
+        if (segment === '..') {
+          normalizedPathSegments.pop();
+        } else if (segment !== '.') {
+          normalizedPathSegments.push(segment);
+        }
       }
-
-      matchedPage.path = finalPath;
-      return Promise.resolve(matchedPage);
+      pathname = normalizedPathSegments.join('/');
     }
-  }, {
-    key: "push",
-    value: function push(to, options) {
-      var subpackage = options === null || options === void 0 ? void 0 : options.subpackage;
-      this.normalizeRoute({
-        to: to,
-        subpackage: subpackage
-      }).then(function (route) {
-        var path = route.path;
 
-        if (route.isTabBar) {
-          switchTab({
-            url: path
-          });
-        } else {
-          navigateTo({
-            url: path
-          });
-        }
+    // 如果是相对路径，修正为绝对路径
+
+    const matchedPage = subPackage ? this.scheduler.getMatchedSubPackagePage(pathname, subPackage) : this.scheduler.getMatchedPage(pathname);
+    if (!matchedPage) {
+      console.warn('try match page', {
+        pathname,
+        query,
+        hash
       });
+      return Promise.reject('can not find page by path: ' + params.to);
     }
-  }, {
-    key: "replace",
-    value: function replace(to, options) {
-      var subpackage = options === null || options === void 0 ? void 0 : options.subpackage;
-      this.normalizeRoute({
-        to: to,
-        subpackage: subpackage
-      }).then(function (route) {
-        if (route.isTabBar) {
-          switchTab({
-            url: route.path
-          });
-        } else {
-          redirectTo({
-            url: route.path
-          });
-        }
-      });
+    // 作为其他小程序时不能作为tabBar
+    if (this.urlPrefix) {
+      matchedPage.isTabBar = false;
     }
-  }, {
-    key: "reload",
-    value: function reload() {
-      var page = currentPage();
-      reLaunch({
-        url: url.params(page.route, page.options)
+    let 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辅助传递
+        })
       });
     }
-  }, {
-    key: "go",
-    value: function go() {
-      throw new Error('Method not implemented.');
+    /**
+     * 坑点之一
+     * 微信小程序: app.json 里的页面配置不能以`/`开头，wx.navigatorTo 却需要
+     */
+    if (this.urlPrefix) {
+      finalPath = ('/' + this.urlPrefix + '/' + finalPath).replace(/\/+/g, '/');
     }
-  }, {
-    key: "back",
-    value: function back() {
-      navigateBack({
-        delta: 1
-      });
-    } // 获取宿主环境上的 href ，小程序端需要通过 path 进行转换
-
-  }, {
-    key: "href",
-    get: function get() {
-      var page = currentPage();
-      var reg = RegExp('^' + this.urlPrefix + '/');
-      var r = page.route.replace(reg, '');
-      var path = url.params("/".concat(r), page.options);
+    matchedPage.path = finalPath;
 
-      var _url$parse2 = url.parse(path),
-          pathname = _url$parse2.pathname,
-          query = _url$parse2.query,
-          hash = _url$parse2.hash;
-
-      return this.scheduler.getHrefByPath({
-        path: pathname,
-        query: query,
-        hash: hash
-      });
+    // 因为可能是功能页模式，必须使用相对路径进行跳转
+    if (isRelativePath) {
+      // 将路径基于 currentRoute 进行绝对路径转成相对路径
+      matchedPage.path = pathRelative(currentRoute.path, matchedPage.path);
     }
-  }]);
-
-  return Router;
-}();
-export var router = new Router();
+    return Promise.resolve(matchedPage);
+  }
+  push(to, options) {
+    const subpackage = options === null || options === void 0 ? void 0 : options.subpackage;
+    this.normalizeRoute({
+      to,
+      subpackage
+    }).then(route => {
+      const path = route.path;
+      if (route.isTabBar) {
+        switchTab({
+          url: path
+        });
+      } else {
+        navigateTo({
+          url: path
+        });
+      }
+    });
+  }
+  replace(to, options) {
+    const subpackage = options === null || options === void 0 ? void 0 : options.subpackage;
+    this.normalizeRoute({
+      to,
+      subpackage
+    }).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)
+    });
+  }
+  go() {
+    throw new Error('Method not implemented.');
+  }
+  back() {
+    navigateBack({
+      delta: 1
+    });
+  }
+  // 获取宿主环境上的 href ，小程序端需要通过 path 进行转换
+  get href() {
+    const page = currentPage();
+    const reg = RegExp('^' + this.urlPrefix + '/');
+    const r = page.route.replace(reg, '');
+    const path = url.params("/".concat(r), page.options);
+    const {
+      pathname,
+      query,
+      hash
+    } = url.parse(path);
+    return this.scheduler.getHrefByPath({
+      path: pathname,
+      query,
+      hash
+    });
+  }
+}
+export const router = new Router();

package/lib/RouterScheduler.d.ts

@@ -1,34 +1,30 @@
-import { RouterScheduler as IRouterScheduler, Routes, TabBar, SubPackages } from '@ray-js/types';
-export declare type Route = Routes[number] & {
+import { RouterScheduler as IRouterScheduler, Routes, SubPackages, TabBar } from '@ray-js/types';
+export type Route = Routes[number] & {
     isTabBar: boolean;
 };
-export declare type SubPackageRoute = {
+export type SubPackageRoute = {
     root: string;
     route: string;
     path: string;
 };
+export declare function currentPage(): any;
 /**
  * 小程序路由别名机制，将标准化的 web pathname 转化为小程序的 path
  */
 export declare class RouterScheduler extends IRouterScheduler<Route> {
     $entityMap: Route[];
-    private $pathMap;
     $subPackageRoute: Record<string, SubPackageRoute[]>;
+    private $pathMap;
+    getCurrentRoute(): Route | undefined;
     /**
      * 将小程序地址栏转化为 web 地址
-     * @param path - 小程序页面地址
+     * @param opts
      */
     getHrefByPath(opts: {
         path: string;
-        query: object;
+        query: Record<string, unknown>;
         hash: string;
     }): string;
-    /**
-     * 以小程序地址进行匹配页面
-     * @param path - 小程序页面地址 /pages/home/index
-     * @returns
-     */
-    private matchPageByPath;
     registryPages(params: {
         routes: Routes;
         tabBar: TabBar;
@@ -40,6 +36,7 @@ export declare class RouterScheduler extends IRouterScheduler<Route> {
         params: object;
         pathname: string;
     };
+    getRouteByPath(pagePath: string): Route | undefined;
     addPage(route: Route): void;
     addSubPackagePage(subPackageRoute: SubPackageRoute): void;
     getMatchedSubPackagePage(pathname: string, subPackage: string): {
@@ -49,4 +46,10 @@ export declare class RouterScheduler extends IRouterScheduler<Route> {
         subPackage: string;
         path: string;
     } | undefined;
+    /**
+     * 以小程序地址进行匹配页面
+     * @param path - 小程序页面地址 /pages/home/index
+     * @returns
+     */
+    private matchPageByPath;
 }

package/lib/RouterScheduler.js

@@ -1,184 +1,162 @@
 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.array.find.js";
-import "core-js/modules/web.dom-collections.for-each.js";
-import { match, compile, pathToRegexp } from 'path-to-regexp';
+import "core-js/modules/web.dom-collections.iterator.js";
+import { compile, match, pathToRegexp } from 'path-to-regexp';
 import { url } from '@ray-js/library';
 import slash from 'slash';
 import { RouterScheduler as IRouterScheduler } from '@ray-js/types';
+import { getLaunchOptionsSync } from '@ray-js/api';
+export function currentPage() {
+  const pages = getCurrentPages();
+  if (pages.length > 0) {
+    return pages[pages.length - 1];
+  } else {
+    const {
+      path,
+      query
+    } = getLaunchOptionsSync();
+    return {
+      route: path,
+      options: query
+    };
+  }
+}
 
 /**
  * 小程序路由别名机制，将标准化的 web pathname 转化为小程序的 path
  */
-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", []);
-
-    _defineProperty(_assertThisInitialized(_this), "$subPackageRoute", {});
-
-    return _this;
+export class RouterScheduler extends IRouterScheduler {
+  constructor() {
+    super(...arguments);
+    _defineProperty(this, "$entityMap", []);
+    _defineProperty(this, "$subPackageRoute", {});
+    _defineProperty(this, "$pathMap", []);
   }
-
-  _createClass(RouterScheduler, [{
-    key: "getHrefByPath",
-    value:
-    /**
-     * 将小程序地址栏转化为 web 地址
-     * @param 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);
-
-        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: false
-          })(query) + hash;
-          return url.params(href, restQuery);
-        }
-
-        return url.params(route.route + hash, query);
-      }
-
-      return '';
+  // 以小程序路径作为键存储关系
+
+  getCurrentRoute() {
+    const {
+      route,
+      __pureRoute__,
+      __scope__
+    } = currentPage();
+    let normalizedRoute = __pureRoute__ || route;
+    // 小程序页面对象上的 route 不是以 / 开头的，需要补上
+    if (!normalizedRoute.startsWith('/')) {
+      normalizedRoute = '/' + normalizedRoute;
     }
-    /**
-     * 以小程序地址进行匹配页面
-     * @param path - 小程序页面地址 /pages/home/index
-     * @returns
-     */
-
-  }, {
-    key: "matchPageByPath",
-    value: function matchPageByPath(path) {
-      var route = this.$pathMap.find(function (route) {
-        return route.path === path;
-      });
+    const matchedRoute = this.getRouteByPath(normalizedRoute);
+    return matchedRoute;
+  }
 
-      if (!route) {
-        console.warn('Not match route by:', path);
-        return undefined;
+  /**
+   * 将小程序地址栏转化为 web 地址
+   * @param opts
+   */
+  getHrefByPath(opts) {
+    const {
+      query,
+      path,
+      hash = ''
+    } = opts;
+    const route = this.matchPageByPath(path);
+    if (route) {
+      const keys = [];
+      pathToRegexp(route.route, keys);
+      if (keys.length > 0) {
+        const restQuery = _objectSpread({}, query);
+        keys.forEach(_ref => {
+          let {
+            name
+          } = _ref;
+          delete restQuery[name];
+        });
+        // 兼容小程序tab页，因tab页不能携带参数
+        keys.forEach(k => {
+          var _query$k$name;
+          return query[k.name] = (_query$k$name = query[k.name]) !== null && _query$k$name !== void 0 ? _query$k$name : '';
+        });
+        const href = compile(route.route, {
+          validate: false
+        })(query) + hash;
+        return url.params(href, restQuery);
       }
-
-      return route;
+      return url.params(route.route + hash, query);
     }
-  }, {
-    key: "registryPages",
-    value: function registryPages(params) {
-      var _this2 = this;
-
-      var routes = params.routes,
-          tabBar = params.tabBar,
-          _params$subpackages = params.subpackages,
-          subpackages = _params$subpackages === void 0 ? [] : _params$subpackages;
-      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 || page.path,
-            path: page.path
-          });
-        });
-      });
-      routes.forEach(function (r) {
-        var isTabBar = tabBarList.some(function (item) {
-          return r.path === item.pagePath;
+    return '';
+  }
+  registryPages(params) {
+    const {
+      routes,
+      tabBar,
+      subpackages = []
+    } = params;
+    const tabBarList = (tabBar === null || tabBar === void 0 ? void 0 : tabBar.list) || [];
+    subpackages.forEach(subPackage => {
+      const root = subPackage.root;
+      subPackage.pages.forEach(page => {
+        this.addSubPackagePage({
+          root,
+          route: page.route || page.path,
+          path: page.path
         });
-        var route = r.route || r.path;
-
-        _this2.addPage(_objectSpread(_objectSpread({}, r), {}, {
-          isTabBar: isTabBar,
-          route: route
-        }));
       });
+    });
+    routes.forEach(r => {
+      const isTabBar = tabBarList.some(item => r.path === item.pagePath);
+      const route = r.route || r.path;
+      this.addPage(_objectSpread(_objectSpread({}, r), {}, {
+        isTabBar,
+        route
+      }));
+    });
+  }
+  getMatchedPage(pathname) {
+    return this.matchPageByPathname(pathname);
+  }
+  getRouteByPath(pagePath) {
+    return this.$pathMap.find(item => item.path === pagePath);
+  }
+  addPage(route) {
+    this.$entityMap.push(route);
+    this.$pathMap.push(route);
+  }
+  addSubPackagePage(subPackageRoute) {
+    if (!this.$subPackageRoute[subPackageRoute.root]) {
+      this.$subPackageRoute[subPackageRoute.root] = [];
     }
-  }, {
-    key: "getMatchedPage",
-    value: function getMatchedPage(pathname) {
-      return this.matchPageByPathname(pathname);
-    }
-  }, {
-    key: "addPage",
-    value: function addPage(route) {
-      this.$entityMap.push(route);
-      this.$pathMap.push(route);
-    }
-  }, {
-    key: "addSubPackagePage",
-    value: function addSubPackagePage(subPackageRoute) {
-      if (!this.$subPackageRoute[subPackageRoute.root]) {
-        this.$subPackageRoute[subPackageRoute.root] = [];
+    this.$subPackageRoute[subPackageRoute.root].push(subPackageRoute);
+  }
+  getMatchedSubPackagePage(pathname, subPackage) {
+    const subs = this.$subPackageRoute[subPackage] || [];
+    for (let index = 0; index < subs.length; index++) {
+      const item = subs[index];
+      const urlMatch = match(item.route, {
+        decode: decodeURIComponent
+      });
+      if (urlMatch(pathname)) {
+        return {
+          pathname,
+          route: item.route,
+          params: urlMatch(pathname)['params'],
+          subPackage,
+          path: slash('/' + subPackage + item.path)
+        };
       }
-
-      this.$subPackageRoute[subPackageRoute.root].push(subPackageRoute);
     }
-  }, {
-    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)) {
-          return {
-            pathname: pathname,
-            route: item.route,
-            params: urlMatch(pathname)['params'],
-            subPackage: subPackage,
-            path: slash('/' + subPackage + item.path)
-          };
-        }
-      }
+  /**
+   * 以小程序地址进行匹配页面
+   * @param path - 小程序页面地址 /pages/home/index
+   * @returns
+   */
+  matchPageByPath(path) {
+    const route = this.$pathMap.find(route => route.path === path);
+    if (!route) {
+      console.warn('Not match route by:', path);
+      return undefined;
     }
-  }]);
-
-  return RouterScheduler;
-}(IRouterScheduler);
+    return route;
+  }
+}

package/lib/index.d.ts

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

package/lib/index.js

@@ -1,22 +1,21 @@
-import "core-js/modules/es.array.map.js";
 import { router } from './Router';
 import { normalizeTabBar } from '@ray-js/framework-shared';
 export function createRouter(params) {
-  var _params$tabBar = params.tabBar,
-      tabBar = _params$tabBar === void 0 ? {} : _params$tabBar,
-      subpackages = params.subpackages;
-  var routes = params.routes.map(function (item) {
+  const {
+    tabBar = {},
+    subpackages,
+    mode
+  } = params;
+  const routes = params.routes.map(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);
-
+  const _tabBar = normalizeTabBar(tabBar, routes);
+  router.setMode(mode);
   router.scheduler.registryPages({
-    routes: routes,
-    subpackages: subpackages,
+    routes,
+    subpackages,
     tabBar: _tabBar
   });
   return router;

package/package.json

@@ -1,42 +1,42 @@
 {
   "name": "@ray-js/router-mp",
-  "version": "1.4.0-alpha.1",
+  "version": "1.4.0-alpha.11",
   "description": "Ray Core",
   "keywords": [
     "ray"
   ],
+  "repository": {},
   "license": "MIT",
+  "maintainers": [
+    {
+      "name": "tuyafe",
+      "email": "tuyafe@tuya.com"
+    }
+  ],
   "main": "lib/index.js",
   "files": [
     "lib"
   ],
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org"
-  },
   "scripts": {
-    "clean": "rm -rf lib",
     "build": "ray build --type=component --transform-mode=pure",
+    "clean": "rm -rf lib",
     "watch": "tsc -p ./tsconfig.build.json --module esnext --outDir lib --watch"
   },
   "dependencies": {
-    "@ray-js/api": "^1.4.0-alpha.1",
-    "@ray-js/env": "^1.4.0-alpha.1",
-    "@ray-js/library": "^1.4.0-alpha.1",
-    "@ray-js/types": "^1.4.0-alpha.1",
-    "@react-navigation/core": "^6.1.0",
-    "path-to-regexp": "^6.2.0",
-    "slash": "^5.0.0"
+    "@ray-js/api": "^1.4.0-alpha.11",
+    "@ray-js/env": "^1.4.0-alpha.11",
+    "@ray-js/library": "^1.4.0-alpha.11",
+    "@ray-js/types": "^1.4.0-alpha.11",
+    "@react-navigation/core": "^6.4.9",
+    "path-to-regexp": "^6.2.1",
+    "slash": "^5.1.0"
   },
   "devDependencies": {
-    "@ray-js/cli": "^1.4.0-alpha.1"
+    "@ray-js/cli": "^1.4.0-alpha.11"
   },
-  "maintainers": [
-    {
-      "name": "tuyafe",
-      "email": "tuyafe@tuya.com"
-    }
-  ],
-  "gitHead": "4340240aafe16c03853241e2356134610e65443e",
-  "repository": {}
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
+  },
+  "gitHead": "5e9c8e1d288eeaf707d34515399784d98ec13a1e"
 }