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

package/bin/feima.js

@@ -2,6 +2,8 @@
 const inquirer = require("inquirer");
 const { Command } = require('commander')
 const feima = require("../src/generate");
+
+const checkLocale  = require('../src/scripts/check-locale')
 const { version } = require("../package.json"); // 读取 package.json 中的版本号
 
 const program = new Command()
@@ -14,7 +16,7 @@ program
   .command('check-locale')
   .description('检查未使用的 locale')
   .action(() => {
-    require('../src/scripts/check-locale')
+    checkLocale.run();
   })
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feima-shortcuts",
-  "version": "0.3.0-beta.0",
+  "version": "0.3.0-beta.2",
   "description": "快捷指令",
   "main": "index.js",
   "directories": {
@@ -19,7 +19,9 @@
     "commander": "^5.1.0",
     "download-git-repo": "^3.0.2",
     "fs-extra": "^9.0.1",
+    "glob": "^13.0.0",
     "inquirer": "^7.3.0",
+    "typescript": "^5.9.3",
     "uuid": "^9.0.0"
   },
   "packageManager": "pnpm@10.6.3+sha512.bb45e34d50a9a76e858a95837301bfb6bd6d35aea2c5d52094fa497a467c43f5c440103ce2511e9e0a2f89c3d6071baac3358fc68ac6fb75e2ceb3d2736065e6"

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

@@ -29,6 +29,7 @@ function loadLocaleKeys(localePath) {
       ts.isExportAssignment(node) &&
       ts.isObjectLiteralExpression(node.expression)
     ) {
+      // eval 需要谨慎，这里保持原逻辑
       obj = eval(`(${node.expression.getText()})`)
     }
     ts.forEachChild(node, visit)
@@ -109,16 +110,25 @@ function checkPageLocale(pageDir) {
 
   const localeKeys = loadLocaleKeys(localePath)
   const usedKeys = extractUsedKeys(code)
-  const unused = localeKeys.filter((k) => !usedKeys.has(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 false
+  return unused.length > 0
 }
 
 /* 组件 locale 检测 */
@@ -157,6 +167,7 @@ function checkComponentLocale(componentDir) {
 
   let hasError = false
 
+  // locale.ts 中定义但未使用的 key
   const unused = localeKeys.filter((k) => !usedKeys.has(k))
   if (unused.length) {
     hasError = true
@@ -165,6 +176,15 @@ 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 引入方式`)
@@ -174,12 +194,12 @@ 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)}`)
+  //   )
+  // }
 
   return hasError
 }
@@ -203,15 +223,11 @@ function run() {
   })
 
   if (hasError) {
-    console.log('\n❗ locale 治理未通过')
+    console.log('\n❗ locale 检查未通过')
     process.exit(1)
   } else {
-    console.log('\n✅ locale 治理通过')
+    console.log('\n✅ locale 检查通过')
   }
 }
 
-if (require.main === module) {
-  run()
-}
-
-module.exports = run
+exports.run = run