gtx-cli 2.4.9 → 2.4.11

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # gtx-cli
 
+## 2.4.11
+
+### Patch Changes
+
+- [#780](https://github.com/generaltranslation/gt/pull/780) [`c048320`](https://github.com/generaltranslation/gt/commit/c048320ae0daf91bebf65145aba6fb15c2f3612d) Thanks [@ErnestM1234](https://github.com/ErnestM1234)! - Fix CLI parsing for nbsp characters
+
+## 2.4.10
+
+### Patch Changes
+
+- [#778](https://github.com/generaltranslation/gt/pull/778) [`0d8f414`](https://github.com/generaltranslation/gt/commit/0d8f4144696873b15f0aaa6744bdb7390d472279) Thanks [@SamEggert](https://github.com/SamEggert)! - skip dynamic expressions for HTML content props in parseJSX
+
 ## 2.4.9
 
 ### Patch Changes

package/dist/react/jsx/trimJsxStringChildren.js

@@ -1,14 +1,41 @@
 import { isAcceptedPluralForm } from 'generaltranslation/internal';
+// JSX whitespace characters (space, tab, newline, carriage return)
+// Does NOT include non-breaking space (U+00A0) which should be preserved
+const isJsxWhitespace = (char) => {
+    return char === ' ' || char === '\t' || char === '\n' || char === '\r';
+};
+const trimJsxWhitespace = (str, side = 'both') => {
+    let start = 0;
+    let end = str.length;
+    if (side === 'start' || side === 'both') {
+        while (start < end && isJsxWhitespace(str[start])) {
+            start++;
+        }
+    }
+    if (side === 'end' || side === 'both') {
+        while (end > start && isJsxWhitespace(str[end - 1])) {
+            end--;
+        }
+    }
+    return str.slice(start, end);
+};
+const hasNonJsxWhitespace = (str) => {
+    for (const char of str) {
+        if (!isJsxWhitespace(char))
+            return true;
+    }
+    return false;
+};
 export function trimJsxStringChild(child, index, childrenTypes) {
     // Normalize line endings to \n for consistency across platforms
     let result = child.replace(/\r\n|\r/g, '\n');
-    // Collapse multiple spaces/tabs into a single space
+    // Collapse multiple spaces/tabs into a single space (but not nbsp)
     result = result.replace(/[\t ]+/g, ' ');
     let newResult = '';
     let newline = false;
     for (const char of result) {
         if (char === '\n') {
-            if (newResult.trim())
+            if (hasNonJsxWhitespace(newResult))
                 newResult += ' ';
             else
                 newResult = '';
@@ -19,15 +46,15 @@ export function trimJsxStringChild(child, index, childrenTypes) {
             newResult += char;
             continue;
         }
-        if (char.trim() === '')
+        if (isJsxWhitespace(char))
             continue;
         newResult += char;
         newline = false;
     }
     if (newline)
-        newResult = newResult.trimEnd();
+        newResult = trimJsxWhitespace(newResult, 'end');
     result = newResult;
-    // Collapse multiple spaces/tabs into a single space
+    // Collapse multiple spaces/tabs into a single space (but not nbsp)
     result = result.replace(/[\t ]+/g, ' ');
     return result;
 }

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

@@ -8,6 +8,7 @@ import { isAcceptedPluralForm } from 'generaltranslation/internal';
 import { handleChildrenWhitespace } from '../trimJsxStringChildren.js';
 import { isStaticExpression } from '../evaluateJsx.js';
 import { GT_ATTRIBUTES, mapAttributeName, VARIABLE_COMPONENTS, } from './constants.js';
+import { HTML_CONTENT_PROPS } from 'generaltranslation/types';
 /**
  * Builds a JSX tree from a given node, recursively handling children.
  * @param node - The node to build the tree from
@@ -80,15 +81,29 @@ export function buildJSXTree(importAliases, node, unwrappedExpressions, updates,
                         attrValue = attr.value.value;
                     }
                     else if (t.isJSXExpressionContainer(attr.value)) {
-                        if ((elementIsPlural && isAcceptedPluralForm(attrName)) ||
-                            (elementIsBranch && attrName !== 'branch')) {
-                            // Make sure that variable strings like {`I have ${count} book`} are invalid!
-                            if (t.isTemplateLiteral(attr.value.expression) &&
-                                !isStaticExpression(attr.value.expression).isStatic) {
-                                unwrappedExpressions.push(generate(attr.value).code);
+                        // Check if this is an HTML content prop (title, placeholder, alt, etc.)
+                        const isHtmlContentProp = Object.values(HTML_CONTENT_PROPS).includes(attrName);
+                        if (isHtmlContentProp) {
+                            // For HTML content props, only accept static string expressions
+                            const staticAnalysis = isStaticExpression(attr.value.expression);
+                            if (staticAnalysis.isStatic &&
+                                staticAnalysis.value !== undefined) {
+                                attrValue = staticAnalysis.value;
                             }
+                            // Otherwise attrValue stays null and won't be included
+                        }
+                        else {
+                            // For non-HTML-content props, validate plural/branch then build tree
+                            if ((elementIsPlural && isAcceptedPluralForm(attrName)) ||
+                                (elementIsBranch && attrName !== 'branch')) {
+                                // Make sure that variable strings like {`I have ${count} book`} are invalid!
+                                if (t.isTemplateLiteral(attr.value.expression) &&
+                                    !isStaticExpression(attr.value.expression).isStatic) {
+                                    unwrappedExpressions.push(generate(attr.value).code);
+                                }
+                            }
+                            attrValue = buildJSXTree(importAliases, attr.value.expression, unwrappedExpressions, updates, errors, warnings, file, true);
                         }
-                        attrValue = buildJSXTree(importAliases, attr.value.expression, unwrappedExpressions, updates, errors, warnings, file, true);
                     }
                 }
                 props[attrName] = attrValue;

package/package.json

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