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

package/package.json

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

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

@@ -4,7 +4,8 @@ const path = require('path')
 const glob = require('glob')
 const ts = require('typescript')
 
-/* 工具函数，保持你原逻辑 */
+/* ================= 工具函数 ================= */
+
 function flattenLocale(obj, prefix = '') {
   let res = []
   for (const k in obj) {
@@ -38,11 +39,19 @@ function loadLocaleKeys(localePath) {
   return obj ? flattenLocale(obj) : []
 }
 
+/**
+ * 提取使用到的 locale key
+ * 兼容：
+ *   t('a.b.c')
+ *   t('a.b.c', 'fallback')
+ */
 function extractUsedKeys(code) {
-  const reg = /t\s*\(\s*['"`]([^'"`]+)['"`]\s*\)/g
+  const reg = /t\s*\(\s*['"`]([^'"`]+)['"`]\s*(?:,|\))/g
   const set = new Set()
   let m
-  while ((m = reg.exec(code))) set.add(m[1])
+  while ((m = reg.exec(code))) {
+    set.add(m[1])
+  }
   return set
 }
 
@@ -77,7 +86,8 @@ function detectUseLocale(code) {
   }
 }
 
-/* 页面 locale 检测 */
+/* ================= 页面 locale 检测 ================= */
+
 function checkPageLocale(pageDir) {
   const localePath = path.join(pageDir, 'locale.ts')
   const indexVue = path.join(pageDir, 'index.vue')
@@ -109,16 +119,6 @@ function checkPageLocale(pageDir) {
 
   const localeKeys = loadLocaleKeys(localePath)
   const usedKeys = extractUsedKeys(code)
-
-  // 检测代码用到但 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) {
@@ -131,7 +131,8 @@ function checkPageLocale(pageDir) {
   return false
 }
 
-/* 组件 locale 检测 */
+/* ================= 组件 locale 检测 ================= */
+
 function checkComponentLocale(componentDir) {
   const localePath = path.join(componentDir, 'locale.ts')
   if (!fs.existsSync(localePath)) return false
@@ -147,8 +148,6 @@ 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)
@@ -164,14 +163,7 @@ function checkComponentLocale(componentDir) {
       return
     }
 
-    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)
-    }
+    extractUsedKeys(code).forEach((k) => usedKeys.add(k))
   })
 
   let hasError = false
@@ -200,19 +192,10 @@ function checkComponentLocale(componentDir) {
     )
   }
 
-  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
 }
 
-/* 主入口 */
+/* ================= 主入口 ================= */
 
 function run() {
   const root = path.resolve(process.cwd(), 'src/views')
@@ -239,7 +222,3 @@ function run() {
 }
 
 exports.run = run
-
-if (require.main === module) {
-  run()
-}