gt 2.14.8 → 2.14.9

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # gtx-cli
 
+## 2.14.9
+
+### Patch Changes
+
+- [#1191](https://github.com/generaltranslation/gt/pull/1191) [`0c24b75`](https://github.com/generaltranslation/gt/commit/0c24b7563005a967a2b8916fabf60ee203466087) Thanks [@ErnestM1234](https://github.com/ErnestM1234)! - fix: Derive JSX tracing behavior for variable declarations
+
 ## 2.14.8
 
 ### Patch Changes

package/dist/generated/version.d.ts

@@ -1 +1 @@
-export declare const PACKAGE_VERSION = "2.14.8";
+export declare const PACKAGE_VERSION = "2.14.9";

package/dist/generated/version.js

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

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

@@ -6,7 +6,7 @@ import * as t from '@babel/types';
 import fs from 'node:fs';
 import { parse } from '@babel/parser';
 import addGTIdentifierToSyntaxTree from './addGTIdentifierToSyntaxTree.js';
-import { warnHasUnwrappedExpressionSync, warnNestedTComponent, warnFunctionNotFoundSync, warnMissingReturnSync, warnDuplicateFunctionDefinitionSync, warnInvalidDeriveInitSync, warnRecursiveFunctionCallSync, warnDataAttrOnBranch, warnNestedInternalTComponent, } from '../../../../console/index.js';
+import { warnHasUnwrappedExpressionSync, warnNestedTComponent, warnFunctionNotFoundSync, warnMissingReturnSync, warnDuplicateFunctionDefinitionSync, warnInvalidDeriveInitSync, warnRecursiveFunctionCallSync, warnDataAttrOnBranch, warnNestedInternalTComponent, warnDeriveNonConstVariableSync, warnDeriveDestructuringSync, } from '../../../../console/index.js';
 import { isAcceptedPluralForm } from 'generaltranslation/internal';
 import { isStaticExpression } from '../../evaluateJsx.js';
 import { DATA_ATTR_PREFIX, STATIC_COMPONENT, DERIVE_COMPONENT, TRANSLATION_COMPONENT, INTERNAL_TRANSLATION_COMPONENT, VARIABLE_COMPONENTS, } from '../constants.js';
@@ -25,7 +25,7 @@ import path from 'node:path';
 import { extractSourceCode } from '../extractSourceCode.js';
 import { SURROUNDING_LINE_COUNT } from '../../../../utils/constants.js';
 import { handleDerivation } from '../stringParsing/derivation/handleDerivation.js';
-import { nodeToStrings } from '../parseString.js';
+import { parseStringExpression, nodeToStrings } from '../parseString.js';
 // Handle CommonJS/ESM interop
 const traverse = traverseModule.default || traverseModule;
 // TODO: currently we cover VariableDeclaration and FunctionDeclaration nodes, but are there others we should cover as well?
@@ -1058,6 +1058,60 @@ function processDeriveExpression({ config, state, output, expressionNodePath, sc
         };
         return result;
     }
+    else if (t.isIdentifier(expressionNodePath.node)) {
+        // Resolve variable declarations: const label = cond ? "boy" : "girl"
+        const name = expressionNodePath.node.name;
+        const binding = scopeNode.scope.getBinding(name);
+        if (binding &&
+            binding.path.isVariableDeclarator() &&
+            binding.path.node.init) {
+            // Reject destructuring patterns
+            if (t.isObjectPattern(binding.path.node.id) ||
+                t.isArrayPattern(binding.path.node.id)) {
+                output.errors.push(warnDeriveDestructuringSync(config.file, name, `${expressionNodePath.node.loc?.start?.line}:${expressionNodePath.node.loc?.start?.column}`));
+                return null;
+            }
+            // Enforce const-only
+            const declaration = binding.path.parentPath;
+            if (declaration?.isVariableDeclaration() &&
+                declaration.node.kind !== 'const') {
+                output.warnings.add(warnDeriveNonConstVariableSync(config.file, name, declaration.node.kind, `${expressionNodePath.node.loc?.start?.line}:${expressionNodePath.node.loc?.start?.column}`));
+                return null;
+            }
+            // Resolve via parseStringExpression (handles all derivable expression types)
+            const errorsBefore = output.errors.length;
+            const stringNode = parseStringExpression(binding.path.node.init, binding.path, config.file, config.parsingOptions, output.warnings, output.errors);
+            if (stringNode) {
+                const strings = nodeToStrings(stringNode);
+                if (strings.length === 0) {
+                    return null;
+                }
+                if (strings.length === 1) {
+                    return strings[0];
+                }
+                return {
+                    nodeType: 'multiplication',
+                    branches: strings.map((s) => s),
+                };
+            }
+            // parseStringExpression returned null — if it already pushed errors,
+            // avoid double-reporting by skipping the buildJSXTree fallthrough.
+            if (output.errors.length > errorsBefore) {
+                return null;
+            }
+        }
+        // Not resolvable — fall through to existing buildJSXTree behavior
+        return buildJSXTree({
+            node: expressionNodePath.node,
+            helperPath: expressionNodePath,
+            scopeNode,
+            insideT: true,
+            inDerive: true,
+            config,
+            state,
+            output,
+        });
+    }
     else {
         return buildJSXTree({
             node: expressionNodePath.node,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gt",
-  "version": "2.14.8",
+  "version": "2.14.9",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [