@ray-js/router-mp 1.1.1 → 1.2.0-beta.1

package/lib/Router.js

@@ -1,192 +1,110 @@
-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 { 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
-    };
-  }
+    const pages = getCurrentPages();
+    if (pages.length > 0) {
+        return pages[pages.length - 1];
+    }
+    else {
+        const { path, query } = getLaunchOptionsSync();
+        return { route: path, options: query };
+    }
 }
-
-export var Router = /*#__PURE__*/function () {
-  function Router() {
-    _classCallCheck(this, Router);
-
-    _defineProperty(this, "urlPrefix", '');
-
-    _defineProperty(this, "scheduler", new RouterScheduler());
-  }
-
-  _createClass(Router, [{
-    key: "setUrlPrefix",
-    value:
+export class Router {
+    constructor() {
+        // 只有作为其他小程序的子包时，才设置urlPrefix
+        this.urlPrefix = '';
+        this.scheduler = new RouterScheduler();
+    }
     /**
      * setUrlPrefix
      */
-    function setUrlPrefix(prefix) {
-      this.urlPrefix = prefix;
+    setUrlPrefix(prefix) {
+        this.urlPrefix = prefix;
     }
-  }, {
-    key: "normalizeRoute",
-    value:
     /**
      * 标准化路由路径，将 web 标准的地址栏转化到 小程序地址
      */
-    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辅助传递
-
-          })
+    normalizeRoute(params) {
+        const { pathname, query, hash } = url.parse(params.to);
+        const subPackage = params.subpackage;
+        const matchedPage = subPackage
+            ? this.scheduler.getMatchedSubPackagePage(pathname, subPackage)
+            : this.scheduler.getMatchedPage(pathname);
+        if (!matchedPage) {
+            return Promise.reject(undefined);
+        }
+        // 作为其他小程序时不能作为tabBar
+        if (this.urlPrefix) {
+            matchedPage.isTabBar = false;
+        }
+        let finalPath = matchedPage.path;
+        // FIXME: tabBar.list里的页面不能有query，也不能有hash
+        if (!matchedPage.isTabBar) {
+            finalPath = url.format({
+                pathname: matchedPage.path,
+                query: Object.assign(Object.assign(Object.assign({}, query), matchedPage.params), { ____h_a_s_h____: hash.slice(1) }),
+            });
+        }
+        /**
+         * 坑点之一
+         * 微信小程序: app.json 里的页面配置不能以`/`开头，wx.navigatorTo 却需要
+         * 涂鸦小程序: 都不能以`/`开头
+         */
+        if (this.urlPrefix) {
+            finalPath = ('/' + this.urlPrefix + '/' + finalPath).replace(/\/+/g, '/');
+        }
+        if (isThing) {
+            finalPath = finalPath.replace(/^\//, '');
+        }
+        matchedPage.path = finalPath;
+        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 });
+            }
         });
-      }
-      /**
-       * 坑点之一
-       * 微信小程序: app.json 里的页面配置不能以`/`开头，wx.navigatorTo 却需要
-       * 涂鸦小程序: 都不能以`/`开头
-       */
-
-
-      if (this.urlPrefix) {
-        finalPath = ('/' + this.urlPrefix + '/' + finalPath).replace(/\/+/g, '/');
-      }
-
-      if (isThing) {
-        finalPath = finalPath.replace(/^\//, '');
-      }
-
-      matchedPage.path = finalPath;
-      return Promise.resolve(matchedPage);
     }
-  }, {
-    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
-          });
-        }
-      });
+    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 });
+            }
+        });
     }
-  }, {
-    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
-          });
-        }
-      });
+    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: "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);
-
-      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
-      });
+    // 获取宿主环境上的 href ，小程序端需要通过 path 进行转换
+    get href() {
+        const page = currentPage();
+        const reg = RegExp('^' + this.urlPrefix + '/');
+        const r = page.route.replace(reg, '');
+        const path = url.params(`/${r}`, page.options);
+        const { pathname, query, hash } = url.parse(path);
+        return this.scheduler.getHrefByPath({ path: pathname, query, hash });
     }
-  }]);
-
-  return Router;
-}();
-export var router = new Router();
+}
+export const router = new Router();

package/lib/RouterScheduler.d.ts

@@ -48,5 +48,5 @@ export declare class RouterScheduler extends IRouterScheduler<Route> {
         params: any;
         subPackage: string;
         path: string;
-    } | undefined;
+    };
 }

package/lib/RouterScheduler.js

@@ -1,184 +1,102 @@
-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 { url } from '@ray-js/library';
 import slash from 'slash';
 import { RouterScheduler as IRouterScheduler } from '@ray-js/types';
-
 /**
  * 小程序路由别名机制，将标准化的 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];
+export class RouterScheduler extends IRouterScheduler {
+    constructor() {
+        super(...arguments);
+        this.$entityMap = [];
+        this.$pathMap = []; // 以小程序路径作为键存储关系
+        this.$subPackageRoute = {};
     }
-
-    _this = _super.call.apply(_super, [this].concat(args));
-
-    _defineProperty(_assertThisInitialized(_this), "$entityMap", []);
-
-    _defineProperty(_assertThisInitialized(_this), "$pathMap", []);
-
-    _defineProperty(_assertThisInitialized(_this), "$subPackageRoute", {});
-
-    return _this;
-  }
-
-  _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);
+    getHrefByPath(opts) {
+        const { query, path, hash = '' } = opts;
+        const route = this.matchPageByPath(path);
+        if (route) {
+            let keys = [];
+            pathToRegexp(route.route, keys);
+            if (keys.length > 0) {
+                const restQuery = Object.assign({}, query);
+                keys.forEach(({ name }) => {
+                    delete restQuery[name];
+                });
+                // 兼容小程序tab页，因tab页不能携带参数
+                keys.forEach((k) => { var _a; return (query[k.name] = (_a = query[k.name]) !== null && _a !== void 0 ? _a : ''); });
+                const href = compile(route.route, { validate: false })(query) + hash;
+                return url.params(href, restQuery);
+            }
+            return url.params(route.route + hash, query);
         }
-
-        return url.params(route.route + hash, query);
-      }
-
-      return '';
+        return '';
     }
     /**
      * 以小程序地址进行匹配页面
      * @param path - 小程序页面地址 /pages/home/index
      * @returns
      */
-
-  }, {
-    key: "matchPageByPath",
-    value: function matchPageByPath(path) {
-      var route = this.$pathMap.find(function (route) {
-        return route.path === path;
-      });
-
-      if (!route) {
-        console.warn('Not match route by:', path);
-        return undefined;
-      }
-
-      return route;
+    matchPageByPath(path) {
+        const route = this.$pathMap.find((route) => route.path === path);
+        if (!route) {
+            console.warn('Not match route by:', path);
+            return undefined;
+        }
+        return route;
     }
-  }, {
-    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
-          });
+    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,
+                });
+            });
         });
-      });
-      routes.forEach(function (r) {
-        var isTabBar = tabBarList.some(function (item) {
-          return r.path === item.pagePath;
+        routes.forEach((r) => {
+            const isTabBar = tabBarList.some((item) => r.path === item.pagePath);
+            const route = r.route || r.path;
+            this.addPage(Object.assign(Object.assign({}, r), { isTabBar, route }));
         });
-        var route = r.route || r.path;
-
-        _this2.addPage(_objectSpread(_objectSpread({}, r), {}, {
-          isTabBar: isTabBar,
-          route: route
-        }));
-      });
     }
-  }, {
-    key: "getMatchedPage",
-    value: function getMatchedPage(pathname) {
-      return this.matchPageByPathname(pathname);
+    getMatchedPage(pathname) {
+        return this.matchPageByPathname(pathname);
     }
-  }, {
-    key: "addPage",
-    value: function addPage(route) {
-      this.$entityMap.push(route);
-      this.$pathMap.push(route);
+    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);
+    addSubPackagePage(subPackageRoute) {
+        if (!this.$subPackageRoute[subPackageRoute.root]) {
+            this.$subPackageRoute[subPackageRoute.root] = [];
+        }
+        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)
-          };
+    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),
+                };
+            }
         }
-      }
     }
-  }]);
-
-  return RouterScheduler;
-}(IRouterScheduler);
+}

package/lib/index.js

@@ -1,24 +1,15 @@
-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) {
-    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,
-    subpackages: subpackages,
-    tabBar: _tabBar
-  });
-  return router;
+    const { tabBar = {}, subpackages } = params;
+    const routes = params.routes.map((item) => {
+        var _a;
+        item.route = (_a = item.route) !== null && _a !== void 0 ? _a : item.path;
+        return item;
+    });
+    const _tabBar = normalizeTabBar(tabBar, routes);
+    const finalCfg = { routes, subpackages, tabBar: _tabBar };
+    router.scheduler.registryPages(finalCfg);
+    return router;
 }
-export default router;
+export default router;

package/package.json

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