@chaoswise/intl 3.1.1 → 3.1.3

package/bin/chaoswise-intl.js

@@ -4,6 +4,7 @@ const runUpdate = require('./scripts/update');
 const runInitConfig = require('./scripts/initConfig');
 const runAddLocale = require('./scripts/addLocale');
 const runNoZhCn = require('./scripts/nozhcn');
+const runNoZhCnGuard = require('./scripts/nozhcnGuard');
 const runVerify = require('./scripts/verify');
 
 const SCRIPTS = ['intl', 'collect', 'update', 'nozhcn', 'addLocale', 'init', 'verify'];
@@ -27,11 +28,17 @@ if (script === 'addLocale') {
 }
 // verify: 检测代码中所有 intl.get('id') 是否都在 relationKey.json 或本地 locale 文件中
 // Usage:
-//   chaoswise-intl verify          → 发现孤立 id 时 exit(1)（CI 门禁）
-//   chaoswise-intl verify --warn   → 仅警告，不 exit(1)
+//   chaoswise-intl verify              → 发现孤立 id 时 exit(1)（CI 门禁）
+//   chaoswise-intl verify --warn       → 仅警告，不 exit(1)
+//   chaoswise-intl verify fix          → 将孤立 id 的 intl 调用降级回字符串字面量（downgrade 策略）
 if (script === 'verify') {
-  const exitOnMissing = !args.includes('--warn');
-  runVerify({ exitOnMissing });
+  const subCommand = args[scriptIndex + 1];
+  if (subCommand === 'fix') {
+    runVerify.fix();
+  } else {
+    const exitOnMissing = !args.includes('--warn');
+    runVerify({ exitOnMissing });
+  }
 }
 // nozhcn: detect (and optionally fix) Chinese characters in source files
 // Usage:
@@ -39,9 +46,15 @@ if (script === 'verify') {
 //   chaoswise-intl nozhcn check     → same as above
 //   chaoswise-intl nozhcn fix       → auto-fix comments, report remaining issues
 //   chaoswise-intl nozhcn report    → non-blocking scan, output JSON report
+//   chaoswise-intl nozhcn guard     → repository-level zero-Chinese guard (supports --report/--config/...)
 if (script === 'nozhcn') {
   // The sub-mode is the argument after 'nozhcn', default to 'check'
   const modeArg = args[scriptIndex + 1];
+  if (modeArg === 'guard') {
+    const guardArgs = args.slice(scriptIndex + 2);
+    runNoZhCnGuard(guardArgs);
+    return;
+  }
   const validModes = ['check', 'fix', 'report'];
   const mode = validModes.includes(modeArg) ? modeArg : 'check';
   runNoZhCn(mode);

package/bin/scripts/conf/default.js

@@ -104,8 +104,9 @@ module.exports = function (excludes = []) {
     //   'string'     - 字符串字面量
     //   'template'   - 模板字符串
     //   'jsx'        - JSX 文本内容
+    //   'console'    - console.* 日志中的中文（可自动清理）
     //   'identifier' - 标识符名称（极少出现，需手动修复）
-    noZhCnCheckTypes: ['comment', 'string', 'template', 'jsx'],
+    noZhCnCheckTypes: ['comment', 'string', 'template', 'jsx', 'console'],
 
     // 注释中文修复策略（fix 模式生效）:
     //   'clean'  - 仅删除中文字符，保留非中文内容；若注释全为中文则整条删除
@@ -137,12 +138,25 @@ module.exports = function (excludes = []) {
     //   'empty'  - 保留元素但清空内容：<title>搜索</title> → <title></title>
     noZhCnSvgMetadataStrategy: 'remove',
 
+    // JSX 内联 <svg> 的元数据元素（<title>、<desc>、<metadata>）修复策略（fix 模式生效）:
+    //   'remove' - 删除整个元素
+    //   'empty'  - 保留元素但清空内容
+    //   false    - 不自动修复 JSX 内联 SVG metadata（仅报告）
+    //   undefined/null - 跟随 noZhCnSvgMetadataStrategy（向后兼容）
+    noZhCnJsxSvgMetadataStrategy: null,
+
     // SVG 属性中文修复策略（fix 模式生效）:
     //   'clean'  - 删除属性值中的中文字符（及 CJK 标点），清理后为空则移除整个属性；
     //              若修改了 id 属性，同步更新 SVG 内部引用（url(#…), href）
     //   'remove' - 移除包含中文的属性
     //   false    - 不自动修复属性中的中文
-    noZhCnSvgAttrStrategy: 'clean',  };
+    noZhCnSvgAttrStrategy: 'clean',
+
+    // console 中文日志修复策略（fix 模式生效）:
+    //   'remove' - 删除包含中文的 console 语句（仅处理可安全定位的表达式语句）
+    //   false    - 不自动修复 console 中文日志（仅报告）
+    noZhCnConsoleStrategy: 'remove',
+  };
 
   excludes.forEach((key) => delete config[key]);
 

package/bin/scripts/nozhcn.js

@@ -26,6 +26,9 @@ const getConf = require('./conf');
 const { targetEntryFiles } = require('./util/getTargetFiles');
 const findZhCnInFile = require('./util/findZhCnInFile');
 const fixZhCnInFile = require('./util/fixZhCnInFile');
+const { fixJsxSvgAttrInFile } = require('./util/fixZhCnInFile');
+const { fixJsxSvgMetadataInFile } = require('./util/fixZhCnInFile');
+const { fixConsoleZhCnInFile } = require('./util/fixZhCnInFile');
 const fixI18nDefaultInFile = require('./util/fixI18nDefaultInFile');
 const findZhCnInSvgFile = require('./util/findZhCnInSvgFile');
 const fixZhCnInSvgFile = require('./util/fixZhCnInSvgFile');
@@ -35,12 +38,15 @@ const file = require('./util/file');
 // ─── Display labels ──────────────────────────────────────────────────────────
 
 const TYPE_LABEL = {
-  comment:    'Comment   ',
-  string:     'String    ',
-  template:   'Template  ',
-  jsx:        'JSX Text  ',
-  'jsx-svg':  'JSX SVG   ',
-  identifier: 'Identifier',
+  comment:        'Comment     ',
+  string:         'String      ',
+  template:       'Template    ',
+  jsx:            'JSX Text    ',
+  'jsx-svg':      'JSX SVG     ',
+  'jsx-svg-attr': 'JSX SVG Attr',
+  'jsx-svg-metadata': 'JSX SVG Meta',
+  console:        'Console Log ',
+  identifier:     'Identifier  ',
   'svg-comment':  'SVG Comment ',
   'svg-metadata': 'SVG Metadata',
   'svg-text':     'SVG Text    ',
@@ -53,6 +59,9 @@ const TYPE_COLOR = {
   template:       chalk.yellow,
   jsx:            chalk.cyan,
   'jsx-svg':      chalk.magenta,
+  'jsx-svg-attr': chalk.magenta,
+  'jsx-svg-metadata': chalk.gray,
+  console:        chalk.blue,
   identifier:     chalk.red,
   'svg-comment':  chalk.gray,
   'svg-metadata': chalk.gray,
@@ -61,8 +70,18 @@ const TYPE_COLOR = {
 };
 
 // Types that can be auto-fixed by nozhcn fix
-// Note: 'svg-attr' is conditionally fixable when noZhCnSvgAttrStrategy is set
-const AUTO_FIXABLE_TYPES = new Set(['comment', 'svg-comment', 'svg-metadata', 'svg-attr']);
+// Note:
+// - 'svg-attr' / 'jsx-svg-attr' are conditionally fixable when noZhCnSvgAttrStrategy is set
+// - 'svg-metadata' / 'jsx-svg-metadata' are conditionally fixable when noZhCnSvgMetadataStrategy is set
+const AUTO_FIXABLE_TYPES = new Set([
+  'comment',
+  'svg-comment',
+  'svg-metadata',
+  'svg-attr',
+  'jsx-svg-attr',
+  'jsx-svg-metadata',
+  'console',
+]);
 
 // Types that `collect` script can handle
 const COLLECT_TYPES = new Set(['string', 'template', 'jsx']);
@@ -163,13 +182,23 @@ function printSummary(findings, mode, autoFixedCount, i18nDefaultFixed) {
     if (svgManualNeeded) {
       console.log(
         chalk.dim(
-          '  Tip: SVG text/attribute occurrences require manual handling.\n' +
-          '       For standalone .svg files, run fix to clean comments/metadata;\n' +
+          '  Tip: SVG visible text occurrences require manual handling.\n' +
+          '       For standalone .svg files, run fix to clean comments/metadata/attrs;\n' +
           '       for <text> content, consider replacing with a JS-driven label.'
         )
       );
     }
 
+    const jsxSvgAttrNeeded = findings.some((f) => f.type === 'jsx-svg-attr');
+    if (jsxSvgAttrNeeded) {
+      console.log(
+        chalk.dim(
+          "  Tip: JSX SVG attribute values (e.g. id=\"编组1\") are design-tool layer name artifacts.\n" +
+          "       Run 'chaoswise-intl nozhcn fix' to auto-strip Chinese characters from them."
+        )
+      );
+    }
+
     const identifierFound = findings.some((f) => f.type === 'identifier');
     if (identifierFound) {
       console.log(
@@ -201,7 +230,9 @@ module.exports = function noZhCn(mode) {
     noZhCnDefaultLang = null,
     noZhCnIncludeSvg = false,
     noZhCnSvgMetadataStrategy = 'remove',
+    noZhCnJsxSvgMetadataStrategy = null,
     noZhCnSvgAttrStrategy = 'clean',
+    noZhCnConsoleStrategy = 'remove',
     localeOutput = 'src/public',
     primaryRegx,
     babelPresets,
@@ -285,9 +316,9 @@ module.exports = function noZhCn(mode) {
 
   // ── Phase 2: Auto-fix (fix mode only) ────────────────────────────────────
   //
-  // All fix sub-phases (2 / 2b / 2c) run first WITHOUT intermediate re-scans.
-  // A single final re-scan at the end produces accurate remaining findings.
-  // This avoids up to 3 redundant full-project AST parses on large codebases.
+  // Most fix sub-phases run without full-project intermediate re-scans.
+  // For offset-based JS/TS fixers (console / jsx-svg-attr / jsx-svg-metadata),
+  // we re-scan only affected files right before patching to avoid stale ranges.
 
   let autoFixedCount = 0;
   let i18nDefaultFixed = 0;
@@ -296,6 +327,15 @@ module.exports = function noZhCn(mode) {
 
   if (mode === 'fix') {
     let anyFixApplied = false;
+    function getLatestFindingsByType(filePath, type) {
+      const result = findZhCnInFile(filePath, scanOpts);
+      if (result.error) {
+        errorFiles.push({ filePath, error: result.error });
+        return [];
+      }
+      return result.findings.filter((f) => f.type === type);
+    }
+
     // ── Phase 2a: Fix comments in JS/TS files ─────────────────────────────
     const commentByFile = new Map();
     allFindings.forEach((f) => {
@@ -309,6 +349,24 @@ module.exports = function noZhCn(mode) {
     });
     if (autoFixedCount > 0) anyFixApplied = true;
 
+    // ── Phase 2a2: Remove Chinese console logs in JS/TS files ───────────
+    if (noZhCnConsoleStrategy) {
+      const consoleFiles = new Set();
+      allFindings.forEach((f) => {
+        if (f.type !== 'console') return;
+        consoleFiles.add(f.filePath);
+      });
+
+      let consoleFixedCount = 0;
+      consoleFiles.forEach((fp) => {
+        const findings = getLatestFindingsByType(fp, 'console');
+        if (!findings.length) return;
+        consoleFixedCount += fixConsoleZhCnInFile(fp, findings, noZhCnConsoleStrategy);
+      });
+      autoFixedCount += consoleFixedCount;
+      if (consoleFixedCount > 0) anyFixApplied = true;
+    }
+
     // ── Phase 2b: Replace .d('Chinese') with translations ─────────────────
     if (noZhCnDefaultLang) {
       const localePath = path.resolve(
@@ -333,10 +391,13 @@ module.exports = function noZhCn(mode) {
 
         if (localeMap) {
           const fixOpts = { i18nObject, i18nMethod, i18nDefaultFunctionKey, babelPresets, babelPlugins };
-          // Collect JS/TS file paths from initial findings (exclude svg-* types)
-          const filesToFix = new Set(
-            allFindings.filter((f) => !f.type.startsWith('svg-')).map((f) => f.filePath)
-          );
+          // Use ALL scanned files rather than only those with findings.
+          // When noZhCnIgnoreI18nDefault:true (the default), the initial Phase-1 scan
+          // blanks out .d('中文') before checking, so files whose ONLY Chinese text is
+          // inside .d() calls produce zero findings and would be silently skipped.
+          // fixI18nDefaultInFile has a cheap fast-path (no Chinese → early return),
+          // so scanning all files here causes no meaningful performance cost.
+          const filesToFix = new Set(files.map(({ filePath: fp }) => fp));
           filesToFix.forEach((fp) => {
             const result = fixI18nDefaultInFile(fp, localeMap, fixOpts);
             i18nDefaultFixed += result.fixed;
@@ -380,6 +441,53 @@ module.exports = function noZhCn(mode) {
       if (svgFixedCount > 0) anyFixApplied = true;
     }
 
+    // ── Phase 2d: Fix JSX SVG attribute strings in JS/TS files ───────────
+    // e.g. <svg id="编组1"> → <svg id="1"> (strip Chinese layer-name artifacts)
+    if (noZhCnSvgAttrStrategy) {
+      const jsxSvgAttrFiles = new Set();
+      allFindings.forEach((f) => {
+        if (f.type !== 'jsx-svg-attr') return;
+        jsxSvgAttrFiles.add(f.filePath);
+      });
+
+      jsxSvgAttrFiles.forEach((fp) => {
+        const findings = getLatestFindingsByType(fp, 'jsx-svg-attr');
+        if (!findings.length) return;
+        const fixed = fixJsxSvgAttrInFile(fp, findings, noZhCnSvgAttrStrategy);
+        svgFixedCount += fixed;
+      });
+      if (svgFixedCount > 0) anyFixApplied = true;
+    }
+
+    // ── Phase 2e: Fix JSX SVG metadata text in JS/TS files ───────────────
+    // e.g. <title>添加icon</title> (inside JSX <svg>)
+    // Strategy precedence:
+    //   1) noZhCnJsxSvgMetadataStrategy (if explicitly set, including false)
+    //   2) fallback to noZhCnSvgMetadataStrategy (backward-compat)
+    const hasExplicitJsxMetaStrategy = Object.prototype.hasOwnProperty.call(
+      conf,
+      'noZhCnJsxSvgMetadataStrategy'
+    );
+    const jsxMetaStrategy = hasExplicitJsxMetaStrategy
+      ? noZhCnJsxSvgMetadataStrategy
+      : noZhCnSvgMetadataStrategy;
+
+    if (jsxMetaStrategy) {
+      const jsxSvgMetadataFiles = new Set();
+      allFindings.forEach((f) => {
+        if (f.type !== 'jsx-svg-metadata') return;
+        jsxSvgMetadataFiles.add(f.filePath);
+      });
+
+      jsxSvgMetadataFiles.forEach((fp) => {
+        const findings = getLatestFindingsByType(fp, 'jsx-svg-metadata');
+        if (!findings.length) return;
+        const fixed = fixJsxSvgMetadataInFile(fp, findings, jsxMetaStrategy);
+        svgFixedCount += fixed;
+      });
+      if (svgFixedCount > 0) anyFixApplied = true;
+    }
+
     // ── Single final re-scan after all fixes ──────────────────────────────
     if (anyFixApplied) {
       allFindings = [];