i18next-cli 1.70.0 → 1.70.2

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.0'); // This string is replaced with the actual version at build time by rollup
+    .version('1.70.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/extractor/core/ast-visitors.js

@@ -218,6 +218,13 @@ class ASTVisitors {
             node.type === 'ObjectMethod') {
             this.scopeManager.enterScope();
             isNewScope = true;
+            // `<Ns extends 'a' | 'b'>(t: TFunction<Ns>)` → constraint lookup for type params
+            const typeParamConstraints = {};
+            for (const tp of (node.typeParameters?.parameters ?? node.typeParameters?.params ?? [])) {
+                const name = tp?.name?.value ?? tp?.name?.name;
+                if (name && tp.constraint)
+                    typeParamConstraints[name] = tp.constraint;
+            }
             const params = (node.params && Array.isArray(node.params)) ? node.params : (node.params || []);
             for (const p of params) {
                 // handle common param shapes: Identifier, AssignmentPattern (default), RestElement ignored
@@ -241,7 +248,7 @@ class ASTVisitors {
                         if (!memberName || !localName)
                             continue;
                         // `({ t }: { t: TFunction<'ns'> })` → bind `t` to that namespace
-                        this.bindTFunctionParam(localName, this.getMemberTypeNode(patType, memberName));
+                        this.bindTFunctionParam(localName, this.getMemberTypeNode(patType, memberName), typeParamConstraints);
                         if (!members?.[memberName])
                             continue;
                         this.expressionResolver.setTemporaryVariable(localName, members[memberName]);
@@ -294,7 +301,11 @@ class ASTVisitors {
                 else {
                     typeAnn = undefined;
                 }
-                this.bindTFunctionParam(paramKey, typeAnn);
+                this.bindTFunctionParam(paramKey, typeAnn, typeParamConstraints);
+                // `props: { t: TFunction<'ns'> }` → bind `props.t` so `props.t('key')` resolves
+                for (const { name, typeNode } of this.getObjectTypeMembers(typeAnn)) {
+                    this.bindTFunctionParam(`${paramKey}.${name}`, typeNode, typeParamConstraints);
+                }
                 // Capture parameter type annotations as temporary variables in the
                 // expression resolver so that dynamic bracket expressions like
                 // `t(($) => $.table.columns[field])` can resolve `field` to its
@@ -560,7 +571,7 @@ class ASTVisitors {
      * If `typeAnn` is a `TFunction<Ns, KPrefix>` type reference, register
      * `paramKey` in the current scope with that namespace / keyPrefix.
      */
-    bindTFunctionParam(paramKey, typeAnn) {
+    bindTFunctionParam(paramKey, typeAnn, typeParamConstraints = {}) {
         // Small helpers to robustly extract the referenced type name and literal string
         const extractTypeName = (ta) => {
             if (!ta)
@@ -584,6 +595,16 @@ 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).
+            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];
+            }
             // Handle: typeof SomeConst  → TsTypeQuery { exprName: { value: 'SomeConst' } }
             if (node?.type === 'TsTypeQuery') {
                 const name = node.exprName?.value ?? node.exprName?.name;
@@ -611,6 +632,23 @@ class ASTVisitors {
                 return extractStringLiteralValue(node.typeParams[0]);
             return undefined;
         };
+        // `ReturnType<typeof useTranslation<'ns', 'kp'>>['t']` is `TFunction<'ns', 'kp'>` spelled indirectly.
+        if (typeAnn?.type === 'TsIndexedAccessType' && extractStringLiteralValue(typeAnn.indexType) === 't') {
+            const obj = typeAnn.objectType;
+            const query = obj?.type === 'TsTypeReference' && extractTypeName(obj) === 'ReturnType'
+                ? (obj.typeParams?.params?.[0] ?? obj.typeArguments?.params?.[0])
+                : undefined;
+            const hookName = query?.type === 'TsTypeQuery' ? (query.exprName?.value ?? query.exprName?.name) : undefined;
+            const hookNames = this.config.extract.useTranslationNames || ['useTranslation', 'getT', 'useT'];
+            if (hookName && hookNames.some(h => (typeof h === 'string' ? h : h.name) === hookName)) {
+                const params = query.typeArguments?.params ?? query.typeArgs?.params ?? [];
+                const ns = extractStringLiteralValue(params[0]);
+                const kp = extractStringLiteralValue(params[1]);
+                if (ns || kp)
+                    this.scopeManager.setVarInScope(paramKey, { defaultNs: ns, keyPrefix: kp });
+            }
+            return;
+        }
         // Detect TsTypeReference like: TFunction<"my-custom-namespace">
         if (typeAnn && (typeAnn.type === 'TsTypeReference' || typeAnn.type === 'TsTypeRef' || typeAnn.type === 'TsTypeReference')) {
             const finalTypeName = extractTypeName(typeAnn);
@@ -665,8 +703,12 @@ class ASTVisitors {
      * alias name).
      */
     getMemberTypeNode(tsType, memberName) {
+        return this.getObjectTypeMembers(tsType).find(m => m.name === memberName)?.typeNode;
+    }
+    /** `{ name, typeNode }` for every property of an object-shaped type annotation. */
+    getObjectTypeMembers(tsType) {
         if (!tsType)
-            return undefined;
+            return [];
         let members;
         if (tsType.type === 'TsTypeLiteral')
             members = tsType.members;
@@ -674,15 +716,16 @@ class ASTVisitors {
             members = this.expressionResolver.getObjectTypeMembersRaw(tsType.typeName.value);
         }
         if (!Array.isArray(members))
-            return undefined;
+            return [];
+        const out = [];
         for (const m of members) {
             if (m?.type !== 'TsPropertySignature')
                 continue;
             const name = m.key?.type === 'Identifier' || m.key?.type === 'StringLiteral' ? m.key.value : undefined;
-            if (name === memberName)
-                return m.typeAnnotation?.typeAnnotation ?? m.typeAnnotation;
+            if (name)
+                out.push({ name, typeNode: m.typeAnnotation?.typeAnnotation ?? m.typeAnnotation });
         }
-        return undefined;
+        return out;
     }
     /**
      * If `node` is a call like `ARRAY.map(param => ...)` where ARRAY is a known

package/dist/cjs/extractor/parsers/comment-parser.js

@@ -312,7 +312,9 @@ function collectCommentTexts(src) {
     const commentRegex = /\/\/(.*)|\/\*([\s\S]*?)\*\//g;
     let cmatch;
     while ((cmatch = commentRegex.exec(src)) !== null) {
-        const content = cmatch[1] ?? cmatch[2];
+        // Strip fenced code blocks (```…```) from doc comments: they are usage
+        // examples, not real call sites, and would otherwise pollute the default namespace.
+        const content = (cmatch[1] ?? cmatch[2]).replace(/```[\s\S]*?```/g, '');
         const s = content.trim();
         if (s && !seen.has(s)) {
             seen.add(s);

package/dist/cjs/extractor/parsers/scope-manager.js

@@ -15,6 +15,8 @@ class ScopeManager {
     simpleConstants = new Map();
     // Track simple local constant objects with string literal property values
     simpleConstantObjects = new Map();
+    // `const NS = ['a', 'b']` → used by resolveNsArg for `useTranslation(NS)`.
+    simpleConstantArrays = new Map();
     // Shared (cross-file) tables so that exported constants from one file can be
     // resolved when imported in another. These are NOT cleared by reset().
     sharedConstants = new Map();
@@ -68,6 +70,7 @@ class ScopeManager {
         this.scope = new Map();
         this.simpleConstants.clear();
         this.simpleConstantObjects.clear();
+        this.simpleConstantArrays.clear();
         this.thisFieldStack = [];
     }
     /**
@@ -258,6 +261,15 @@ class ScopeManager {
                     this.sharedConstantObjects.set(node.id.value, map);
                 }
             }
+            else if (unwrapped?.type === 'ArrayExpression') {
+                const arr = unwrapped.elements
+                    .map((el) => ScopeManager.unwrapTsExpression(el?.expression))
+                    .filter((e) => e?.type === 'StringLiteral')
+                    .map((e) => e.value);
+                if (arr.length > 0 && arr.length === unwrapped.elements.length) {
+                    this.simpleConstantArrays.set(node.id.value, arr);
+                }
+            }
             else {
                 const fromType = ScopeManager.extractStringFromTypeAnnotation(node);
                 if (fromType !== undefined) {
@@ -267,6 +279,17 @@ class ScopeManager {
             }
             // continue processing; still may be a useTranslation/getFixedT call below
         }
+        // Handle: const t = useCallback((key, opts) => tLocal(key, opts), [...])  OR
+        //         const t = (key, opts) => tLocal(key, opts)
+        // A wrapper that forwards its first parameter as the key to an already-scoped
+        // translation function inherits that function's scope.
+        if (node.id.type === 'Identifier') {
+            const wrapped = this.resolveDelegatingWrapperScope(init);
+            if (wrapped) {
+                this.setVarInScope(node.id.value, wrapped);
+                return;
+            }
+        }
         // Handle: const { t } = this.#field  OR  const { t } = this.#field()
         // Resolve the source `this.<field>` to its previously-registered ScopeInfo
         // and propagate it onto the destructured variables.
@@ -544,10 +567,15 @@ class ScopeManager {
     resolveNsArg(nsNode) {
         if (!nsNode)
             return {};
+        nsNode = ScopeManager.unwrapTsExpression(nsNode); // `[...] as const`, `satisfies`, `as X`
         if (nsNode.type === 'StringLiteral')
             return { defaultNs: nsNode.value };
-        if (nsNode.type === 'Identifier')
+        if (nsNode.type === 'Identifier') {
+            const arr = this.simpleConstantArrays.get(nsNode.value);
+            if (arr)
+                return { defaultNs: arr[0], namespaces: arr };
             return { defaultNs: this.resolveSimpleStringIdentifier(nsNode.value) };
+        }
         if (nsNode.type === 'MemberExpression')
             return { defaultNs: this.resolveSimpleMemberExpression(nsNode) };
         // `useTranslation(ns ?? 'fallback')` / `useTranslation(ns || 'fallback')`:
@@ -579,6 +607,51 @@ class ScopeManager {
         }
         return {};
     }
+    /**
+     * If `init` is a function (optionally wrapped in `useCallback(fn, deps)`) whose
+     * first parameter is passed as the first argument to a call of an already-scoped
+     * variable (e.g. `tLocal(key, opts)`), return that variable's ScopeInfo.
+     */
+    resolveDelegatingWrapperScope(init) {
+        let fn = ScopeManager.unwrapTsExpression(init);
+        if (fn?.type === 'CallExpression' && fn.callee?.type === 'Identifier' && fn.callee.value === 'useCallback') {
+            fn = fn.arguments?.[0]?.expression;
+        }
+        if (fn?.type !== 'ArrowFunctionExpression' && fn?.type !== 'FunctionExpression')
+            return undefined;
+        const first = fn.params?.[0];
+        const pat = first?.pat ?? first;
+        const keyParam = pat?.type === 'Identifier' ? pat.value : undefined;
+        if (!keyParam)
+            return undefined;
+        let found;
+        const visit = (n) => {
+            if (found || !n || typeof n !== 'object')
+                return;
+            if (Array.isArray(n)) {
+                for (const c of n)
+                    visit(c);
+                return;
+            }
+            if (n.type === 'CallExpression' &&
+                n.callee?.type === 'Identifier' &&
+                n.arguments?.[0]?.expression?.type === 'Identifier' &&
+                n.arguments[0].expression.value === keyParam) {
+                const scope = this.getVarFromScope(n.callee.value);
+                if (scope) {
+                    found = scope;
+                    return;
+                }
+            }
+            for (const k of Object.keys(n)) {
+                if (k === 'span')
+                    continue;
+                visit(n[k]);
+            }
+        };
+        visit(fn.body);
+        return found;
+    }
     resolveStringArg(node) {
         if (!node)
             return undefined;

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.0'); // This string is replaced with the actual version at build time by rollup
+    .version('1.70.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/extractor/core/ast-visitors.js

@@ -216,6 +216,13 @@ class ASTVisitors {
             node.type === 'ObjectMethod') {
             this.scopeManager.enterScope();
             isNewScope = true;
+            // `<Ns extends 'a' | 'b'>(t: TFunction<Ns>)` → constraint lookup for type params
+            const typeParamConstraints = {};
+            for (const tp of (node.typeParameters?.parameters ?? node.typeParameters?.params ?? [])) {
+                const name = tp?.name?.value ?? tp?.name?.name;
+                if (name && tp.constraint)
+                    typeParamConstraints[name] = tp.constraint;
+            }
             const params = (node.params && Array.isArray(node.params)) ? node.params : (node.params || []);
             for (const p of params) {
                 // handle common param shapes: Identifier, AssignmentPattern (default), RestElement ignored
@@ -239,7 +246,7 @@ class ASTVisitors {
                         if (!memberName || !localName)
                             continue;
                         // `({ t }: { t: TFunction<'ns'> })` → bind `t` to that namespace
-                        this.bindTFunctionParam(localName, this.getMemberTypeNode(patType, memberName));
+                        this.bindTFunctionParam(localName, this.getMemberTypeNode(patType, memberName), typeParamConstraints);
                         if (!members?.[memberName])
                             continue;
                         this.expressionResolver.setTemporaryVariable(localName, members[memberName]);
@@ -292,7 +299,11 @@ class ASTVisitors {
                 else {
                     typeAnn = undefined;
                 }
-                this.bindTFunctionParam(paramKey, typeAnn);
+                this.bindTFunctionParam(paramKey, typeAnn, typeParamConstraints);
+                // `props: { t: TFunction<'ns'> }` → bind `props.t` so `props.t('key')` resolves
+                for (const { name, typeNode } of this.getObjectTypeMembers(typeAnn)) {
+                    this.bindTFunctionParam(`${paramKey}.${name}`, typeNode, typeParamConstraints);
+                }
                 // Capture parameter type annotations as temporary variables in the
                 // expression resolver so that dynamic bracket expressions like
                 // `t(($) => $.table.columns[field])` can resolve `field` to its
@@ -558,7 +569,7 @@ class ASTVisitors {
      * If `typeAnn` is a `TFunction<Ns, KPrefix>` type reference, register
      * `paramKey` in the current scope with that namespace / keyPrefix.
      */
-    bindTFunctionParam(paramKey, typeAnn) {
+    bindTFunctionParam(paramKey, typeAnn, typeParamConstraints = {}) {
         // Small helpers to robustly extract the referenced type name and literal string
         const extractTypeName = (ta) => {
             if (!ta)
@@ -582,6 +593,16 @@ 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).
+            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];
+            }
             // Handle: typeof SomeConst  → TsTypeQuery { exprName: { value: 'SomeConst' } }
             if (node?.type === 'TsTypeQuery') {
                 const name = node.exprName?.value ?? node.exprName?.name;
@@ -609,6 +630,23 @@ class ASTVisitors {
                 return extractStringLiteralValue(node.typeParams[0]);
             return undefined;
         };
+        // `ReturnType<typeof useTranslation<'ns', 'kp'>>['t']` is `TFunction<'ns', 'kp'>` spelled indirectly.
+        if (typeAnn?.type === 'TsIndexedAccessType' && extractStringLiteralValue(typeAnn.indexType) === 't') {
+            const obj = typeAnn.objectType;
+            const query = obj?.type === 'TsTypeReference' && extractTypeName(obj) === 'ReturnType'
+                ? (obj.typeParams?.params?.[0] ?? obj.typeArguments?.params?.[0])
+                : undefined;
+            const hookName = query?.type === 'TsTypeQuery' ? (query.exprName?.value ?? query.exprName?.name) : undefined;
+            const hookNames = this.config.extract.useTranslationNames || ['useTranslation', 'getT', 'useT'];
+            if (hookName && hookNames.some(h => (typeof h === 'string' ? h : h.name) === hookName)) {
+                const params = query.typeArguments?.params ?? query.typeArgs?.params ?? [];
+                const ns = extractStringLiteralValue(params[0]);
+                const kp = extractStringLiteralValue(params[1]);
+                if (ns || kp)
+                    this.scopeManager.setVarInScope(paramKey, { defaultNs: ns, keyPrefix: kp });
+            }
+            return;
+        }
         // Detect TsTypeReference like: TFunction<"my-custom-namespace">
         if (typeAnn && (typeAnn.type === 'TsTypeReference' || typeAnn.type === 'TsTypeRef' || typeAnn.type === 'TsTypeReference')) {
             const finalTypeName = extractTypeName(typeAnn);
@@ -663,8 +701,12 @@ class ASTVisitors {
      * alias name).
      */
     getMemberTypeNode(tsType, memberName) {
+        return this.getObjectTypeMembers(tsType).find(m => m.name === memberName)?.typeNode;
+    }
+    /** `{ name, typeNode }` for every property of an object-shaped type annotation. */
+    getObjectTypeMembers(tsType) {
         if (!tsType)
-            return undefined;
+            return [];
         let members;
         if (tsType.type === 'TsTypeLiteral')
             members = tsType.members;
@@ -672,15 +714,16 @@ class ASTVisitors {
             members = this.expressionResolver.getObjectTypeMembersRaw(tsType.typeName.value);
         }
         if (!Array.isArray(members))
-            return undefined;
+            return [];
+        const out = [];
         for (const m of members) {
             if (m?.type !== 'TsPropertySignature')
                 continue;
             const name = m.key?.type === 'Identifier' || m.key?.type === 'StringLiteral' ? m.key.value : undefined;
-            if (name === memberName)
-                return m.typeAnnotation?.typeAnnotation ?? m.typeAnnotation;
+            if (name)
+                out.push({ name, typeNode: m.typeAnnotation?.typeAnnotation ?? m.typeAnnotation });
         }
-        return undefined;
+        return out;
     }
     /**
      * If `node` is a call like `ARRAY.map(param => ...)` where ARRAY is a known

package/dist/esm/extractor/parsers/comment-parser.js

@@ -310,7 +310,9 @@ function collectCommentTexts(src) {
     const commentRegex = /\/\/(.*)|\/\*([\s\S]*?)\*\//g;
     let cmatch;
     while ((cmatch = commentRegex.exec(src)) !== null) {
-        const content = cmatch[1] ?? cmatch[2];
+        // Strip fenced code blocks (```…```) from doc comments: they are usage
+        // examples, not real call sites, and would otherwise pollute the default namespace.
+        const content = (cmatch[1] ?? cmatch[2]).replace(/```[\s\S]*?```/g, '');
         const s = content.trim();
         if (s && !seen.has(s)) {
             seen.add(s);

package/dist/esm/extractor/parsers/scope-manager.js

@@ -13,6 +13,8 @@ class ScopeManager {
     simpleConstants = new Map();
     // Track simple local constant objects with string literal property values
     simpleConstantObjects = new Map();
+    // `const NS = ['a', 'b']` → used by resolveNsArg for `useTranslation(NS)`.
+    simpleConstantArrays = new Map();
     // Shared (cross-file) tables so that exported constants from one file can be
     // resolved when imported in another. These are NOT cleared by reset().
     sharedConstants = new Map();
@@ -66,6 +68,7 @@ class ScopeManager {
         this.scope = new Map();
         this.simpleConstants.clear();
         this.simpleConstantObjects.clear();
+        this.simpleConstantArrays.clear();
         this.thisFieldStack = [];
     }
     /**
@@ -256,6 +259,15 @@ class ScopeManager {
                     this.sharedConstantObjects.set(node.id.value, map);
                 }
             }
+            else if (unwrapped?.type === 'ArrayExpression') {
+                const arr = unwrapped.elements
+                    .map((el) => ScopeManager.unwrapTsExpression(el?.expression))
+                    .filter((e) => e?.type === 'StringLiteral')
+                    .map((e) => e.value);
+                if (arr.length > 0 && arr.length === unwrapped.elements.length) {
+                    this.simpleConstantArrays.set(node.id.value, arr);
+                }
+            }
             else {
                 const fromType = ScopeManager.extractStringFromTypeAnnotation(node);
                 if (fromType !== undefined) {
@@ -265,6 +277,17 @@ class ScopeManager {
             }
             // continue processing; still may be a useTranslation/getFixedT call below
         }
+        // Handle: const t = useCallback((key, opts) => tLocal(key, opts), [...])  OR
+        //         const t = (key, opts) => tLocal(key, opts)
+        // A wrapper that forwards its first parameter as the key to an already-scoped
+        // translation function inherits that function's scope.
+        if (node.id.type === 'Identifier') {
+            const wrapped = this.resolveDelegatingWrapperScope(init);
+            if (wrapped) {
+                this.setVarInScope(node.id.value, wrapped);
+                return;
+            }
+        }
         // Handle: const { t } = this.#field  OR  const { t } = this.#field()
         // Resolve the source `this.<field>` to its previously-registered ScopeInfo
         // and propagate it onto the destructured variables.
@@ -542,10 +565,15 @@ class ScopeManager {
     resolveNsArg(nsNode) {
         if (!nsNode)
             return {};
+        nsNode = ScopeManager.unwrapTsExpression(nsNode); // `[...] as const`, `satisfies`, `as X`
         if (nsNode.type === 'StringLiteral')
             return { defaultNs: nsNode.value };
-        if (nsNode.type === 'Identifier')
+        if (nsNode.type === 'Identifier') {
+            const arr = this.simpleConstantArrays.get(nsNode.value);
+            if (arr)
+                return { defaultNs: arr[0], namespaces: arr };
             return { defaultNs: this.resolveSimpleStringIdentifier(nsNode.value) };
+        }
         if (nsNode.type === 'MemberExpression')
             return { defaultNs: this.resolveSimpleMemberExpression(nsNode) };
         // `useTranslation(ns ?? 'fallback')` / `useTranslation(ns || 'fallback')`:
@@ -577,6 +605,51 @@ class ScopeManager {
         }
         return {};
     }
+    /**
+     * If `init` is a function (optionally wrapped in `useCallback(fn, deps)`) whose
+     * first parameter is passed as the first argument to a call of an already-scoped
+     * variable (e.g. `tLocal(key, opts)`), return that variable's ScopeInfo.
+     */
+    resolveDelegatingWrapperScope(init) {
+        let fn = ScopeManager.unwrapTsExpression(init);
+        if (fn?.type === 'CallExpression' && fn.callee?.type === 'Identifier' && fn.callee.value === 'useCallback') {
+            fn = fn.arguments?.[0]?.expression;
+        }
+        if (fn?.type !== 'ArrowFunctionExpression' && fn?.type !== 'FunctionExpression')
+            return undefined;
+        const first = fn.params?.[0];
+        const pat = first?.pat ?? first;
+        const keyParam = pat?.type === 'Identifier' ? pat.value : undefined;
+        if (!keyParam)
+            return undefined;
+        let found;
+        const visit = (n) => {
+            if (found || !n || typeof n !== 'object')
+                return;
+            if (Array.isArray(n)) {
+                for (const c of n)
+                    visit(c);
+                return;
+            }
+            if (n.type === 'CallExpression' &&
+                n.callee?.type === 'Identifier' &&
+                n.arguments?.[0]?.expression?.type === 'Identifier' &&
+                n.arguments[0].expression.value === keyParam) {
+                const scope = this.getVarFromScope(n.callee.value);
+                if (scope) {
+                    found = scope;
+                    return;
+                }
+            }
+            for (const k of Object.keys(n)) {
+                if (k === 'span')
+                    continue;
+                visit(n[k]);
+            }
+        };
+        visit(fn.body);
+        return found;
+    }
     resolveStringArg(node) {
         if (!node)
             return undefined;

package/package.json

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

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

@@ -96,6 +96,8 @@ export declare class ASTVisitors {
      * alias name).
      */
     private getMemberTypeNode;
+    /** `{ name, typeNode }` for every property of an object-shaped type annotation. */
+    private getObjectTypeMembers;
     /**
      * If `node` is a call like `ARRAY.map(param => ...)` where ARRAY is a known
      * string-array constant, returns the callback's first parameter name and the

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;IAoYZ;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAwF1B;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IAgBzB;;;;;;;;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;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"}

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

@@ -7,6 +7,7 @@ export declare class ScopeManager {
     private thisFieldStack;
     private simpleConstants;
     private simpleConstantObjects;
+    private simpleConstantArrays;
     private sharedConstants;
     private sharedConstantObjects;
     constructor(config: Omit<I18nextToolkitConfig, 'plugins'>);
@@ -161,6 +162,12 @@ export declare class ScopeManager {
      * either single form behaves identically downstream.
      */
     private resolveNsArg;
+    /**
+     * If `init` is a function (optionally wrapped in `useCallback(fn, deps)`) whose
+     * first parameter is passed as the first argument to a call of an already-scoped
+     * variable (e.g. `tLocal(key, opts)`), return that variable's ScopeInfo.
+     */
+    private resolveDelegatingWrapperScope;
     private resolveStringArg;
     /**
      * Handles cases where a getFixedT-like function is a variable (from a custom hook)

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,EACV,UAAU,EAEV,kBAAkB,EAMnB,MAAM,WAAW,CAAA;AAClB,OAAO,KAAK,EAAE,SAAS,EAA4B,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAG/F,qBAAa,YAAY;IACvB,OAAO,CAAC,UAAU,CAAoC;IACtD,OAAO,CAAC,MAAM,CAAuC;IACrD,OAAO,CAAC,KAAK,CAAqE;IAMlF,OAAO,CAAC,cAAc,CAAoC;IAG1D,OAAO,CAAC,eAAe,CAAiC;IAGxD,OAAO,CAAC,qBAAqB,CAAiD;IAI9E,OAAO,CAAC,eAAe,CAAiC;IACxD,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;IAQrB;;;;OAIG;IACH,eAAe,IAAK,IAAI;IAIxB;;;OAGG;IACH,cAAc,IAAK,IAAI;IAIvB;;;;;;;OAOG;IACH,YAAY,CAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI;IAMvD;;;;;OAKG;IACH,YAAY,CAAE,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IASvD;;;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;IAsGzD;;;;;;;;OAQG;IACH,OAAO,CAAC,+BAA+B;IA8FvC;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,8BAA8B;IA0EtC;;;;;;;;;;OAUG;IACH,OAAO,CAAC,yBAAyB;IAiBjC;;;;;;OAMG;IACH;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,YAAY;IA8BpB,OAAO,CAAC,gBAAgB;IAexB;;;;;;;;;OASG;IACH,OAAO,CAAC,qCAAqC;IAqB7C;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAgBnC;;;OAGG;IACH,OAAO,CAAC,6BAA6B;IAyBrC;;;;;;;;;;;OAWG;IACH,kBAAkB,CAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI,GAAG,SAAS,GAAG,IAAI;IAwBlF;;;;;OAKG;IACH,OAAO,CAAC,4BAA4B;CA+DrC"}
+{"version":3,"file":"scope-manager.d.ts","sourceRoot":"","sources":["../../../src/extractor/parsers/scope-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EAEV,kBAAkB,EAMnB,MAAM,WAAW,CAAA;AAClB,OAAO,KAAK,EAAE,SAAS,EAA4B,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAG/F,qBAAa,YAAY;IACvB,OAAO,CAAC,UAAU,CAAoC;IACtD,OAAO,CAAC,MAAM,CAAuC;IACrD,OAAO,CAAC,KAAK,CAAqE;IAMlF,OAAO,CAAC,cAAc,CAAoC;IAG1D,OAAO,CAAC,eAAe,CAAiC;IAGxD,OAAO,CAAC,qBAAqB,CAAiD;IAE9E,OAAO,CAAC,oBAAoB,CAAmC;IAI/D,OAAO,CAAC,eAAe,CAAiC;IACxD,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;IASrB;;;;OAIG;IACH,eAAe,IAAK,IAAI;IAIxB;;;OAGG;IACH,cAAc,IAAK,IAAI;IAIvB;;;;;;;OAOG;IACH,YAAY,CAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI;IAMvD;;;;;OAKG;IACH,YAAY,CAAE,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IASvD;;;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;IA0HzD;;;;;;;;OAQG;IACH,OAAO,CAAC,+BAA+B;IA8FvC;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,8BAA8B;IA0EtC;;;;;;;;;;OAUG;IACH,OAAO,CAAC,yBAAyB;IAiBjC;;;;;;OAMG;IACH;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,YAAY;IAmCpB;;;;OAIG;IACH,OAAO,CAAC,6BAA6B;IAiCrC,OAAO,CAAC,gBAAgB;IAexB;;;;;;;;;OASG;IACH,OAAO,CAAC,qCAAqC;IAqB7C;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAgBnC;;;OAGG;IACH,OAAO,CAAC,6BAA6B;IAyBrC;;;;;;;;;;;OAWG;IACH,kBAAkB,CAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI,GAAG,SAAS,GAAG,IAAI;IAwBlF;;;;;OAKG;IACH,OAAO,CAAC,4BAA4B;CA+DrC"}