i18next-cli 1.58.0 → 1.58.2

package/dist/cjs/cli.js

@@ -32,7 +32,7 @@ const program = new commander.Command();
 program
     .name('i18next-cli')
     .description('A unified, high-performance i18next CLI.')
-    .version('1.58.0'); // This string is replaced with the actual version at build time by rollup
+    .version('1.58.2'); // This string is replaced with the actual version at build time by rollup
 // new: global config override option
 program.option('-c, --config <path>', 'Path to i18next-cli config file (overrides detection)');
 program

package/dist/cjs/instrumenter/core/transformer.js

@@ -328,18 +328,62 @@ function addImportStatements(s, content, needs) {
     if (content.startsWith('#!')) {
         insertPos = content.indexOf('\n') + 1;
     }
-    // Find the end of the last import statement
-    const importRegex = /^import\s.+$/gm;
+    // Find the end of the last import statement. Imports may span multiple lines
+    // (e.g. `import {\n  CCol,\n} from '...'`), so we can't treat each `import`
+    // line as a complete statement — we scan to the real end of each declaration.
+    const importStartRegex = /^import\b/gm;
     let match;
-    while ((match = importRegex.exec(content)) !== null) {
-        const endOfImport = match.index + match[0].length;
-        if (endOfImport > insertPos) {
-            const nextNewline = content.indexOf('\n', endOfImport);
-            insertPos = nextNewline !== -1 ? nextNewline + 1 : endOfImport;
-        }
+    while ((match = importStartRegex.exec(content)) !== null) {
+        const endOfImport = findImportStatementEnd(content, match.index);
+        if (endOfImport > insertPos)
+            insertPos = endOfImport;
+        // Skip past this statement so we don't match `import` lines inside it.
+        importStartRegex.lastIndex = endOfImport;
     }
     s.appendRight(insertPos, importStatement);
 }
+/**
+ * Returns the offset just past the end of the import statement that begins at
+ * `start`, handling multi-line imports with `{ ... }` clauses. The statement
+ * ends at the first newline or `;` at brace depth 0, after its module-specifier
+ * string has been closed.
+ */
+function findImportStatementEnd(content, start) {
+    let depth = 0;
+    let stringChar = null;
+    let sawString = false;
+    for (let i = start; i < content.length; i++) {
+        const ch = content[i];
+        if (stringChar !== null) {
+            if (ch === '\\') {
+                i++;
+                continue;
+            }
+            if (ch === stringChar) {
+                stringChar = null;
+                if (depth === 0)
+                    sawString = true;
+            }
+            continue;
+        }
+        if (ch === '\'' || ch === '"' || ch === '`') {
+            stringChar = ch;
+            continue;
+        }
+        if (ch === '{' || ch === '(' || ch === '[') {
+            depth++;
+            continue;
+        }
+        if (ch === '}' || ch === ')' || ch === ']') {
+            depth--;
+            continue;
+        }
+        if (depth === 0 && sawString && (ch === '\n' || ch === ';')) {
+            return i + 1;
+        }
+    }
+    return content.length;
+}
 /**
  * Augments an existing `import { ... } from 'react-i18next'` with any missing
  * named exports (e.g. adds `Trans` when only `useTranslation` is imported).

package/dist/cjs/types-generator.js

@@ -9,6 +9,8 @@ var promises = require('node:fs/promises');
 var node_path = require('node:path');
 var core = require('@swc/core');
 var fileUtils = require('./utils/file-utils.js');
+var json5Parser = require('@croct/json5-parser');
+var yaml = require('yaml');
 var vm = require('node:vm');
 
 async function loadFile(file) {
@@ -27,10 +29,10 @@ async function loadFile(file) {
                 type: 'commonjs'
             }
         });
-        const exports$1 = {};
-        const module = { exports: exports$1 };
+        const exports = {};
+        const module = { exports };
         const context = vm.createContext({
-            exports: exports$1,
+            exports,
             module,
             require: (id) => require(id),
             console,
@@ -43,6 +45,12 @@ async function loadFile(file) {
         return exported;
     }
     const content = await promises.readFile(file, 'utf-8');
+    if (ext === '.yaml' || ext === '.yml') {
+        return yaml.parse(content);
+    }
+    if (ext === '.json5') {
+        return json5Parser.JsonParser.parse(content, json5Parser.JsonObjectNode).toJSON();
+    }
     return JSON.parse(content);
 }
 /**

package/dist/esm/cli.js

@@ -30,7 +30,7 @@ const program = new Command();
 program
     .name('i18next-cli')
     .description('A unified, high-performance i18next CLI.')
-    .version('1.58.0'); // This string is replaced with the actual version at build time by rollup
+    .version('1.58.2'); // This string is replaced with the actual version at build time by rollup
 // new: global config override option
 program.option('-c, --config <path>', 'Path to i18next-cli config file (overrides detection)');
 program

package/dist/esm/instrumenter/core/transformer.js

@@ -326,18 +326,62 @@ function addImportStatements(s, content, needs) {
     if (content.startsWith('#!')) {
         insertPos = content.indexOf('\n') + 1;
     }
-    // Find the end of the last import statement
-    const importRegex = /^import\s.+$/gm;
+    // Find the end of the last import statement. Imports may span multiple lines
+    // (e.g. `import {\n  CCol,\n} from '...'`), so we can't treat each `import`
+    // line as a complete statement — we scan to the real end of each declaration.
+    const importStartRegex = /^import\b/gm;
     let match;
-    while ((match = importRegex.exec(content)) !== null) {
-        const endOfImport = match.index + match[0].length;
-        if (endOfImport > insertPos) {
-            const nextNewline = content.indexOf('\n', endOfImport);
-            insertPos = nextNewline !== -1 ? nextNewline + 1 : endOfImport;
-        }
+    while ((match = importStartRegex.exec(content)) !== null) {
+        const endOfImport = findImportStatementEnd(content, match.index);
+        if (endOfImport > insertPos)
+            insertPos = endOfImport;
+        // Skip past this statement so we don't match `import` lines inside it.
+        importStartRegex.lastIndex = endOfImport;
     }
     s.appendRight(insertPos, importStatement);
 }
+/**
+ * Returns the offset just past the end of the import statement that begins at
+ * `start`, handling multi-line imports with `{ ... }` clauses. The statement
+ * ends at the first newline or `;` at brace depth 0, after its module-specifier
+ * string has been closed.
+ */
+function findImportStatementEnd(content, start) {
+    let depth = 0;
+    let stringChar = null;
+    let sawString = false;
+    for (let i = start; i < content.length; i++) {
+        const ch = content[i];
+        if (stringChar !== null) {
+            if (ch === '\\') {
+                i++;
+                continue;
+            }
+            if (ch === stringChar) {
+                stringChar = null;
+                if (depth === 0)
+                    sawString = true;
+            }
+            continue;
+        }
+        if (ch === '\'' || ch === '"' || ch === '`') {
+            stringChar = ch;
+            continue;
+        }
+        if (ch === '{' || ch === '(' || ch === '[') {
+            depth++;
+            continue;
+        }
+        if (ch === '}' || ch === ')' || ch === ']') {
+            depth--;
+            continue;
+        }
+        if (depth === 0 && sawString && (ch === '\n' || ch === ';')) {
+            return i + 1;
+        }
+    }
+    return content.length;
+}
 /**
  * Augments an existing `import { ... } from 'react-i18next'` with any missing
  * named exports (e.g. adds `Trans` when only `useTranslation` is imported).

package/dist/esm/types-generator.js

@@ -7,6 +7,8 @@ import { mkdir, writeFile, access, readFile } from 'node:fs/promises';
 import { join, dirname, basename, extname, resolve, relative } from 'node:path';
 import { transform } from '@swc/core';
 import { getOutputPath } from './utils/file-utils.js';
+import { JsonParser, JsonObjectNode } from '@croct/json5-parser';
+import yaml from 'yaml';
 import vm from 'node:vm';
 
 async function loadFile(file) {
@@ -25,10 +27,10 @@ async function loadFile(file) {
                 type: 'commonjs'
             }
         });
-        const exports$1 = {};
-        const module = { exports: exports$1 };
+        const exports = {};
+        const module = { exports };
         const context = vm.createContext({
-            exports: exports$1,
+            exports,
             module,
             require: (id) => require(id),
             console,
@@ -41,6 +43,12 @@ async function loadFile(file) {
         return exported;
     }
     const content = await readFile(file, 'utf-8');
+    if (ext === '.yaml' || ext === '.yml') {
+        return yaml.parse(content);
+    }
+    if (ext === '.json5') {
+        return JsonParser.parse(content, JsonObjectNode).toJSON();
+    }
     return JSON.parse(content);
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-cli",
-  "version": "1.58.0",
+  "version": "1.58.2",
   "description": "A unified, high-performance i18next CLI.",
   "type": "module",
   "bin": {
@@ -56,36 +56,36 @@
     "@rollup/plugin-terser": "^1.0.0",
     "@rollup/plugin-typescript": "^12.3.0",
     "@types/inquirer": "^9.0.9",
-    "@types/node": "^25.6.0",
-    "@types/react": "^19.2.14",
-    "@typescript-eslint/parser": "^8.58.2",
-    "@vitest/coverage-v8": "^4.1.4",
+    "@types/node": "^25.9.1",
+    "@types/react": "^19.2.15",
+    "@typescript-eslint/parser": "^8.60.0",
+    "@vitest/coverage-v8": "^4.1.7",
     "eslint": "^9.39.4",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-import": "^2.32.0",
-    "memfs": "^4.57.2",
+    "memfs": "^4.57.3",
     "neostandard": "^0.13.0",
-    "rollup": "^4.60.1",
+    "rollup": "^4.60.4",
     "typescript": "^6.0.3",
     "unplugin-swc": "^1.5.9",
-    "vitest": "^4.1.4"
+    "vitest": "^4.1.7"
   },
   "dependencies": {
     "@croct/json5-parser": "^0.2.2",
-    "@swc/core": "^1.15.26",
+    "@swc/core": "^1.15.40",
     "chokidar": "^5.0.0",
     "commander": "^14.0.3",
     "execa": "^9.6.1",
     "glob": "^13.0.6",
     "i18next-resources-for-ts": "^2.1.0",
-    "inquirer": "^13.4.1",
-    "jiti": "^2.6.1",
+    "inquirer": "^13.4.3",
+    "jiti": "^2.7.0",
     "jsonc-parser": "^3.3.1",
     "magic-string": "^0.30.21",
     "minimatch": "^10.2.5",
-    "ora": "^9.3.0",
-    "react": "^19.2.5",
-    "react-i18next": "^17.0.7",
-    "yaml": "^2.8.3"
+    "ora": "^9.4.0",
+    "react": "^19.2.6",
+    "react-i18next": "^17.0.8",
+    "yaml": "^2.9.0"
   }
 }

package/tsconfig.json

@@ -46,7 +46,7 @@
     // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
     // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
     // "typeRoots": [],                       /* List of folders to include type definitions from. */
-    // "types": [],                           /* Type declaration files to be included in compilation. */
+    "types": ["node"],                        /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
     "esModuleInterop": true,                  /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */

package/types/instrumenter/core/transformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transformer.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/core/transformer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,eAAe,EAAE,eAAe,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAGnI,UAAU,kBAAkB;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,EAAE,OAAO,CAAA;IACjB,qBAAqB,EAAE,OAAO,CAAA;IAC9B,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAA;IAC7C,6EAA6E;IAC7E,UAAU,CAAC,EAAE,iBAAiB,EAAE,CAAA;IAChC,kEAAkE;IAClE,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,gFAAgF;IAChF,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAC3C;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,eAAe,EAAE,EAC7B,OAAO,EAAE,kBAAkB,GAC1B,eAAe,CAyLjB;AAmND;;GAEG;AACH,wBAAgB,YAAY,CAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAwB1F"}
+{"version":3,"file":"transformer.d.ts","sourceRoot":"","sources":["../../../src/instrumenter/core/transformer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,eAAe,EAAE,eAAe,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAGnI,UAAU,kBAAkB;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,EAAE,OAAO,CAAA;IACjB,qBAAqB,EAAE,OAAO,CAAA;IAC9B,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAA;IAC7C,6EAA6E;IAC7E,UAAU,CAAC,EAAE,iBAAiB,EAAE,CAAA;IAChC,kEAAkE;IAClE,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,gFAAgF;IAChF,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAC3C;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,eAAe,EAAE,EAC7B,OAAO,EAAE,kBAAkB,GAC1B,eAAe,CAyLjB;AAkPD;;GAEG;AACH,wBAAgB,YAAY,CAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAwB1F"}

package/types/types-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types-generator.d.ts","sourceRoot":"","sources":["../src/types-generator.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAqE9D;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,oBAAoB,EAC5B,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAO,iBA+GnD"}
+{"version":3,"file":"types-generator.d.ts","sourceRoot":"","sources":["../src/types-generator.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AA6E9D;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,oBAAoB,EAC5B,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAO,iBA+GnD"}