From 38ace74d983698f785d858e9afc29adc3e0273ee Mon Sep 17 00:00:00 2001 From: lisonge Date: Mon, 8 Jan 2024 20:57:32 +0800 Subject: [PATCH] perf: check category group name format --- src/file.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/file.ts b/src/file.ts index 8d093abe..718e4312 100644 --- a/src/file.ts +++ b/src/file.ts @@ -189,8 +189,12 @@ export const checkConfig = (newConfig: RawSubscription) => { app.groups?.forEach((g) => { const oldGroup = oldGroups.find((og) => og.key == g.key); if (!oldGroup || !_.isEqual(oldGroup, g)) { - // 检查新增/变动的规则组是否能被分类捕获 - if (!categories.some((c) => g.name.startsWith(c.name))) { + // 检查新增/变动的规则组是否能被分类 + if ( + !categories.some( + (c) => g.name == c.name || g.name.startsWith(c.name + '-'), + ) + ) { console.error({ configName: newConfig.name, appId: app.id, @@ -200,7 +204,10 @@ export const checkConfig = (newConfig: RawSubscription) => { categories: categories.map((c) => c.name), }); throw new Error( - 'invalid group name, it must startsWith any category', + [ + 'invalid group name, it must equal any category name or startWith categoryName + "-".', + 'example: "开屏广告" or "分段广告-朋友圈"', + ].join('\n'), ); } }