feima-shortcuts 0.3.0-beta.2 → 0.3.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feima-shortcuts",
-  "version": "0.3.0-beta.2",
+  "version": "0.3.0-beta.3",
   "description": "快捷指令",
   "main": "index.js",
   "directories": {

package/src/scripts/check-locale/index.js

@@ -29,7 +29,6 @@ function loadLocaleKeys(localePath) {
       ts.isExportAssignment(node) &&
       ts.isObjectLiteralExpression(node.expression)
     ) {
-      // eval 需要谨慎，这里保持原逻辑
       obj = eval(`(${node.expression.getText()})`)
     }
     ts.forEachChild(node, visit)
@@ -111,24 +110,25 @@ function checkPageLocale(pageDir) {
   const localeKeys = loadLocaleKeys(localePath)
   const usedKeys = extractUsedKeys(code)
 
-  // locale.ts 中定义但未使用的 key
+  // 检测代码用到但 locale.ts 未定义的 key
+  const undefinedKeys = Array.from(usedKeys).filter((k) => !localeKeys.includes(k))
+  if (undefinedKeys.length) {
+    console.log(`\n❗ 页面中使用了 locale.ts 中不存在的 key:`)
+    console.log(`   ${indexVue}`)
+    undefinedKeys.forEach((k) => console.log(`   - ${k}`))
+  }
+
+  // 检测 locale.ts 里未使用的 key
   const unused = localeKeys.filter((k) => !usedKeys.has(k))
+
   if (unused.length) {
     console.log(`\n❌ 页面未使用 locale key`)
     console.log(`   ${localePath}`)
     unused.forEach((k) => console.log(`   - ${k}`))
-  }
-
-  // 页面中用到了 locale.ts 中未定义的 key
-  const undefinedKeys = [...usedKeys].filter((k) => !localeKeys.includes(k))
-  if (undefinedKeys.length) {
-    console.log(`\n❌ 页面使用了 locale.ts 中未定义的 key`)
-    console.log(`   ${indexVue}`)
-    undefinedKeys.forEach((k) => console.log(`   - ${k}`))
     return true
   }
 
-  return unused.length > 0
+  return false
 }
 
 /* 组件 locale 检测 */
@@ -147,6 +147,8 @@ function checkComponentLocale(componentDir) {
   const invalidFiles = []
   const skippedFiles = []
 
+  const undefinedKeyMap = new Map() // 文件 -> [key]
+
   vueFiles.forEach((file) => {
     const code = fs.readFileSync(file, 'utf-8')
     const localeImport = detectLocaleImport(code)
@@ -162,12 +164,18 @@ function checkComponentLocale(componentDir) {
       return
     }
 
-    extractUsedKeys(code).forEach((k) => usedKeys.add(k))
+    const keys = extractUsedKeys(code)
+    keys.forEach((k) => usedKeys.add(k))
+
+    // 检测未定义 key
+    const undefinedKeys = Array.from(keys).filter((k) => !localeKeys.includes(k))
+    if (undefinedKeys.length) {
+      undefinedKeyMap.set(file, undefinedKeys)
+    }
   })
 
   let hasError = false
 
-  // locale.ts 中定义但未使用的 key
   const unused = localeKeys.filter((k) => !usedKeys.has(k))
   if (unused.length) {
     hasError = true
@@ -176,15 +184,6 @@ function checkComponentLocale(componentDir) {
     unused.forEach((k) => console.log(`   - ${k}`))
   }
 
-  // 组件代码中使用但 locale.ts 未定义的 key
-  const undefinedKeys = [...usedKeys].filter((k) => !localeKeys.includes(k))
-  if (undefinedKeys.length) {
-    hasError = true
-    console.log(`\n❌ 组件使用了 locale.ts 中未定义的 key`)
-    console.log(`   ${componentDir}`)
-    undefinedKeys.forEach((k) => console.log(`   - ${k}`))
-  }
-
   if (invalidFiles.length) {
     hasError = true
     console.log(`\n🚫 组件存在错误的 locale 引入方式`)
@@ -194,12 +193,21 @@ function checkComponentLocale(componentDir) {
     })
   }
 
-  // if (skippedFiles.length) {
-  //   console.log(`\n⚠️ 组件中以下文件未绑定本地 locale（已跳过）`)
-  //   skippedFiles.forEach((f) =>
-  //     console.log(`   ${path.relative(process.cwd(), f)}`)
-  //   )
-  // }
+  if (skippedFiles.length) {
+    console.log(`\n⚠️ 组件中以下文件未绑定本地 locale（已跳过）`)
+    skippedFiles.forEach((f) =>
+      console.log(`   ${path.relative(process.cwd(), f)}`)
+    )
+  }
+
+  if (undefinedKeyMap.size) {
+    hasError = true
+    console.log(`\n❗ 组件中存在未定义的 locale key:`)
+    for (const [file, keys] of undefinedKeyMap.entries()) {
+      console.log(`   ${path.relative(process.cwd(), file)}`)
+      keys.forEach((k) => console.log(`   - ${k}`))
+    }
+  }
 
   return hasError
 }
@@ -231,3 +239,7 @@ function run() {
 }
 
 exports.run = run
+
+if (require.main === module) {
+  run()
+}