@oddo/lang 0.0.3 → 0.0.5

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",
@@ -3449,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);
@@ -3459,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);
     }
@@ -3503,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"));
   }
@@ -3536,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];
@@ -3660,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)) {
@@ -3717,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)) {
@@ -3771,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);
@@ -3792,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);
@@ -3884,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) {
@@ -4028,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) {
@@ -4106,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);