gt 2.14.4 → 2.14.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # gtx-cli
 
+## 2.14.5
+
+### Patch Changes
+
+- [#1174](https://github.com/generaltranslation/gt/pull/1174) [`4730814`](https://github.com/generaltranslation/gt/commit/4730814799ba5487b45477094c6ca581ac56c3ff) Thanks [@ErnestM1234](https://github.com/ErnestM1234)! - fix: recursive string translation function resolution
+
 ## 2.14.4
 
 ### Patch Changes

package/dist/generated/version.d.ts

@@ -1 +1 @@
-export declare const PACKAGE_VERSION = "2.14.4";
+export declare const PACKAGE_VERSION = "2.14.5";

package/dist/generated/version.js

@@ -1,2 +1,2 @@
 // This file is auto-generated. Do not edit manually.
-export const PACKAGE_VERSION = '2.14.4';
+export const PACKAGE_VERSION = '2.14.5';

package/dist/react/jsx/utils/parseStringFunction.js

@@ -83,7 +83,7 @@ export function resolveVariableAliases(scope, variableName, visited = new Set())
  * This covers both direct translation calls (gt('hello')) and prop drilling
  * where the translation callback is passed to other functions (getData(gt)).
  */
-function handleFunctionCall(tPath, config, state, output) {
+function handleFunctionCall(tPath, config, state, output, visitedFunctions) {
     if (tPath.parent.type === 'CallExpression' &&
         tPath.parent.callee === tPath.node) {
         // Direct translation call: t('hello')
@@ -105,7 +105,7 @@ function handleFunctionCall(tPath, config, state, output) {
             const calleeBinding = tPath.scope.getBinding(callee.name);
             if (calleeBinding && calleeBinding.path.isFunction()) {
                 const functionPath = calleeBinding.path;
-                processFunctionIfMatches(callee.name, argIndex, functionPath.node, functionPath, config, output);
+                processFunctionIfMatches(callee.name, argIndex, functionPath.node, functionPath, config, output, visitedFunctions);
             }
             // Handle arrow functions assigned to variables: const getData = (t) => {...}
             else if (calleeBinding &&
@@ -114,7 +114,7 @@ function handleFunctionCall(tPath, config, state, output) {
                 (t.isArrowFunctionExpression(calleeBinding.path.node.init) ||
                     t.isFunctionExpression(calleeBinding.path.node.init))) {
                 const initPath = calleeBinding.path.get('init');
-                processFunctionIfMatches(callee.name, argIndex, calleeBinding.path.node.init, initPath, config, output);
+                processFunctionIfMatches(callee.name, argIndex, calleeBinding.path.node.init, initPath, config, output, visitedFunctions);
             }
             // If not found locally, check if it's an imported function
             else if (state.importMap.has(callee.name)) {
@@ -132,14 +132,18 @@ function handleFunctionCall(tPath, config, state, output) {
  * Validates the function has enough parameters and traces how the translation callback
  * is used within that function's body.
  */
-function processFunctionIfMatches(_functionName, argIndex, functionNode, functionPath, config, output) {
+function processFunctionIfMatches(_functionName, argIndex, functionNode, functionPath, config, output, visitedFunctions) {
+    if (visitedFunctions.has(functionNode))
+        return;
+    visitedFunctions.add(functionNode);
     if (functionNode.params.length > argIndex) {
         const param = functionNode.params[argIndex];
         const paramName = extractParameterName(param);
         if (paramName) {
-            findFunctionParameterUsage(functionPath, paramName, config, output);
+            findFunctionParameterUsage(functionPath, paramName, config, output, visitedFunctions);
         }
     }
+    visitedFunctions.delete(functionNode);
 }
 /**
  * Finds all usages of a translation callback parameter within a user-defined function's scope.
@@ -149,7 +153,7 @@ function processFunctionIfMatches(_functionName, argIndex, functionNode, functio
  * Example: In function getInfo(t) { return t('hello'); }, this finds the t('hello') call.
  * Example: In function getData(t) { return getFooter(t); }, this finds and traces into getFooter.
  */
-function findFunctionParameterUsage(functionPath, parameterName, config, output) {
+function findFunctionParameterUsage(functionPath, parameterName, config, output, visitedFunctions) {
     // Look for the function body and find all usages of the parameter
     if (functionPath.isFunction()) {
         const functionScope = functionPath.scope;
@@ -164,7 +168,7 @@ function findFunctionParameterUsage(functionPath, parameterName, config, output)
             const binding = functionScope.bindings[name];
             if (binding) {
                 binding.referencePaths.forEach((refPath) => {
-                    handleFunctionCall(refPath, config, { visited: new Set(), importMap }, output);
+                    handleFunctionCall(refPath, config, { visited: new Set(), importMap }, output, visitedFunctions);
                 });
             }
         });
@@ -200,12 +204,15 @@ function processFunctionInFile(filePath, functionName, argIndex, config, state,
         });
         let found = false;
         const reExports = [];
+        // Fresh set per cross-file parse — node identity is only stable within a single parse.
+        // Cross-file cycles are already guarded by processFunctionCache above.
+        const visitedFunctions = new Set();
         traverse(ast, {
             // Handle function declarations: function getInfo(t) { ... }
             FunctionDeclaration(path) {
                 if (path.node.id?.name === functionName) {
                     found = true;
-                    processFunctionIfMatches(functionName, argIndex, path.node, path, config, output);
+                    processFunctionIfMatches(functionName, argIndex, path.node, path, config, output, visitedFunctions);
                 }
             },
             // Handle variable declarations: const getInfo = (t) => { ... }
@@ -217,7 +224,7 @@ function processFunctionInFile(filePath, functionName, argIndex, config, state,
                         t.isFunctionExpression(path.node.init))) {
                     found = true;
                     const initPath = path.get('init');
-                    processFunctionIfMatches(functionName, argIndex, path.node.init, initPath, config, output);
+                    processFunctionIfMatches(functionName, argIndex, path.node.init, initPath, config, output, visitedFunctions);
                 }
             },
             // Collect re-exports: export * from './other'
@@ -401,10 +408,11 @@ export function parseStrings(importName, originalName, path, config, output) {
                 // Example: translate -> [translate, t, a, b] for const t = translate; const a = t; const b = a;
                 const allTranslationNames = resolveVariableAliases(variableScope, tFuncName);
                 // Process references for all translation function names and their aliases
+                const visitedFunctions = new Set();
                 allTranslationNames.forEach((name) => {
                     const tReferencePaths = variableScope.bindings[name]?.referencePaths || [];
                     for (const tPath of tReferencePaths) {
-                        handleFunctionCall(tPath, hookConfig, { visited: new Set(), importMap }, output);
+                        handleFunctionCall(tPath, hookConfig, { visited: new Set(), importMap }, output, visitedFunctions);
                     }
                 });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gt",
-  "version": "2.14.4",
+  "version": "2.14.5",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [
@@ -111,8 +111,8 @@
     "unist-util-visit": "^5.0.0",
     "yaml": "^2.8.0",
     "@generaltranslation/python-extractor": "0.2.6",
-    "generaltranslation": "8.2.2",
-    "gt-remark": "1.0.7"
+    "gt-remark": "1.0.7",
+    "generaltranslation": "8.2.2"
   },
   "devDependencies": {
     "@babel/types": "^7.28.4",