@oddo/lang 0.0.13 → 0.0.15

package/dist/index.mjs

@@ -3004,7 +3004,9 @@ function convertTemplateLiteralFromToken(token) {
           if (braceDepth === 0) {
             const exprText = text.substring(exprStart, pos);
             try {
+              const savedSourceText = sourceText;
               const exprAST = parseOddoExpression(exprText);
+              sourceText = savedSourceText;
               expressions.push(exprAST);
             } catch (e) {
               expressions.push({
@@ -3467,7 +3469,6 @@ function decodeHTMLEntities(text) {
   });
 }
 function convertJSXChildren(childrenCST) {
-  var _a;
   if (!childrenCST || childrenCST.length === 0) return [];
   const childrenWithOffsets = childrenCST.map((child) => {
     const firstOffset = getFirstTokenOffset(child);
@@ -3478,14 +3479,32 @@ function convertJSXChildren(childrenCST) {
   const result = [];
   for (let i = 0; i < childrenWithOffsets.length; i++) {
     const current = childrenWithOffsets[i];
-    const prevEnd = i > 0 ? childrenWithOffsets[i - 1].lastOffset + 1 : void 0;
-    const nextStart = (_a = childrenWithOffsets[i + 1]) == null ? void 0 : _a.firstOffset;
-    const converted = convertJSXChild(current.cst, prevEnd, nextStart);
+    if (i > 0 && sourceText) {
+      const prev = childrenWithOffsets[i - 1];
+      const gapStart = prev.lastOffset + 1;
+      const gapEnd = current.firstOffset;
+      if (gapEnd > gapStart) {
+        const gap = sourceText.slice(gapStart, gapEnd);
+        if (gap.length > 0 && gap.trim() === "" && !gap.includes("\n")) {
+          result.push({ type: "jsxText", value: " " });
+        }
+      }
+    }
+    const converted = convertJSXChild(current.cst);
     if (converted !== null) {
       result.push(converted);
     }
   }
-  return result;
+  const merged = [];
+  for (const child of result) {
+    const prev = merged[merged.length - 1];
+    if (child.type === "jsxText" && (prev == null ? void 0 : prev.type) === "jsxText") {
+      prev.value += child.value;
+    } else {
+      merged.push(child);
+    }
+  }
+  return merged;
 }
 function getLastTokenOffset(node) {
   if (!node) return void 0;
@@ -3513,7 +3532,7 @@ function getLastTokenOffset(node) {
   }
   return lastOffset;
 }
-function convertJSXChild(cst, startBoundary, endBoundary) {
+function convertJSXChild(cst) {
   if (cst.children.jsxElement) {
     return convertJSXElement(getFirstChild(cst, "jsxElement"));
   }
@@ -3549,16 +3568,10 @@ function convertJSXChild(cst, startBoundary, endBoundary) {
     const firstToken = allTokens2[0];
     const lastToken = allTokens2[allTokens2.length - 1];
     const lastTokenEnd = lastToken.token.endOffset !== void 0 ? lastToken.token.endOffset : lastToken.token.startOffset + lastToken.token.image.length - 1;
-    if (sourceText && (startBoundary !== void 0 || endBoundary !== void 0)) {
-      const textStart = startBoundary ?? firstToken.offset;
-      const textEnd = endBoundary ?? lastTokenEnd + 1;
-      const textValue2 = sourceText.slice(textStart, textEnd);
+    if (sourceText) {
+      const textValue2 = sourceText.slice(firstToken.offset, lastTokenEnd + 1);
       if (textValue2) {
-        const decodedValue2 = decodeHTMLEntities(textValue2);
-        return {
-          type: "jsxText",
-          value: decodedValue2
-        };
+        return { type: "jsxText", value: decodeHTMLEntities(textValue2) };
       }
       return null;
     }