@oddo/lang 0.0.9 → 0.0.10

package/dist/index.js

@@ -3586,7 +3586,7 @@ var traverse = _traverse3.default.default || _traverse3.default;
 function isValidJSIdentifier(name) {
   return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name);
 }
-function wrapDependenciesWithCalls(arrowFunc, deps) {
+function wrapDependenciesWithCalls(arrowFunc, deps, prefix = "") {
   const depSet = new Set(deps);
   const locals = /* @__PURE__ */ new Set();
   const tempFile = t.file(t.program([t.expressionStatement(arrowFunc)]));
@@ -3602,6 +3602,14 @@ function wrapDependenciesWithCalls(arrowFunc, deps) {
   const shorthandToExpand = [];
   traverse(tempFile, {
     noScope: true,
+    // Skip already-processed reactive expression calls - don't modify their deps arrays
+    // These have the pattern: _x(fn, deps) or _computed(fn, deps) or similar
+    CallExpression(path) {
+      const callee = path.node.callee;
+      if (t.isIdentifier(callee) && callee.name.startsWith("_") && path.node.arguments.length === 2 && t.isArrowFunctionExpression(path.node.arguments[0]) && t.isArrayExpression(path.node.arguments[1])) {
+        path.skip();
+      }
+    },
     Identifier(path) {
       var _a;
       if (t.isArrowFunctionExpression(path.parent) && path.parent.params.includes(path.node)) {
@@ -3631,9 +3639,9 @@ function wrapDependenciesWithCalls(arrowFunc, deps) {
   });
   shorthandToExpand.forEach(({ prop, name }) => {
     prop.shorthand = false;
-    prop.value = t.callExpression(t.identifier(name), []);
+    prop.value = t.callExpression(t.identifier(prefix + name), []);
   });
-  toReplace.forEach((p) => p.replaceWith(t.callExpression(t.identifier(p.node.name), [])));
+  toReplace.forEach((p) => p.replaceWith(t.callExpression(t.identifier(prefix + p.node.name), [])));
 }
 function getReactiveDeps(identifiers) {
   return identifiers.filter((id) => {
@@ -3670,7 +3678,7 @@ function createLiftedExpr(valueExpr, identifiers) {
   );
 }
 function createReactiveExpr(oddoExpr, valueExpr, attrExpression = false) {
-  const allIdentifiers = collectOddoIdentifiersOnly(oddoExpr);
+  const allIdentifiers = collectOddoIdentifiersOnly(oddoExpr, /* @__PURE__ */ new Set(), true);
   const identifiers = allIdentifiers.filter((id) => isReactive(id));
   const pragma = attrExpression ? "computed" : "x";
   if (identifiers.length === 0) {
@@ -3685,10 +3693,10 @@ function createReactiveExpr(oddoExpr, valueExpr, attrExpression = false) {
     );
   }
   usedModifiers.add(pragma);
-  const params = identifiers.map((id) => t.identifier(id));
+  const params = identifiers.map((id) => t.identifier("_" + id));
   const deps = identifiers.map((id) => t.identifier(id));
   const arrowFunc = t.arrowFunctionExpression(params, valueExpr);
-  wrapDependenciesWithCalls(arrowFunc, identifiers);
+  wrapDependenciesWithCalls(arrowFunc, identifiers, "_");
   return t.callExpression(
     t.identifier(modifierAliases[pragma]),
     [arrowFunc, t.arrayExpression(deps)]
@@ -4019,7 +4027,7 @@ var moduleScope = null;
 var currentScope = null;
 var reactiveScope = /* @__PURE__ */ Symbol("reactive-scope");
 function declareVariable(name, type) {
-  const reactive = type === "state" || type === "computed" || type === "param" || type === "import-oddo";
+  const reactive = type === "state" || type === "computed" || type === "reactive-param" || type === "import-oddo";
   currentScope[name] = { type, reactive };
 }
 function isDeclared(name) {
@@ -4596,17 +4604,20 @@ function convertReactiveContainer(expr) {
   currentScope = savedScope;
   return t.functionExpression(null, params, body);
 }
-function collectOddoIdentifiersOnly(node, names = /* @__PURE__ */ new Set()) {
+function collectOddoIdentifiersOnly(node, names = /* @__PURE__ */ new Set(), stopAtJsxExpressions = false) {
   if (!node || typeof node !== "object") return Array.from(names);
+  if (stopAtJsxExpressions && node.type === "jsxExpression") {
+    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);
+      collectOddoIdentifiersOnly(node.key, names, stopAtJsxExpressions);
     }
     if (node.value) {
-      collectOddoIdentifiersOnly(node.value, names);
+      collectOddoIdentifiersOnly(node.value, names, stopAtJsxExpressions);
     }
     return Array.from(names);
   }
@@ -4614,9 +4625,9 @@ function collectOddoIdentifiersOnly(node, names = /* @__PURE__ */ new Set()) {
     if (key === "type") continue;
     const val = node[key];
     if (Array.isArray(val)) {
-      val.forEach((item) => collectOddoIdentifiersOnly(item, names));
+      val.forEach((item) => collectOddoIdentifiersOnly(item, names, stopAtJsxExpressions));
     } else if (val && typeof val === "object") {
-      collectOddoIdentifiersOnly(val, names);
+      collectOddoIdentifiersOnly(val, names, stopAtJsxExpressions);
     }
   }
   return Array.from(names);