i18ntk 4.5.4 → 4.6.1

package/utils/report-model.js

@@ -2,8 +2,12 @@
 
 const fs = require('fs');
 const path = require('path');
+const { getSourceExtensions, getExcludeDirs } = require('./framework-detector');
 const SecurityUtils = require('./security');
 
+const EXCLUDE_DIRS = new Set(getExcludeDirs());
+const SOURCE_EXTENSIONS = getSourceExtensions();
+
 const ISSUE_TYPES = new Set([
   'missing_key',
   'unused_key',
@@ -265,7 +269,7 @@ function discoverLocaleFiles(localesDir) {
 function walk(dir, extensions, acc = [], basePath = process.cwd()) {
   if (!SecurityUtils.safeExistsSync(dir, basePath)) return acc;
   for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-    if (['node_modules', '.git', 'dist', 'build', 'coverage', 'out', 'tmp', 'temp', 'test', 'tests', 'test_env', 'i18ntk-reports'].includes(entry.name)) continue;
+    if (EXCLUDE_DIRS.has(entry.name)) continue;
     const entryPath = path.join(dir, entry.name);
     if (entry.isDirectory()) walk(entryPath, extensions, acc, basePath);
     else if (entry.isFile() && extensions.includes(path.extname(entry.name))) acc.push(entryPath);
@@ -290,7 +294,7 @@ function scanSourceFiles(sourceDir, availableKeys) {
   const hardcodedTexts = [];
   const translationValueIndex = new Map();
   const basePath = path.resolve(sourceDir);
-  const files = walk(sourceDir, ['.js', '.jsx', '.ts', '.tsx', '.vue', '.svelte'], [], basePath);
+  const files = walk(sourceDir, SOURCE_EXTENSIONS, [], basePath);
 
   for (const file of files) {
     const content = SecurityUtils.safeReadFileSync(file, basePath, 'utf8');
@@ -339,7 +343,13 @@ function findKeyByValue(_text, _availableKeys) {
 function extractPlaceholders(value) {
   const placeholders = new Set();
   const text = String(value || '');
-  const patterns = [/\{\{\s*([\w.-]+)\s*\}\}/g, /%\{([\w.-]+)\}/g, /\{([\w.-]+)\}/g];
+  const patterns = [
+    /\{\{\s*([\w.-]+)\s*\}\}/g,
+    /%\{([\w.-]+)\}/g,
+    /\{([\w.-]+)\}/g,
+    /\$\{([\w.-]+)\}/g,
+    /\$([a-zA-Z_][a-zA-Z0-9_-]+)/g
+  ];
   for (const pattern of patterns) {
     let match;
     while ((match = pattern.exec(text))) placeholders.add(match[1]);
@@ -356,7 +366,10 @@ function looksLikelyUntranslated(source, target, locale) {
 }
 
 function normalizeText(value) {
-  return String(value || '').replace(/\{\{[^}]+\}\}|\{[^}]+\}|%\{[^}]+\}/g, '').trim().toLowerCase();
+  return String(value || '')
+    .replace(/\{\{[^}]+\}\}|\{[^}]+\}|%\{[^}]+\}/g, '')
+    .replace(/\$[a-zA-Z_][a-zA-Z0-9_-]*(?:\s*\{\s*[^}]+\})?/g, '')
+    .trim().toLowerCase();
 }
 
 function getExpansionPercent(source, target) {

package/utils/usage-source.js

@@ -2,8 +2,9 @@
 
 const path = require('path');
 const SecurityUtils = require('./security');
+const { SOURCE_DIRS } = require('./framework-detector');
 
-const DEFAULT_SOURCE_DIRS = ['src', 'app', 'lib', 'source'];
+const DEFAULT_SOURCE_DIRS = SOURCE_DIRS;
 
 function resolveUsageSourceDir(options = {}) {
   const projectRoot = path.resolve(options.projectRoot || process.cwd());

package/utils/validation-risk.js

@@ -34,24 +34,32 @@ const ENGLISH_WORDS = new Set([
   'warning', 'when', 'with', 'without'
 ]);
 
-const DEFAULT_ALLOWED_ENGLISH_TERMS = new Set([
-  'api',
-]);
+const DEFAULT_ALLOWED_ENGLISH_TERMS = new Set(['api']);
+
+function resolveAllowedEnglishTerms(options, projectConfig) {
+  const terms = new Set(DEFAULT_ALLOWED_ENGLISH_TERMS);
+  const sources = [
+    options && options.allowedEnglishTerms,
+    projectConfig && projectConfig.allowedEnglishTerms
+  ];
+  for (const source of sources) {
+    if (Array.isArray(source)) {
+      source.forEach(term => {
+        if (typeof term === 'string' && term.trim()) {
+          terms.add(term.trim().toLowerCase());
+        }
+      });
+    }
+  }
+  return terms;
+}
 
 function normalizeLanguage(language) {
   return String(language || '').toLowerCase().split(/[-_]/)[0];
 }
 
 function toAllowedTermSet(terms) {
-  const allowed = new Set(DEFAULT_ALLOWED_ENGLISH_TERMS);
-  if (Array.isArray(terms)) {
-    terms.forEach(term => {
-      if (typeof term === 'string' && term.trim()) {
-        allowed.add(term.trim().toLowerCase());
-      }
-    });
-  }
-  return allowed;
+  return resolveAllowedEnglishTerms({ allowedEnglishTerms: terms });
 }
 
 function stripNonLanguageTokens(value) {
@@ -171,5 +179,6 @@ module.exports = {
   DEFAULT_ENGLISH_THRESHOLD_PERCENT,
   analyzeEnglishContent,
   detectTranslationContentRisks,
-  hasSecretLikeValue
+  hasSecretLikeValue,
+  resolveAllowedEnglishTerms
 };