i18next-cli 1.70.2 → 1.70.3

package/dist/cjs/cli.js

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

@@ -595,15 +595,14 @@ class ASTVisitors {
         const extractStringLiteralValue = (node) => {
             if (!node)
                 return undefined;
-            // Union (`'a' | 'b'`), local alias, or generic constrained to those: use the
-            // first member. Mirrors i18next's type-level behaviour (first ns wins).
+            // Union (`'a' | 'b'`) or generic constrained to one (`<Ns extends 'a' | 'b'>`):
+            // use the first member, mirroring i18next's type-level behaviour (first ns wins).
+            // Named aliases (`TFunction<Namespace>`) are deliberately NOT resolved: an
+            // app-wide `Namespace` union would otherwise "win" with an arbitrary first entry.
             if (node.type === 'TsUnionType')
                 return extractStringLiteralValue(node.types?.[0]);
             if (node.type === 'TsTypeReference' && node.typeName?.type === 'Identifier') {
-                const constraint = typeParamConstraints[node.typeName.value];
-                if (constraint)
-                    return extractStringLiteralValue(constraint);
-                return this.expressionResolver.resolveTypeToStringValues(node)[0];
+                return extractStringLiteralValue(typeParamConstraints[node.typeName.value]);
             }
             // Handle: typeof SomeConst  → TsTypeQuery { exprName: { value: 'SomeConst' } }
             if (node?.type === 'TsTypeQuery') {
@@ -709,6 +708,11 @@ class ASTVisitors {
     getObjectTypeMembers(tsType) {
         if (!tsType)
             return [];
+        // `A & { t: TFunction<'ns'> }` / `(A)` → union of the constituents' members
+        if (tsType.type === 'TsIntersectionType')
+            return (tsType.types ?? []).flatMap((t) => this.getObjectTypeMembers(t));
+        if (tsType.type === 'TsParenthesizedType')
+            return this.getObjectTypeMembers(tsType.typeAnnotation);
         let members;
         if (tsType.type === 'TsTypeLiteral')
             members = tsType.members;

package/dist/esm/cli.js

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

@@ -593,15 +593,14 @@ class ASTVisitors {
         const extractStringLiteralValue = (node) => {
             if (!node)
                 return undefined;
-            // Union (`'a' | 'b'`), local alias, or generic constrained to those: use the
-            // first member. Mirrors i18next's type-level behaviour (first ns wins).
+            // Union (`'a' | 'b'`) or generic constrained to one (`<Ns extends 'a' | 'b'>`):
+            // use the first member, mirroring i18next's type-level behaviour (first ns wins).
+            // Named aliases (`TFunction<Namespace>`) are deliberately NOT resolved: an
+            // app-wide `Namespace` union would otherwise "win" with an arbitrary first entry.
             if (node.type === 'TsUnionType')
                 return extractStringLiteralValue(node.types?.[0]);
             if (node.type === 'TsTypeReference' && node.typeName?.type === 'Identifier') {
-                const constraint = typeParamConstraints[node.typeName.value];
-                if (constraint)
-                    return extractStringLiteralValue(constraint);
-                return this.expressionResolver.resolveTypeToStringValues(node)[0];
+                return extractStringLiteralValue(typeParamConstraints[node.typeName.value]);
             }
             // Handle: typeof SomeConst  → TsTypeQuery { exprName: { value: 'SomeConst' } }
             if (node?.type === 'TsTypeQuery') {
@@ -707,6 +706,11 @@ class ASTVisitors {
     getObjectTypeMembers(tsType) {
         if (!tsType)
             return [];
+        // `A & { t: TFunction<'ns'> }` / `(A)` → union of the constituents' members
+        if (tsType.type === 'TsIntersectionType')
+            return (tsType.types ?? []).flatMap((t) => this.getObjectTypeMembers(t));
+        if (tsType.type === 'TsParenthesizedType')
+            return this.getObjectTypeMembers(tsType.typeAnnotation);
         let members;
         if (tsType.type === 'TsTypeLiteral')
             members = tsType.members;

package/package.json

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

package/types/extractor/core/ast-visitors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ast-visitors.d.ts","sourceRoot":"","sources":["../../../src/extractor/core/ast-visitors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAQ,MAAM,WAAW,CAAA;AAC7C,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC7G,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AAItE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;IAC9D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,KAAK,CAAiB;IAE9B,IAAW,UAAU,gBAEpB;IAED,SAAgB,YAAY,EAAE,YAAY,CAAA;IAC1C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAoB;IACvD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAuB;IAC7D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,WAAW,CAAa;IAEhC;;;;;;OAMG;gBAED,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC7C,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,eAAe,EACvB,kBAAkB,CAAC,EAAE,kBAAkB;IAiCzC;;;;;;;;;;;;;OAaG;IACI,mBAAmB,CAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAK/C;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAqDzB;;;;;OAKG;IACI,KAAK,CAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAUjC;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,IAAI;IA+YZ;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAiH1B;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IAIzB,mFAAmF;IACnF,OAAO,CAAC,oBAAoB;IAiB5B;;;;;;;;OAQG;IACH,OAAO,CAAC,gCAAgC;IAqDxC;;;;;;;;;OASG;IACH,OAAO,CAAC,0BAA0B;IA+ClC;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAqB5B;;;;;;;;OAQG;IACI,eAAe,CAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAI5D;;OAEG;IACI,cAAc,CAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxD;;;;;;OAMG;IACI,cAAc,IAAK,MAAM;IAIhC;;OAEG;IACI,cAAc,IAAK,MAAM;CAGjC"}
+{"version":3,"file":"ast-visitors.d.ts","sourceRoot":"","sources":["../../../src/extractor/core/ast-visitors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAQ,MAAM,WAAW,CAAA;AAC7C,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC7G,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AAItE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;IAC9D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,KAAK,CAAiB;IAE9B,IAAW,UAAU,gBAEpB;IAED,SAAgB,YAAY,EAAE,YAAY,CAAA;IAC1C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAoB;IACvD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAuB;IAC7D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,WAAW,CAAa;IAEhC;;;;;;OAMG;gBAED,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC7C,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,eAAe,EACvB,kBAAkB,CAAC,EAAE,kBAAkB;IAiCzC;;;;;;;;;;;;;OAaG;IACI,mBAAmB,CAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAK/C;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAqDzB;;;;;OAKG;IACI,KAAK,CAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAUjC;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,IAAI;IA+YZ;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAiH1B;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IAIzB,mFAAmF;IACnF,OAAO,CAAC,oBAAoB;IAoB5B;;;;;;;;OAQG;IACH,OAAO,CAAC,gCAAgC;IAqDxC;;;;;;;;;OASG;IACH,OAAO,CAAC,0BAA0B;IA+ClC;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAqB5B;;;;;;;;OAQG;IACI,eAAe,CAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAI5D;;OAEG;IACI,cAAc,CAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxD;;;;;;OAMG;IACI,cAAc,IAAK,MAAM;IAIhC;;OAEG;IACI,cAAc,IAAK,MAAM;CAGjC"}