@ray-js/framework-shared 0.6.21 → 0.6.22-beta-2

package/lib/index.d.ts

@@ -7,3 +7,4 @@ export * from './useThrottle';
 export * from './useTouch';
 export * from './useTransition';
 export * from './emitter';
+export { normalizeTabBar } from './normalizeTabBar';

package/lib/index.js

@@ -6,4 +6,5 @@ export * from './useStylesheet';
 export * from './useThrottle';
 export * from './useTouch';
 export * from './useTransition';
-export * from './emitter';
+export * from './emitter';
+export { normalizeTabBar } from './normalizeTabBar';

package/lib/normalizeTabBar.d.ts

@@ -0,0 +1,2 @@
+import { Routes, TabBar } from '@ray-js/types';
+export declare function normalizeTabBar(tabBar: TabBar, routes: Routes): TabBar;

package/lib/normalizeTabBar.js

@@ -0,0 +1,95 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
+import "core-js/modules/es.array.map.js";
+import "core-js/modules/es.array.filter.js";
+import "core-js/modules/es.object.to-string.js";
+import "core-js/modules/es.array.find.js";
+import "core-js/modules/es.array.concat.js";
+import "core-js/modules/es.json.stringify.js";
+import { match, parse } from 'path-to-regexp';
+export function normalizeTabBar(tabBar, routes) {
+  var list = tabBar.list;
+
+  if (Array.isArray(list)) {
+    list = list.map(function (tab) {
+      var _iterator = _createForOfIteratorHelper(routes),
+          _step;
+
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var r = _step.value;
+
+          // 兼容老项目
+          if (tab.id === r.id) {
+            return _objectSpread(_objectSpread({}, tab), {}, {
+              pagePath: r.path
+            });
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+
+      return tab;
+    }); // tabBar.list[number].pagePath 必须在 routes[number].page 中，即tab.pagePath === routes[number].page
+    // tabBar.list[number].route 可不配置
+    // tabBar.list[number].route 若未配置，则设置 tabBar.list[number].route = routes[number].page（非模式匹配）或tabBar.list[number].pagePath
+    // tabBar.list[number].route 不能用模式，如不能用/xxx/:id等，必须是明确的 如/xxx/123
+    // tabBar.list[number].route 必须要能命中对应routes[number].route 路由规则，规则详见 path-to-regexp 模块
+
+    tabBar.list = list.map(function (tab, index) {
+      var _m$route;
+
+      tab = _objectSpread({}, tab);
+      var m = routes.find(function (i) {
+        return tab.pagePath === i.path;
+      });
+
+      if (!m) {
+        throw new Error("tabBar.list[".concat(index, "].pagePath: ").concat(tab.pagePath, " \u9700\u8981\u5728\u8DEF\u7531\u914D\u7F6E\u4E2D:  ").concat(JSON.stringify(routes, null, 2)));
+      }
+
+      if (!tab.route) {
+        // 判断 routes[number].route 是否为模式匹配规则
+        tab.route = m.route && parse(m.route).length === 1 ? m.route : m.path;
+      } // 判断是否能被路由命中
+
+
+      var matched = match((_m$route = m.route) !== null && _m$route !== void 0 ? _m$route : m.path)(tab.route);
+
+      if (!matched) {
+        console.warn("tabBar.list[".concat(index, "]\n.route: ").concat(tab.route, "\n.pagePath: ").concat(tab.pagePath, "\n\u5E94\u88AB\u8DEF\u7531\u547D\u4E2D: \n").concat(JSON.stringify(m, null, 2)));
+        return;
+      } // 判断是否还被其他路由命中
+
+
+      var otherMatched = routes.filter(function (r) {
+        return tab.pagePath !== r.path;
+      }).filter(function (r) {
+        var _r$route;
+
+        return match((_r$route = r.route) !== null && _r$route !== void 0 ? _r$route : r.path)(tab.route);
+      });
+      var unusable = otherMatched.filter(function (r) {
+        return r.path !== tab.pagePath;
+      });
+
+      if (unusable.length) {
+        console.warn("tabBar.list[".concat(index, "]\n.route: ").concat(tab.route, "\n%c.pagePath: ").concat(tab.pagePath, "\n%c\u88AB\u5176\u5B83\u8DEF\u7531\u547D\u4E2D\uFF1A\n").concat(JSON.stringify(unusable, null, 2)), 'background:#290000;color:green', 'background:#290000;color:green', 'color:red');
+        return;
+      }
+
+      return tab;
+    }).filter(function (tab) {
+      return !!tab;
+    });
+
+    if (!tabBar.list.length) {
+      return {};
+    }
+  }
+
+  return tabBar;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/framework-shared",
-  "version": "0.6.21",
+  "version": "0.6.22-beta-2",
   "description": "Ray shared for framework",
   "keywords": [
     "ray"
@@ -21,10 +21,12 @@
   },
   "dependencies": {
     "@ray-core/wechat": "^0.0.x",
-    "@ray-js/env": "^0.6.21"
+    "@ray-js/env": "^0.6.22-beta-2",
+    "@ray-js/types": "^0.6.22-beta-2",
+    "path-to-regexp": "^6.2.1"
   },
   "devDependencies": {
-    "@ray-js/cli": "^0.6.21"
+    "@ray-js/cli": "^0.6.22-beta-2"
   },
   "maintainers": [
     {
@@ -32,6 +34,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "cbb81571d068e6997e9b1fe95198c1b0275112e7",
+  "gitHead": "5d621bf1561047175b967cdf3aa35446f7d7198a",
   "repository": {}
 }