i18next-cli 1.51.1 → 1.51.3

package/README.md

@@ -683,10 +683,10 @@ export default defineConfig({
   // options for linter
   lint: {
     /** Optional accept-list of JSX attribute names to exclusively lint (takes precedence over ignoredAttributes). */
-    acceptedAttributes: ['title'];
+    acceptedAttributes: ['title'],
 
     /** Optional accept-list of JSX tag names to exclusively lint (takes precedence over ignoredTags). */
-    acceptedTags: ['p'];
+    acceptedTags: ['p'],
 
     // Optional custom JSX attributes to ignore during linting
     ignoredAttributes: ['data-testid', 'aria-label'],

package/dist/cjs/cli.js

@@ -31,7 +31,7 @@ const program = new commander.Command();
 program
     .name('i18next-cli')
     .description('A unified, high-performance i18next CLI.')
-    .version('1.51.1'); // This string is replaced with the actual version at build time by rollup
+    .version('1.51.3'); // 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/extractor/core/extractor.js

@@ -149,6 +149,10 @@ function isExtExplicitlyInInputPatterns(ext, input) {
  */
 async function processFile(file, plugins, astVisitors, pluginContext, config, logger$1 = new logger.ConsoleLogger(), fileErrors) {
     try {
+        // Skip directories that happen to match file-extension globs (e.g. a directory named "Foo.tsx")
+        const fileStat = await promises.stat(file);
+        if (fileStat.isDirectory())
+            return;
         let code = await promises.readFile(file, 'utf-8');
         // Run onLoad hooks from plugins with error handling.
         // Track whether any plugin actually transformed the code so we can make
@@ -302,6 +306,10 @@ async function processFile(file, plugins, astVisitors, pluginContext, config, lo
  */
 async function preScanFile(file, astVisitors, config, logger$1 = new logger.ConsoleLogger(), fileErrors) {
     try {
+        // Skip directories that happen to match file-extension globs (e.g. a directory named "Foo.tsx")
+        const fileStat = await promises.stat(file);
+        if (fileStat.isDirectory())
+            return;
         const code = await promises.readFile(file, 'utf-8');
         const fileExt = node_path.extname(file).toLowerCase();
         // Non-native files (e.g. .svelte, .vue) cannot be parsed by SWC in the

package/dist/cjs/extractor/core/translation-manager.js

@@ -915,9 +915,12 @@ async function getTranslations(keys, objectKeys, config, { syncPrimaryWithDefaul
             }
             // When nsSeparator is false, keys resolved to the defaultNS (e.g. from
             // useTranslation() with no args) should be treated as top-level, not
-            // wrapped under the namespace name.
+            // wrapped under the namespace name — but only when there are no other
+            // explicit namespaces. If multiple namespaces exist, we must keep the
+            // default namespace wrapper to avoid flattening it into the top level (#227).
             const defaultNs = String(config.extract.defaultNS ?? 'translation');
-            const isTopLevel = (nsKey) => nsKey === NO_NS_TOKEN || (config.extract.nsSeparator === false && nsKey === defaultNs);
+            const hasOtherNamespaces = [...keysByNS.keys()].some(k => k !== NO_NS_TOKEN && k !== defaultNs);
+            const isTopLevel = (nsKey) => nsKey === NO_NS_TOKEN || (config.extract.nsSeparator === false && nsKey === defaultNs && !hasOtherNamespaces);
             for (const nsKey of namespacesToProcess) {
                 const nsKeys = keysByNS.get(nsKey) || [];
                 if (isTopLevel(nsKey)) {

package/dist/esm/cli.js

@@ -29,7 +29,7 @@ const program = new Command();
 program
     .name('i18next-cli')
     .description('A unified, high-performance i18next CLI.')
-    .version('1.51.1'); // This string is replaced with the actual version at build time by rollup
+    .version('1.51.3'); // 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/extractor/core/extractor.js

@@ -1,7 +1,7 @@
 import { createSpinnerLike } from '../../utils/wrap-ora.js';
 import { styleText } from 'node:util';
 import { parse } from '@swc/core';
-import { mkdir, writeFile, readFile } from 'node:fs/promises';
+import { mkdir, writeFile, stat, readFile } from 'node:fs/promises';
 import { dirname, extname } from 'node:path';
 import { findKeys } from './key-finder.js';
 import { getTranslations } from './translation-manager.js';
@@ -147,6 +147,10 @@ function isExtExplicitlyInInputPatterns(ext, input) {
  */
 async function processFile(file, plugins, astVisitors, pluginContext, config, logger = new ConsoleLogger(), fileErrors) {
     try {
+        // Skip directories that happen to match file-extension globs (e.g. a directory named "Foo.tsx")
+        const fileStat = await stat(file);
+        if (fileStat.isDirectory())
+            return;
         let code = await readFile(file, 'utf-8');
         // Run onLoad hooks from plugins with error handling.
         // Track whether any plugin actually transformed the code so we can make
@@ -300,6 +304,10 @@ async function processFile(file, plugins, astVisitors, pluginContext, config, lo
  */
 async function preScanFile(file, astVisitors, config, logger = new ConsoleLogger(), fileErrors) {
     try {
+        // Skip directories that happen to match file-extension globs (e.g. a directory named "Foo.tsx")
+        const fileStat = await stat(file);
+        if (fileStat.isDirectory())
+            return;
         const code = await readFile(file, 'utf-8');
         const fileExt = extname(file).toLowerCase();
         // Non-native files (e.g. .svelte, .vue) cannot be parsed by SWC in the

package/dist/esm/extractor/core/translation-manager.js

@@ -913,9 +913,12 @@ async function getTranslations(keys, objectKeys, config, { syncPrimaryWithDefaul
             }
             // When nsSeparator is false, keys resolved to the defaultNS (e.g. from
             // useTranslation() with no args) should be treated as top-level, not
-            // wrapped under the namespace name.
+            // wrapped under the namespace name — but only when there are no other
+            // explicit namespaces. If multiple namespaces exist, we must keep the
+            // default namespace wrapper to avoid flattening it into the top level (#227).
             const defaultNs = String(config.extract.defaultNS ?? 'translation');
-            const isTopLevel = (nsKey) => nsKey === NO_NS_TOKEN || (config.extract.nsSeparator === false && nsKey === defaultNs);
+            const hasOtherNamespaces = [...keysByNS.keys()].some(k => k !== NO_NS_TOKEN && k !== defaultNs);
+            const isTopLevel = (nsKey) => nsKey === NO_NS_TOKEN || (config.extract.nsSeparator === false && nsKey === defaultNs && !hasOtherNamespaces);
             for (const nsKey of namespacesToProcess) {
                 const nsKeys = keysByNS.get(nsKey) || [];
                 if (isTopLevel(nsKey)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-cli",
-  "version": "1.51.1",
+  "version": "1.51.3",
   "description": "A unified, high-performance i18next CLI.",
   "type": "module",
   "bin": {

package/types/extractor/core/extractor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extractor.d.ts","sourceRoot":"","sources":["../../../src/extractor/core/extractor.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAO5G,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAK/C;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,oBAAoB,EAC5B,OAAO,GAAE;IACP,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;CACX,GACL,OAAO,CAAC;IAAE,cAAc,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAAC,CA6E1D;AAwBD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EAAE,EACjB,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC7C,MAAM,GAAE,MAA4B,EACpC,UAAU,CAAC,EAAE,MAAM,EAAE,GACpB,OAAO,CAAC,IAAI,CAAC,CAgJf;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC7C,MAAM,GAAE,MAA4B,EACpC,UAAU,CAAC,EAAE,MAAM,EAAE,GACpB,OAAO,CAAC,IAAI,CAAC,CAyDf;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,OAAO,CAAE,MAAM,EAAE,oBAAoB,EAAE,EAAE,uBAA+B,EAAE,GAAE;IAAE,uBAAuB,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAO1K"}
+{"version":3,"file":"extractor.d.ts","sourceRoot":"","sources":["../../../src/extractor/core/extractor.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAO5G,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAK/C;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,oBAAoB,EAC5B,OAAO,GAAE;IACP,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;CACX,GACL,OAAO,CAAC;IAAE,cAAc,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAAC,CA6E1D;AAwBD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EAAE,EACjB,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC7C,MAAM,GAAE,MAA4B,EACpC,UAAU,CAAC,EAAE,MAAM,EAAE,GACpB,OAAO,CAAC,IAAI,CAAC,CAoJf;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC7C,MAAM,GAAE,MAA4B,EACpC,UAAU,CAAC,EAAE,MAAM,EAAE,GACpB,OAAO,CAAC,IAAI,CAAC,CA6Df;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,OAAO,CAAE,MAAM,EAAE,oBAAoB,EAAE,EAAE,uBAA+B,EAAE,GAAE;IAAE,uBAAuB,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAO1K"}

package/types/extractor/core/translation-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"translation-manager.d.ts","sourceRoot":"","sources":["../../../src/extractor/core/translation-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AA66B9F;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EAC/B,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,EACvB,MAAM,EAAE,oBAAoB,EAC5B,EACE,uBAA+B,EAC/B,OAAe,EACf,MAA4B,EAC7B,GAAE;IACD,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;CACX,GACL,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAoJ9B"}
+{"version":3,"file":"translation-manager.d.ts","sourceRoot":"","sources":["../../../src/extractor/core/translation-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AA66B9F;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EAC/B,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,EACvB,MAAM,EAAE,oBAAoB,EAC5B,EACE,uBAA+B,EAC/B,OAAe,EACf,MAA4B,EAC7B,GAAE;IACD,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;CACX,GACL,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAuJ9B"}