@oddo/lang 0.0.12 → 0.0.14

package/dist/index.js

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }// src/lexer.mjs
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }// src/lexer.mjs
 var _chevrotain = require('chevrotain');
 var Identifier = _chevrotain.createToken.call(void 0, {
   name: "Identifier",
@@ -3467,7 +3467,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 +3477,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 +3530,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 +3566,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 = _nullishCoalesce(startBoundary, () => ( firstToken.offset));
-      const textEnd = _nullishCoalesce(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;
     }
@@ -4559,7 +4570,7 @@ function convertExpressionStatement2(stmt) {
   if (stmt.expression) {
     const isPlainExpr = stmt.expression.type !== "variableDeclaration" && stmt.expression.type !== "assignment" && stmt.expression.type !== "arraySliceAssignment";
     if (isPlainExpr) {
-      const allIdentifiers = collectOddoIdentifiersOnly(stmt.expression);
+      const allIdentifiers = collectOddoIdentifiersOnly(stmt.expression, /* @__PURE__ */ new Set(), false, true);
       const reactiveDeps = allIdentifiers.filter((id) => isReactive(id));
       if (reactiveDeps.length > 0) {
         const savedScope = currentScope;
@@ -4832,20 +4843,23 @@ function convertReactiveContainer(expr) {
   currentScope = savedScope;
   return t.functionExpression(null, params, body);
 }
-function collectOddoIdentifiersOnly(node, names = /* @__PURE__ */ new Set(), stopAtJsxExpressions = false) {
+function collectOddoIdentifiersOnly(node, names = /* @__PURE__ */ new Set(), stopAtJsxExpressions = false, stopAtArrowFunctions = false) {
   if (!node || typeof node !== "object") return Array.from(names);
   if (stopAtJsxExpressions && node.type === "jsxExpression") {
     return Array.from(names);
   }
+  if (stopAtArrowFunctions && node.type === "arrowFunction") {
+    return Array.from(names);
+  }
   if (node.type === "identifier") {
     names.add(node.name);
   }
   if (node.type === "property") {
     if (node.computed && node.key) {
-      collectOddoIdentifiersOnly(node.key, names, stopAtJsxExpressions);
+      collectOddoIdentifiersOnly(node.key, names, stopAtJsxExpressions, stopAtArrowFunctions);
     }
     if (node.value) {
-      collectOddoIdentifiersOnly(node.value, names, stopAtJsxExpressions);
+      collectOddoIdentifiersOnly(node.value, names, stopAtJsxExpressions, stopAtArrowFunctions);
     }
     return Array.from(names);
   }
@@ -4853,9 +4867,9 @@ function collectOddoIdentifiersOnly(node, names = /* @__PURE__ */ new Set(), sto
     if (key === "type") continue;
     const val = node[key];
     if (Array.isArray(val)) {
-      val.forEach((item) => collectOddoIdentifiersOnly(item, names, stopAtJsxExpressions));
+      val.forEach((item) => collectOddoIdentifiersOnly(item, names, stopAtJsxExpressions, stopAtArrowFunctions));
     } else if (val && typeof val === "object") {
-      collectOddoIdentifiersOnly(val, names, stopAtJsxExpressions);
+      collectOddoIdentifiersOnly(val, names, stopAtJsxExpressions, stopAtArrowFunctions);
     }
   }
   return Array.from(names);