@oddo/lang 0.0.2 → 0.0.4

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 }; }// 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 }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }// src/lexer.mjs
 var _chevrotain = require('chevrotain');
 var Identifier = _chevrotain.createToken.call(void 0, {
   name: "Identifier",
@@ -2633,8 +2633,10 @@ function convertPostfix(cst) {
   return operand;
 }
 function convertFunctionCall(cst) {
+  var _a;
   let callee = convertExpression(getFirstChild(cst, "memberAccess"));
   const leftParens = cst.children.LeftParen || [];
+  const rightParens = cst.children.RightParen || [];
   const questionDots = cst.children.QuestionDot || [];
   const templateLiterals = cst.children.TemplateLiteral || [];
   if (templateLiterals.length > 0 && leftParens.length === 0) {
@@ -2652,11 +2654,16 @@ function convertFunctionCall(cst) {
   const argLists = getAllChildren(cst, "argumentList");
   const allExprs = getAllChildren(cst, "expression");
   const ops = [
-    ...leftParens.map((t2, i) => ({ k: "c", off: t2.startOffset, i, token: t2 })),
+    ...leftParens.map((t2, i) => ({
+      k: "c",
+      off: t2.startOffset,
+      token: t2,
+      rightParen: rightParens[i]
+    })),
     ...dots.map((t2, i) => ({ k: "d", off: t2.startOffset, i })),
     ...brackets.map((t2, i) => {
-      var _a;
-      return { k: "b", off: t2.startOffset, i, end: (_a = rightBrackets[i]) == null ? void 0 : _a.endOffset };
+      var _a2;
+      return { k: "b", off: t2.startOffset, i, end: (_a2 = rightBrackets[i]) == null ? void 0 : _a2.endOffset };
     }),
     ...questionDots.filter((q) => !leftParens.some((p) => Math.abs(p.startOffset - q.endOffset) <= 1)).map((t2, i) => ({ k: "q", off: t2.startOffset, i }))
   ].sort((a, b) => a.off - b.off);
@@ -2664,7 +2671,12 @@ function convertFunctionCall(cst) {
   for (const op of ops) {
     if (op.k === "c") {
       const isOptional = questionDots.some((q) => q.endOffset < op.token.startOffset && op.token.startOffset - q.endOffset <= 1);
-      const argsCST = argLists[op.i];
+      const leftOff = op.token.startOffset;
+      const rightOff = (_a = op.rightParen) == null ? void 0 : _a.endOffset;
+      const argsCST = argLists.find((al) => {
+        const alStart = getFirstTokenOffset(al);
+        return alStart !== void 0 && alStart > leftOff && (rightOff === void 0 || alStart < rightOff);
+      });
       const args = [];
       if (argsCST) {
         const exprs = getAllChildren(argsCST, "expression");
@@ -2684,9 +2696,9 @@ function convertFunctionCall(cst) {
       if (nextBracket) {
         const bIdx = brackets.indexOf(nextBracket);
         const expr = allExprs.find((e) => {
-          var _a;
+          var _a2;
           const o = getFirstTokenOffset(e);
-          return o > nextBracket.startOffset && o < ((_a = rightBrackets[bIdx]) == null ? void 0 : _a.endOffset);
+          return o > nextBracket.startOffset && o < ((_a2 = rightBrackets[bIdx]) == null ? void 0 : _a2.endOffset);
         });
         if (expr) callee = { type: "memberAccess", object: callee, property: convertExpression(expr), computed: true, optional: true };
         ops.splice(ops.findIndex((o) => o.k === "b" && o.i === bIdx), 1);
@@ -2709,6 +2721,7 @@ function convertMemberAccess(cst) {
   const dots = cst.children.Dot || [];
   const questionDots = cst.children.QuestionDot || [];
   const brackets = cst.children.LeftBracket || [];
+  const rightBrackets = cst.children.RightBracket || [];
   const dotDotDots = cst.children.DotDotDot || [];
   if (dots.length === 0 && questionDots.length === 0 && brackets.length === 0) {
     return object;
@@ -2718,85 +2731,96 @@ function convertMemberAccess(cst) {
     allOps.push({ type: "dot", token: dot, optional: false });
   }
   for (const qDot of questionDots) {
-    allOps.push({ type: "dot", token: qDot, optional: true });
-  }
-  allOps.sort((a, b) => a.token.startOffset - b.token.startOffset);
-  const identifiers = cst.children.Identifier || [];
-  let identifierIndex = 0;
-  for (let i = 0; i < allOps.length; i++) {
-    const op = allOps[i];
-    const identifier2 = identifiers[identifierIndex];
-    if (identifier2) {
-      identifierIndex++;
-      object = {
-        type: "memberAccess",
-        object,
-        property: identifier2.image,
-        computed: false,
-        optional: op.optional
-      };
+    const isFollowedByBracket = brackets.some((b) => b.startOffset > qDot.endOffset && b.startOffset - qDot.endOffset <= 1);
+    if (!isFollowedByBracket) {
+      allOps.push({ type: "dot", token: qDot, optional: true });
     }
   }
-  const expressions = getAllChildren(cst, "expression");
-  let expressionIndex = 0;
   for (let i = 0; i < brackets.length; i++) {
     const bracket = brackets[i];
-    const bracketStart = bracket.startOffset;
-    const isOptional = questionDots.some((qDot) => {
-      return qDot.endOffset < bracketStart && bracketStart - qDot.endOffset <= 1;
-    });
-    const rightBrackets = cst.children.RightBracket || [];
     const rightBracket = rightBrackets[i];
     if (!rightBracket) continue;
+    const isOptional = questionDots.some(
+      (qDot) => qDot.endOffset < bracket.startOffset && bracket.startOffset - qDot.endOffset <= 1
+    );
     const dotDotDotsInRange = dotDotDots.filter(
-      (ddd) => ddd.startOffset > bracketStart && ddd.startOffset < rightBracket.startOffset
+      (ddd) => ddd.startOffset > bracket.startOffset && ddd.startOffset < rightBracket.startOffset
     );
-    if (dotDotDotsInRange.length > 0) {
-      if (expressions.length === expressionIndex) {
-        object = {
-          type: "arraySlice",
-          object,
-          start: null,
-          end: null
-        };
-        continue;
-      }
-      if (expressions.length >= expressionIndex + 2) {
-        const startExpr = expressions[expressionIndex];
-        const endExpr = expressions[expressionIndex + 1];
-        expressionIndex += 2;
+    allOps.push({
+      type: "bracket",
+      token: bracket,
+      rightBracket,
+      optional: isOptional,
+      isSlice: dotDotDotsInRange.length > 0
+    });
+  }
+  allOps.sort((a, b) => a.token.startOffset - b.token.startOffset);
+  const identifiers = cst.children.Identifier || [];
+  const expressions = getAllChildren(cst, "expression");
+  let identifierIndex = 0;
+  let expressionIndex = 0;
+  for (const op of allOps) {
+    if (op.type === "dot") {
+      const identifier2 = identifiers[identifierIndex];
+      if (identifier2) {
+        identifierIndex++;
         object = {
-          type: "arraySlice",
+          type: "memberAccess",
           object,
-          start: convertExpression(startExpr),
-          end: convertExpression(endExpr)
+          property: identifier2.image,
+          computed: false,
+          optional: op.optional
         };
-        continue;
       }
-      if (expressions.length === expressionIndex + 1) {
-        const startExpr = expressions[expressionIndex];
-        expressionIndex++;
-        object = {
-          type: "arraySlice",
-          object,
-          start: convertExpression(startExpr),
-          end: null
-        };
-        continue;
+    } else if (op.type === "bracket") {
+      if (op.isSlice) {
+        const exprsInBracket = expressions.filter((e, idx) => {
+          if (idx < expressionIndex) return false;
+          const exprStart = getFirstTokenOffset(e);
+          return exprStart > op.token.startOffset && exprStart < op.rightBracket.startOffset;
+        });
+        if (exprsInBracket.length === 0) {
+          object = {
+            type: "arraySlice",
+            object,
+            start: null,
+            end: null
+          };
+        } else if (exprsInBracket.length >= 2) {
+          const startExpr = expressions[expressionIndex];
+          const endExpr = expressions[expressionIndex + 1];
+          expressionIndex += 2;
+          object = {
+            type: "arraySlice",
+            object,
+            start: convertExpression(startExpr),
+            end: convertExpression(endExpr)
+          };
+        } else {
+          const startExpr = expressions[expressionIndex];
+          expressionIndex++;
+          object = {
+            type: "arraySlice",
+            object,
+            start: convertExpression(startExpr),
+            end: null
+          };
+        }
+      } else {
+        if (expressions.length > expressionIndex) {
+          const exprCst = expressions[expressionIndex];
+          expressionIndex++;
+          const property = convertExpression(exprCst);
+          object = {
+            type: "memberAccess",
+            object,
+            property,
+            computed: true,
+            optional: op.optional
+          };
+        }
       }
     }
-    if (expressions.length > expressionIndex) {
-      const exprCst = expressions[expressionIndex];
-      expressionIndex++;
-      const property = convertExpression(exprCst);
-      object = {
-        type: "memberAccess",
-        object,
-        property,
-        computed: true,
-        optional: isOptional
-      };
-    }
   }
   return object;
 }
@@ -3425,6 +3449,7 @@ function decodeHTMLEntities(text) {
   });
 }
 function convertJSXChildren(childrenCST) {
+  var _a;
   if (!childrenCST || childrenCST.length === 0) return [];
   const childrenWithOffsets = childrenCST.map((child) => {
     const firstOffset = getFirstTokenOffset(child);
@@ -3435,18 +3460,9 @@ function convertJSXChildren(childrenCST) {
   const result = [];
   for (let i = 0; i < childrenWithOffsets.length; i++) {
     const current = childrenWithOffsets[i];
-    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 && /\s/.test(gap)) {
-          result.push({ type: "jsxText", value: " " });
-        }
-      }
-    }
-    const converted = convertJSXChild(current.cst);
+    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 (converted !== null) {
       result.push(converted);
     }
@@ -3479,7 +3495,7 @@ function getLastTokenOffset(node) {
   }
   return lastOffset;
 }
-function convertJSXChild(cst) {
+function convertJSXChild(cst, startBoundary, endBoundary) {
   if (cst.children.jsxElement) {
     return convertJSXElement(getFirstChild(cst, "jsxElement"));
   }
@@ -3512,6 +3528,22 @@ function convertJSXChild(cst) {
   }
   if (allTokens2.length > 0) {
     allTokens2.sort((a, b) => a.offset - b.offset);
+    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 (textValue2) {
+        const decodedValue2 = decodeHTMLEntities(textValue2);
+        return {
+          type: "jsxText",
+          value: decodedValue2
+        };
+      }
+      return null;
+    }
     let textValue = "";
     for (let i = 0; i < allTokens2.length; i++) {
       const current = allTokens2[i];
@@ -3636,11 +3668,21 @@ function wrapDependenciesWithCalls(arrowFunc, deps) {
   traverse(tempFile, {
     noScope: true,
     Identifier(path) {
+      var _a;
       if (t.isArrowFunctionExpression(path.parent) && path.parent.params.includes(path.node)) {
         return;
       }
       const parent = path.parent;
-      const isMemberProp = t.isMemberExpression(parent) && parent.property === path.node && !parent.computed;
+      if (t.isObjectPattern(parent) || t.isArrayPattern(parent)) {
+        return;
+      }
+      if (t.isVariableDeclarator(parent) && parent.id === path.node) {
+        return;
+      }
+      if (t.isObjectProperty(parent) && t.isObjectPattern((_a = path.parentPath) == null ? void 0 : _a.parent)) {
+        return;
+      }
+      const isMemberProp = (t.isMemberExpression(parent) || t.isOptionalMemberExpression(parent)) && parent.property === path.node && !parent.computed;
       const isObjectKey = t.isObjectProperty(parent) && parent.key === path.node && !parent.shorthand;
       const isShorthand = t.isObjectProperty(parent) && parent.shorthand && parent.key === path.node;
       if (depSet.has(path.node.name) && !isMemberProp && !isObjectKey && !locals.has(path.node.name)) {
@@ -3693,7 +3735,8 @@ function createLiftedExpr(valueExpr, identifiers) {
   );
 }
 function createReactiveExpr(valueExpr, attrExpression = false) {
-  const identifiers = extractIdentifiers(valueExpr);
+  const allIdentifiers = extractIdentifiers(valueExpr);
+  const identifiers = getReactiveDeps(allIdentifiers);
   const pragma = attrExpression ? "computed" : "x";
   if (identifiers.length === 0) {
     if (t.isLiteral(valueExpr)) {
@@ -3747,7 +3790,8 @@ var MODIFIER_TRANSFORMATIONS = {
     needsImport: true,
     // @computed sum = x + y -> const sum = _computed((x, y) => x() + y(), [x, y])
     transform: (valueExpr, leftExpr) => {
-      const identifiers = extractIdentifiers(valueExpr);
+      const allIds = extractIdentifiers(valueExpr);
+      const identifiers = getReactiveDeps(allIds);
       const params = identifiers.map((id) => t.identifier(id));
       const deps = identifiers.map((id) => t.identifier(id));
       const arrowFunc = t.arrowFunctionExpression(params, valueExpr);
@@ -3768,7 +3812,8 @@ var MODIFIER_TRANSFORMATIONS = {
     needsImport: true,
     // @react sum = x + y -> const sum = _react((x, y) => x() + y(), [x, y])
     transform: (valueExpr, leftExpr) => {
-      const identifiers = extractIdentifiers(valueExpr);
+      const allIds = extractIdentifiers(valueExpr);
+      const identifiers = getReactiveDeps(allIds);
       const params = identifiers.map((id) => t.identifier(id));
       const deps = identifiers.map((id) => t.identifier(id));
       const arrowFunc = t.arrowFunctionExpression(params, valueExpr);
@@ -3860,7 +3905,7 @@ var MODIFIER_TRANSFORMATIONS = {
           noScope: true,
           Identifier(path) {
             const parent = path.parent;
-            const isMemberProp = t.isMemberExpression(parent) && parent.property === path.node && !parent.computed;
+            const isMemberProp = (t.isMemberExpression(parent) || t.isOptionalMemberExpression(parent)) && parent.property === path.node && !parent.computed;
             const isObjectKey = t.isObjectProperty(parent) && parent.key === path.node && !parent.shorthand;
             const isShorthand = t.isObjectProperty(parent) && parent.shorthand && parent.key === path.node;
             if (callableIds.has(path.node.name) && !isMemberProp && !isObjectKey) {
@@ -4004,7 +4049,7 @@ var mutableVariables = /* @__PURE__ */ new Set();
 var moduleScope = null;
 var currentScope = null;
 function declareVariable(name, type) {
-  const reactive = type === "state" || type === "computed" || type === "param";
+  const reactive = type === "state" || type === "computed" || type === "param" || type === "import-oddo";
   currentScope[name] = { type, reactive };
 }
 function isDeclared(name) {
@@ -4082,6 +4127,20 @@ function collectOddoIdentifiers(node, names = /* @__PURE__ */ new Set()) {
       }
     }
   }
+  if (node.type === "importStatement") {
+    const source = node.source || "";
+    const isOddoImport = source.endsWith(".oddo");
+    const type = isOddoImport ? "import-oddo" : "import-js";
+    if (node.defaultImport) {
+      declareVariable(node.defaultImport, type);
+    }
+    for (const spec of node.specifiers || []) {
+      const localName = spec.local || spec.imported;
+      if (localName) {
+        declareVariable(localName, type);
+      }
+    }
+  }
   if (node.type === "arrowFunction") {
     const parentScope = currentScope;
     currentScope = Object.create(parentScope);