feima-shortcuts 0.3.0-beta.10 → 0.3.0-beta.11

package/package.json

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

package/src/scripts/check-i18n-views/index.js

@@ -5,16 +5,12 @@ const { parse } = require('@vue/compiler-sfc')
 const babelParser = require('@babel/parser')
 const traverse = require('@babel/traverse').default
 
-/* ---------------- defaults ---------------- */
-
 const DEFAULT_OPTIONS = {
   cwd: process.cwd(),
   scanDirs: ['src/views', 'src/components'],
   silent: false,
 }
 
-/* ---------------- utils ---------------- */
-
 function flattenLocale(obj, prefix = '') {
   let res = []
   for (const k in obj) {
@@ -43,12 +39,12 @@ function parseCode(code) {
 }
 
 /**
- * 从当前文件目录开始，向上查找最近的 locale.ts
- * 直到到达 componentsRoot 为止
+ * components 目录专用：
+ * 向上查找最近含 locale.ts 的目录（包含自身目录）
+ * 到达 componentsRoot 停止
  */
 function findNearestLocale(fileDir, componentsRoot) {
   let current = fileDir
-
   while (current.startsWith(componentsRoot)) {
     const localePath = path.join(current, 'locale.ts')
     if (fs.existsSync(localePath)) {
@@ -58,11 +54,18 @@ function findNearestLocale(fileDir, componentsRoot) {
     if (parent === current) break
     current = parent
   }
-
   return null
 }
 
-/* ---------------- core ---------------- */
+/**
+ * views 目录专用：
+ * 只查找当前文件同目录的 locale.ts
+ */
+function findViewsLocale(fileDir) {
+  const localePath = path.join(fileDir, 'locale.ts')
+  if (fs.existsSync(localePath)) return localePath
+  return null
+}
 
 function run(userOptions = {}) {
   const options = { ...DEFAULT_OPTIONS, ...userOptions }
@@ -73,12 +76,9 @@ function run(userOptions = {}) {
   for (const dir of scanDirs) {
     const absDir = path.join(cwd, dir)
     if (!fs.existsSync(absDir)) {
-      if (!silent) {
-        console.warn(`⚠️ 目录不存在：${dir}`)
-      }
+      if (!silent) console.warn(`⚠️ 目录不存在：${dir}`)
       continue
     }
-
     files.push(
       ...glob.sync('**/*.{vue,ts,tsx}', {
         cwd: absDir,
@@ -116,7 +116,7 @@ function run(userOptions = {}) {
     }
 
     const usedKeys = []
-    let importedLocale = false
+    let importedLocale = false // 只对 views 生效
 
     traverse(ast, {
       ImportDeclaration(p) {
@@ -124,22 +124,44 @@ function run(userOptions = {}) {
           importedLocale = true
         }
       },
-
       CallExpression(p) {
         const callee = p.node.callee
-        if (
-          (callee.type === 'Identifier' && (callee.name === 't' || callee.name === '$t'))
-        ) {
-          const keyArg = p.node.arguments[0]
-          const defaultArg = p.node.arguments[1]
-          if (keyArg && keyArg.type === 'StringLiteral') {
-            usedKeys.push({
-              key: keyArg.value,
-              defaultValue:
-                defaultArg && defaultArg.type === 'StringLiteral'
-                  ? defaultArg.value
-                  : null,
-            })
+
+        if (file.startsWith(viewsRoot)) {
+          // src/views 目录：只检查 t()
+          if (
+            callee.type === 'Identifier' &&
+            callee.name === 't'
+          ) {
+            const keyArg = p.node.arguments[0]
+            const defaultArg = p.node.arguments[1]
+            if (keyArg && keyArg.type === 'StringLiteral') {
+              usedKeys.push({
+                key: keyArg.value,
+                defaultValue:
+                  defaultArg && defaultArg.type === 'StringLiteral'
+                    ? defaultArg.value
+                    : null,
+              })
+            }
+          }
+        } else if (file.startsWith(componentsRoot)) {
+          // src/components 目录：只检查 $t()
+          if (
+            callee.type === 'Identifier' &&
+            callee.name === '$t'
+          ) {
+            const keyArg = p.node.arguments[0]
+            const defaultArg = p.node.arguments[1]
+            if (keyArg && keyArg.type === 'StringLiteral') {
+              usedKeys.push({
+                key: keyArg.value,
+                defaultValue:
+                  defaultArg && defaultArg.type === 'StringLiteral'
+                    ? defaultArg.value
+                    : null,
+              })
+            }
           }
         }
       },
@@ -149,15 +171,25 @@ function run(userOptions = {}) {
 
     const fileDir = path.dirname(file)
 
-    /* ---------- views 逻辑 ---------- */
     if (file.startsWith(viewsRoot)) {
-      const localePath = path.join(fileDir, 'locale.ts')
-      const localeKeys = loadLocaleKeys(localePath)
+      // views 逻辑：只查同目录 locale.ts，且 vue 文件必须导入 locale
+      const localePath = findViewsLocale(fileDir)
+      const localeKeys = localePath && loadLocaleKeys(localePath)
 
-      if (!importedLocale || !localeKeys) {
+      if (file.endsWith('.vue') && !importedLocale) {
         noLocaleUsage.push({
           file: path.relative(cwd, file),
           keys: usedKeys.map(i => i.key),
+          reason: 'vue 文件未 import locale',
+        })
+        continue
+      }
+
+      if (!localeKeys) {
+        noLocaleUsage.push({
+          file: path.relative(cwd, file),
+          keys: usedKeys.map(i => i.key),
+          reason: '同目录无 locale.ts',
         })
         continue
       }
@@ -171,12 +203,11 @@ function run(userOptions = {}) {
           })
         }
       }
-
       continue
     }
 
-    /* ---------- components 逻辑 ---------- */
     if (file.startsWith(componentsRoot)) {
+      // components 逻辑：向上找最近 locale.ts
       const localePath = findNearestLocale(fileDir, componentsRoot)
       const localeKeys = localePath && loadLocaleKeys(localePath)
 
@@ -184,6 +215,7 @@ function run(userOptions = {}) {
         noLocaleUsage.push({
           file: path.relative(cwd, file),
           keys: usedKeys.map(i => i.key),
+          reason: '未找到可用 locale.ts',
         })
         continue
       }
@@ -197,25 +229,28 @@ function run(userOptions = {}) {
           })
         }
       }
+      continue
     }
   }
 
-  /* ---------------- output ---------------- */
-
   if (!silent) {
     if (missingKeys.length) {
       console.error('\n❌ 缺失的国际化 key：')
       missingKeys.forEach(i =>
         console.error(
-          `  ${i.file}  →  ${i.key}${i.defaultValue ? ` （默认值: ${i.defaultValue}）` : ''}`
+          `  ${i.file}  →  ${i.key}${
+            i.defaultValue ? ` （默认值: ${i.defaultValue}）` : ''
+          }`
         )
       )
     }
 
     if (noLocaleUsage.length) {
-      console.warn('\n⚠️ 使用了 $t / t 但未找到 locale.ts：')
+      console.warn('\n⚠️ 以下文件使用了 $t / t，但未正确使用 locale.ts：')
       noLocaleUsage.forEach(i =>
-        console.warn(`  ${i.file}`)
+        console.warn(
+          `  ${i.file}  →  原因: ${i.reason}，涉及 keys: ${i.keys.join(', ')}`
+        )
       )
     }
 
@@ -233,6 +268,4 @@ function run(userOptions = {}) {
   }
 }
 
-/* ---------------- exports ---------------- */
-
 exports.run = run