gtx-cli 2.5.0 → 2.5.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # gtx-cli
 
+## 2.5.1
+
+### Patch Changes
+
+- [#796](https://github.com/generaltranslation/gt/pull/796) [`855a653`](https://github.com/generaltranslation/gt/commit/855a6538e2a080fc73d97585df2a838f02a3d00a) Thanks [@ErnestM1234](https://github.com/ErnestM1234)! - fix: remove null vals from jsx children
+
 ## 2.5.0
 
 ### Minor Changes

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

@@ -5,7 +5,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, warnInvalidStaticChildSync, warnInvalidReturnSync as warnInvalidReturnExpressionSync, warnFunctionNotFoundSync, warnMissingReturnSync, warnDuplicateFunctionDefinitionSync, warnInvalidStaticInitSync, warnRecursiveFunctionCallSync, } from '../../../../console/index.js';
+import { warnHasUnwrappedExpressionSync, warnNestedTComponent, warnInvalidStaticChildSync, warnFunctionNotFoundSync, warnMissingReturnSync, warnDuplicateFunctionDefinitionSync, warnInvalidStaticInitSync, warnRecursiveFunctionCallSync, } from '../../../../console/index.js';
 import { isAcceptedPluralForm } from 'generaltranslation/internal';
 import { isStaticExpression } from '../../evaluateJsx.js';
 import { STATIC_COMPONENT, TRANSLATION_COMPONENT, VARIABLE_COMPONENTS, } from '../constants.js';
@@ -18,6 +18,7 @@ import { parseTProps } from './parseTProps.js';
 import { handleChildrenWhitespace } from './handleChildrenWhitespace.js';
 import { isElementNode, } from './types.js';
 import { multiplyJsxTree } from './multiplication/multiplyJsxTree.js';
+import { removeNullChildrenFields } from './removeNullChildrenFields.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?
@@ -421,9 +422,11 @@ export function parseJSXElement({ importAliases, node, originalName, pkg, update
     }
     // <T> is valid here
     for (const minifiedTree of minifiedTress) {
+        // Clean the tree by removing null 'c' fields from JsxElements
+        const cleanedTree = removeNullChildrenFields(minifiedTree);
         updates.push({
             dataFormat: 'JSX',
-            source: minifiedTree,
+            source: cleanedTree,
             // eslint-disable-next-line no-undef
             metadata: { ...structuredClone(metadata) },
         });
@@ -992,14 +995,21 @@ function processReturnExpression({ unwrappedExpressions, scopeNode, expressionNo
         return result;
     }
     else {
-        // Handle static expressions (e.g. return 'static string')
-        const staticAnalysis = isStaticExpression(expressionNodePath.node);
-        if (staticAnalysis.isStatic && staticAnalysis.value !== undefined) {
-            // Preserve the exact whitespace for static string expressions
-            return staticAnalysis.value;
-        }
-        // reject
-        errors.push(warnInvalidReturnExpressionSync(file, functionName, generate(expressionNodePath.node).code, `${scopeNode.node.loc?.start?.line}:${scopeNode.node.loc?.start?.column}`));
-        return null;
+        return buildJSXTree({
+            importAliases,
+            node: expressionNodePath.node,
+            unwrappedExpressions,
+            visited,
+            callStack,
+            updates,
+            errors,
+            warnings,
+            file,
+            insideT: true,
+            parsingOptions,
+            scopeNode,
+            importedFunctionsMap,
+            pkg,
+        });
     }
 }

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

@@ -0,0 +1,2 @@
+import { JsxChildren } from 'generaltranslation/types';
+export declare function removeNullChildrenFields(tree: JsxChildren): JsxChildren;

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

@@ -0,0 +1,61 @@
+import { isVariable } from 'generaltranslation/internal';
+export function removeNullChildrenFields(tree) {
+    return handleChildren(tree);
+    function handleChildren(children) {
+        if (Array.isArray(children)) {
+            return children.filter((child) => child != null).map(handleChild);
+        }
+        return handleChild(children);
+    }
+    function handleChild(child) {
+        if (typeof child === 'string') {
+            return child;
+        }
+        if (typeof child !== 'object' || child === null) {
+            return child;
+        }
+        if (isVariable(child)) {
+            return child;
+        }
+        // other fields
+        let t;
+        if (child && 't' in child && child.t != null) {
+            t = child.t;
+        }
+        let i;
+        if (child && 'i' in child && child.i != null) {
+            i = child.i;
+        }
+        // gtprop
+        let d;
+        if (child && 'd' in child && child.d != null) {
+            let b;
+            if (child.d && 'b' in child.d && child.d.b != null) {
+                b = {
+                    ...Object.fromEntries(Object.entries(child.d.b).map(([key, value]) => [
+                        key,
+                        handleChildren(value),
+                    ])),
+                };
+            }
+            d = {
+                ...(b != null && { b }),
+                ...(child.d?.t != null && { t: child.d.t }),
+                ...Object.fromEntries(Object.entries(child.d)
+                    .filter(([key, value]) => key !== 'b' && key !== 't' && value != null)
+                    .map(([key, value]) => [key, value])),
+            };
+        }
+        // children
+        let c;
+        if (child && 'c' in child && child.c != null) {
+            c = handleChildren(child.c);
+        }
+        return {
+            ...(t != null && { t }),
+            ...(i != null && { i }),
+            ...(d != null && { d }),
+            ...(c != null && { c }),
+        };
+    }
+}

package/package.json

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