npm - @ray-js/build-plugin-router - Versions diffs - 0.6.22-beta-2 → 0.6.25 - Mend

@ray-js/build-plugin-router 0.6.22-beta-2 → 0.6.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/lib/index.js +78 -74
package/package.json +4 -4

package/lib/index.js CHANGED Viewed

@@ -72,92 +72,96 @@ const standardAppConfigFieldMap = [
     'backgroundColor',
 ];
 function normalizeTabBarConfig(config, routes, fields) {
-    let _a = config || {}, { list } = _a, rest = __rest(_a, ["list"]);
+    if (!config) {
+        return;
+    }
+    let { list } = config, rest = __rest(config, ["list"]);
     let cfg;
+    if (!lodash_1.default.isArray(list)) {
+        printError(`tabBar.list 数据结构不对`.red);
+        return cfg;
+    }
     list = list.map((tab) => {
+        if (tab.id === undefined) {
+            return tab;
+        }
         for (const r of routes) {
-            // 兼容老项目
+            // 兼容老项目，将老数据格式到新数据
             if (tab.id === r.id) {
                 return Object.assign(Object.assign({}, tab), { pagePath: r.path });
             }
         }
         return tab;
     });
-    if (list && list.length) {
-        const _cfg = {};
-        // 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 模块
-        const tabs = list
-            .map((tab, index) => {
-            var _a;
-            const m = routes.find((i) => {
-                return (tab.pagePath === i.path ||
-                    // 兼容老项目
-                    tab.id === i.id);
-            });
-            if (!m) {
-                printError(`tabBar.list[${index}].pagePath: ${tab.pagePath} 需要在路由配置中: \n${JSON.stringify(routes, null, 2)}`.red);
-                return;
-            }
-            let pagePath = tab.pagePath.replace(/^\//, '');
-            const urlObj = url_1.default.parse(pagePath);
-            if (urlObj.hash || urlObj.search) {
-                printError(`tabBar.list[${index}]: ${tab.pagePath} 不能携带参数`.red);
-                return;
-            }
-            pagePath = urlObj.pathname;
-            if (!tab.route) {
-                // 判断 routes[number].route 是否为模式匹配规则
-                tab.route = m.route && (0, path_to_regexp_1.parse)(m.route).length === 1 ? m.route : m.path;
-            }
-            // 判断是否能被路由命中
-            const matched = (0, path_to_regexp_1.match)((_a = m.route) !== null && _a !== void 0 ? _a : m.path)(tab.route);
-            if (!matched) {
-                printError(`tabBar.list[${index}]\n.route: ${tab.route}\n.pagePath: ${tab.pagePath}\n无法被路由命中: \n${JSON.stringify(m, null, 2)}`.red);
-                return;
-            }
-            // 判断是否还被其他路由命中
-            const otherMatched = routes
-                .filter((r) => tab.pagePath !== r.path)
-                .filter((r) => { var _a; return (0, path_to_regexp_1.match)((_a = r.route) !== null && _a !== void 0 ? _a : r.path)(tab.route); });
-            const unusable = otherMatched.filter((r) => r.path !== tab.pagePath);
-            if (unusable.length) {
-                printError(`tabBar.list[${index}]\n.route: ${tab.route}\n.pagePath: ${tab.pagePath}\n应被路由命中：\n${JSON.stringify(m, null, 2)}\n但同时又被其它路由命中：\n${JSON.stringify(unusable, null, 2)}`.red);
-                return;
-            }
-            // tab中配置的页面.route 匹配的页面为模式匹配，需给出告警
-            if (!lodash_1.default.isEmpty(matched.params)) {
-                console.warn(LOG_PREFIX, `tabBar.list[${index}].route: ${tab.route} 命中的路由 \n${JSON.stringify(m, null, 2)}.route: ${m.route} 为模式匹配\ntab页不能携带参数`.yellow);
-            }
-            return {
-                pagePath,
-                text: tab.text,
-                iconPath: tab.icon,
-                selectedIconPath: tab.activeIcon,
-            };
-        })
-            .filter((tab) => !!tab);
-        if (tabs.length < 2 || tabs.length > 5) {
-            printError(`tabBar.list 最少 2 个、最多 5 个 tab`.red);
-            return cfg;
+    const _cfg = {};
+    // 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 模块
+    const tabs = list
+        .map((tab, index) => {
+        var _a;
+        const m = routes.find((i) => tab.pagePath === i.path);
+        if (!m) {
+            printError(`tabBar.list[${index}].pagePath: ${tab.pagePath} 需要在路由配置中: \n${JSON.stringify(routes, null, 2)}`.red);
+            return;
         }
-        _cfg.list = tabs;
-        // 找出 tabBar.list[number].pagePath 重复的配置
-        const _list = duplicates(tabs, (a, b) => (a.pagePath > b.pagePath ? 1 : a.pagePath == b.pagePath ? 0 : -1), 'pagePath');
-        if (_list.length) {
-            console.error(LOG_PREFIX, `tabBar.list不能有重复的页面: \n${JSON.stringify(_list, null, 2)}`.red);
+        let pagePath = tab.pagePath.replace(/^\//, '');
+        const urlObj = url_1.default.parse(pagePath);
+        if (urlObj.hash || urlObj.search) {
+            printError(`tabBar.list[${index}]: ${tab.pagePath} 不能携带参数`.red);
+            return;
         }
-        cfg = fields.reduce((o, next) => {
-            const [src, t] = typeof next === 'string' ? [next] : next;
-            if (rest[src]) {
-                o[t || src] = rest[src];
-            }
-            return o;
-        }, _cfg);
+        pagePath = urlObj.pathname;
+        if (!tab.route) {
+            // 判断 routes[number].route 是否为模式匹配规则
+            tab.route = m.route && (0, path_to_regexp_1.parse)(m.route).length === 1 ? m.route : m.path;
+        }
+        // 判断是否能被路由命中
+        const matched = (0, path_to_regexp_1.match)((_a = m.route) !== null && _a !== void 0 ? _a : m.path)(tab.route);
+        if (!matched) {
+            printError(`tabBar.list[${index}]\n.route: ${tab.route}\n.pagePath: ${tab.pagePath}\n无法被路由命中: \n${JSON.stringify(m, null, 2)}`.red);
+            return;
+        }
+        // 判断是否还被其他路由命中
+        const otherMatched = routes
+            .filter((r) => tab.pagePath !== r.path)
+            .filter((r) => { var _a; return (0, path_to_regexp_1.match)((_a = r.route) !== null && _a !== void 0 ? _a : r.path)(tab.route); });
+        const unusable = otherMatched.filter((r) => r.path !== tab.pagePath);
+        if (unusable.length) {
+            printError(`tabBar.list[${index}]\n.route: ${tab.route}\n.pagePath: ${tab.pagePath}\n应被路由命中：\n${JSON.stringify(m, null, 2)}\n但同时又被其它路由命中：\n${JSON.stringify(unusable, null, 2)}`.red);
+            return;
+        }
+        // tab中配置的页面.route 匹配的页面为模式匹配，需给出告警
+        if (!lodash_1.default.isEmpty(matched.params)) {
+            console.warn(LOG_PREFIX, `tabBar.list[${index}].route: ${tab.route} 命中的路由 \n${JSON.stringify(m, null, 2)}.route: ${m.route} 为模式匹配\ntab页不能携带参数`.yellow);
+        }
+        return {
+            pagePath,
+            text: tab.text,
+            iconPath: tab.icon,
+            selectedIconPath: tab.activeIcon,
+        };
+    })
+        .filter((tab) => !!tab);
+    if (tabs.length < 2 || tabs.length > 5) {
+        printError(`tabBar.list 最少 2 个、最多 5 个 tab`.red);
+        return cfg;
     }
+    _cfg.list = tabs;
+    // 找出 tabBar.list[number].pagePath 重复的配置
+    const _list = duplicates(tabs, (a, b) => (a.pagePath > b.pagePath ? 1 : a.pagePath == b.pagePath ? 0 : -1), 'pagePath');
+    if (_list.length) {
+        console.error(LOG_PREFIX, `tabBar.list不能有重复的页面: \n${JSON.stringify(_list, null, 2)}`.red);
+    }
+    cfg = fields.reduce((o, next) => {
+        const [src, t] = typeof next === 'string' ? [next] : next;
+        if (rest[src]) {
+            o[t || src] = rest[src];
+        }
+        return o;
+    }, _cfg);
     return cfg;
 }
 function PluginRouter(api) {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/build-plugin-router",
-  "version": "0.6.22-beta-2",
+  "version": "0.6.25",
   "description": "Ray build plugin for router",
   "keywords": [
     "ray"
@@ -21,7 +21,7 @@
     "watch": "tsc -p ./tsconfig.build.json --watch"
   },
   "dependencies": {
-    "@ray-js/shared": "^0.6.22-beta-2",
+    "@ray-js/shared": "^0.6.25",
     "chokidar": "^3.5.2",
     "colors": "1.4.0",
     "ejs": "^3.1.6",
@@ -30,7 +30,7 @@
     "url": "^0.11.0"
   },
   "devDependencies": {
-    "@ray-js/types": "^0.6.22-beta-2"
+    "@ray-js/types": "^0.6.25"
   },
   "maintainers": [
     {
@@ -38,6 +38,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "5d621bf1561047175b967cdf3aa35446f7d7198a",
+  "gitHead": "410b4714bc5f496978ddd642ee092f0fe3d8bf8d",
   "repository": {}
 }