@abdess76/i18nkit 1.0.3 → 1.0.5

package/bin/core/file-walker.js

@@ -10,6 +10,7 @@ const fs = require('./fs-adapter');
 const path = require('path');
 
 const DEFAULT_EXCLUDED_FOLDERS = ['node_modules', 'dist', '.git', 'coverage', 'e2e', '.angular'];
+const DEFAULT_EXCLUDED_SET = new Set(DEFAULT_EXCLUDED_FOLDERS);
 
 const VALID_SOURCE_RE = /\.(ts|html)$/;
 const EXCLUDED_SOURCE_RE = /\.(spec|test|e2e|mock)\./;
@@ -22,30 +23,36 @@ function validateDir(dir) {
   }
 }
 
-function shouldSkipEntry(entry, excludedFolders) {
-  return excludedFolders.includes(entry.name);
+function shouldSkipEntry(entry, excludedSet) {
+  return excludedSet.has(entry.name);
 }
 
-async function* processEntry(entry, dir, excludedFolders) {
+async function* processEntry(entry, dir, excludedSet) {
   const filePath = path.join(dir, entry.name);
   if (entry.isDirectory()) {
-    yield* walkDirAsync(filePath, excludedFolders);
+    yield* walkDirRecursive(filePath, excludedSet);
   } else if (isValidSourceFile(entry.name)) {
     yield filePath;
   }
 }
 
-async function* walkDirAsync(dir, excludedFolders = DEFAULT_EXCLUDED_FOLDERS) {
+async function* walkDirRecursive(dir, excludedSet) {
   validateDir(dir);
   const entries = await fs.readdir(dir, { withFileTypes: true });
   for (const entry of entries) {
-    if (shouldSkipEntry(entry, excludedFolders)) {
+    if (shouldSkipEntry(entry, excludedSet)) {
       continue;
     }
-    yield* processEntry(entry, dir, excludedFolders);
+    yield* processEntry(entry, dir, excludedSet);
   }
 }
 
+async function* walkDirAsync(dir, excludedFolders = DEFAULT_EXCLUDED_FOLDERS) {
+  const excludedSet =
+    Array.isArray(excludedFolders) ? new Set(excludedFolders) : DEFAULT_EXCLUDED_SET;
+  yield* walkDirRecursive(dir, excludedSet);
+}
+
 /**
  * Collects all .ts/.html files recursively, excluding test files
  * @param {string} dir
@@ -109,17 +116,24 @@ function handleHtmlFile(content, filePath, processedTemplates) {
   return { template: content, typescript: null, type: 'html' };
 }
 
+function removeMatchedSections(content, matches) {
+  const parts = [];
+  let lastIndex = 0;
+  for (const m of matches) {
+    parts.push(content.slice(lastIndex, m.index));
+    lastIndex = m.index + m[0].length;
+  }
+  parts.push(content.slice(lastIndex));
+  return parts.join('');
+}
+
 function extractInlineTemplate(content) {
   const templateMatches = [...content.matchAll(/template\s*:\s*`([\s\S]*?)`/g)];
   if (templateMatches.length === 0) {
     return { template: null, tsCode: content };
   }
   const template = templateMatches.map(m => m[1]).join('\n');
-  let tsCode = content;
-  for (const m of templateMatches) {
-    tsCode = tsCode.replace(m[0], '');
-  }
-  return { template, tsCode };
+  return { template, tsCode: removeMatchedSections(content, templateMatches) };
 }
 
 function resolveTemplatePath(content, filePath) {

package/bin/core/fs-adapter.js

@@ -33,11 +33,16 @@ const readdirSync = (path, options) => fs.readdirSync(path, options);
 const statSync = path => fs.statSync(path);
 const watch = (path, options, listener) => fs.watch(path, options, listener);
 const mkdirSync = (path, options) => fs.mkdirSync(path, options);
+const copyFileSync = (src, dest) => fs.copyFileSync(src, dest);
 
 const readFile = (path, encoding = 'utf-8') => fsp.readFile(path, encoding);
 const writeFile = (path, data, encoding = 'utf-8') => fsp.writeFile(path, data, encoding);
 const readdir = (path, options) => fsp.readdir(path, options);
 const mkdir = (path, options) => fsp.mkdir(path, options);
+const rename = (oldPath, newPath) => fsp.rename(oldPath, newPath);
+const unlink = path => fsp.unlink(path);
+const copyFile = (src, dest) => fsp.copyFile(src, dest);
+const rm = (path, options) => fsp.rm(path, options);
 
 module.exports = {
   setAdapter,
@@ -47,10 +52,15 @@ module.exports = {
   writeFileSync,
   readdirSync,
   mkdirSync,
+  copyFileSync,
   statSync,
   watch,
   readFile,
   writeFile,
   readdir,
   mkdir,
+  rename,
+  unlink,
+  copyFile,
+  rm,
 };

package/bin/core/help-generator.js

@@ -165,7 +165,7 @@ function generateFooter() {
 
 PLUGIN LOCATIONS:
   builtin:  <package>/bin/plugins/
-  local:    .i18n/plugins/
+  local:    .i18nkit/plugins/
   npm:      i18nkit-* packages`;
 }
 

package/bin/core/index.js

@@ -19,13 +19,9 @@ const plugins = require('./plugin-resolver');
 const config = require('./config');
 const detector = require('./detector');
 const help = require('./help-generator');
-const fsAdapter = require('./fs-adapter');
 const logUtils = require('./log-utils');
 
 module.exports = {
-  setFsAdapter: fsAdapter.setAdapter,
-  resetFsAdapter: fsAdapter.resetAdapter,
-
   getArgValue: config.getArgValue,
 
   readJsonFile: json.readJsonFile,

package/bin/core/json-utils.js

@@ -109,17 +109,21 @@ const isPlainObject = v => typeof v === 'object' && v !== null && !Array.isArray
  * Flattens nested JSON to dot-notation keys
  * @param {Object} obj
  * @param {string} [prefix='']
+ * @param {Object} [result={}]
  * @returns {Record<string, string>}
  * @example
  * flattenJson({ user: { name: 'John' } }) // { 'user.name': 'John' }
  */
-function flattenJson(obj, prefix = '') {
-  return Object.entries(obj).reduce((acc, [key, value]) => {
+function flattenJson(obj, prefix = '', result = {}) {
+  for (const [key, value] of Object.entries(obj)) {
     const fullKey = buildKey(prefix, escapeKey(key));
-    return isPlainObject(value) ?
-        { ...acc, ...flattenJson(value, fullKey) }
-      : { ...acc, [fullKey]: value };
-  }, {});
+    if (isPlainObject(value)) {
+      flattenJson(value, fullKey, result);
+    } else {
+      result[fullKey] = value;
+    }
+  }
+  return result;
 }
 
 function ensurePath(obj, parts) {

package/bin/core/key-generator.js

@@ -10,6 +10,17 @@ const path = require('path');
 const { decodeHtmlEntities } = require('./parser-utils');
 
 const MAX_KEY_LENGTH = 50;
+const IGNORED_SCOPE_FOLDERS = new Set([
+  'components',
+  'pages',
+  'shared',
+  'common',
+  'features',
+  'dialogs',
+  'forms',
+  'ui',
+  'lib',
+]);
 
 /**
  * Converts text to a translation key (lowercase, underscored, max 50 chars)
@@ -49,18 +60,7 @@ function pathToScope(filePath, baseDir) {
     .replace(/\.(component|html|ts)$/g, '')
     .replace(/\.component$/, '');
 
-  const ignoredFolders = [
-    'components',
-    'pages',
-    'shared',
-    'common',
-    'features',
-    'dialogs',
-    'forms',
-    'ui',
-    'lib',
-  ];
-  const significantParts = parts.filter(p => !ignoredFolders.includes(p));
+  const significantParts = parts.filter(p => !IGNORED_SCOPE_FOLDERS.has(p));
 
   const scope = significantParts
     .concat(fileName !== 'app' && fileName !== parts.at(-1) ? [fileName] : [])

package/bin/core/orphan-finder.js

@@ -50,26 +50,22 @@ function detectDynamicPatterns(content, relPath, dynamicPatterns) {
   }
 }
 
+const QUOTED_STRING_RE = /['"`]([a-zA-Z][a-zA-Z0-9_.]+)['"`]/g;
+
 function scanFileForKeyUsage(ctx) {
-  const { content, relPath, allKeys, keyUsageMap, dynamicPatterns } = ctx;
+  const { content, relPath, keySet, keyUsageMap, dynamicPatterns } = ctx;
   detectDynamicPatterns(content, relPath, dynamicPatterns);
 
-  const keySet = new Set(allKeys.filter(k => !keyUsageMap.get(k)));
-  if (keySet.size === 0) {
-    return;
-  }
-
-  const keyPattern = new RegExp(
-    `['"\`](${[...keySet].map(k => k.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')).join('|')})['"\`]`,
-    'g',
-  );
-  for (const match of content.matchAll(keyPattern)) {
-    keyUsageMap.set(match[1], true);
+  for (const match of content.matchAll(QUOTED_STRING_RE)) {
+    const candidate = match[1];
+    if (keySet.has(candidate)) {
+      keyUsageMap.set(candidate, true);
+    }
   }
 }
 
 async function scanAllFilesForKeys(files, ctx) {
-  const { srcDir, allKeys, keyUsageMap, dynamicPatterns, verbose } = ctx;
+  const { srcDir, keySet, keyUsageMap, dynamicPatterns, verbose } = ctx;
   await Promise.all(
     files.map(async filePath => {
       try {
@@ -77,7 +73,7 @@ async function scanAllFilesForKeys(files, ctx) {
         scanFileForKeyUsage({
           content,
           relPath: path.relative(srcDir, filePath),
-          allKeys,
+          keySet,
           keyUsageMap,
           dynamicPatterns,
         });
@@ -131,10 +127,11 @@ function logOrphanResults(results, log) {
 
 async function scanAndCollect(ctx) {
   const { srcDir, excludedFolders, allKeys, verbose } = ctx;
+  const keySet = new Set(allKeys);
   const keyUsageMap = new Map(allKeys.map(k => [k, false]));
   const dynamicPatterns = [];
   const files = await collectFiles(srcDir, excludedFolders);
-  await scanAllFilesForKeys(files, { srcDir, allKeys, keyUsageMap, dynamicPatterns, verbose });
+  await scanAllFilesForKeys(files, { srcDir, keySet, keyUsageMap, dynamicPatterns, verbose });
   const { usedKeys, orphanKeys } = partitionKeyUsage(keyUsageMap);
   return { usedKeys, orphanKeys, dynamicPatterns, allKeys };
 }

package/bin/core/paths.js

@@ -43,14 +43,14 @@ function resolveOutputFile(ctx) {
 function resolvePaths(ctx) {
   const { args, config, cwd, lang = null } = ctx;
   const i18nDir = resolveI18nDir(args, config, cwd);
-  const reportDir = path.join(cwd, '.i18n');
+  const i18nkitDir = path.join(cwd, '.i18nkit');
   return {
     srcDir: resolveSrcDir(args, config, cwd),
     i18nDir,
-    reportDir,
-    backupDir: path.join(reportDir, 'backup'),
+    reportDir: i18nkitDir,
+    backupDir: path.join(i18nkitDir, 'backups'),
     outputFile: resolveOutputFile({ args, config, i18nDir, lang }),
-    keyMappingFile: path.join(cwd, '.i18n-keys.json'),
+    keyMappingFile: path.join(i18nkitDir, 'keys.json'),
     excludedFolders: config.excludedFolders || DEFAULT_EXCLUDED_FOLDERS,
   };
 }

package/bin/core/plugin-resolver-utils.js

@@ -10,7 +10,7 @@ const fs = require('./fs-adapter');
 const path = require('path');
 
 const BUILTIN_DIR = path.join(__dirname, '..', 'plugins');
-const LOCAL_DIR = '.i18n/plugins';
+const LOCAL_DIR = '.i18nkit/plugins';
 
 /** @type {Record<string, string>} */
 const BUILTIN_ALIASES = {

package/bin/core/translator.js

@@ -50,7 +50,11 @@ function logTranslationSummary(ctx) {
 
 async function executeDeepLTranslation(ctx) {
   const { uniqueValues, sourceLang, targetLang, provider } = ctx;
-  const translated = await provider.translateBatch(uniqueValues, sourceLang, targetLang);
+  const translated = await provider.translateBatch({
+    texts: uniqueValues,
+    fromLang: sourceLang,
+    toLang: targetLang,
+  });
   return {
     translationMap: new Map(uniqueValues.map((v, i) => [v, translated[i]])),
     failedCount: 0,
@@ -59,13 +63,18 @@ async function executeDeepLTranslation(ctx) {
 
 function executeMyMemoryTranslation(ctx) {
   const { uniqueValues, sourceLang, targetLang, provider, email, verbose } = ctx;
-  return provider.translateBatch(uniqueValues, sourceLang, targetLang, {
-    email,
-    verbose,
-    onProgress: (processed, total) => {
-      if (processed < total) {
-        process.stdout.write(`\r  Progress: ${processed}/${total}`);
-      }
+  return provider.translateBatch({
+    texts: uniqueValues,
+    fromLang: sourceLang,
+    toLang: targetLang,
+    options: {
+      email,
+      verbose,
+      onProgress: (processed, total) => {
+        if (processed < total) {
+          process.stdout.write(`\r  Progress: ${processed}/${total}`);
+        }
+      },
     },
   });
 }

package/bin/plugins/adapter-transloco.js

@@ -22,6 +22,7 @@ const TRANSLATABLE_ATTRS = [
   'defaultLabel',
   'selectedItemsLabel',
   'text',
+  'value',
 ];
 
 const ATTR_REPLACEMENT_MAP = Object.fromEntries(
@@ -29,7 +30,7 @@ const ATTR_REPLACEMENT_MAP = Object.fromEntries(
 );
 
 const TAG_CONTENT_RE =
-  /(<(?:h[1-6]|p|span|div|li|td|th|a|button|label|option)[^>]*>)\s*(.+?)\s*(<\/(?:h[1-6]|p|span|div|li|td|th|a|button|label|option)>)/gi;
+  /(<(?:h[1-6]|p|span|div|li|td|th|a|button|label|option)[^>]*>)\s*([^<]+?)\s*(<\/(?:h[1-6]|p|span|div|li|td|th|a|button|label|option)>)/gi;
 
 const hasTranslocoPipe = content => /\bTranslocoPipe\b/.test(content);
 const hasTranslocoImport = content => /@jsverse\/transloco/.test(content);
@@ -140,7 +141,7 @@ module.exports = {
 
   transform(ctx) {
     const { content, rawText, key, context } = ctx;
-    if (context.startsWith('ts_')) {
+    if (context?.startsWith('ts_')) {
       return { content, replacements: 0 };
     }
     return transformTemplate({ content, rawText, key });

package/bin/plugins/parser-primeng.js

@@ -37,7 +37,7 @@ const PRIMENG_PATTERNS = [
     context: 'buttons',
     attr: 'chooseLabel',
   },
-  { regex: /<p-(?:chip|tag)[^>]*\blabel="([^"]+)"/gi, context: 'labels', attr: 'label' },
+  { regex: /<p-(?:chip|tag)[^>]*\b(?:label|value)="([^"]+)"/gi, context: 'labels', attr: 'value' },
   {
     regex: /<p-(?:inputNumber|calendar)[^>]*\b(?:prefix|suffix)="([^"]+)"/gi,
     context: 'labels',

package/bin/plugins/provider-deepl.js

@@ -27,14 +27,13 @@ function buildDeepLRequest(texts, ctx) {
   };
 }
 
-async function translate(text, ctx) {
-  const result = await translateBatch([text], ctx);
-  return result[0];
-}
-
-async function translateBatch(texts, ctx) {
-  const apiKey = getApiKey(ctx);
-  const response = await fetch(getEndpoint(apiKey), buildDeepLRequest(texts, { ...ctx, apiKey }));
+async function doTranslateBatch(ctx) {
+  const { texts, fromLang, toLang, options = {} } = ctx;
+  const apiKey = getApiKey(options);
+  const response = await fetch(
+    getEndpoint(apiKey),
+    buildDeepLRequest(texts, { fromLang, toLang, apiKey }),
+  );
   if (!response.ok) {
     throw new Error(`DeepL API error: ${response.status} - ${await response.text()}`);
   }
@@ -42,6 +41,21 @@ async function translateBatch(texts, ctx) {
   return data.translations.map(t => t.text);
 }
 
+async function translate(ctx) {
+  const { text, fromLang, toLang, options = {} } = ctx;
+  const result = await doTranslateBatch({ texts: [text], fromLang, toLang, options });
+  return result[0];
+}
+
+async function translateBatch(ctx) {
+  const { texts, fromLang, toLang, options = {} } = ctx;
+  const translated = await doTranslateBatch({ texts, fromLang, toLang, options });
+  return {
+    translationMap: new Map(texts.map((t, i) => [t, translated[i]])),
+    failedCount: 0,
+  };
+}
+
 module.exports = {
   name: 'provider-deepl',
   type: 'provider',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abdess76/i18nkit",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Universal i18n CLI - extract translation keys, sync language files, detect missing translations. Extensible plugin architecture.",
   "author": {
     "name": "Abdessamad DERRAZ",