i18next-cli 1.47.10 → 1.47.12

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.47.10'); // This string is replaced with the actual version at build time by rollup
+    .version('1.47.12'); // 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/parsers/scope-manager.js

@@ -8,9 +8,45 @@ class ScopeManager {
     scope = new Map();
     // Track simple local constants with string literal values to resolve identifier args
     simpleConstants = new Map();
+    // Track simple local constant objects with string literal property values
+    simpleConstantObjects = new Map();
     constructor(config) {
         this.config = config;
     }
+    /**
+     * Recursively unwraps TypeScript type assertion wrappers to reach the
+     * underlying expression node.
+     */
+    static unwrapTsExpression(node) {
+        if (!node)
+            return node;
+        switch (node.type) {
+            case 'TsConstAssertion':
+            case 'TsAsExpression':
+            case 'TsSatisfiesExpression':
+                return ScopeManager.unwrapTsExpression(node.expression);
+            default:
+                return node;
+        }
+    }
+    /**
+     * Extracts a string value from a variable declarator's TypeScript type
+     * annotation when it is a literal string type (e.g., `const ns: 'users'`).
+     */
+    static extractStringFromTypeAnnotation(node) {
+        if (!node?.id || node.id.type !== 'Identifier')
+            return undefined;
+        if ('typeAnnotation' in node.id) {
+            const rawTypeAnn = node.id.typeAnnotation;
+            if (!rawTypeAnn)
+                return undefined;
+            const tsType = rawTypeAnn.typeAnnotation;
+            if (tsType?.type === 'TsLiteralType' && tsType.literal?.type === 'StringLiteral') {
+                return tsType.literal.value;
+            }
+        }
+        return undefined;
+    }
     /**
      * Reset per-file scope state.
      *
@@ -22,6 +58,7 @@ class ScopeManager {
         this.scopeStack = [];
         this.scope = new Map();
         this.simpleConstants.clear();
+        this.simpleConstantObjects.clear();
     }
     /**
      * Enters a new variable scope by pushing a new scope map onto the stack.
@@ -100,6 +137,27 @@ class ScopeManager {
     resolveSimpleStringIdentifier(name) {
         return this.simpleConstants.get(name);
     }
+    /**
+     * Resolve a MemberExpression node (e.g., `ns.custom`) to its string value
+     * by looking up the object in `simpleConstantObjects`.
+     */
+    resolveSimpleMemberExpression(node) {
+        if (node.object.type !== 'Identifier') {
+            return undefined;
+        }
+        const map = this.simpleConstantObjects.get(node.object.value);
+        if (!map) {
+            return undefined;
+        }
+        const prop = node.property;
+        if (prop.type === 'Identifier') {
+            return map[prop.value];
+        }
+        if (prop.type === 'Computed' && prop.expression.type === 'StringLiteral') {
+            return map[prop.expression.value];
+        }
+        return undefined;
+    }
     /**
      * Handles variable declarations that might define translation functions.
      *
@@ -115,9 +173,43 @@ class ScopeManager {
         const init = node.init;
         if (!init)
             return;
-        // Record simple const/let string initializers for later resolution
-        if (node.id.type === 'Identifier' && init.type === 'StringLiteral') {
-            this.simpleConstants.set(node.id.value, init.value);
+        // Record simple const/let string initializers for later resolution.
+        // Unwrap TS type assertion wrappers (as const, satisfies, as 'x') and fall
+        // back to the variable's type annotation when the init is not a string literal.
+        if (node.id.type === 'Identifier') {
+            const unwrapped = ScopeManager.unwrapTsExpression(init);
+            if (unwrapped?.type === 'StringLiteral') {
+                this.simpleConstants.set(node.id.value, unwrapped.value);
+            }
+            else if (unwrapped?.type === 'ObjectExpression' && Array.isArray(unwrapped.properties)) {
+                const map = {};
+                for (const p of unwrapped.properties) {
+                    if (p.type !== 'KeyValueProperty') {
+                        continue;
+                    }
+                    const keyName = p.key.type === 'Identifier'
+                        ? p.key.value
+                        : p.key.type === 'StringLiteral'
+                            ? p.key.value
+                            : undefined;
+                    if (!keyName) {
+                        continue;
+                    }
+                    const val = ScopeManager.unwrapTsExpression(p.value);
+                    if (val?.type === 'StringLiteral') {
+                        map[keyName] = val.value;
+                    }
+                }
+                if (Object.keys(map).length > 0) {
+                    this.simpleConstantObjects.set(node.id.value, map);
+                }
+            }
+            else {
+                const fromType = ScopeManager.extractStringFromTypeAnnotation(node);
+                if (fromType !== undefined) {
+                    this.simpleConstants.set(node.id.value, fromType);
+                }
+            }
             // continue processing; still may be a useTranslation/getFixedT call below
         }
         // Determine the actual call expression, looking inside AwaitExpressions.
@@ -227,15 +319,19 @@ class ScopeManager {
                     defaultNs = nsNode.value;
                 }
                 else if (nsNode?.type === 'Identifier') {
-                    // ← FIX A: resolve const I18N_NS = 'users'
                     defaultNs = this.resolveSimpleStringIdentifier(nsNode.value);
                 }
+                else if (nsNode?.type === 'MemberExpression') {
+                    defaultNs = this.resolveSimpleMemberExpression(nsNode);
+                }
                 else if (nsNode?.type === 'ArrayExpression') {
                     const first = nsNode.elements[0]?.expression;
-                    if (first?.type === 'StringLiteral')
+                    if (first?.type === 'StringLiteral') {
                         defaultNs = first.value;
-                    else if (first?.type === 'Identifier')
+                    }
+                    else if (first?.type === 'Identifier') {
                         defaultNs = this.resolveSimpleStringIdentifier(first.value);
+                    }
                 }
             }
             kpArg = kpArgIndex === -1 ? undefined : callExpr.arguments?.[kpArgIndex]?.expression;
@@ -308,15 +404,19 @@ class ScopeManager {
                     defaultNs = nsNode.value;
                 }
                 else if (nsNode?.type === 'Identifier') {
-                    // ← FIX A: resolve const I18N_NS = 'users'
                     defaultNs = this.resolveSimpleStringIdentifier(nsNode.value);
                 }
+                else if (nsNode?.type === 'MemberExpression') {
+                    defaultNs = this.resolveSimpleMemberExpression(nsNode);
+                }
                 else if (nsNode?.type === 'ArrayExpression') {
                     const first = nsNode.elements[0]?.expression;
-                    if (first?.type === 'StringLiteral')
+                    if (first?.type === 'StringLiteral') {
                         defaultNs = first.value;
-                    else if (first?.type === 'Identifier')
+                    }
+                    else if (first?.type === 'Identifier') {
                         defaultNs = this.resolveSimpleStringIdentifier(first.value);
+                    }
                 }
             }
             kpArg = kpArgIndex === -1 ? undefined : callExpr.arguments?.[kpArgIndex]?.expression;

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.47.10'); // This string is replaced with the actual version at build time by rollup
+    .version('1.47.12'); // 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/parsers/scope-manager.js

@@ -6,9 +6,45 @@ class ScopeManager {
     scope = new Map();
     // Track simple local constants with string literal values to resolve identifier args
     simpleConstants = new Map();
+    // Track simple local constant objects with string literal property values
+    simpleConstantObjects = new Map();
     constructor(config) {
         this.config = config;
     }
+    /**
+     * Recursively unwraps TypeScript type assertion wrappers to reach the
+     * underlying expression node.
+     */
+    static unwrapTsExpression(node) {
+        if (!node)
+            return node;
+        switch (node.type) {
+            case 'TsConstAssertion':
+            case 'TsAsExpression':
+            case 'TsSatisfiesExpression':
+                return ScopeManager.unwrapTsExpression(node.expression);
+            default:
+                return node;
+        }
+    }
+    /**
+     * Extracts a string value from a variable declarator's TypeScript type
+     * annotation when it is a literal string type (e.g., `const ns: 'users'`).
+     */
+    static extractStringFromTypeAnnotation(node) {
+        if (!node?.id || node.id.type !== 'Identifier')
+            return undefined;
+        if ('typeAnnotation' in node.id) {
+            const rawTypeAnn = node.id.typeAnnotation;
+            if (!rawTypeAnn)
+                return undefined;
+            const tsType = rawTypeAnn.typeAnnotation;
+            if (tsType?.type === 'TsLiteralType' && tsType.literal?.type === 'StringLiteral') {
+                return tsType.literal.value;
+            }
+        }
+        return undefined;
+    }
     /**
      * Reset per-file scope state.
      *
@@ -20,6 +56,7 @@ class ScopeManager {
         this.scopeStack = [];
         this.scope = new Map();
         this.simpleConstants.clear();
+        this.simpleConstantObjects.clear();
     }
     /**
      * Enters a new variable scope by pushing a new scope map onto the stack.
@@ -98,6 +135,27 @@ class ScopeManager {
     resolveSimpleStringIdentifier(name) {
         return this.simpleConstants.get(name);
     }
+    /**
+     * Resolve a MemberExpression node (e.g., `ns.custom`) to its string value
+     * by looking up the object in `simpleConstantObjects`.
+     */
+    resolveSimpleMemberExpression(node) {
+        if (node.object.type !== 'Identifier') {
+            return undefined;
+        }
+        const map = this.simpleConstantObjects.get(node.object.value);
+        if (!map) {
+            return undefined;
+        }
+        const prop = node.property;
+        if (prop.type === 'Identifier') {
+            return map[prop.value];
+        }
+        if (prop.type === 'Computed' && prop.expression.type === 'StringLiteral') {
+            return map[prop.expression.value];
+        }
+        return undefined;
+    }
     /**
      * Handles variable declarations that might define translation functions.
      *
@@ -113,9 +171,43 @@ class ScopeManager {
         const init = node.init;
         if (!init)
             return;
-        // Record simple const/let string initializers for later resolution
-        if (node.id.type === 'Identifier' && init.type === 'StringLiteral') {
-            this.simpleConstants.set(node.id.value, init.value);
+        // Record simple const/let string initializers for later resolution.
+        // Unwrap TS type assertion wrappers (as const, satisfies, as 'x') and fall
+        // back to the variable's type annotation when the init is not a string literal.
+        if (node.id.type === 'Identifier') {
+            const unwrapped = ScopeManager.unwrapTsExpression(init);
+            if (unwrapped?.type === 'StringLiteral') {
+                this.simpleConstants.set(node.id.value, unwrapped.value);
+            }
+            else if (unwrapped?.type === 'ObjectExpression' && Array.isArray(unwrapped.properties)) {
+                const map = {};
+                for (const p of unwrapped.properties) {
+                    if (p.type !== 'KeyValueProperty') {
+                        continue;
+                    }
+                    const keyName = p.key.type === 'Identifier'
+                        ? p.key.value
+                        : p.key.type === 'StringLiteral'
+                            ? p.key.value
+                            : undefined;
+                    if (!keyName) {
+                        continue;
+                    }
+                    const val = ScopeManager.unwrapTsExpression(p.value);
+                    if (val?.type === 'StringLiteral') {
+                        map[keyName] = val.value;
+                    }
+                }
+                if (Object.keys(map).length > 0) {
+                    this.simpleConstantObjects.set(node.id.value, map);
+                }
+            }
+            else {
+                const fromType = ScopeManager.extractStringFromTypeAnnotation(node);
+                if (fromType !== undefined) {
+                    this.simpleConstants.set(node.id.value, fromType);
+                }
+            }
             // continue processing; still may be a useTranslation/getFixedT call below
         }
         // Determine the actual call expression, looking inside AwaitExpressions.
@@ -225,15 +317,19 @@ class ScopeManager {
                     defaultNs = nsNode.value;
                 }
                 else if (nsNode?.type === 'Identifier') {
-                    // ← FIX A: resolve const I18N_NS = 'users'
                     defaultNs = this.resolveSimpleStringIdentifier(nsNode.value);
                 }
+                else if (nsNode?.type === 'MemberExpression') {
+                    defaultNs = this.resolveSimpleMemberExpression(nsNode);
+                }
                 else if (nsNode?.type === 'ArrayExpression') {
                     const first = nsNode.elements[0]?.expression;
-                    if (first?.type === 'StringLiteral')
+                    if (first?.type === 'StringLiteral') {
                         defaultNs = first.value;
-                    else if (first?.type === 'Identifier')
+                    }
+                    else if (first?.type === 'Identifier') {
                         defaultNs = this.resolveSimpleStringIdentifier(first.value);
+                    }
                 }
             }
             kpArg = kpArgIndex === -1 ? undefined : callExpr.arguments?.[kpArgIndex]?.expression;
@@ -306,15 +402,19 @@ class ScopeManager {
                     defaultNs = nsNode.value;
                 }
                 else if (nsNode?.type === 'Identifier') {
-                    // ← FIX A: resolve const I18N_NS = 'users'
                     defaultNs = this.resolveSimpleStringIdentifier(nsNode.value);
                 }
+                else if (nsNode?.type === 'MemberExpression') {
+                    defaultNs = this.resolveSimpleMemberExpression(nsNode);
+                }
                 else if (nsNode?.type === 'ArrayExpression') {
                     const first = nsNode.elements[0]?.expression;
-                    if (first?.type === 'StringLiteral')
+                    if (first?.type === 'StringLiteral') {
                         defaultNs = first.value;
-                    else if (first?.type === 'Identifier')
+                    }
+                    else if (first?.type === 'Identifier') {
                         defaultNs = this.resolveSimpleStringIdentifier(first.value);
+                    }
                 }
             }
             kpArg = kpArgIndex === -1 ? undefined : callExpr.arguments?.[kpArgIndex]?.expression;

package/package.json

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

package/types/extractor/parsers/scope-manager.d.ts

@@ -5,7 +5,18 @@ export declare class ScopeManager {
     private config;
     private scope;
     private simpleConstants;
+    private simpleConstantObjects;
     constructor(config: Omit<I18nextToolkitConfig, 'plugins'>);
+    /**
+     * Recursively unwraps TypeScript type assertion wrappers to reach the
+     * underlying expression node.
+     */
+    private static unwrapTsExpression;
+    /**
+     * Extracts a string value from a variable declarator's TypeScript type
+     * annotation when it is a literal string type (e.g., `const ns: 'users'`).
+     */
+    private static extractStringFromTypeAnnotation;
     /**
      * Reset per-file scope state.
      *
@@ -45,6 +56,11 @@ export declare class ScopeManager {
      * Resolve simple identifier declared in-file to its string literal value, if known.
      */
     resolveSimpleStringIdentifier(name: string): string | undefined;
+    /**
+     * Resolve a MemberExpression node (e.g., `ns.custom`) to its string value
+     * by looking up the object in `simpleConstantObjects`.
+     */
+    private resolveSimpleMemberExpression;
     /**
      * Handles variable declarations that might define translation functions.
      *

package/types/extractor/parsers/scope-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scope-manager.d.ts","sourceRoot":"","sources":["../../../src/extractor/parsers/scope-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAmC,MAAM,WAAW,CAAA;AACpF,OAAO,KAAK,EAAE,SAAS,EAA4B,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAG5F,qBAAa,YAAY;IACvB,OAAO,CAAC,UAAU,CAAoC;IACtD,OAAO,CAAC,MAAM,CAAuC;IACrD,OAAO,CAAC,KAAK,CAAqE;IAGlF,OAAO,CAAC,eAAe,CAAiC;gBAE3C,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC;IAI1D;;;;;;OAMG;IACI,KAAK,IAAK,IAAI;IAMrB;;;OAGG;IACH,UAAU,IAAK,IAAI;IAInB;;;OAGG;IACH,SAAS,IAAK,IAAI;IAIlB;;;;;;OAMG;IACH,aAAa,CAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI;IAUnD;;;;;;OAMG;IACH,eAAe,CAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAkBrD,OAAO,CAAC,uBAAuB;IAoB/B;;OAEG;IACI,6BAA6B,CAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIvE;;;;;;;;;;OAUG;IACH,wBAAwB,CAAE,IAAI,EAAE,kBAAkB,GAAG,IAAI;IAuDzD;;;;;;;;OAQG;IACH,OAAO,CAAC,+BAA+B;IAsGvC;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,8BAA8B;IA+EtC;;;;;;;;;;OAUG;IACH,OAAO,CAAC,yBAAyB;IAoBjC;;;;;;;;;OASG;IACH,OAAO,CAAC,qCAAqC;CAuB9C"}
+{"version":3,"file":"scope-manager.d.ts","sourceRoot":"","sources":["../../../src/extractor/parsers/scope-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,kBAAkB,EAMnB,MAAM,WAAW,CAAA;AAClB,OAAO,KAAK,EAAE,SAAS,EAA4B,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAG5F,qBAAa,YAAY;IACvB,OAAO,CAAC,UAAU,CAAoC;IACtD,OAAO,CAAC,MAAM,CAAuC;IACrD,OAAO,CAAC,KAAK,CAAqE;IAGlF,OAAO,CAAC,eAAe,CAAiC;IAGxD,OAAO,CAAC,qBAAqB,CAAiD;gBAEjE,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC;IAI1D;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAcjC;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,+BAA+B;IAgB9C;;;;;;OAMG;IACI,KAAK,IAAK,IAAI;IAOrB;;;OAGG;IACH,UAAU,IAAK,IAAI;IAInB;;;OAGG;IACH,SAAS,IAAK,IAAI;IAIlB;;;;;;OAMG;IACH,aAAa,CAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI;IAUnD;;;;;;OAMG;IACH,eAAe,CAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAkBrD,OAAO,CAAC,uBAAuB;IAoB/B;;OAEG;IACI,6BAA6B,CAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIvE;;;OAGG;IACH,OAAO,CAAC,6BAA6B;IAqBrC;;;;;;;;;;OAUG;IACH,wBAAwB,CAAE,IAAI,EAAE,kBAAkB,GAAG,IAAI;IAuFzD;;;;;;;;OAQG;IACH,OAAO,CAAC,+BAA+B;IA0GvC;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,8BAA8B;IAmFtC;;;;;;;;;;OAUG;IACH,OAAO,CAAC,yBAAyB;IAoBjC;;;;;;;;;OASG;IACH,OAAO,CAAC,qCAAqC;CAuB9C"}