@ray-js/framework-shared 1.6.25 → 1.6.26

package/lib/normalizeTabBar.d.ts

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

package/lib/normalizeTabBar.js

@@ -4,6 +4,22 @@ import "core-js/modules/esnext.iterator.filter.js";
 import "core-js/modules/esnext.iterator.find.js";
 import "core-js/modules/esnext.iterator.map.js";
 import { match, parse } from 'path-to-regexp';
+const locals = {
+  tabBarPagePathMustBeInRoutes: 'tabBar.list[{index}].pagePath: {pagePath} must be in route configuration: {routes}',
+  tabBarRouteShouldBeMatched: 'tabBar.list[{index}]\n.route: {route}\n.pagePath: {pagePath}\nshould be matched by route: \n{routeInfo}',
+  tabBarRouteMatchedByOthers: 'tabBar.list[{index}]\n.route: {route}\n.pagePath: {pagePath}\nis matched by other routes：\n{unusable}'
+};
+const i18n = {
+  __: (key, data) => {
+    const txt = locals[key] || key;
+    if (data) {
+      return txt.replace(/\{(\w+)}/g, (_, k) => {
+        return String(data[k] || '');
+      });
+    }
+    return txt;
+  }
+};
 export function normalizeTabBar(tabBar, routes) {
   let list = tabBar.list;
   if (Array.isArray(list)) {
@@ -12,7 +28,7 @@ export function normalizeTabBar(tabBar, routes) {
         return tab;
       }
       for (const r of routes) {
-        // 兼容老项目，将老数据格式到新数据
+        // Compatible with older projects, converting old data format to new
         if (tab.id === r.id) {
           return _objectSpread(_objectSpread({}, tab), {}, {
             pagePath: r.path
@@ -21,36 +37,50 @@ export function normalizeTabBar(tabBar, routes) {
       }
       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[number].pagePath must be in routes[number].page, i.e., tab.pagePath === routes[number].page
+    // tabBar.list[number].route is optional
+    // If tabBar.list[number].route is not configured, set tabBar.list[number].route = routes[number].page (non-pattern matching) or tabBar.list[number].pagePath
+    // tabBar.list[number].route cannot use patterns like /xxx/:id, must be specific like /xxx/123
+    // tabBar.list[number].route must match the corresponding routes[number].route routing rule, see path-to-regexp module for details
     tabBar.list = list.map((tab, index) => {
       var _m$route;
       tab = _objectSpread({}, tab);
       const m = routes.find(i => tab.pagePath === i.path);
       if (!m) {
-        throw new Error(`tabBar.list[${index}].pagePath: ${tab.pagePath} 需要在路由配置中:  ${JSON.stringify(routes, null, 2)}`);
+        throw new Error(i18n.__('tabBarPagePathMustBeInRoutes', {
+          index,
+          pagePath: tab.pagePath,
+          routes: JSON.stringify(routes, null, 2)
+        }));
       }
       if (!tab.route) {
-        // 判断 routes[number].route 是否为模式匹配规则
+        // Check if routes[number].route is a pattern matching rule
         tab.route = m.route && parse(m.route).length === 1 ? m.route : m.path;
       }
-      // 判断是否能被路由命中
+      // Check if it can be matched by the route
       const matched = match((_m$route = m.route) !== null && _m$route !== void 0 ? _m$route : m.path)(tab.route);
       if (!matched) {
-        console.warn(`tabBar.list[${index}]\n.route: ${tab.route}\n.pagePath: ${tab.pagePath}\n应被路由命中: \n${JSON.stringify(m, null, 2)}`);
+        console.warn(i18n.__('tabBarRouteShouldBeMatched', {
+          index,
+          route: tab.route,
+          pagePath: tab.pagePath,
+          routeInfo: JSON.stringify(m, null, 2)
+        }));
         return;
       }
-      // 判断是否还被其他路由命中
+      // Check if it is matched by other routes
       const otherMatched = routes.filter(r => tab.pagePath !== r.path).filter(r => {
         var _r$route;
         return match((_r$route = r.route) !== null && _r$route !== void 0 ? _r$route : r.path)(tab.route);
       });
       const unusable = otherMatched.filter(r => r.path !== tab.pagePath);
       if (unusable.length) {
-        console.warn(`tabBar.list[${index}]\n.route: ${tab.route}\n%c.pagePath: ${tab.pagePath}\n%c被其它路由命中：\n${JSON.stringify(unusable, null, 2)}`, 'background:#290000;color:green', 'background:#290000;color:green', 'color:red');
+        console.warn(i18n.__('tabBarRouteMatchedByOthers', {
+          index,
+          route: tab.route,
+          pagePath: tab.pagePath,
+          unusable: JSON.stringify(unusable, null, 2)
+        }), 'background:#290000;color:green', 'background:#290000;color:green', 'color:red');
         return;
       }
       return tab;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/framework-shared",
-  "version": "1.6.25",
+  "version": "1.6.26",
   "description": "Ray shared for framework",
   "keywords": [
     "ray"
@@ -24,16 +24,16 @@
   },
   "dependencies": {
     "@ray-core/wechat": "^0.4.8",
-    "@ray-js/env": "1.6.25",
-    "@ray-js/types": "1.6.25",
+    "@ray-js/env": "1.6.26",
+    "@ray-js/types": "1.6.26",
     "path-to-regexp": "^6.3.0"
   },
   "devDependencies": {
-    "@ray-js/cli": "1.6.25"
+    "@ray-js/cli": "1.6.26"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.com"
   },
-  "gitHead": "a2c08384889bbc2b1812c4a37490126c18aa1803"
+  "gitHead": "d842231dd15303495069483a809a71dbc640ebaf"
 }