gtx-cli 2.5.5 → 2.5.6

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # gtx-cli
 
+## 2.5.6
+
+### Patch Changes
+
+- [#817](https://github.com/generaltranslation/gt/pull/817) [`80eef0e`](https://github.com/generaltranslation/gt/commit/80eef0e0f61d5a07ed850aa39b25e81bddd12b34) Thanks [@ErnestM1234](https://github.com/ErnestM1234)! - fix: Static component resolution edge cases
+
 ## 2.5.5
 
 ### Patch Changes

package/dist/console/index.js

@@ -25,7 +25,7 @@ export const warnDuplicateFunctionDefinitionSync = (file, functionName, location
 export const warnInvalidStaticInitSync = (file, functionName, location) => withLocation(file, withStaticError(`The definition for ${colorizeFunctionName(functionName)} could not be resolved. When using arrow syntax to define a static function, the right hand side or the assignment MUST only contain the arrow function itself and no other expressions.
 Example: ${colorizeContent(`const ${colorizeFunctionName(functionName)} = () => { ... }`)}
 Invalid: ${colorizeContent(`const ${colorizeFunctionName(functionName)} = [() => { ... }][0]`)}`), location);
-export const warnRecursiveFunctionCallSync = (file, functionName, location) => withLocation(file, withStaticError(`Recursive function call detected: ${colorizeFunctionName(functionName)}. A static function use recursive calls to construct its result.`), location);
+export const warnRecursiveFunctionCallSync = (file, functionName, location) => withLocation(file, withStaticError(`Recursive function call detected: ${colorizeFunctionName(functionName)}. A static function cannot use recursive calls to construct its result.`), location);
 // Re-export error messages
 export const noLocalesError = `No locales found! Please provide a list of locales to translate to, or specify them in your gt.config.json file.`;
 export const noDefaultLocaleError = `No default locale found! Please provide a default locale, or specify it in your gt.config.json file.`;

package/dist/react/jsx/utils/getPathsAndAliases.d.ts

@@ -1,6 +1,9 @@
 import { NodePath } from '@babel/traverse';
 /**
- *
+ * Constructs tracking for gt related variables of interest
+ * inlineTranslationPaths: these are string-related translation functions
+ * translationComponentPaths: these are just <T> components
+ * importAliases: any other GT related imports
  */
 export declare function getPathsAndAliases(ast: any, pkg: 'gt-react' | 'gt-next'): {
     importAliases: Record<string, string>;

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

@@ -4,7 +4,10 @@ import { extractImportName } from './parseAst.js';
 // Handle CommonJS/ESM interop
 const traverse = traverseModule.default || traverseModule;
 /**
- *
+ * Constructs tracking for gt related variables of interest
+ * inlineTranslationPaths: these are string-related translation functions
+ * translationComponentPaths: these are just <T> components
+ * importAliases: any other GT related imports
  */
 export function getPathsAndAliases(ast, pkg) {
     // First pass: collect imports and process translation functions

package/dist/react/jsx/utils/jsxParsing/parseJsx.d.ts

@@ -35,7 +35,7 @@ export declare function buildJSXTree({ importAliases, node, unwrappedExpressions
     node: any;
     callStack: string[];
     unwrappedExpressions: string[];
-    visited: Set<string>;
+    visited: Set<string> | null;
     updates: Updates;
     errors: string[];
     warnings: Set<string>;

package/dist/react/jsx/utils/jsxParsing/parseJsx.js

@@ -202,6 +202,9 @@ export function buildJSXTree({ importAliases, node, unwrappedExpressions, visite
         });
         if (elementIsVariable) {
             if (componentType === STATIC_COMPONENT) {
+                if (visited === null) {
+                    visited = new Set();
+                }
                 return resolveStaticComponentChildren({
                     importAliases,
                     scopeNode,
@@ -376,7 +379,7 @@ export function parseJSXElement({ importAliases, node, originalName, pkg, update
         importAliases,
         node,
         scopeNode,
-        visited: new Set(),
+        visited: null,
         callStack: [],
         pkg,
         unwrappedExpressions,
@@ -486,7 +489,7 @@ function resolveStaticComponentChildren({ importAliases, scopeNode, children, un
             : child.expression.callee);
         const calleeBinding = scopeNode.scope.getBinding(callee.name);
         if (!calleeBinding) {
-            warnFunctionNotFoundSync(file, callee.name, `${callee.loc?.start?.line}:${callee.loc?.start?.column}`);
+            warnings.add(warnFunctionNotFoundSync(file, callee.name, `${callee.loc?.start?.line}:${callee.loc?.start?.column}`));
             continue;
         }
         // Function is found locally, return wrapped in an expression
@@ -577,17 +580,29 @@ function resolveStaticFunctionInvocationFromBinding({ importAliases, calleeBindi
         });
     }
     else if (importedFunctionsMap.has(callee.name)) {
+        // Get the original function name
+        let originalName;
+        if (calleeBinding.path.isImportSpecifier()) {
+            originalName = t.isIdentifier(calleeBinding.path.node.imported)
+                ? calleeBinding.path.node.imported.name
+                : calleeBinding.path.node.imported.value;
+        }
+        else if (calleeBinding.path.isImportDefaultSpecifier()) {
+            originalName = calleeBinding.path.node.local.name;
+        }
+        else if (calleeBinding.path.isImportNamespaceSpecifier()) {
+            originalName = calleeBinding.path.node.local.name;
+        }
         // Function is being imported
         const importPath = importedFunctionsMap.get(callee.name);
         const filePath = resolveImportPath(file, importPath, parsingOptions, resolveImportPathCache);
-        if (filePath) {
-            const functionName = callee.name;
-            return withRecusionGuard({
-                filename: file,
-                functionName,
+        if (filePath && originalName) {
+            const result = withRecusionGuard({
+                filename: filePath,
+                functionName: originalName,
                 cb: () => processFunctionInFile({
                     filePath,
-                    functionName,
+                    functionName: originalName,
                     visited,
                     callStack,
                     unwrappedExpressions,
@@ -599,6 +614,9 @@ function resolveStaticFunctionInvocationFromBinding({ importAliases, calleeBindi
                     pkg,
                 }),
             });
+            if (result !== null) {
+                return result;
+            }
         }
     }
     warnings.add(warnFunctionNotFoundSync(file, callee.name, `${callee.loc?.start?.line}:${callee.loc?.start?.column}`));
@@ -644,7 +662,7 @@ function processFunctionInFile({ filePath, functionName, visited, callStack, par
         });
         const reExports = [];
         const warnDuplicateFuncDef = (path) => {
-            warnings.add(warnDuplicateFunctionDefinitionSync(file, functionName, `${path.node.loc?.start?.line}:${path.node.loc?.start?.column}`));
+            warnings.add(warnDuplicateFunctionDefinitionSync(filePath, functionName, `${path.node.loc?.start?.line}:${path.node.loc?.start?.column}`));
         };
         traverse(ast, {
             // Handle function declarations: function getInfo() { ... }
@@ -663,7 +681,7 @@ function processFunctionInFile({ filePath, functionName, visited, callStack, par
                         updates,
                         errors,
                         warnings,
-                        file,
+                        file: filePath,
                         parsingOptions,
                         importedFunctionsMap,
                     });
@@ -689,7 +707,7 @@ function processFunctionInFile({ filePath, functionName, visited, callStack, par
                         warnings,
                         visited,
                         unwrappedExpressions,
-                        file,
+                        file: filePath,
                         parsingOptions,
                         importedFunctionsMap,
                     });
@@ -735,7 +753,7 @@ function processFunctionInFile({ filePath, functionName, visited, callStack, par
                         updates,
                         errors,
                         warnings,
-                        file,
+                        file: filePath,
                         pkg,
                     });
                     if (foundResult != null) {

package/dist/react/parse/createInlineUpdates.js

@@ -35,7 +35,7 @@ export async function createInlineUpdates(pkg, validate, filePatterns, parsingOp
         // Parse <T> components
         for (const { localName, path } of translationComponentPaths) {
             parseTranslationComponent({
-                importAliases: importAliases,
+                importAliases,
                 originalName: localName,
                 localName,
                 ast,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtx-cli",
-  "version": "2.5.5",
+  "version": "2.5.6",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [