@oddo/lang 0.0.8 → 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)]
@@ -3728,7 +3736,11 @@ var MODIFIER_TRANSFORMATIONS = {
     transform: (oddoExpr, leftExpr) => {
       const allIds = collectOddoIdentifiersOnly(oddoExpr);
       const identifiers = allIds.filter((id) => isReactive(id));
+      const savedScope = currentScope;
+      currentScope = Object.create(currentScope);
+      currentScope[reactiveScope] = false;
       const valueExpr = convertExpression2(oddoExpr);
+      currentScope = savedScope;
       const params = identifiers.map((id) => t.identifier(id));
       const deps = identifiers.map((id) => t.identifier(id));
       const arrowFunc = t.arrowFunctionExpression(params, valueExpr);
@@ -3811,6 +3823,9 @@ var MODIFIER_TRANSFORMATIONS = {
         ...stateContainerNames,
         ...outerDepsArray.filter((id) => !mutableVariables.has(id))
       ]);
+      const savedScopeMutate = currentScope;
+      currentScope = Object.create(currentScope);
+      currentScope[reactiveScope] = false;
       for (const assignment of assignments) {
         const rightBabel = convertExpression2(assignment.rightOddo);
         const tempFile = t.file(t.program([t.expressionStatement(rightBabel)]));
@@ -3863,6 +3878,7 @@ var MODIFIER_TRANSFORMATIONS = {
           );
         }
       }
+      currentScope = savedScopeMutate;
       if (stateContainerNames.length > 0) {
         mutateBodyStmts.push(
           t.expressionStatement(
@@ -3916,6 +3932,7 @@ var MODIFIER_TRANSFORMATIONS = {
       const deps = identifiers.map((id) => t.identifier(id));
       const savedScope = currentScope;
       currentScope = Object.create(currentScope);
+      currentScope[reactiveScope] = false;
       for (const id of identifiers) {
         currentScope[id] = { type: "param", reactive: false };
       }
@@ -3948,7 +3965,16 @@ var MODIFIER_TRANSFORMATIONS = {
       if (leftExpr && t.isIdentifier(leftExpr)) {
         mutableVariables.add(leftExpr.name);
         const identifiers = collectOddoIdentifiersOnly(oddoExpr);
+        const reactiveDeps = getReactiveDeps(identifiers);
+        const savedScope = currentScope;
+        if (reactiveDeps.length > 0) {
+          currentScope = Object.create(currentScope);
+          currentScope[reactiveScope] = false;
+        }
         const valueExpr = convertExpression2(oddoExpr);
+        if (reactiveDeps.length > 0) {
+          currentScope = savedScope;
+        }
         const liftedExpr = createLiftedExpr(valueExpr, identifiers);
         return t.variableDeclaration("let", [
           t.variableDeclarator(leftExpr, liftedExpr || valueExpr)
@@ -3999,8 +4025,9 @@ var stateSetterMap = /* @__PURE__ */ new Map();
 var mutableVariables = /* @__PURE__ */ new Set();
 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) {
@@ -4059,6 +4086,7 @@ function collectOddoIdentifiers(node, names = /* @__PURE__ */ new Set()) {
   if (!node || typeof node !== "object") return names;
   if (node.type === "program") {
     moduleScope = /* @__PURE__ */ Object.create(null);
+    moduleScope[reactiveScope] = true;
     currentScope = moduleScope;
   }
   if (node.type === "identifier") {
@@ -4301,14 +4329,23 @@ function convertExpressionStatement2(stmt) {
   if (stmt.expression && stmt.expression.type === "variableDeclaration") {
     const left = convertExpression2(stmt.expression.left);
     const oddoRight = stmt.expression.right;
-    const right = convertExpression2(oddoRight);
-    let finalExpr = right;
+    let finalExpr;
     if (oddoRight.type !== "arrowFunction") {
       const identifiers = collectOddoIdentifiersOnly(oddoRight);
-      const liftedExpr = createLiftedExpr(right, identifiers);
-      if (liftedExpr) {
-        finalExpr = liftedExpr;
+      const reactiveDeps = getReactiveDeps(identifiers);
+      const savedScope = currentScope;
+      if (reactiveDeps.length > 0) {
+        currentScope = Object.create(currentScope);
+        currentScope[reactiveScope] = false;
+      }
+      const right = convertExpression2(oddoRight);
+      if (reactiveDeps.length > 0) {
+        currentScope = savedScope;
       }
+      const liftedExpr = createLiftedExpr(right, identifiers);
+      finalExpr = liftedExpr || right;
+    } else {
+      finalExpr = convertExpression2(oddoRight);
     }
     return t.variableDeclaration("const", [
       t.variableDeclarator(left, finalExpr)
@@ -4457,17 +4494,21 @@ function convertArrowFunction2(expr) {
   if (expr._scope) {
     currentScope = expr._scope;
   }
+  const inReactiveScope = (savedScope == null ? void 0 : savedScope[reactiveScope]) !== false;
   const bodyIdentifiers = collectOddoIdentifiersOnly(expr.body);
-  const reactiveDepsForBody = bodyIdentifiers.filter((id) => {
+  const reactiveDepsForBody = inReactiveScope ? bodyIdentifiers.filter((id) => {
     var _a;
     const isOwnParam = (_a = expr.parameters) == null ? void 0 : _a.some((p) => p.name === id);
     if (isOwnParam) return false;
     const varInfo = savedScope == null ? void 0 : savedScope[id];
     return (varInfo == null ? void 0 : varInfo.reactive) === true;
-  });
+  }) : [];
   for (const dep of reactiveDepsForBody) {
     currentScope[dep] = { type: "param", reactive: false };
   }
+  if (reactiveDepsForBody.length > 0) {
+    currentScope[reactiveScope] = false;
+  }
   const params = expr.parameters.map((param) => {
     if (param.type === "restElement") {
       return t.restElement(convertExpression2(param.argument));
@@ -4498,7 +4539,7 @@ function convertArrowFunction2(expr) {
     body = null;
   }
   currentScope = savedScope;
-  if (reactiveDepsForBody.length > 0 || params.length > 0) {
+  if (reactiveDepsForBody.length > 0 || params.length > 0 && inReactiveScope) {
     usedModifiers.add("liftFn");
     const depParams = reactiveDepsForBody.map((id) => t.identifier(id));
     const allParams = [...depParams, ...params];
@@ -4563,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);
   }
@@ -4581,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);
@@ -4821,7 +4865,11 @@ function convertJSXChild2(child) {
     if (!text) return null;
     return t.stringLiteral(text);
   } else if (child.type === "jsxExpression") {
+    const savedScope = currentScope;
+    currentScope = Object.create(currentScope);
+    currentScope[reactiveScope] = false;
     const innerExpr = convertExpression2(child.expression);
+    currentScope = savedScope;
     return createReactiveExpr(child.expression, innerExpr);
   } else if (child.type === "jsxElement") {
     return convertJSXElement2(child);
@@ -4838,6 +4886,9 @@ function convertJSXElement2(expr) {
   const hasSpread = expr.attributes.some((attr) => attr.type === "jsxSpread");
   let propsArg;
   if (hasSpread) {
+    const savedScopeSpread = currentScope;
+    currentScope = Object.create(currentScope);
+    currentScope[reactiveScope] = false;
     const properties = [];
     const oddoExprs = [];
     for (const attr of expr.attributes) {
@@ -4861,6 +4912,7 @@ function convertJSXElement2(expr) {
         properties.push(t.objectProperty(key, value));
       }
     }
+    currentScope = savedScopeSpread;
     const propsObj = t.objectExpression(properties);
     const syntheticOddo = { type: "array", elements: oddoExprs };
     propsArg = createReactiveExpr(syntheticOddo, propsObj, true);
@@ -4876,10 +4928,18 @@ function convertJSXElement2(expr) {
       } else if (attr.value.type === "string") {
         value = t.stringLiteral(attr.value.value);
       } else if (attr.value.type === "expression") {
+        const savedScopeAttr = currentScope;
+        currentScope = Object.create(currentScope);
+        currentScope[reactiveScope] = false;
         const innerExpr = convertExpression2(attr.value.value);
+        currentScope = savedScopeAttr;
         value = createReactiveExpr(attr.value.value, innerExpr, true);
       } else {
+        const savedScopeAttr = currentScope;
+        currentScope = Object.create(currentScope);
+        currentScope[reactiveScope] = false;
         const innerExpr = convertExpression2(attr.value);
+        currentScope = savedScopeAttr;
         value = createReactiveExpr(attr.value, innerExpr, true);
       }
       properties.push(t.objectProperty(key, value));