@fictjs/compiler 0.0.3 → 0.0.4

package/README.md

@@ -1,6 +1,6 @@
 # @fictjs/compiler
 
-![Node CI](https://github.com/fictjs/fict/workflows/Node%20CI/badge.svg)
+![Node CI](https://github.com/fictjs/fict/workflows/CI/badge.svg)
 ![npm](https://img.shields.io/npm/v/fict.svg)
 ![license](https://img.shields.io/npm/l/fict)
 

package/dist/index.cjs

@@ -14152,6 +14152,7 @@ var RUNTIME_HELPERS = {
   bindClass: "bindClass",
   bindStyle: "bindStyle",
   bindEvent: "bindEvent",
+  callEventHandler: "callEventHandler",
   bindRef: "bindRef",
   toNodeArray: "toNodeArray",
   createKeyedListContainer: "createKeyedListContainer",
@@ -14191,6 +14192,7 @@ var RUNTIME_ALIASES = {
   bindClass: "bindClass",
   bindStyle: "bindStyle",
   bindEvent: "bindEvent",
+  callEventHandler: "callEventHandler",
   bindRef: "bindRef",
   toNodeArray: "toNodeArray",
   createKeyedListContainer: "createKeyedListContainer",
@@ -19074,7 +19076,7 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
     const isTracked = ctx.trackedVars.has(baseName2);
     const isSignal = ctx.signalVars?.has(baseName2) ?? false;
     const aliasVars = ctx.aliasVars ?? (ctx.aliasVars = /* @__PURE__ */ new Set());
-    const dependsOnTracked2 = expressionUsesTracked(instr.value, ctx);
+    const dependsOnTracked2 = expressionUsesTracked(instr.value, ctx) || (ctx.memoVars?.has(baseName2) ?? false);
     const capturedTracked = ctx.externalTracked && ctx.externalTracked.has(baseName2) && !declaredVars.has(baseName2);
     const isShadowDeclaration = !!declKind && declaredVars.has(baseName2);
     const treatAsTracked = !isShadowDeclaration && isTracked;
@@ -19082,6 +19084,9 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
     const isStateCall2 = instr.value.kind === "CallExpression" && instr.value.callee.kind === "Identifier" && instr.value.callee.name === "$state";
     const inRegionMemo = ctx.inRegionMemo ?? false;
     const isFunctionValue = instr.value.kind === "ArrowFunction" || instr.value.kind === "FunctionExpression";
+    const isAccessorReturningCall = instr.value.kind === "CallExpression" && instr.value.callee.kind === "Identifier" && ["$memo", "createMemo", "useProp"].includes(instr.value.callee.name);
+    const isReactiveObjectCall = instr.value.kind === "CallExpression" && instr.value.callee.kind === "Identifier" && ["mergeProps", "prop"].includes(instr.value.callee.name);
+    const isMemoReturningCall = isAccessorReturningCall || isReactiveObjectCall;
     const lowerAssignedValue = (forceAssigned = false) => lowerExpressionWithDeSSA(instr.value, ctx, forceAssigned || isFunctionValue);
     const buildMemoCall = (expr) => {
       const args = [
@@ -19128,7 +19133,7 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
               t2.variableDeclarator(t2.identifier(baseName2), derivedExpr)
             ]);
           }
-          ctx.memoVars?.add(baseName2);
+          if (!isReactiveObjectCall) ctx.memoVars?.add(baseName2);
           if (ctx.noMemo) {
             return t2.variableDeclaration(normalizedDecl, [
               t2.variableDeclarator(
@@ -19138,7 +19143,10 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
             ]);
           }
           return t2.variableDeclaration(normalizedDecl, [
-            t2.variableDeclarator(t2.identifier(baseName2), buildMemoCall(derivedExpr))
+            t2.variableDeclarator(
+              t2.identifier(baseName2),
+              isMemoReturningCall ? derivedExpr : buildMemoCall(derivedExpr)
+            )
           ]);
         }
       }
@@ -19149,7 +19157,7 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
             t2.variableDeclarator(t2.identifier(baseName2), derivedExpr)
           ]);
         }
-        ctx.memoVars?.add(baseName2);
+        if (!isReactiveObjectCall) ctx.memoVars?.add(baseName2);
         if (ctx.noMemo) {
           return t2.variableDeclaration(normalizedDecl, [
             t2.variableDeclarator(
@@ -19159,7 +19167,10 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
           ]);
         }
         return t2.variableDeclaration(normalizedDecl, [
-          t2.variableDeclarator(t2.identifier(baseName2), buildMemoCall(derivedExpr))
+          t2.variableDeclarator(
+            t2.identifier(baseName2),
+            isMemoReturningCall ? derivedExpr : buildMemoCall(derivedExpr)
+          )
         ]);
       }
       return t2.variableDeclaration(fallbackDecl, [
@@ -19217,7 +19228,7 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
             t2.variableDeclarator(t2.identifier(baseName2), derivedExpr)
           ]);
         }
-        ctx.memoVars?.add(baseName2);
+        if (!isReactiveObjectCall) ctx.memoVars?.add(baseName2);
         if (ctx.noMemo) {
           return t2.variableDeclaration("const", [
             t2.variableDeclarator(
@@ -19227,7 +19238,10 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
           ]);
         }
         return t2.variableDeclaration("const", [
-          t2.variableDeclarator(t2.identifier(baseName2), buildMemoCall(derivedExpr))
+          t2.variableDeclarator(
+            t2.identifier(baseName2),
+            isMemoReturningCall ? derivedExpr : buildMemoCall(derivedExpr)
+          )
         ]);
       }
       return t2.variableDeclaration("let", [
@@ -19241,22 +19255,17 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
           t2.variableDeclarator(t2.identifier(baseName2), derivedExpr)
         ]);
       }
-      if (ctx.memoVars?.has(baseName2)) {
-        if (buildMemoCall) {
-          console.log("Declaring memo var:", baseName2);
-          return t2.variableDeclaration("const", [
-            t2.variableDeclarator(t2.identifier(baseName2), buildMemoCall(derivedExpr))
-          ]);
-        }
-      }
-      ctx.memoVars?.add(baseName2);
+      if (!isReactiveObjectCall) ctx.memoVars?.add(baseName2);
       if (ctx.noMemo) {
         return t2.variableDeclaration("const", [
           t2.variableDeclarator(t2.identifier(baseName2), t2.arrowFunctionExpression([], derivedExpr))
         ]);
       }
       return t2.variableDeclaration("const", [
-        t2.variableDeclarator(t2.identifier(baseName2), buildMemoCall(derivedExpr))
+        t2.variableDeclarator(
+          t2.identifier(baseName2),
+          isMemoReturningCall ? derivedExpr : buildMemoCall(derivedExpr)
+        )
       ]);
     }
     return t2.variableDeclaration("let", [
@@ -20334,7 +20343,8 @@ function collectExpressionIdentifiersDeep(expr, into, bound = /* @__PURE__ */ ne
     case "CallExpression":
     case "OptionalCallExpression": {
       const isMacroCallee = expr.callee.kind === "Identifier" && (expr.callee.name === "$state" || expr.callee.name === "$effect" || expr.callee.name === "$store");
-      if (!isMacroCallee) {
+      const isIIFE = expr.callee.kind === "ArrowFunction" || expr.callee.kind === "FunctionExpression";
+      if (!isMacroCallee && !isIIFE) {
         collectExpressionIdentifiersDeep(expr.callee, into, bound);
       }
       expr.arguments.forEach(
@@ -20375,73 +20385,81 @@ function collectExpressionIdentifiersDeep(expr, into, bound = /* @__PURE__ */ ne
       );
       return;
     case "ArrowFunction": {
-      const nextBound = new Set(bound);
-      expr.params.forEach((p) => nextBound.add(deSSAVarName(p.name)));
+      const tempSet = /* @__PURE__ */ new Set();
       if (expr.isExpression && expr.body && !Array.isArray(expr.body)) {
-        collectExpressionIdentifiersDeep(expr.body, into, nextBound);
+        collectExpressionIdentifiers(expr.body, tempSet);
       } else if (Array.isArray(expr.body)) {
         for (const block of expr.body) {
           for (const instr of block.instructions) {
             if (instr.kind === "Assign") {
-              collectExpressionIdentifiersDeep(instr.value, into, nextBound);
+              collectExpressionIdentifiers(instr.value, tempSet);
             } else if (instr.kind === "Expression") {
-              collectExpressionIdentifiersDeep(instr.value, into, nextBound);
+              collectExpressionIdentifiers(instr.value, tempSet);
             } else if (instr.kind === "Phi") {
-              instr.sources.forEach((src) => addIdentifier(src.id.name));
+              instr.sources.forEach((src) => tempSet.add(deSSAVarName(src.id.name)));
             }
           }
           const term = block.terminator;
           if (term.kind === "Branch") {
-            collectExpressionIdentifiersDeep(term.test, into, nextBound);
+            collectExpressionIdentifiers(term.test, tempSet);
           } else if (term.kind === "Switch") {
-            collectExpressionIdentifiersDeep(term.discriminant, into, nextBound);
+            collectExpressionIdentifiers(term.discriminant, tempSet);
             term.cases.forEach((c) => {
-              if (c.test) collectExpressionIdentifiersDeep(c.test, into, nextBound);
+              if (c.test) collectExpressionIdentifiers(c.test, tempSet);
             });
           } else if (term.kind === "ForOf") {
-            collectExpressionIdentifiersDeep(term.iterable, into, nextBound);
+            collectExpressionIdentifiers(term.iterable, tempSet);
           } else if (term.kind === "ForIn") {
-            collectExpressionIdentifiersDeep(term.object, into, nextBound);
+            collectExpressionIdentifiers(term.object, tempSet);
           } else if (term.kind === "Return" && term.argument) {
-            collectExpressionIdentifiersDeep(term.argument, into, nextBound);
+            collectExpressionIdentifiers(term.argument, tempSet);
           } else if (term.kind === "Throw") {
-            collectExpressionIdentifiersDeep(term.argument, into, nextBound);
+            collectExpressionIdentifiers(term.argument, tempSet);
           }
         }
       }
+      const paramNames = new Set(expr.params.map((p) => deSSAVarName(p.name)));
+      for (const name of bound) paramNames.add(name);
+      for (const dep of tempSet) {
+        if (!paramNames.has(dep)) into.add(dep);
+      }
       return;
     }
     case "FunctionExpression": {
-      const nextBound = new Set(bound);
-      expr.params.forEach((p) => nextBound.add(deSSAVarName(p.name)));
+      const tempSet = /* @__PURE__ */ new Set();
       for (const block of expr.body) {
         for (const instr of block.instructions) {
           if (instr.kind === "Assign") {
-            collectExpressionIdentifiersDeep(instr.value, into, nextBound);
+            collectExpressionIdentifiers(instr.value, tempSet);
           } else if (instr.kind === "Expression") {
-            collectExpressionIdentifiersDeep(instr.value, into, nextBound);
+            collectExpressionIdentifiers(instr.value, tempSet);
           } else if (instr.kind === "Phi") {
-            instr.sources.forEach((src) => addIdentifier(src.id.name));
+            instr.sources.forEach((src) => tempSet.add(deSSAVarName(src.id.name)));
           }
         }
         const term = block.terminator;
         if (term.kind === "Branch") {
-          collectExpressionIdentifiersDeep(term.test, into, nextBound);
+          collectExpressionIdentifiers(term.test, tempSet);
         } else if (term.kind === "Switch") {
-          collectExpressionIdentifiersDeep(term.discriminant, into, nextBound);
+          collectExpressionIdentifiers(term.discriminant, tempSet);
           term.cases.forEach((c) => {
-            if (c.test) collectExpressionIdentifiersDeep(c.test, into, nextBound);
+            if (c.test) collectExpressionIdentifiers(c.test, tempSet);
           });
         } else if (term.kind === "ForOf") {
-          collectExpressionIdentifiersDeep(term.iterable, into, nextBound);
+          collectExpressionIdentifiers(term.iterable, tempSet);
         } else if (term.kind === "ForIn") {
-          collectExpressionIdentifiersDeep(term.object, into, nextBound);
+          collectExpressionIdentifiers(term.object, tempSet);
         } else if (term.kind === "Return" && term.argument) {
-          collectExpressionIdentifiersDeep(term.argument, into, nextBound);
+          collectExpressionIdentifiers(term.argument, tempSet);
         } else if (term.kind === "Throw") {
-          collectExpressionIdentifiersDeep(term.argument, into, nextBound);
+          collectExpressionIdentifiers(term.argument, tempSet);
         }
       }
+      const paramNames = new Set(expr.params.map((p) => deSSAVarName(p.name)));
+      for (const name of bound) paramNames.add(name);
+      for (const dep of tempSet) {
+        if (!paramNames.has(dep)) into.add(dep);
+      }
       return;
     }
     case "AssignmentExpression":
@@ -20510,6 +20528,13 @@ function getExpressionIdentifiers(expr) {
   }
   return deps;
 }
+function getExpressionIdentifiersDeep(expr) {
+  const deps = /* @__PURE__ */ new Set();
+  if (expr) {
+    collectExpressionIdentifiersDeep(expr, deps);
+  }
+  return deps;
+}
 function buildControlDependencyMap(fn) {
   const depsByInstruction = /* @__PURE__ */ new Map();
   let structured;
@@ -20636,7 +20661,7 @@ function computeReactiveAccessors(fn, ctx) {
     for (const instr of block.instructions) {
       if (instr.kind === "Assign") {
         const target = deSSAVarName(instr.target.name);
-        const dataDeps = getExpressionIdentifiers(instr.value);
+        const dataDeps = getExpressionIdentifiersDeep(instr.value);
         addDepsToTarget(target, dataDeps, dataDepsByTarget);
         const controlDeps = controlDepsByInstr.get(instr) ?? /* @__PURE__ */ new Set();
         addDepsToTarget(target, controlDeps, controlDepsByTarget);
@@ -20697,7 +20722,7 @@ function computeReactiveAccessors(fn, ctx) {
         if (instr.kind === "Assign") {
           const target = deSSAVarName(instr.target.name);
           if (isFunctionVar(target)) continue;
-          const dataDeps = getExpressionIdentifiers(instr.value);
+          const dataDeps = getExpressionIdentifiersDeep(instr.value);
           const controlDepsForInstr = controlDepsByInstr.get(instr) ?? /* @__PURE__ */ new Set();
           const hasDataDep = Array.from(dataDeps).some((dep) => tracked.has(dep));
           const hasControlDep = Array.from(controlDepsForInstr).some((dep) => tracked.has(dep));
@@ -20707,7 +20732,8 @@ function computeReactiveAccessors(fn, ctx) {
             tracked.add(target);
             changed = true;
           }
-          if (hasDataDep && !isSignal(target) && !isStore(target)) {
+          const isReactiveObjectCall = instr.value.kind === "CallExpression" && instr.value.callee.kind === "Identifier" && ["mergeProps", "prop"].includes(instr.value.callee.name);
+          if (hasDataDep && !isSignal(target) && !isStore(target) && !isReactiveObjectCall) {
             memo.add(target);
           }
         } else if (instr.kind === "Phi") {
@@ -21204,6 +21230,13 @@ function lowerExpressionImpl(expr, ctx, isAssigned = false) {
         return t2.callExpression(t2.identifier(RUNTIME_ALIASES.mergeProps), args);
       }
       const isIIFE = (expr.callee.kind === "ArrowFunction" || expr.callee.kind === "FunctionExpression") && expr.arguments.length === 0 && expr.callee.params.length === 0;
+      const calleeName = expr.callee.kind === "Identifier" ? deSSAVarName(expr.callee.name) : null;
+      const calleeIsMemoAccessor = !!calleeName && ctx.memoVars?.has(calleeName);
+      const calleeIsSignalLike = !!calleeName && (ctx.signalVars?.has(calleeName) || ctx.storeVars?.has(calleeName));
+      if (calleeIsMemoAccessor && !calleeIsSignalLike && expr.arguments.length > 0) {
+        const loweredArgs = expr.arguments.map((a) => lowerExpression(a, ctx));
+        return t2.callExpression(t2.callExpression(t2.identifier(calleeName), []), loweredArgs);
+      }
       const lowerCallee = () => isIIFE ? withNonReactiveScope(ctx, () => lowerExpression(expr.callee, ctx)) : lowerExpression(expr.callee, ctx);
       return t2.callExpression(
         lowerCallee(),
@@ -21556,11 +21589,12 @@ function lowerExpressionImpl(expr, ctx, isAssigned = false) {
       return t2.identifier("undefined");
   }
 }
-function lowerDomExpression(expr, ctx, region) {
+function lowerDomExpression(expr, ctx, region, options) {
   let lowered = lowerExpression(expr, ctx);
-  if (ctx.t.isMemberExpression(lowered) && ctx.t.isIdentifier(lowered.object) && ctx.hookResultVarMap?.has(deSSAVarName(lowered.object.name))) {
+  const skipHookAccessors = options?.skipHookAccessors ?? false;
+  if (!skipHookAccessors && ctx.t.isMemberExpression(lowered) && ctx.t.isIdentifier(lowered.object) && ctx.hookResultVarMap?.has(deSSAVarName(lowered.object.name))) {
     lowered = ctx.t.callExpression(lowered, []);
-  } else if (ctx.t.isIdentifier(lowered)) {
+  } else if (!skipHookAccessors && ctx.t.isIdentifier(lowered)) {
     const hookName = ctx.hookResultVarMap?.get(deSSAVarName(lowered.name));
     if (hookName) {
       const info = getHookReturnInfo(hookName, ctx);
@@ -21569,7 +21603,9 @@ function lowerDomExpression(expr, ctx, region) {
       }
     }
   }
-  return applyRegionMetadataToExpression(lowered, ctx, region);
+  return applyRegionMetadataToExpression(lowered, ctx, region, {
+    skipRootOverride: options?.skipRegionRootOverride
+  });
 }
 function lowerJSXChildNonFineGrained(child, ctx) {
   const { t: t2 } = ctx;
@@ -21778,12 +21814,13 @@ function getDependencyPathFromNode(node, t2) {
   }
   return null;
 }
-function applyRegionMetadataToExpression(expr, ctx, regionOverride) {
+function applyRegionMetadataToExpression(expr, ctx, regionOverride, options) {
   if (ctx.inReturn && ctx.currentFnIsHook) {
     return expr;
   }
   const region = regionOverride ?? ctx.currentRegion;
   if (!region) return expr;
+  const skipRootOverride = options?.skipRootOverride ?? false;
   const metadata = regionInfoToMetadata(region);
   const state = {};
   applyRegionMetadata(state, {
@@ -21836,7 +21873,7 @@ function applyRegionMetadataToExpression(expr, ctx, regionOverride) {
   if (Object.keys(overrides).length === 0) {
     return expr;
   }
-  if (ctx.t.isIdentifier(expr)) {
+  if (!skipRootOverride && ctx.t.isIdentifier(expr)) {
     const key = normalizeDependencyKey2(expr.name);
     const direct = overrides[key] ?? overrides[expr.name];
     if (direct) {
@@ -21844,10 +21881,10 @@ function applyRegionMetadataToExpression(expr, ctx, regionOverride) {
     }
   }
   const cloned = ctx.t.cloneNode(expr, true);
-  replaceIdentifiersWithOverrides(cloned, overrides, ctx.t);
+  replaceIdentifiersWithOverrides(cloned, overrides, ctx.t, void 0, void 0, skipRootOverride);
   return cloned;
 }
-function replaceIdentifiersWithOverrides(node, overrides, t2, parentKind, parentKey) {
+function replaceIdentifiersWithOverrides(node, overrides, t2, parentKind, parentKey, skipCurrentNode = false) {
   const isCallTarget = parentKey === "callee" && (parentKind === "CallExpression" || parentKind === "OptionalCallExpression");
   const collectParamNames = (params) => {
     const names = /* @__PURE__ */ new Set();
@@ -21883,7 +21920,7 @@ function replaceIdentifiersWithOverrides(node, overrides, t2, parentKind, parent
     params.forEach((p) => visitPattern(p));
     return names;
   };
-  if (t2.isMemberExpression(node) || t2.isOptionalMemberExpression(node)) {
+  if (!skipCurrentNode && (t2.isMemberExpression(node) || t2.isOptionalMemberExpression(node))) {
     const path = getDependencyPathFromNode(node, t2);
     const normalized = path ? normalizeDependencyKey2(path) : null;
     const override = normalized && overrides[normalized] || (path ? overrides[path] : void 0);
@@ -21893,7 +21930,7 @@ function replaceIdentifiersWithOverrides(node, overrides, t2, parentKind, parent
       return;
     }
   }
-  if (t2.isIdentifier(node)) {
+  if (!skipCurrentNode && t2.isIdentifier(node)) {
     const key = normalizeDependencyKey2(node.name);
     const override = overrides[key] ?? overrides[node.name];
     if (override && !isCallTarget) {
@@ -21938,7 +21975,8 @@ function replaceIdentifiersWithOverrides(node, overrides, t2, parentKind, parent
             overrides,
             t2,
             node.type,
-            key
+            key,
+            false
           );
         }
       }
@@ -22367,7 +22405,10 @@ function lowerIntrinsicElement(jsx, ctx) {
       const shouldWrapHandler = isExpressionReactive(binding.expr, ctx);
       const prevWrapTracked = ctx.wrapTrackedExpressions;
       ctx.wrapTrackedExpressions = false;
-      const valueExpr = lowerDomExpression(binding.expr, ctx, containingRegion);
+      const valueExpr = lowerDomExpression(binding.expr, ctx, containingRegion, {
+        skipHookAccessors: true,
+        skipRegionRootOverride: true
+      });
       ctx.wrapTrackedExpressions = prevWrapTracked;
       const eventParam = t2.identifier("_e");
       const isFn = t2.isArrowFunctionExpression(valueExpr) || t2.isFunctionExpression(valueExpr);

package/dist/index.js

@@ -14140,6 +14140,7 @@ var RUNTIME_HELPERS = {
   bindClass: "bindClass",
   bindStyle: "bindStyle",
   bindEvent: "bindEvent",
+  callEventHandler: "callEventHandler",
   bindRef: "bindRef",
   toNodeArray: "toNodeArray",
   createKeyedListContainer: "createKeyedListContainer",
@@ -14179,6 +14180,7 @@ var RUNTIME_ALIASES = {
   bindClass: "bindClass",
   bindStyle: "bindStyle",
   bindEvent: "bindEvent",
+  callEventHandler: "callEventHandler",
   bindRef: "bindRef",
   toNodeArray: "toNodeArray",
   createKeyedListContainer: "createKeyedListContainer",
@@ -19062,7 +19064,7 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
     const isTracked = ctx.trackedVars.has(baseName2);
     const isSignal = ctx.signalVars?.has(baseName2) ?? false;
     const aliasVars = ctx.aliasVars ?? (ctx.aliasVars = /* @__PURE__ */ new Set());
-    const dependsOnTracked2 = expressionUsesTracked(instr.value, ctx);
+    const dependsOnTracked2 = expressionUsesTracked(instr.value, ctx) || (ctx.memoVars?.has(baseName2) ?? false);
     const capturedTracked = ctx.externalTracked && ctx.externalTracked.has(baseName2) && !declaredVars.has(baseName2);
     const isShadowDeclaration = !!declKind && declaredVars.has(baseName2);
     const treatAsTracked = !isShadowDeclaration && isTracked;
@@ -19070,6 +19072,9 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
     const isStateCall2 = instr.value.kind === "CallExpression" && instr.value.callee.kind === "Identifier" && instr.value.callee.name === "$state";
     const inRegionMemo = ctx.inRegionMemo ?? false;
     const isFunctionValue = instr.value.kind === "ArrowFunction" || instr.value.kind === "FunctionExpression";
+    const isAccessorReturningCall = instr.value.kind === "CallExpression" && instr.value.callee.kind === "Identifier" && ["$memo", "createMemo", "useProp"].includes(instr.value.callee.name);
+    const isReactiveObjectCall = instr.value.kind === "CallExpression" && instr.value.callee.kind === "Identifier" && ["mergeProps", "prop"].includes(instr.value.callee.name);
+    const isMemoReturningCall = isAccessorReturningCall || isReactiveObjectCall;
     const lowerAssignedValue = (forceAssigned = false) => lowerExpressionWithDeSSA(instr.value, ctx, forceAssigned || isFunctionValue);
     const buildMemoCall = (expr) => {
       const args = [
@@ -19116,7 +19121,7 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
               t2.variableDeclarator(t2.identifier(baseName2), derivedExpr)
             ]);
           }
-          ctx.memoVars?.add(baseName2);
+          if (!isReactiveObjectCall) ctx.memoVars?.add(baseName2);
           if (ctx.noMemo) {
             return t2.variableDeclaration(normalizedDecl, [
               t2.variableDeclarator(
@@ -19126,7 +19131,10 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
             ]);
           }
           return t2.variableDeclaration(normalizedDecl, [
-            t2.variableDeclarator(t2.identifier(baseName2), buildMemoCall(derivedExpr))
+            t2.variableDeclarator(
+              t2.identifier(baseName2),
+              isMemoReturningCall ? derivedExpr : buildMemoCall(derivedExpr)
+            )
           ]);
         }
       }
@@ -19137,7 +19145,7 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
             t2.variableDeclarator(t2.identifier(baseName2), derivedExpr)
           ]);
         }
-        ctx.memoVars?.add(baseName2);
+        if (!isReactiveObjectCall) ctx.memoVars?.add(baseName2);
         if (ctx.noMemo) {
           return t2.variableDeclaration(normalizedDecl, [
             t2.variableDeclarator(
@@ -19147,7 +19155,10 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
           ]);
         }
         return t2.variableDeclaration(normalizedDecl, [
-          t2.variableDeclarator(t2.identifier(baseName2), buildMemoCall(derivedExpr))
+          t2.variableDeclarator(
+            t2.identifier(baseName2),
+            isMemoReturningCall ? derivedExpr : buildMemoCall(derivedExpr)
+          )
         ]);
       }
       return t2.variableDeclaration(fallbackDecl, [
@@ -19205,7 +19216,7 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
             t2.variableDeclarator(t2.identifier(baseName2), derivedExpr)
           ]);
         }
-        ctx.memoVars?.add(baseName2);
+        if (!isReactiveObjectCall) ctx.memoVars?.add(baseName2);
         if (ctx.noMemo) {
           return t2.variableDeclaration("const", [
             t2.variableDeclarator(
@@ -19215,7 +19226,10 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
           ]);
         }
         return t2.variableDeclaration("const", [
-          t2.variableDeclarator(t2.identifier(baseName2), buildMemoCall(derivedExpr))
+          t2.variableDeclarator(
+            t2.identifier(baseName2),
+            isMemoReturningCall ? derivedExpr : buildMemoCall(derivedExpr)
+          )
         ]);
       }
       return t2.variableDeclaration("let", [
@@ -19229,22 +19243,17 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
           t2.variableDeclarator(t2.identifier(baseName2), derivedExpr)
         ]);
       }
-      if (ctx.memoVars?.has(baseName2)) {
-        if (buildMemoCall) {
-          console.log("Declaring memo var:", baseName2);
-          return t2.variableDeclaration("const", [
-            t2.variableDeclarator(t2.identifier(baseName2), buildMemoCall(derivedExpr))
-          ]);
-        }
-      }
-      ctx.memoVars?.add(baseName2);
+      if (!isReactiveObjectCall) ctx.memoVars?.add(baseName2);
       if (ctx.noMemo) {
         return t2.variableDeclaration("const", [
           t2.variableDeclarator(t2.identifier(baseName2), t2.arrowFunctionExpression([], derivedExpr))
         ]);
       }
       return t2.variableDeclaration("const", [
-        t2.variableDeclarator(t2.identifier(baseName2), buildMemoCall(derivedExpr))
+        t2.variableDeclarator(
+          t2.identifier(baseName2),
+          isMemoReturningCall ? derivedExpr : buildMemoCall(derivedExpr)
+        )
       ]);
     }
     return t2.variableDeclaration("let", [
@@ -20322,7 +20331,8 @@ function collectExpressionIdentifiersDeep(expr, into, bound = /* @__PURE__ */ ne
     case "CallExpression":
     case "OptionalCallExpression": {
       const isMacroCallee = expr.callee.kind === "Identifier" && (expr.callee.name === "$state" || expr.callee.name === "$effect" || expr.callee.name === "$store");
-      if (!isMacroCallee) {
+      const isIIFE = expr.callee.kind === "ArrowFunction" || expr.callee.kind === "FunctionExpression";
+      if (!isMacroCallee && !isIIFE) {
         collectExpressionIdentifiersDeep(expr.callee, into, bound);
       }
       expr.arguments.forEach(
@@ -20363,73 +20373,81 @@ function collectExpressionIdentifiersDeep(expr, into, bound = /* @__PURE__ */ ne
       );
       return;
     case "ArrowFunction": {
-      const nextBound = new Set(bound);
-      expr.params.forEach((p) => nextBound.add(deSSAVarName(p.name)));
+      const tempSet = /* @__PURE__ */ new Set();
       if (expr.isExpression && expr.body && !Array.isArray(expr.body)) {
-        collectExpressionIdentifiersDeep(expr.body, into, nextBound);
+        collectExpressionIdentifiers(expr.body, tempSet);
       } else if (Array.isArray(expr.body)) {
         for (const block of expr.body) {
           for (const instr of block.instructions) {
             if (instr.kind === "Assign") {
-              collectExpressionIdentifiersDeep(instr.value, into, nextBound);
+              collectExpressionIdentifiers(instr.value, tempSet);
             } else if (instr.kind === "Expression") {
-              collectExpressionIdentifiersDeep(instr.value, into, nextBound);
+              collectExpressionIdentifiers(instr.value, tempSet);
             } else if (instr.kind === "Phi") {
-              instr.sources.forEach((src) => addIdentifier(src.id.name));
+              instr.sources.forEach((src) => tempSet.add(deSSAVarName(src.id.name)));
             }
           }
           const term = block.terminator;
           if (term.kind === "Branch") {
-            collectExpressionIdentifiersDeep(term.test, into, nextBound);
+            collectExpressionIdentifiers(term.test, tempSet);
           } else if (term.kind === "Switch") {
-            collectExpressionIdentifiersDeep(term.discriminant, into, nextBound);
+            collectExpressionIdentifiers(term.discriminant, tempSet);
             term.cases.forEach((c) => {
-              if (c.test) collectExpressionIdentifiersDeep(c.test, into, nextBound);
+              if (c.test) collectExpressionIdentifiers(c.test, tempSet);
             });
           } else if (term.kind === "ForOf") {
-            collectExpressionIdentifiersDeep(term.iterable, into, nextBound);
+            collectExpressionIdentifiers(term.iterable, tempSet);
           } else if (term.kind === "ForIn") {
-            collectExpressionIdentifiersDeep(term.object, into, nextBound);
+            collectExpressionIdentifiers(term.object, tempSet);
           } else if (term.kind === "Return" && term.argument) {
-            collectExpressionIdentifiersDeep(term.argument, into, nextBound);
+            collectExpressionIdentifiers(term.argument, tempSet);
           } else if (term.kind === "Throw") {
-            collectExpressionIdentifiersDeep(term.argument, into, nextBound);
+            collectExpressionIdentifiers(term.argument, tempSet);
           }
         }
       }
+      const paramNames = new Set(expr.params.map((p) => deSSAVarName(p.name)));
+      for (const name of bound) paramNames.add(name);
+      for (const dep of tempSet) {
+        if (!paramNames.has(dep)) into.add(dep);
+      }
       return;
     }
     case "FunctionExpression": {
-      const nextBound = new Set(bound);
-      expr.params.forEach((p) => nextBound.add(deSSAVarName(p.name)));
+      const tempSet = /* @__PURE__ */ new Set();
       for (const block of expr.body) {
         for (const instr of block.instructions) {
           if (instr.kind === "Assign") {
-            collectExpressionIdentifiersDeep(instr.value, into, nextBound);
+            collectExpressionIdentifiers(instr.value, tempSet);
           } else if (instr.kind === "Expression") {
-            collectExpressionIdentifiersDeep(instr.value, into, nextBound);
+            collectExpressionIdentifiers(instr.value, tempSet);
           } else if (instr.kind === "Phi") {
-            instr.sources.forEach((src) => addIdentifier(src.id.name));
+            instr.sources.forEach((src) => tempSet.add(deSSAVarName(src.id.name)));
           }
         }
         const term = block.terminator;
         if (term.kind === "Branch") {
-          collectExpressionIdentifiersDeep(term.test, into, nextBound);
+          collectExpressionIdentifiers(term.test, tempSet);
         } else if (term.kind === "Switch") {
-          collectExpressionIdentifiersDeep(term.discriminant, into, nextBound);
+          collectExpressionIdentifiers(term.discriminant, tempSet);
           term.cases.forEach((c) => {
-            if (c.test) collectExpressionIdentifiersDeep(c.test, into, nextBound);
+            if (c.test) collectExpressionIdentifiers(c.test, tempSet);
           });
         } else if (term.kind === "ForOf") {
-          collectExpressionIdentifiersDeep(term.iterable, into, nextBound);
+          collectExpressionIdentifiers(term.iterable, tempSet);
         } else if (term.kind === "ForIn") {
-          collectExpressionIdentifiersDeep(term.object, into, nextBound);
+          collectExpressionIdentifiers(term.object, tempSet);
         } else if (term.kind === "Return" && term.argument) {
-          collectExpressionIdentifiersDeep(term.argument, into, nextBound);
+          collectExpressionIdentifiers(term.argument, tempSet);
         } else if (term.kind === "Throw") {
-          collectExpressionIdentifiersDeep(term.argument, into, nextBound);
+          collectExpressionIdentifiers(term.argument, tempSet);
         }
       }
+      const paramNames = new Set(expr.params.map((p) => deSSAVarName(p.name)));
+      for (const name of bound) paramNames.add(name);
+      for (const dep of tempSet) {
+        if (!paramNames.has(dep)) into.add(dep);
+      }
       return;
     }
     case "AssignmentExpression":
@@ -20498,6 +20516,13 @@ function getExpressionIdentifiers(expr) {
   }
   return deps;
 }
+function getExpressionIdentifiersDeep(expr) {
+  const deps = /* @__PURE__ */ new Set();
+  if (expr) {
+    collectExpressionIdentifiersDeep(expr, deps);
+  }
+  return deps;
+}
 function buildControlDependencyMap(fn) {
   const depsByInstruction = /* @__PURE__ */ new Map();
   let structured;
@@ -20624,7 +20649,7 @@ function computeReactiveAccessors(fn, ctx) {
     for (const instr of block.instructions) {
       if (instr.kind === "Assign") {
         const target = deSSAVarName(instr.target.name);
-        const dataDeps = getExpressionIdentifiers(instr.value);
+        const dataDeps = getExpressionIdentifiersDeep(instr.value);
         addDepsToTarget(target, dataDeps, dataDepsByTarget);
         const controlDeps = controlDepsByInstr.get(instr) ?? /* @__PURE__ */ new Set();
         addDepsToTarget(target, controlDeps, controlDepsByTarget);
@@ -20685,7 +20710,7 @@ function computeReactiveAccessors(fn, ctx) {
         if (instr.kind === "Assign") {
           const target = deSSAVarName(instr.target.name);
           if (isFunctionVar(target)) continue;
-          const dataDeps = getExpressionIdentifiers(instr.value);
+          const dataDeps = getExpressionIdentifiersDeep(instr.value);
           const controlDepsForInstr = controlDepsByInstr.get(instr) ?? /* @__PURE__ */ new Set();
           const hasDataDep = Array.from(dataDeps).some((dep) => tracked.has(dep));
           const hasControlDep = Array.from(controlDepsForInstr).some((dep) => tracked.has(dep));
@@ -20695,7 +20720,8 @@ function computeReactiveAccessors(fn, ctx) {
             tracked.add(target);
             changed = true;
           }
-          if (hasDataDep && !isSignal(target) && !isStore(target)) {
+          const isReactiveObjectCall = instr.value.kind === "CallExpression" && instr.value.callee.kind === "Identifier" && ["mergeProps", "prop"].includes(instr.value.callee.name);
+          if (hasDataDep && !isSignal(target) && !isStore(target) && !isReactiveObjectCall) {
             memo.add(target);
           }
         } else if (instr.kind === "Phi") {
@@ -21192,6 +21218,13 @@ function lowerExpressionImpl(expr, ctx, isAssigned = false) {
         return t2.callExpression(t2.identifier(RUNTIME_ALIASES.mergeProps), args);
       }
       const isIIFE = (expr.callee.kind === "ArrowFunction" || expr.callee.kind === "FunctionExpression") && expr.arguments.length === 0 && expr.callee.params.length === 0;
+      const calleeName = expr.callee.kind === "Identifier" ? deSSAVarName(expr.callee.name) : null;
+      const calleeIsMemoAccessor = !!calleeName && ctx.memoVars?.has(calleeName);
+      const calleeIsSignalLike = !!calleeName && (ctx.signalVars?.has(calleeName) || ctx.storeVars?.has(calleeName));
+      if (calleeIsMemoAccessor && !calleeIsSignalLike && expr.arguments.length > 0) {
+        const loweredArgs = expr.arguments.map((a) => lowerExpression(a, ctx));
+        return t2.callExpression(t2.callExpression(t2.identifier(calleeName), []), loweredArgs);
+      }
       const lowerCallee = () => isIIFE ? withNonReactiveScope(ctx, () => lowerExpression(expr.callee, ctx)) : lowerExpression(expr.callee, ctx);
       return t2.callExpression(
         lowerCallee(),
@@ -21544,11 +21577,12 @@ function lowerExpressionImpl(expr, ctx, isAssigned = false) {
       return t2.identifier("undefined");
   }
 }
-function lowerDomExpression(expr, ctx, region) {
+function lowerDomExpression(expr, ctx, region, options) {
   let lowered = lowerExpression(expr, ctx);
-  if (ctx.t.isMemberExpression(lowered) && ctx.t.isIdentifier(lowered.object) && ctx.hookResultVarMap?.has(deSSAVarName(lowered.object.name))) {
+  const skipHookAccessors = options?.skipHookAccessors ?? false;
+  if (!skipHookAccessors && ctx.t.isMemberExpression(lowered) && ctx.t.isIdentifier(lowered.object) && ctx.hookResultVarMap?.has(deSSAVarName(lowered.object.name))) {
     lowered = ctx.t.callExpression(lowered, []);
-  } else if (ctx.t.isIdentifier(lowered)) {
+  } else if (!skipHookAccessors && ctx.t.isIdentifier(lowered)) {
     const hookName = ctx.hookResultVarMap?.get(deSSAVarName(lowered.name));
     if (hookName) {
       const info = getHookReturnInfo(hookName, ctx);
@@ -21557,7 +21591,9 @@ function lowerDomExpression(expr, ctx, region) {
       }
     }
   }
-  return applyRegionMetadataToExpression(lowered, ctx, region);
+  return applyRegionMetadataToExpression(lowered, ctx, region, {
+    skipRootOverride: options?.skipRegionRootOverride
+  });
 }
 function lowerJSXChildNonFineGrained(child, ctx) {
   const { t: t2 } = ctx;
@@ -21766,12 +21802,13 @@ function getDependencyPathFromNode(node, t2) {
   }
   return null;
 }
-function applyRegionMetadataToExpression(expr, ctx, regionOverride) {
+function applyRegionMetadataToExpression(expr, ctx, regionOverride, options) {
   if (ctx.inReturn && ctx.currentFnIsHook) {
     return expr;
   }
   const region = regionOverride ?? ctx.currentRegion;
   if (!region) return expr;
+  const skipRootOverride = options?.skipRootOverride ?? false;
   const metadata = regionInfoToMetadata(region);
   const state = {};
   applyRegionMetadata(state, {
@@ -21824,7 +21861,7 @@ function applyRegionMetadataToExpression(expr, ctx, regionOverride) {
   if (Object.keys(overrides).length === 0) {
     return expr;
   }
-  if (ctx.t.isIdentifier(expr)) {
+  if (!skipRootOverride && ctx.t.isIdentifier(expr)) {
     const key = normalizeDependencyKey2(expr.name);
     const direct = overrides[key] ?? overrides[expr.name];
     if (direct) {
@@ -21832,10 +21869,10 @@ function applyRegionMetadataToExpression(expr, ctx, regionOverride) {
     }
   }
   const cloned = ctx.t.cloneNode(expr, true);
-  replaceIdentifiersWithOverrides(cloned, overrides, ctx.t);
+  replaceIdentifiersWithOverrides(cloned, overrides, ctx.t, void 0, void 0, skipRootOverride);
   return cloned;
 }
-function replaceIdentifiersWithOverrides(node, overrides, t2, parentKind, parentKey) {
+function replaceIdentifiersWithOverrides(node, overrides, t2, parentKind, parentKey, skipCurrentNode = false) {
   const isCallTarget = parentKey === "callee" && (parentKind === "CallExpression" || parentKind === "OptionalCallExpression");
   const collectParamNames = (params) => {
     const names = /* @__PURE__ */ new Set();
@@ -21871,7 +21908,7 @@ function replaceIdentifiersWithOverrides(node, overrides, t2, parentKind, parent
     params.forEach((p) => visitPattern(p));
     return names;
   };
-  if (t2.isMemberExpression(node) || t2.isOptionalMemberExpression(node)) {
+  if (!skipCurrentNode && (t2.isMemberExpression(node) || t2.isOptionalMemberExpression(node))) {
     const path = getDependencyPathFromNode(node, t2);
     const normalized = path ? normalizeDependencyKey2(path) : null;
     const override = normalized && overrides[normalized] || (path ? overrides[path] : void 0);
@@ -21881,7 +21918,7 @@ function replaceIdentifiersWithOverrides(node, overrides, t2, parentKind, parent
       return;
     }
   }
-  if (t2.isIdentifier(node)) {
+  if (!skipCurrentNode && t2.isIdentifier(node)) {
     const key = normalizeDependencyKey2(node.name);
     const override = overrides[key] ?? overrides[node.name];
     if (override && !isCallTarget) {
@@ -21926,7 +21963,8 @@ function replaceIdentifiersWithOverrides(node, overrides, t2, parentKind, parent
             overrides,
             t2,
             node.type,
-            key
+            key,
+            false
           );
         }
       }
@@ -22355,7 +22393,10 @@ function lowerIntrinsicElement(jsx, ctx) {
       const shouldWrapHandler = isExpressionReactive(binding.expr, ctx);
       const prevWrapTracked = ctx.wrapTrackedExpressions;
       ctx.wrapTrackedExpressions = false;
-      const valueExpr = lowerDomExpression(binding.expr, ctx, containingRegion);
+      const valueExpr = lowerDomExpression(binding.expr, ctx, containingRegion, {
+        skipHookAccessors: true,
+        skipRegionRootOverride: true
+      });
       ctx.wrapTrackedExpressions = prevWrapTracked;
       const eventParam = t2.identifier("_e");
       const isFn = t2.isArrowFunctionExpression(valueExpr) || t2.isFunctionExpression(valueExpr);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fictjs/compiler",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Babel plugin for Fict Compiler",
   "publishConfig": {
     "access": "public"
@@ -38,7 +38,7 @@
     "@types/babel__helper-plugin-utils": "^7.10.3",
     "@types/babel__traverse": "^7.28.0",
     "tsup": "^8.5.1",
-    "@fictjs/runtime": "0.0.3"
+    "@fictjs/runtime": "0.0.4"
   },
   "scripts": {
     "build": "tsup src/index.ts --format cjs,esm --dts",