i18next-cli 1.69.2 → 1.70.1

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.69.2'); // This string is replaced with the actual version at build time by rollup
+    .version('1.70.1'); // 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

@@ -230,22 +230,24 @@ class ASTVisitors {
                 if (pat.type === 'ObjectPattern') {
                     const patType = pat.typeAnnotation?.typeAnnotation ?? pat.typeAnnotation;
                     const members = this.expressionResolver.resolveTypeMembers(patType);
-                    if (members) {
-                        for (const prop of (pat.properties ?? [])) {
-                            // `{ size }` / `{ size = 'all' }` → AssignmentPatternProperty (local name is the key)
-                            // `{ size: s }` / `{ size: s = 'all' }` → KeyValuePatternProperty
-                            const memberName = prop?.key?.value;
-                            let localNode = prop?.type === 'KeyValuePatternProperty' ? prop.value : prop?.key;
-                            if (localNode?.type === 'AssignmentPattern')
-                                localNode = localNode.left;
-                            const localName = localNode?.type === 'Identifier' ? localNode.value : undefined;
-                            if (!memberName || !localName || !members[memberName])
-                                continue;
-                            this.expressionResolver.setTemporaryVariable(localName, members[memberName]);
-                            if (!paramTemporaries)
-                                paramTemporaries = [];
-                            paramTemporaries.push(localName);
-                        }
+                    for (const prop of (pat.properties ?? [])) {
+                        // `{ size }` / `{ size = 'all' }` → AssignmentPatternProperty (local name is the key)
+                        // `{ size: s }` / `{ size: s = 'all' }` → KeyValuePatternProperty
+                        const memberName = prop?.key?.value;
+                        let localNode = prop?.type === 'KeyValuePatternProperty' ? prop.value : prop?.key;
+                        if (localNode?.type === 'AssignmentPattern')
+                            localNode = localNode.left;
+                        const localName = localNode?.type === 'Identifier' ? localNode.value : undefined;
+                        if (!memberName || !localName)
+                            continue;
+                        // `({ t }: { t: TFunction<'ns'> })` → bind `t` to that namespace
+                        this.bindTFunctionParam(localName, this.getMemberTypeNode(patType, memberName));
+                        if (!members?.[memberName])
+                            continue;
+                        this.expressionResolver.setTemporaryVariable(localName, members[memberName]);
+                        if (!paramTemporaries)
+                            paramTemporaries = [];
+                        paramTemporaries.push(localName);
                     }
                     continue;
                 }
@@ -292,103 +294,7 @@ class ASTVisitors {
                 else {
                     typeAnn = undefined;
                 }
-                // Small helpers to robustly extract the referenced type name and literal string
-                const extractTypeName = (ta) => {
-                    if (!ta)
-                        return undefined;
-                    // Identifier style: { type: 'Identifier', value: 'TFunction' } OR { name: 'TFunction' }
-                    if (ta.typeName && (ta.typeName.type === 'Identifier'))
-                        return ta.typeName.value ?? ta.typeName.name;
-                    if (ta.typeName && ta.typeName.type === 'TsQualifiedName') {
-                        // Qualified like Foo.TFunction -> try right side
-                        const right = (ta.typeName.right ?? ta.typeName);
-                        return right?.value ?? right?.name;
-                    }
-                    if (ta.typeName && typeof ta.typeName === 'string')
-                        return ta.typeName;
-                    if (ta.type === 'Identifier')
-                        return ta.value ?? ta.name;
-                    if (ta.id)
-                        return ta.id?.value ?? ta.id?.name ?? ta.id;
-                    return undefined;
-                };
-                const extractStringLiteralValue = (node) => {
-                    if (!node)
-                        return undefined;
-                    // Handle: typeof SomeConst  → TsTypeQuery { exprName: { value: 'SomeConst' } }
-                    if (node?.type === 'TsTypeQuery') {
-                        const name = node.exprName?.value ?? node.exprName?.name;
-                        if (name)
-                            return this.scopeManager.resolveSimpleStringIdentifier(name);
-                    }
-                    // shapes: TsLiteralType -> { literal: { type: 'StringLiteral', value: 'x' } }
-                    if (node.type === 'TsLiteralType' && node.literal)
-                        return node.literal.value ?? node.literal.raw;
-                    if (node.type === 'StringLiteral' || node.type === 'Str' || node.type === 'Literal')
-                        return node.value ?? node.raw ?? node.value;
-                    if (node.literal && (node.literal.type === 'StringLiteral' || node.literal.type === 'Str'))
-                        return node.literal.value;
-                    // some SWC builds put the string directly on .value
-                    if (typeof node.value === 'string')
-                        return node.value;
-                    // handle wrapped parameter like { params: [ ... ] } where a literal might be one level deeper
-                    if (node.params && Array.isArray(node.params) && node.params[0])
-                        return extractStringLiteralValue(node.params[0]);
-                    if (node.typeArguments && Array.isArray(node.typeArguments) && node.typeArguments[0])
-                        return extractStringLiteralValue(node.typeArguments[0]);
-                    if (node.typeParameters && Array.isArray(node.typeParameters) && node.typeParameters[0])
-                        return extractStringLiteralValue(node.typeParameters[0]);
-                    if (node.typeParams && Array.isArray(node.typeParams) && node.typeParams[0])
-                        return extractStringLiteralValue(node.typeParams[0]);
-                    return undefined;
-                };
-                // Detect TsTypeReference like: TFunction<"my-custom-namespace">
-                if (typeAnn && (typeAnn.type === 'TsTypeReference' || typeAnn.type === 'TsTypeRef' || typeAnn.type === 'TsTypeReference')) {
-                    const finalTypeName = extractTypeName(typeAnn);
-                    if (finalTypeName === 'TFunction') {
-                        // support multiple AST shapes for type parameters:
-                        // - typeAnn.typeParameters?.params?.[0]
-                        // - typeAnn.typeArguments?.params?.[0]
-                        // - typeAnn.typeParams?.[0] / typeAnn.params?.[0]
-                        const candidates = [
-                            typeAnn.typeParameters?.params?.[0],
-                            typeAnn.typeParameters?.[0],
-                            typeAnn.typeArguments?.params?.[0],
-                            typeAnn.typeArguments?.[0],
-                            typeAnn.typeParams?.params?.[0],
-                            typeAnn.typeParams?.[0],
-                            typeAnn.params?.[0],
-                            typeAnn.args?.[0],
-                            typeAnn.typeParameters, // fallback if it's directly the literal
-                            typeAnn.typeArguments,
-                            typeAnn.typeParams,
-                        ];
-                        let tp;
-                        for (const c of candidates) {
-                            if (c) {
-                                tp = c;
-                                break;
-                            }
-                        }
-                        const ns = extractStringLiteralValue(tp);
-                        // Extract the second type parameter for KPrefix
-                        // We need to find the second element from the same type parameter list
-                        const typeParams = typeAnn.typeParameters?.params ??
-                            typeAnn.typeArguments?.params ??
-                            typeAnn.typeParams?.params ??
-                            undefined;
-                        let kpFromType;
-                        if (typeParams && typeParams.length >= 2) {
-                            kpFromType = extractStringLiteralValue(typeParams[1]);
-                        }
-                        if (ns || kpFromType) {
-                            this.scopeManager.setVarInScope(paramKey, {
-                                defaultNs: ns,
-                                keyPrefix: kpFromType // honour TFunction<Ns, KPrefix>
-                            });
-                        }
-                    }
-                }
+                this.bindTFunctionParam(paramKey, typeAnn);
                 // 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
@@ -650,6 +556,151 @@ class ASTVisitors {
             this.scopeManager.exitClassScope();
         }
     }
+    /**
+     * If `typeAnn` is a `TFunction<Ns, KPrefix>` type reference, register
+     * `paramKey` in the current scope with that namespace / keyPrefix.
+     */
+    bindTFunctionParam(paramKey, typeAnn) {
+        // Small helpers to robustly extract the referenced type name and literal string
+        const extractTypeName = (ta) => {
+            if (!ta)
+                return undefined;
+            // Identifier style: { type: 'Identifier', value: 'TFunction' } OR { name: 'TFunction' }
+            if (ta.typeName && (ta.typeName.type === 'Identifier'))
+                return ta.typeName.value ?? ta.typeName.name;
+            if (ta.typeName && ta.typeName.type === 'TsQualifiedName') {
+                // Qualified like Foo.TFunction -> try right side
+                const right = (ta.typeName.right ?? ta.typeName);
+                return right?.value ?? right?.name;
+            }
+            if (ta.typeName && typeof ta.typeName === 'string')
+                return ta.typeName;
+            if (ta.type === 'Identifier')
+                return ta.value ?? ta.name;
+            if (ta.id)
+                return ta.id?.value ?? ta.id?.name ?? ta.id;
+            return undefined;
+        };
+        const extractStringLiteralValue = (node) => {
+            if (!node)
+                return undefined;
+            // Handle: typeof SomeConst  → TsTypeQuery { exprName: { value: 'SomeConst' } }
+            if (node?.type === 'TsTypeQuery') {
+                const name = node.exprName?.value ?? node.exprName?.name;
+                if (name)
+                    return this.scopeManager.resolveSimpleStringIdentifier(name);
+            }
+            // shapes: TsLiteralType -> { literal: { type: 'StringLiteral', value: 'x' } }
+            if (node.type === 'TsLiteralType' && node.literal)
+                return node.literal.value ?? node.literal.raw;
+            if (node.type === 'StringLiteral' || node.type === 'Str' || node.type === 'Literal')
+                return node.value ?? node.raw ?? node.value;
+            if (node.literal && (node.literal.type === 'StringLiteral' || node.literal.type === 'Str'))
+                return node.literal.value;
+            // some SWC builds put the string directly on .value
+            if (typeof node.value === 'string')
+                return node.value;
+            // handle wrapped parameter like { params: [ ... ] } where a literal might be one level deeper
+            if (node.params && Array.isArray(node.params) && node.params[0])
+                return extractStringLiteralValue(node.params[0]);
+            if (node.typeArguments && Array.isArray(node.typeArguments) && node.typeArguments[0])
+                return extractStringLiteralValue(node.typeArguments[0]);
+            if (node.typeParameters && Array.isArray(node.typeParameters) && node.typeParameters[0])
+                return extractStringLiteralValue(node.typeParameters[0]);
+            if (node.typeParams && Array.isArray(node.typeParams) && node.typeParams[0])
+                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);
+            if (finalTypeName === 'TFunction') {
+                // support multiple AST shapes for type parameters:
+                // - typeAnn.typeParameters?.params?.[0]
+                // - typeAnn.typeArguments?.params?.[0]
+                // - typeAnn.typeParams?.[0] / typeAnn.params?.[0]
+                const candidates = [
+                    typeAnn.typeParameters?.params?.[0],
+                    typeAnn.typeParameters?.[0],
+                    typeAnn.typeArguments?.params?.[0],
+                    typeAnn.typeArguments?.[0],
+                    typeAnn.typeParams?.params?.[0],
+                    typeAnn.typeParams?.[0],
+                    typeAnn.params?.[0],
+                    typeAnn.args?.[0],
+                    typeAnn.typeParameters, // fallback if it's directly the literal
+                    typeAnn.typeArguments,
+                    typeAnn.typeParams,
+                ];
+                let tp;
+                for (const c of candidates) {
+                    if (c) {
+                        tp = c;
+                        break;
+                    }
+                }
+                const ns = extractStringLiteralValue(tp);
+                // Extract the second type parameter for KPrefix
+                // We need to find the second element from the same type parameter list
+                const typeParams = typeAnn.typeParameters?.params ??
+                    typeAnn.typeArguments?.params ??
+                    typeAnn.typeParams?.params ??
+                    undefined;
+                let kpFromType;
+                if (typeParams && typeParams.length >= 2) {
+                    kpFromType = extractStringLiteralValue(typeParams[1]);
+                }
+                if (ns || kpFromType) {
+                    this.scopeManager.setVarInScope(paramKey, {
+                        defaultNs: ns,
+                        keyPrefix: kpFromType // honour TFunction<Ns, KPrefix>
+                    });
+                }
+            }
+        }
+    }
+    /**
+     * Find the raw type node of a named member on an object-shaped type
+     * annotation (inline `{ t: TFunction<'ns'> }` or a local interface / type
+     * alias name).
+     */
+    getMemberTypeNode(tsType, memberName) {
+        if (!tsType)
+            return undefined;
+        let members;
+        if (tsType.type === 'TsTypeLiteral')
+            members = tsType.members;
+        else if (tsType.type === 'TsTypeReference' && tsType.typeName?.type === 'Identifier') {
+            members = this.expressionResolver.getObjectTypeMembersRaw(tsType.typeName.value);
+        }
+        if (!Array.isArray(members))
+            return undefined;
+        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;
+        }
+        return undefined;
+    }
     /**
      * 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/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/expression-resolver.js

@@ -30,6 +30,8 @@ class ExpressionResolver {
     // type aliases. Maps typeName -> { memberName: possible string values }.
     // e.g. `interface IProps { size: ChangeType }` -> { IProps: { size: ['all','next'] } }
     objectTypeTable = new Map();
+    // Raw TS member nodes of local interfaces / object type aliases, keyed by type name.
+    objectTypeMembersRaw = new Map();
     // Temporary per-scope bindings for identifiers holding an object-shaped type,
     // e.g. `function f(props: IProps)` -> { props: { size: ['all','next'] } }.
     temporaryObjectVariables = new Map();
@@ -236,6 +238,7 @@ class ExpressionResolver {
                 return;
             // `type IProps = { size: ChangeType }` — object shape, not a string union.
             if (tsType.type === 'TsTypeLiteral') {
+                this.objectTypeMembersRaw.set(name, tsType.members);
                 const members = this.collectObjectTypeMembers(tsType.members);
                 if (members)
                     this.objectTypeTable.set(name, members);
@@ -264,6 +267,8 @@ class ExpressionResolver {
             const name = node?.id?.type === 'Identifier' ? node.id.value : undefined;
             if (!name)
                 return;
+            if (Array.isArray(node?.body?.body))
+                this.objectTypeMembersRaw.set(name, node.body.body);
             const members = this.collectObjectTypeMembers(node?.body?.body);
             if (members)
                 this.objectTypeTable.set(name, members);
@@ -300,6 +305,9 @@ class ExpressionResolver {
      * Resolve a type annotation that refers to an object shape (interface, object
      * type alias, or inline type literal) to its member → string values map.
      */
+    getObjectTypeMembersRaw(name) {
+        return this.objectTypeMembersRaw.get(name);
+    }
     resolveTypeMembers(tsType) {
         try {
             if (!tsType)

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

@@ -267,6 +267,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.
@@ -550,6 +561,12 @@ class ScopeManager {
             return { defaultNs: this.resolveSimpleStringIdentifier(nsNode.value) };
         if (nsNode.type === 'MemberExpression')
             return { defaultNs: this.resolveSimpleMemberExpression(nsNode) };
+        // `useTranslation(ns ?? 'fallback')` / `useTranslation(ns || 'fallback')`:
+        // prefer a statically resolvable left side, otherwise use the fallback.
+        if (nsNode.type === 'BinaryExpression' && (nsNode.operator === '??' || nsNode.operator === '||')) {
+            const left = this.resolveNsArg(nsNode.left);
+            return left.defaultNs !== undefined ? left : this.resolveNsArg(nsNode.right);
+        }
         if (nsNode.type === 'ArrayExpression') {
             const namespaces = [];
             for (const el of nsNode.elements) {
@@ -573,6 +590,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.69.2'); // This string is replaced with the actual version at build time by rollup
+    .version('1.70.1'); // 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

@@ -228,22 +228,24 @@ class ASTVisitors {
                 if (pat.type === 'ObjectPattern') {
                     const patType = pat.typeAnnotation?.typeAnnotation ?? pat.typeAnnotation;
                     const members = this.expressionResolver.resolveTypeMembers(patType);
-                    if (members) {
-                        for (const prop of (pat.properties ?? [])) {
-                            // `{ size }` / `{ size = 'all' }` → AssignmentPatternProperty (local name is the key)
-                            // `{ size: s }` / `{ size: s = 'all' }` → KeyValuePatternProperty
-                            const memberName = prop?.key?.value;
-                            let localNode = prop?.type === 'KeyValuePatternProperty' ? prop.value : prop?.key;
-                            if (localNode?.type === 'AssignmentPattern')
-                                localNode = localNode.left;
-                            const localName = localNode?.type === 'Identifier' ? localNode.value : undefined;
-                            if (!memberName || !localName || !members[memberName])
-                                continue;
-                            this.expressionResolver.setTemporaryVariable(localName, members[memberName]);
-                            if (!paramTemporaries)
-                                paramTemporaries = [];
-                            paramTemporaries.push(localName);
-                        }
+                    for (const prop of (pat.properties ?? [])) {
+                        // `{ size }` / `{ size = 'all' }` → AssignmentPatternProperty (local name is the key)
+                        // `{ size: s }` / `{ size: s = 'all' }` → KeyValuePatternProperty
+                        const memberName = prop?.key?.value;
+                        let localNode = prop?.type === 'KeyValuePatternProperty' ? prop.value : prop?.key;
+                        if (localNode?.type === 'AssignmentPattern')
+                            localNode = localNode.left;
+                        const localName = localNode?.type === 'Identifier' ? localNode.value : undefined;
+                        if (!memberName || !localName)
+                            continue;
+                        // `({ t }: { t: TFunction<'ns'> })` → bind `t` to that namespace
+                        this.bindTFunctionParam(localName, this.getMemberTypeNode(patType, memberName));
+                        if (!members?.[memberName])
+                            continue;
+                        this.expressionResolver.setTemporaryVariable(localName, members[memberName]);
+                        if (!paramTemporaries)
+                            paramTemporaries = [];
+                        paramTemporaries.push(localName);
                     }
                     continue;
                 }
@@ -290,103 +292,7 @@ class ASTVisitors {
                 else {
                     typeAnn = undefined;
                 }
-                // Small helpers to robustly extract the referenced type name and literal string
-                const extractTypeName = (ta) => {
-                    if (!ta)
-                        return undefined;
-                    // Identifier style: { type: 'Identifier', value: 'TFunction' } OR { name: 'TFunction' }
-                    if (ta.typeName && (ta.typeName.type === 'Identifier'))
-                        return ta.typeName.value ?? ta.typeName.name;
-                    if (ta.typeName && ta.typeName.type === 'TsQualifiedName') {
-                        // Qualified like Foo.TFunction -> try right side
-                        const right = (ta.typeName.right ?? ta.typeName);
-                        return right?.value ?? right?.name;
-                    }
-                    if (ta.typeName && typeof ta.typeName === 'string')
-                        return ta.typeName;
-                    if (ta.type === 'Identifier')
-                        return ta.value ?? ta.name;
-                    if (ta.id)
-                        return ta.id?.value ?? ta.id?.name ?? ta.id;
-                    return undefined;
-                };
-                const extractStringLiteralValue = (node) => {
-                    if (!node)
-                        return undefined;
-                    // Handle: typeof SomeConst  → TsTypeQuery { exprName: { value: 'SomeConst' } }
-                    if (node?.type === 'TsTypeQuery') {
-                        const name = node.exprName?.value ?? node.exprName?.name;
-                        if (name)
-                            return this.scopeManager.resolveSimpleStringIdentifier(name);
-                    }
-                    // shapes: TsLiteralType -> { literal: { type: 'StringLiteral', value: 'x' } }
-                    if (node.type === 'TsLiteralType' && node.literal)
-                        return node.literal.value ?? node.literal.raw;
-                    if (node.type === 'StringLiteral' || node.type === 'Str' || node.type === 'Literal')
-                        return node.value ?? node.raw ?? node.value;
-                    if (node.literal && (node.literal.type === 'StringLiteral' || node.literal.type === 'Str'))
-                        return node.literal.value;
-                    // some SWC builds put the string directly on .value
-                    if (typeof node.value === 'string')
-                        return node.value;
-                    // handle wrapped parameter like { params: [ ... ] } where a literal might be one level deeper
-                    if (node.params && Array.isArray(node.params) && node.params[0])
-                        return extractStringLiteralValue(node.params[0]);
-                    if (node.typeArguments && Array.isArray(node.typeArguments) && node.typeArguments[0])
-                        return extractStringLiteralValue(node.typeArguments[0]);
-                    if (node.typeParameters && Array.isArray(node.typeParameters) && node.typeParameters[0])
-                        return extractStringLiteralValue(node.typeParameters[0]);
-                    if (node.typeParams && Array.isArray(node.typeParams) && node.typeParams[0])
-                        return extractStringLiteralValue(node.typeParams[0]);
-                    return undefined;
-                };
-                // Detect TsTypeReference like: TFunction<"my-custom-namespace">
-                if (typeAnn && (typeAnn.type === 'TsTypeReference' || typeAnn.type === 'TsTypeRef' || typeAnn.type === 'TsTypeReference')) {
-                    const finalTypeName = extractTypeName(typeAnn);
-                    if (finalTypeName === 'TFunction') {
-                        // support multiple AST shapes for type parameters:
-                        // - typeAnn.typeParameters?.params?.[0]
-                        // - typeAnn.typeArguments?.params?.[0]
-                        // - typeAnn.typeParams?.[0] / typeAnn.params?.[0]
-                        const candidates = [
-                            typeAnn.typeParameters?.params?.[0],
-                            typeAnn.typeParameters?.[0],
-                            typeAnn.typeArguments?.params?.[0],
-                            typeAnn.typeArguments?.[0],
-                            typeAnn.typeParams?.params?.[0],
-                            typeAnn.typeParams?.[0],
-                            typeAnn.params?.[0],
-                            typeAnn.args?.[0],
-                            typeAnn.typeParameters, // fallback if it's directly the literal
-                            typeAnn.typeArguments,
-                            typeAnn.typeParams,
-                        ];
-                        let tp;
-                        for (const c of candidates) {
-                            if (c) {
-                                tp = c;
-                                break;
-                            }
-                        }
-                        const ns = extractStringLiteralValue(tp);
-                        // Extract the second type parameter for KPrefix
-                        // We need to find the second element from the same type parameter list
-                        const typeParams = typeAnn.typeParameters?.params ??
-                            typeAnn.typeArguments?.params ??
-                            typeAnn.typeParams?.params ??
-                            undefined;
-                        let kpFromType;
-                        if (typeParams && typeParams.length >= 2) {
-                            kpFromType = extractStringLiteralValue(typeParams[1]);
-                        }
-                        if (ns || kpFromType) {
-                            this.scopeManager.setVarInScope(paramKey, {
-                                defaultNs: ns,
-                                keyPrefix: kpFromType // honour TFunction<Ns, KPrefix>
-                            });
-                        }
-                    }
-                }
+                this.bindTFunctionParam(paramKey, typeAnn);
                 // 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
@@ -648,6 +554,151 @@ class ASTVisitors {
             this.scopeManager.exitClassScope();
         }
     }
+    /**
+     * If `typeAnn` is a `TFunction<Ns, KPrefix>` type reference, register
+     * `paramKey` in the current scope with that namespace / keyPrefix.
+     */
+    bindTFunctionParam(paramKey, typeAnn) {
+        // Small helpers to robustly extract the referenced type name and literal string
+        const extractTypeName = (ta) => {
+            if (!ta)
+                return undefined;
+            // Identifier style: { type: 'Identifier', value: 'TFunction' } OR { name: 'TFunction' }
+            if (ta.typeName && (ta.typeName.type === 'Identifier'))
+                return ta.typeName.value ?? ta.typeName.name;
+            if (ta.typeName && ta.typeName.type === 'TsQualifiedName') {
+                // Qualified like Foo.TFunction -> try right side
+                const right = (ta.typeName.right ?? ta.typeName);
+                return right?.value ?? right?.name;
+            }
+            if (ta.typeName && typeof ta.typeName === 'string')
+                return ta.typeName;
+            if (ta.type === 'Identifier')
+                return ta.value ?? ta.name;
+            if (ta.id)
+                return ta.id?.value ?? ta.id?.name ?? ta.id;
+            return undefined;
+        };
+        const extractStringLiteralValue = (node) => {
+            if (!node)
+                return undefined;
+            // Handle: typeof SomeConst  → TsTypeQuery { exprName: { value: 'SomeConst' } }
+            if (node?.type === 'TsTypeQuery') {
+                const name = node.exprName?.value ?? node.exprName?.name;
+                if (name)
+                    return this.scopeManager.resolveSimpleStringIdentifier(name);
+            }
+            // shapes: TsLiteralType -> { literal: { type: 'StringLiteral', value: 'x' } }
+            if (node.type === 'TsLiteralType' && node.literal)
+                return node.literal.value ?? node.literal.raw;
+            if (node.type === 'StringLiteral' || node.type === 'Str' || node.type === 'Literal')
+                return node.value ?? node.raw ?? node.value;
+            if (node.literal && (node.literal.type === 'StringLiteral' || node.literal.type === 'Str'))
+                return node.literal.value;
+            // some SWC builds put the string directly on .value
+            if (typeof node.value === 'string')
+                return node.value;
+            // handle wrapped parameter like { params: [ ... ] } where a literal might be one level deeper
+            if (node.params && Array.isArray(node.params) && node.params[0])
+                return extractStringLiteralValue(node.params[0]);
+            if (node.typeArguments && Array.isArray(node.typeArguments) && node.typeArguments[0])
+                return extractStringLiteralValue(node.typeArguments[0]);
+            if (node.typeParameters && Array.isArray(node.typeParameters) && node.typeParameters[0])
+                return extractStringLiteralValue(node.typeParameters[0]);
+            if (node.typeParams && Array.isArray(node.typeParams) && node.typeParams[0])
+                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);
+            if (finalTypeName === 'TFunction') {
+                // support multiple AST shapes for type parameters:
+                // - typeAnn.typeParameters?.params?.[0]
+                // - typeAnn.typeArguments?.params?.[0]
+                // - typeAnn.typeParams?.[0] / typeAnn.params?.[0]
+                const candidates = [
+                    typeAnn.typeParameters?.params?.[0],
+                    typeAnn.typeParameters?.[0],
+                    typeAnn.typeArguments?.params?.[0],
+                    typeAnn.typeArguments?.[0],
+                    typeAnn.typeParams?.params?.[0],
+                    typeAnn.typeParams?.[0],
+                    typeAnn.params?.[0],
+                    typeAnn.args?.[0],
+                    typeAnn.typeParameters, // fallback if it's directly the literal
+                    typeAnn.typeArguments,
+                    typeAnn.typeParams,
+                ];
+                let tp;
+                for (const c of candidates) {
+                    if (c) {
+                        tp = c;
+                        break;
+                    }
+                }
+                const ns = extractStringLiteralValue(tp);
+                // Extract the second type parameter for KPrefix
+                // We need to find the second element from the same type parameter list
+                const typeParams = typeAnn.typeParameters?.params ??
+                    typeAnn.typeArguments?.params ??
+                    typeAnn.typeParams?.params ??
+                    undefined;
+                let kpFromType;
+                if (typeParams && typeParams.length >= 2) {
+                    kpFromType = extractStringLiteralValue(typeParams[1]);
+                }
+                if (ns || kpFromType) {
+                    this.scopeManager.setVarInScope(paramKey, {
+                        defaultNs: ns,
+                        keyPrefix: kpFromType // honour TFunction<Ns, KPrefix>
+                    });
+                }
+            }
+        }
+    }
+    /**
+     * Find the raw type node of a named member on an object-shaped type
+     * annotation (inline `{ t: TFunction<'ns'> }` or a local interface / type
+     * alias name).
+     */
+    getMemberTypeNode(tsType, memberName) {
+        if (!tsType)
+            return undefined;
+        let members;
+        if (tsType.type === 'TsTypeLiteral')
+            members = tsType.members;
+        else if (tsType.type === 'TsTypeReference' && tsType.typeName?.type === 'Identifier') {
+            members = this.expressionResolver.getObjectTypeMembersRaw(tsType.typeName.value);
+        }
+        if (!Array.isArray(members))
+            return undefined;
+        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;
+        }
+        return undefined;
+    }
     /**
      * 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/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/expression-resolver.js

@@ -28,6 +28,8 @@ class ExpressionResolver {
     // type aliases. Maps typeName -> { memberName: possible string values }.
     // e.g. `interface IProps { size: ChangeType }` -> { IProps: { size: ['all','next'] } }
     objectTypeTable = new Map();
+    // Raw TS member nodes of local interfaces / object type aliases, keyed by type name.
+    objectTypeMembersRaw = new Map();
     // Temporary per-scope bindings for identifiers holding an object-shaped type,
     // e.g. `function f(props: IProps)` -> { props: { size: ['all','next'] } }.
     temporaryObjectVariables = new Map();
@@ -234,6 +236,7 @@ class ExpressionResolver {
                 return;
             // `type IProps = { size: ChangeType }` — object shape, not a string union.
             if (tsType.type === 'TsTypeLiteral') {
+                this.objectTypeMembersRaw.set(name, tsType.members);
                 const members = this.collectObjectTypeMembers(tsType.members);
                 if (members)
                     this.objectTypeTable.set(name, members);
@@ -262,6 +265,8 @@ class ExpressionResolver {
             const name = node?.id?.type === 'Identifier' ? node.id.value : undefined;
             if (!name)
                 return;
+            if (Array.isArray(node?.body?.body))
+                this.objectTypeMembersRaw.set(name, node.body.body);
             const members = this.collectObjectTypeMembers(node?.body?.body);
             if (members)
                 this.objectTypeTable.set(name, members);
@@ -298,6 +303,9 @@ class ExpressionResolver {
      * Resolve a type annotation that refers to an object shape (interface, object
      * type alias, or inline type literal) to its member → string values map.
      */
+    getObjectTypeMembersRaw(name) {
+        return this.objectTypeMembersRaw.get(name);
+    }
     resolveTypeMembers(tsType) {
         try {
             if (!tsType)

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

@@ -265,6 +265,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.
@@ -548,6 +559,12 @@ class ScopeManager {
             return { defaultNs: this.resolveSimpleStringIdentifier(nsNode.value) };
         if (nsNode.type === 'MemberExpression')
             return { defaultNs: this.resolveSimpleMemberExpression(nsNode) };
+        // `useTranslation(ns ?? 'fallback')` / `useTranslation(ns || 'fallback')`:
+        // prefer a statically resolvable left side, otherwise use the fallback.
+        if (nsNode.type === 'BinaryExpression' && (nsNode.operator === '??' || nsNode.operator === '||')) {
+            const left = this.resolveNsArg(nsNode.left);
+            return left.defaultNs !== undefined ? left : this.resolveNsArg(nsNode.right);
+        }
         if (nsNode.type === 'ArrayExpression') {
             const namespaces = [];
             for (const el of nsNode.elements) {
@@ -571,6 +588,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.69.2",
+  "version": "1.70.1",
   "description": "A unified, high-performance i18next CLI.",
   "type": "module",
   "bin": {

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

@@ -85,6 +85,17 @@ export declare class ASTVisitors {
      * @private
      */
     private walk;
+    /**
+     * If `typeAnn` is a `TFunction<Ns, KPrefix>` type reference, register
+     * `paramKey` in the current scope with that namespace / keyPrefix.
+     */
+    private bindTFunctionParam;
+    /**
+     * Find the raw type node of a named member on an object-shaped type
+     * annotation (inline `{ t: TFunction<'ns'> }` or a local interface / type
+     * alias name).
+     */
+    private getMemberTypeNode;
     /**
      * 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;IAudZ;;;;;;;;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;IAoYZ;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAyG1B;;;;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"}

package/types/extractor/parsers/expression-resolver.d.ts

@@ -10,6 +10,7 @@ export declare class ExpressionResolver {
     private sharedFunctionReturnTable;
     private temporaryVariables;
     private objectTypeTable;
+    private objectTypeMembersRaw;
     private temporaryObjectVariables;
     private arrayElementMembers;
     constructor(hooks: ASTVisitorHooks);
@@ -55,6 +56,7 @@ export declare class ExpressionResolver {
      * Resolve a type annotation that refers to an object shape (interface, object
      * type alias, or inline type literal) to its member → string values map.
      */
+    getObjectTypeMembersRaw(name: string): any[] | undefined;
     resolveTypeMembers(tsType: any): Record<string, string[]> | undefined;
     /**
      * Resolve a type annotation for an array of an object shape (`IProps[]`,

package/types/extractor/parsers/expression-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expression-resolver.d.ts","sourceRoot":"","sources":["../../../src/extractor/parsers/expression-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAkD,MAAM,WAAW,CAAA;AAC3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAErD,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,KAAK,CAAiB;IAK9B,OAAO,CAAC,aAAa,CAA4D;IAGjF,OAAO,CAAC,eAAe,CAAiD;IAIxE,OAAO,CAAC,cAAc,CAAmC;IAIzD,OAAO,CAAC,mBAAmB,CAAmC;IAI9D,OAAO,CAAC,oBAAoB,CAAmC;IAM/D,OAAO,CAAC,yBAAyB,CAAmC;IAIpE,OAAO,CAAC,kBAAkB,CAAmC;IAK7D,OAAO,CAAC,eAAe,CAAmD;IAI1E,OAAO,CAAC,wBAAwB,CAAmD;IAKnF,OAAO,CAAC,mBAAmB,CAAmD;gBAEjE,KAAK,EAAE,eAAe;IAInC;;OAEG;IACI,gBAAgB,IAAK,IAAI;IAOhC;;;;;;;;;OASG;IACH,yBAAyB,CAAE,IAAI,EAAE,GAAG,GAAG,IAAI;IAmK3C;;;;;;;OAOG;IACH,2BAA2B,CAAE,IAAI,EAAE,GAAG,GAAG,IAAI;IAwB7C;;;;;;OAMG;IACH,2BAA2B,CAAE,IAAI,EAAE,GAAG,GAAG,IAAI;IAW7C;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;IAehC;;;OAGG;IACI,kBAAkB,CAAE,MAAM,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS;IAa7E;;;;OAIG;IACI,0BAA0B,CAAE,MAAM,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS;IAgBrF;;;OAGG;IACI,sBAAsB,CAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI;IAI9E,sBAAsB,CAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS;IAI3E,yBAAyB,CAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAIrD;;;OAGG;IACI,0BAA0B,CAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI;IAIlF,6BAA6B,CAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAIzD;;;;;;;;;OASG;IACH,0BAA0B,CAAE,IAAI,EAAE,GAAG,GAAG,IAAI;IAqC5C;;;;;;;;OAQG;IACH,OAAO,CAAC,iCAAiC;IA8CzC;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAQ7B;;;;OAIG;IACI,oBAAoB,CAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI;IAIlE;;OAEG;IACI,uBAAuB,CAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAInD;;;;OAIG;IACI,yBAAyB,CAAE,MAAM,EAAE,GAAG,GAAG,MAAM,EAAE;IAQxD;;;OAGG;IACI,iBAAiB,CAAE,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS;IAQ7D;;;;OAIG;IACI,YAAY,CAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS;IAQtE;;;;;OAKG;IACH,sBAAsB,CAAE,IAAI,EAAE,GAAG,GAAG,IAAI;IAwBxC;;;;;;;OAOG;IACH,kCAAkC,CAAE,UAAU,EAAE,UAAU,GAAG,MAAM,EAAE;IAKrE;;;;;;;OAOG;IACH,8BAA8B,CAAE,UAAU,EAAE,UAAU,GAAG,MAAM,EAAE;IAKjE;;;;;;;;;;;;;;;;;;OAkBG;IACH,OAAO,CAAC,yCAAyC;IAqOjD,OAAO,CAAC,mCAAmC;IAiH3C;;;;;;OAMG;IACH,OAAO,CAAC,6CAA6C;IAyBrD;;;;;;OAMG;IACH,OAAO,CAAC,kDAAkD;CAwB3D"}
+{"version":3,"file":"expression-resolver.d.ts","sourceRoot":"","sources":["../../../src/extractor/parsers/expression-resolver.ts"],"names":[],"mappings":"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"}

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

@@ -161,6 +161,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;IAwBpB,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;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;IAkHzD;;;;;;;;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;;;;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"}