@fictjs/compiler 0.0.5 → 0.0.8

package/dist/index.cjs

@@ -15991,6 +15991,75 @@ function debugEnabled(flag) {
   return parts.includes(normalized) || parts.includes("all");
 }
 
+// src/utils.ts
+function isStateCall(node, t2) {
+  return t2.isCallExpression(node) && t2.isIdentifier(node.callee) && node.callee.name === "$state";
+}
+function isEffectCall(node, t2) {
+  return t2.isCallExpression(node) && t2.isIdentifier(node.callee) && node.callee.name === "$effect";
+}
+function getRootIdentifier(expr, t2) {
+  if (t2.isIdentifier(expr)) {
+    return expr;
+  }
+  if (t2.isMemberExpression(expr) && t2.isExpression(expr.object) && !t2.isOptionalMemberExpression(expr)) {
+    return getRootIdentifier(expr.object, t2);
+  }
+  if (t2.isOptionalMemberExpression(expr) && t2.isExpression(expr.object)) {
+    return getRootIdentifier(expr.object, t2);
+  }
+  if (t2.isCallExpression(expr) && t2.isExpression(expr.callee)) {
+    return getRootIdentifier(expr.callee, t2);
+  }
+  if (t2.isOptionalCallExpression(expr) && t2.isExpression(expr.callee)) {
+    return getRootIdentifier(expr.callee, t2);
+  }
+  if (t2.isTSAsExpression(expr) && t2.isExpression(expr.expression)) {
+    return getRootIdentifier(expr.expression, t2);
+  }
+  if (t2.isTSNonNullExpression(expr) && t2.isExpression(expr.expression)) {
+    return getRootIdentifier(expr.expression, t2);
+  }
+  return null;
+}
+
+// src/fine-grained-dom.ts
+function normalizeDependencyKey(name) {
+  return name.split(".").map((part) => part.replace(/_\d+$/, "")).join(".");
+}
+function applyRegionMetadata(state, options) {
+  if (!options.region) return;
+  const region = options.region;
+  state.regionMetadata = region;
+  if (region.dependencies.size > 0) {
+    state.identifierOverrides = state.identifierOverrides ?? {};
+    const dependencyGetter = options.dependencyGetter ?? null;
+    if (!dependencyGetter) {
+      return;
+    }
+    for (const dep of region.dependencies) {
+      const key = normalizeDependencyKey(dep);
+      state.identifierOverrides[key] = () => dependencyGetter(dep);
+      const base = key.split(".")[0];
+      if (base && !state.identifierOverrides[base]) {
+        state.identifierOverrides[base] = () => dependencyGetter(base);
+      }
+    }
+  }
+}
+function shouldMemoizeRegion(region) {
+  if (region.dependencies.size > 0) {
+    return true;
+  }
+  if (region.hasControlFlow) {
+    return true;
+  }
+  if (region.hasReactiveWrites) {
+    return true;
+  }
+  return false;
+}
+
 // src/ir/ssa.ts
 function analyzeCFG(blocks) {
   const predecessors = computePredecessors(blocks);
@@ -16481,7 +16550,7 @@ function collectExprReads(expr, into, paths, bound = /* @__PURE__ */ new Set(),
       }
       return;
     case "CallExpression": {
-      const isMacroCallee = expr.callee.kind === "Identifier" && (expr.callee.name === "$state" || expr.callee.name === "$effect");
+      const isMacroCallee = expr.callee.kind === "Identifier" && (expr.callee.name === "$state" || expr.callee.name === "$effect" || expr.callee.name === "$store");
       if (!isMacroCallee) {
         collectExprReads(expr.callee, into, paths, bound);
       }
@@ -18849,6 +18918,7 @@ function wrapInMemo(region, t2, declaredVars, ctx, bodyStatementsOverride, outpu
   }
   const outputNames = outputNamesOverride ?? Array.from(region.declarations).map((name) => deSSAVarName(name));
   const uniqueOutputNames = [...new Set(outputNames)];
+  const bindableOutputs = uniqueOutputNames.filter((name) => !declaredVars.has(name));
   if (debugEnabled("region")) {
     console.log("Region memo", region.id, {
       instructions: region.instructions.map((instr) => instr.kind),
@@ -18905,10 +18975,10 @@ function wrapInMemo(region, t2, declaredVars, ctx, bodyStatementsOverride, outpu
       t2.variableDeclaration("const", [t2.variableDeclarator(t2.identifier(regionVarName), memoCall)])
     );
     const isAccessorOutput = (name) => ctx.signalVars?.has(name) || ctx.memoVars?.has(name) || ctx.aliasVars?.has(name) || ctx.storeVars?.has(name);
-    const getterOutputs = uniqueOutputNames.filter(
+    const getterOutputs = bindableOutputs.filter(
       (name) => ctx.trackedVars.has(name) && !isAccessorOutput(name)
     );
-    const directOutputs = uniqueOutputNames.filter((name) => !getterOutputs.includes(name));
+    const directOutputs = bindableOutputs.filter((name) => !getterOutputs.includes(name));
     if (debugEnabled("region")) {
       console.log("Region debug", {
         id: region.id,
@@ -19284,17 +19354,6 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
       const needsMutable = ctx.mutatedVars?.has(baseName2) ?? false;
       const isExternalAlias = declKind === "const" && instr.value.kind === "Identifier" && !(ctx.scopes?.byName?.has(deSSAVarName(instr.value.name)) ?? false);
       const fallbackDecl = !treatAsTracked && (!dependsOnTracked2 || isDestructuringTemp) ? declKind === "const" && (needsMutable || isExternalAlias) ? "let" : declKind : normalizedDecl;
-      const isAliasOfTracked = !isShadowDeclaration && instr.value.kind === "Identifier" && ctx.trackedVars.has(deSSAVarName(instr.value.name)) && !isDestructuringTemp;
-      if (isAliasOfTracked) {
-        declaredVars.add(baseName2);
-        const sourceIdent = instr.value;
-        return t2.variableDeclaration(fallbackDecl, [
-          t2.variableDeclarator(
-            t2.identifier(baseName2),
-            t2.callExpression(t2.identifier(deSSAVarName(sourceIdent.name)), [])
-          )
-        ]);
-      }
       declaredVars.add(baseName2);
       if (treatAsTracked && !isDestructuringTemp) {
         if (isStateCall2) {
@@ -19303,6 +19362,9 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
           ]);
         }
         if (dependsOnTracked2) {
+          if (instr.value.kind === "Identifier" && ctx.trackedVars.has(deSSAVarName(instr.value.name)) && !isDestructuringTemp) {
+            aliasVars.add(baseName2);
+          }
           const derivedExpr = lowerAssignedValue(true);
           if (ctx.nonReactiveScopeDepth && ctx.nonReactiveScopeDepth > 0) {
             return t2.variableDeclaration(normalizedDecl, [
@@ -19327,6 +19389,9 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
         }
       }
       if (dependsOnTracked2 && !isDestructuringTemp) {
+        if (instr.value.kind === "Identifier" && ctx.trackedVars.has(deSSAVarName(instr.value.name)) && !isDestructuringTemp) {
+          aliasVars.add(baseName2);
+        }
         const derivedExpr = lowerAssignedValue(true);
         if (ctx.nonReactiveScopeDepth && ctx.nonReactiveScopeDepth > 0) {
           return t2.variableDeclaration(normalizedDecl, [
@@ -19361,17 +19426,35 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
         t2.callExpression(t2.identifier(baseName2), [lowerAssignedValue(true)])
       );
     }
-    if (instr.value.kind === "Identifier" && !isDestructuringTemp) {
-      const source = deSSAVarName(instr.value.name);
-      if (ctx.trackedVars.has(source) && !declaredVars.has(baseName2)) {
-        return t2.variableDeclaration(declKind ?? "const", [
-          t2.variableDeclarator(t2.identifier(baseName2), t2.callExpression(t2.identifier(source), []))
-        ]);
-      }
-    }
     if (aliasVars.has(baseName2) && !declaredVars.has(baseName2)) {
       throw new Error(`Alias reassignment is not supported for "${baseName2}"`);
     }
+    if (dependsOnTracked2 && !declKind && !isDestructuringTemp && !isTracked && !isSignal && instr.value.kind === "Identifier" && ctx.trackedVars.has(deSSAVarName(instr.value.name))) {
+      const derivedExpr = lowerAssignedValue(true);
+      aliasVars.add(baseName2);
+      if (ctx.nonReactiveScopeDepth && ctx.nonReactiveScopeDepth > 0) {
+        return t2.expressionStatement(
+          t2.assignmentExpression("=", t2.identifier(baseName2), derivedExpr)
+        );
+      }
+      if (!isReactiveObjectCall) ctx.memoVars?.add(baseName2);
+      if (ctx.noMemo) {
+        return t2.expressionStatement(
+          t2.assignmentExpression(
+            "=",
+            t2.identifier(baseName2),
+            t2.arrowFunctionExpression([], derivedExpr)
+          )
+        );
+      }
+      return t2.expressionStatement(
+        t2.assignmentExpression(
+          "=",
+          t2.identifier(baseName2),
+          isMemoReturningCall ? derivedExpr : buildMemoCall(derivedExpr)
+        )
+      );
+    }
     if (declaredVars.has(baseName2)) {
       if (aliasVars.has(baseName2)) {
         throw new Error(`Alias reassignment is not supported for "${baseName2}"`);
@@ -19769,75 +19852,6 @@ function deSSAJSXChild(child, t2) {
   return child;
 }
 
-// src/utils.ts
-function isStateCall(node, t2) {
-  return t2.isCallExpression(node) && t2.isIdentifier(node.callee) && node.callee.name === "$state";
-}
-function isEffectCall(node, t2) {
-  return t2.isCallExpression(node) && t2.isIdentifier(node.callee) && node.callee.name === "$effect";
-}
-function getRootIdentifier(expr, t2) {
-  if (t2.isIdentifier(expr)) {
-    return expr;
-  }
-  if (t2.isMemberExpression(expr) && t2.isExpression(expr.object) && !t2.isOptionalMemberExpression(expr)) {
-    return getRootIdentifier(expr.object, t2);
-  }
-  if (t2.isOptionalMemberExpression(expr) && t2.isExpression(expr.object)) {
-    return getRootIdentifier(expr.object, t2);
-  }
-  if (t2.isCallExpression(expr) && t2.isExpression(expr.callee)) {
-    return getRootIdentifier(expr.callee, t2);
-  }
-  if (t2.isOptionalCallExpression(expr) && t2.isExpression(expr.callee)) {
-    return getRootIdentifier(expr.callee, t2);
-  }
-  if (t2.isTSAsExpression(expr) && t2.isExpression(expr.expression)) {
-    return getRootIdentifier(expr.expression, t2);
-  }
-  if (t2.isTSNonNullExpression(expr) && t2.isExpression(expr.expression)) {
-    return getRootIdentifier(expr.expression, t2);
-  }
-  return null;
-}
-
-// src/fine-grained-dom.ts
-function normalizeDependencyKey(name) {
-  return name.split(".").map((part) => part.replace(/_\d+$/, "")).join(".");
-}
-function applyRegionMetadata(state, options) {
-  if (!options.region) return;
-  const region = options.region;
-  state.regionMetadata = region;
-  if (region.dependencies.size > 0) {
-    state.identifierOverrides = state.identifierOverrides ?? {};
-    const dependencyGetter = options.dependencyGetter ?? null;
-    if (!dependencyGetter) {
-      return;
-    }
-    for (const dep of region.dependencies) {
-      const key = normalizeDependencyKey(dep);
-      state.identifierOverrides[key] = () => dependencyGetter(dep);
-      const base = key.split(".")[0];
-      if (base && !state.identifierOverrides[base]) {
-        state.identifierOverrides[base] = () => dependencyGetter(base);
-      }
-    }
-  }
-}
-function shouldMemoizeRegion(region) {
-  if (region.dependencies.size > 0) {
-    return true;
-  }
-  if (region.hasControlFlow) {
-    return true;
-  }
-  if (region.hasReactiveWrites) {
-    return true;
-  }
-  return false;
-}
-
 // src/ir/codegen.ts
 var HOOK_SLOT_BASE = 1e3;
 var HOOK_NAME_PREFIX = "use";
@@ -21995,6 +22009,8 @@ function getDependencyPathFromNode(node, t2) {
     if (node.computed) {
       if (t2.isStringLiteral(property) || t2.isNumericLiteral(property)) {
         propName = String(property.value);
+      } else {
+        return objectPath;
       }
     } else if (t2.isIdentifier(property)) {
       propName = property.name;
@@ -22111,10 +22127,12 @@ function replaceIdentifiersWithOverrides(node, overrides, t2, parentKind, parent
     return names;
   };
   if (!skipCurrentNode && (t2.isMemberExpression(node) || t2.isOptionalMemberExpression(node))) {
+    const propertyNode = node.property;
+    const isDynamicComputed = (node.computed ?? false) && !t2.isStringLiteral(propertyNode) && !t2.isNumericLiteral(propertyNode);
     const path = getDependencyPathFromNode(node, t2);
     const normalized = path ? normalizeDependencyKey2(path) : null;
     const override = normalized && overrides[normalized] || (path ? overrides[path] : void 0);
-    if (override && !isCallTarget) {
+    if (override && !isCallTarget && !isDynamicComputed) {
       const replacement = override();
       Object.assign(node, replacement);
       return;
@@ -23591,8 +23609,11 @@ function lowerHIRWithRegions(program, t2, options) {
   for (const stmt of originalBody) {
     if (t2.isVariableDeclaration(stmt)) {
       for (const decl of stmt.declarations) {
-        if (t2.isIdentifier(decl.id) && decl.init && t2.isCallExpression(decl.init) && t2.isIdentifier(decl.init.callee) && decl.init.callee.name === "$state") {
+        if (t2.isIdentifier(decl.id) && decl.init && t2.isCallExpression(decl.init) && t2.isIdentifier(decl.init.callee) && (decl.init.callee.name === "$state" || decl.init.callee.name === "$store")) {
           ctx.trackedVars.add(decl.id.name);
+          if (decl.init.callee.name === "$store") {
+            ctx.storeVars?.add(decl.id.name);
+          }
         }
       }
     }
@@ -24634,9 +24655,22 @@ function createHIREntrypointVisitor(t2, options) {
     Program: {
       exit(path) {
         const fileName = path.hub?.file?.opts?.filename || "<unknown>";
+        const isHookName2 = (name) => !!name && /^use[A-Z]/.test(name);
+        const getFunctionName = (fnPath) => {
+          return fnPath.isFunctionDeclaration() && fnPath.node.id ? fnPath.node.id.name : fnPath.isFunctionExpression() && fnPath.node.id ? fnPath.node.id.name : fnPath.parentPath.isVariableDeclarator() && t2.isIdentifier(fnPath.parentPath.node.id) && fnPath.parentPath.node.init === fnPath.node ? fnPath.parentPath.node.id.name : void 0;
+        };
+        const isComponentDefinition = (fnPath) => {
+          const name = getFunctionName(fnPath);
+          return name && isComponentName(name) || functionHasJSX(fnPath);
+        };
+        const isHookDefinition = (fnPath) => {
+          const name = getFunctionName(fnPath);
+          return isHookName2(name);
+        };
+        const isComponentOrHookDefinition = (fnPath) => isComponentDefinition(fnPath) || isHookDefinition(fnPath);
         const isComponentLike = (fnPath) => {
-          const name = fnPath.isFunctionDeclaration() && fnPath.node.id ? fnPath.node.id.name : fnPath.isFunctionExpression() && fnPath.node.id ? fnPath.node.id.name : fnPath.parentPath.isVariableDeclarator() && t2.isIdentifier(fnPath.parentPath.node.id) && fnPath.parentPath.node.init === fnPath.node ? fnPath.parentPath.node.id.name : void 0;
-          return name && isComponentName(name) || functionHasJSX(fnPath) || functionUsesStateLike(fnPath, t2);
+          const name = getFunctionName(fnPath);
+          return name && isComponentName(name) || isHookName2(name) || functionHasJSX(fnPath) || functionUsesStateLike(fnPath, t2);
         };
         const memoHasSideEffects = (fn) => {
           const checkNode = (node) => {
@@ -24763,6 +24797,12 @@ function createHIREntrypointVisitor(t2, options) {
                   "Destructuring $state is not supported. Use a simple identifier."
                 );
               }
+              const ownerComponent = varPath.getFunctionParent();
+              if (!ownerComponent || !isComponentOrHookDefinition(ownerComponent)) {
+                throw varPath.buildCodeFrameError(
+                  "$state() must be declared inside a component or hook function body"
+                );
+              }
               stateVars.add(varPath.node.id.name);
               if (isInsideLoop(varPath) || isInsideConditional(varPath)) {
                 throw varPath.buildCodeFrameError(
@@ -24809,6 +24849,12 @@ function createHIREntrypointVisitor(t2, options) {
           },
           CallExpression(callPath) {
             if (isStateCall(callPath.node, t2)) {
+              const ownerComponent = callPath.getFunctionParent();
+              if (!ownerComponent || !isComponentOrHookDefinition(ownerComponent)) {
+                throw callPath.buildCodeFrameError(
+                  "$state() must be declared inside a component or hook function body"
+                );
+              }
               if (isInsideLoop(callPath) || isInsideConditional(callPath)) {
                 throw callPath.buildCodeFrameError(
                   "$state() cannot be declared inside loops or conditionals"
@@ -24846,6 +24892,27 @@ function createHIREntrypointVisitor(t2, options) {
                 fileName
               );
             }
+            if (calleeId && isHookName2(calleeId)) {
+              const binding = callPath.scope.getBinding(calleeId);
+              const bindingPath = binding?.path;
+              const bindingIsHook = !bindingPath && isHookName2(calleeId) || bindingPath?.isImportSpecifier() || bindingPath?.isImportDefaultSpecifier() || bindingPath?.isFunctionDeclaration() && isHookDefinition(bindingPath) || bindingPath?.isVariableDeclarator() && (() => {
+                const init = bindingPath.get?.("init");
+                return init ? isHookDefinition(init) : false;
+              })();
+              if (bindingIsHook) {
+                const ownerFunction = callPath.getFunctionParent();
+                if (!ownerFunction || !isComponentOrHookDefinition(ownerFunction)) {
+                  throw callPath.buildCodeFrameError(
+                    `${calleeId}() must be called inside a component or hook (useX)`
+                  );
+                }
+                if (isInsideLoop(callPath) || isInsideConditional(callPath) || isInsideNestedFunction(callPath)) {
+                  throw callPath.buildCodeFrameError(
+                    `${calleeId}() must be called at the top level of a component or hook (no loops/conditions/nested functions)`
+                  );
+                }
+              }
+            }
             const allowedStateCallees = /* @__PURE__ */ new Set([
               "$effect",
               "$memo",
@@ -24880,6 +24947,68 @@ function createHIREntrypointVisitor(t2, options) {
             }
           }
         });
+        const aliasStack = [/* @__PURE__ */ new Set()];
+        const currentAliasSet = () => aliasStack[aliasStack.length - 1];
+        const rhsUsesState = (exprPath) => {
+          if (!exprPath) return false;
+          if (exprPath.isIdentifier() && t2.isIdentifier(exprPath.node) && stateVars.has(exprPath.node.name)) {
+            return true;
+          }
+          let usesState = false;
+          exprPath.traverse({
+            Identifier(idPath) {
+              if (stateVars.has(idPath.node.name)) {
+                usesState = true;
+                idPath.stop();
+              }
+            }
+          });
+          return usesState;
+        };
+        if (process.env.FICT_DEBUG_ALIAS) {
+          console.log("[fict] alias check state vars", Array.from(stateVars));
+        }
+        path.traverse({
+          Function: {
+            enter() {
+              aliasStack.push(/* @__PURE__ */ new Set());
+            },
+            exit() {
+              aliasStack.pop();
+            }
+          },
+          VariableDeclarator(varPath) {
+            const aliasSet = currentAliasSet();
+            if (aliasSet && t2.isIdentifier(varPath.node.id) && rhsUsesState(varPath.get("init"))) {
+              if (process.env.FICT_DEBUG_ALIAS) {
+                console.log("[fict] alias add from decl", varPath.node.id.name);
+              }
+              aliasSet.add(varPath.node.id.name);
+            }
+          },
+          AssignmentExpression(assignPath) {
+            const aliasSet = currentAliasSet();
+            if (!aliasSet) return;
+            if (!t2.isIdentifier(assignPath.node.left)) return;
+            const targetName = assignPath.node.left.name;
+            const rightPath = assignPath.get("right");
+            if (rhsUsesState(rightPath)) {
+              if (process.env.FICT_DEBUG_ALIAS) {
+                console.log("[fict] alias add from assign", targetName);
+              }
+              aliasSet.add(targetName);
+              return;
+            }
+            if (aliasSet.has(targetName)) {
+              if (process.env.FICT_DEBUG_ALIAS) {
+                console.log("[fict] alias reassignment detected", targetName);
+              }
+              throw assignPath.buildCodeFrameError(
+                `Alias reassignment is not supported for "${targetName}"`
+              );
+            }
+          }
+        });
         if (derivedVars.size > 0) {
           path.traverse({
             AssignmentExpression(assignPath) {
@@ -24918,7 +25047,9 @@ function createHIREntrypointVisitor(t2, options) {
         const lowered = lowerHIRWithRegions(hir, t2, options);
         path.node.body = lowered.program.body;
         path.node.directives = lowered.program.directives;
-        path.scope.crawl();
+        if (!process.env.FICT_SKIP_SCOPE_CRAWL) {
+          path.scope.crawl();
+        }
         stripMacroImports(path, t2);
       }
     }

package/dist/index.js

@@ -15979,6 +15979,75 @@ function debugEnabled(flag) {
   return parts.includes(normalized) || parts.includes("all");
 }
 
+// src/utils.ts
+function isStateCall(node, t2) {
+  return t2.isCallExpression(node) && t2.isIdentifier(node.callee) && node.callee.name === "$state";
+}
+function isEffectCall(node, t2) {
+  return t2.isCallExpression(node) && t2.isIdentifier(node.callee) && node.callee.name === "$effect";
+}
+function getRootIdentifier(expr, t2) {
+  if (t2.isIdentifier(expr)) {
+    return expr;
+  }
+  if (t2.isMemberExpression(expr) && t2.isExpression(expr.object) && !t2.isOptionalMemberExpression(expr)) {
+    return getRootIdentifier(expr.object, t2);
+  }
+  if (t2.isOptionalMemberExpression(expr) && t2.isExpression(expr.object)) {
+    return getRootIdentifier(expr.object, t2);
+  }
+  if (t2.isCallExpression(expr) && t2.isExpression(expr.callee)) {
+    return getRootIdentifier(expr.callee, t2);
+  }
+  if (t2.isOptionalCallExpression(expr) && t2.isExpression(expr.callee)) {
+    return getRootIdentifier(expr.callee, t2);
+  }
+  if (t2.isTSAsExpression(expr) && t2.isExpression(expr.expression)) {
+    return getRootIdentifier(expr.expression, t2);
+  }
+  if (t2.isTSNonNullExpression(expr) && t2.isExpression(expr.expression)) {
+    return getRootIdentifier(expr.expression, t2);
+  }
+  return null;
+}
+
+// src/fine-grained-dom.ts
+function normalizeDependencyKey(name) {
+  return name.split(".").map((part) => part.replace(/_\d+$/, "")).join(".");
+}
+function applyRegionMetadata(state, options) {
+  if (!options.region) return;
+  const region = options.region;
+  state.regionMetadata = region;
+  if (region.dependencies.size > 0) {
+    state.identifierOverrides = state.identifierOverrides ?? {};
+    const dependencyGetter = options.dependencyGetter ?? null;
+    if (!dependencyGetter) {
+      return;
+    }
+    for (const dep of region.dependencies) {
+      const key = normalizeDependencyKey(dep);
+      state.identifierOverrides[key] = () => dependencyGetter(dep);
+      const base = key.split(".")[0];
+      if (base && !state.identifierOverrides[base]) {
+        state.identifierOverrides[base] = () => dependencyGetter(base);
+      }
+    }
+  }
+}
+function shouldMemoizeRegion(region) {
+  if (region.dependencies.size > 0) {
+    return true;
+  }
+  if (region.hasControlFlow) {
+    return true;
+  }
+  if (region.hasReactiveWrites) {
+    return true;
+  }
+  return false;
+}
+
 // src/ir/ssa.ts
 function analyzeCFG(blocks) {
   const predecessors = computePredecessors(blocks);
@@ -16469,7 +16538,7 @@ function collectExprReads(expr, into, paths, bound = /* @__PURE__ */ new Set(),
       }
       return;
     case "CallExpression": {
-      const isMacroCallee = expr.callee.kind === "Identifier" && (expr.callee.name === "$state" || expr.callee.name === "$effect");
+      const isMacroCallee = expr.callee.kind === "Identifier" && (expr.callee.name === "$state" || expr.callee.name === "$effect" || expr.callee.name === "$store");
       if (!isMacroCallee) {
         collectExprReads(expr.callee, into, paths, bound);
       }
@@ -18837,6 +18906,7 @@ function wrapInMemo(region, t2, declaredVars, ctx, bodyStatementsOverride, outpu
   }
   const outputNames = outputNamesOverride ?? Array.from(region.declarations).map((name) => deSSAVarName(name));
   const uniqueOutputNames = [...new Set(outputNames)];
+  const bindableOutputs = uniqueOutputNames.filter((name) => !declaredVars.has(name));
   if (debugEnabled("region")) {
     console.log("Region memo", region.id, {
       instructions: region.instructions.map((instr) => instr.kind),
@@ -18893,10 +18963,10 @@ function wrapInMemo(region, t2, declaredVars, ctx, bodyStatementsOverride, outpu
       t2.variableDeclaration("const", [t2.variableDeclarator(t2.identifier(regionVarName), memoCall)])
     );
     const isAccessorOutput = (name) => ctx.signalVars?.has(name) || ctx.memoVars?.has(name) || ctx.aliasVars?.has(name) || ctx.storeVars?.has(name);
-    const getterOutputs = uniqueOutputNames.filter(
+    const getterOutputs = bindableOutputs.filter(
       (name) => ctx.trackedVars.has(name) && !isAccessorOutput(name)
     );
-    const directOutputs = uniqueOutputNames.filter((name) => !getterOutputs.includes(name));
+    const directOutputs = bindableOutputs.filter((name) => !getterOutputs.includes(name));
     if (debugEnabled("region")) {
       console.log("Region debug", {
         id: region.id,
@@ -19272,17 +19342,6 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
       const needsMutable = ctx.mutatedVars?.has(baseName2) ?? false;
       const isExternalAlias = declKind === "const" && instr.value.kind === "Identifier" && !(ctx.scopes?.byName?.has(deSSAVarName(instr.value.name)) ?? false);
       const fallbackDecl = !treatAsTracked && (!dependsOnTracked2 || isDestructuringTemp) ? declKind === "const" && (needsMutable || isExternalAlias) ? "let" : declKind : normalizedDecl;
-      const isAliasOfTracked = !isShadowDeclaration && instr.value.kind === "Identifier" && ctx.trackedVars.has(deSSAVarName(instr.value.name)) && !isDestructuringTemp;
-      if (isAliasOfTracked) {
-        declaredVars.add(baseName2);
-        const sourceIdent = instr.value;
-        return t2.variableDeclaration(fallbackDecl, [
-          t2.variableDeclarator(
-            t2.identifier(baseName2),
-            t2.callExpression(t2.identifier(deSSAVarName(sourceIdent.name)), [])
-          )
-        ]);
-      }
       declaredVars.add(baseName2);
       if (treatAsTracked && !isDestructuringTemp) {
         if (isStateCall2) {
@@ -19291,6 +19350,9 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
           ]);
         }
         if (dependsOnTracked2) {
+          if (instr.value.kind === "Identifier" && ctx.trackedVars.has(deSSAVarName(instr.value.name)) && !isDestructuringTemp) {
+            aliasVars.add(baseName2);
+          }
           const derivedExpr = lowerAssignedValue(true);
           if (ctx.nonReactiveScopeDepth && ctx.nonReactiveScopeDepth > 0) {
             return t2.variableDeclaration(normalizedDecl, [
@@ -19315,6 +19377,9 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
         }
       }
       if (dependsOnTracked2 && !isDestructuringTemp) {
+        if (instr.value.kind === "Identifier" && ctx.trackedVars.has(deSSAVarName(instr.value.name)) && !isDestructuringTemp) {
+          aliasVars.add(baseName2);
+        }
         const derivedExpr = lowerAssignedValue(true);
         if (ctx.nonReactiveScopeDepth && ctx.nonReactiveScopeDepth > 0) {
           return t2.variableDeclaration(normalizedDecl, [
@@ -19349,17 +19414,35 @@ function instructionToStatement(instr, t2, declaredVars, ctx, _buildMemoCall) {
         t2.callExpression(t2.identifier(baseName2), [lowerAssignedValue(true)])
       );
     }
-    if (instr.value.kind === "Identifier" && !isDestructuringTemp) {
-      const source = deSSAVarName(instr.value.name);
-      if (ctx.trackedVars.has(source) && !declaredVars.has(baseName2)) {
-        return t2.variableDeclaration(declKind ?? "const", [
-          t2.variableDeclarator(t2.identifier(baseName2), t2.callExpression(t2.identifier(source), []))
-        ]);
-      }
-    }
     if (aliasVars.has(baseName2) && !declaredVars.has(baseName2)) {
       throw new Error(`Alias reassignment is not supported for "${baseName2}"`);
     }
+    if (dependsOnTracked2 && !declKind && !isDestructuringTemp && !isTracked && !isSignal && instr.value.kind === "Identifier" && ctx.trackedVars.has(deSSAVarName(instr.value.name))) {
+      const derivedExpr = lowerAssignedValue(true);
+      aliasVars.add(baseName2);
+      if (ctx.nonReactiveScopeDepth && ctx.nonReactiveScopeDepth > 0) {
+        return t2.expressionStatement(
+          t2.assignmentExpression("=", t2.identifier(baseName2), derivedExpr)
+        );
+      }
+      if (!isReactiveObjectCall) ctx.memoVars?.add(baseName2);
+      if (ctx.noMemo) {
+        return t2.expressionStatement(
+          t2.assignmentExpression(
+            "=",
+            t2.identifier(baseName2),
+            t2.arrowFunctionExpression([], derivedExpr)
+          )
+        );
+      }
+      return t2.expressionStatement(
+        t2.assignmentExpression(
+          "=",
+          t2.identifier(baseName2),
+          isMemoReturningCall ? derivedExpr : buildMemoCall(derivedExpr)
+        )
+      );
+    }
     if (declaredVars.has(baseName2)) {
       if (aliasVars.has(baseName2)) {
         throw new Error(`Alias reassignment is not supported for "${baseName2}"`);
@@ -19757,75 +19840,6 @@ function deSSAJSXChild(child, t2) {
   return child;
 }
 
-// src/utils.ts
-function isStateCall(node, t2) {
-  return t2.isCallExpression(node) && t2.isIdentifier(node.callee) && node.callee.name === "$state";
-}
-function isEffectCall(node, t2) {
-  return t2.isCallExpression(node) && t2.isIdentifier(node.callee) && node.callee.name === "$effect";
-}
-function getRootIdentifier(expr, t2) {
-  if (t2.isIdentifier(expr)) {
-    return expr;
-  }
-  if (t2.isMemberExpression(expr) && t2.isExpression(expr.object) && !t2.isOptionalMemberExpression(expr)) {
-    return getRootIdentifier(expr.object, t2);
-  }
-  if (t2.isOptionalMemberExpression(expr) && t2.isExpression(expr.object)) {
-    return getRootIdentifier(expr.object, t2);
-  }
-  if (t2.isCallExpression(expr) && t2.isExpression(expr.callee)) {
-    return getRootIdentifier(expr.callee, t2);
-  }
-  if (t2.isOptionalCallExpression(expr) && t2.isExpression(expr.callee)) {
-    return getRootIdentifier(expr.callee, t2);
-  }
-  if (t2.isTSAsExpression(expr) && t2.isExpression(expr.expression)) {
-    return getRootIdentifier(expr.expression, t2);
-  }
-  if (t2.isTSNonNullExpression(expr) && t2.isExpression(expr.expression)) {
-    return getRootIdentifier(expr.expression, t2);
-  }
-  return null;
-}
-
-// src/fine-grained-dom.ts
-function normalizeDependencyKey(name) {
-  return name.split(".").map((part) => part.replace(/_\d+$/, "")).join(".");
-}
-function applyRegionMetadata(state, options) {
-  if (!options.region) return;
-  const region = options.region;
-  state.regionMetadata = region;
-  if (region.dependencies.size > 0) {
-    state.identifierOverrides = state.identifierOverrides ?? {};
-    const dependencyGetter = options.dependencyGetter ?? null;
-    if (!dependencyGetter) {
-      return;
-    }
-    for (const dep of region.dependencies) {
-      const key = normalizeDependencyKey(dep);
-      state.identifierOverrides[key] = () => dependencyGetter(dep);
-      const base = key.split(".")[0];
-      if (base && !state.identifierOverrides[base]) {
-        state.identifierOverrides[base] = () => dependencyGetter(base);
-      }
-    }
-  }
-}
-function shouldMemoizeRegion(region) {
-  if (region.dependencies.size > 0) {
-    return true;
-  }
-  if (region.hasControlFlow) {
-    return true;
-  }
-  if (region.hasReactiveWrites) {
-    return true;
-  }
-  return false;
-}
-
 // src/ir/codegen.ts
 var HOOK_SLOT_BASE = 1e3;
 var HOOK_NAME_PREFIX = "use";
@@ -21983,6 +21997,8 @@ function getDependencyPathFromNode(node, t2) {
     if (node.computed) {
       if (t2.isStringLiteral(property) || t2.isNumericLiteral(property)) {
         propName = String(property.value);
+      } else {
+        return objectPath;
       }
     } else if (t2.isIdentifier(property)) {
       propName = property.name;
@@ -22099,10 +22115,12 @@ function replaceIdentifiersWithOverrides(node, overrides, t2, parentKind, parent
     return names;
   };
   if (!skipCurrentNode && (t2.isMemberExpression(node) || t2.isOptionalMemberExpression(node))) {
+    const propertyNode = node.property;
+    const isDynamicComputed = (node.computed ?? false) && !t2.isStringLiteral(propertyNode) && !t2.isNumericLiteral(propertyNode);
     const path = getDependencyPathFromNode(node, t2);
     const normalized = path ? normalizeDependencyKey2(path) : null;
     const override = normalized && overrides[normalized] || (path ? overrides[path] : void 0);
-    if (override && !isCallTarget) {
+    if (override && !isCallTarget && !isDynamicComputed) {
       const replacement = override();
       Object.assign(node, replacement);
       return;
@@ -23579,8 +23597,11 @@ function lowerHIRWithRegions(program, t2, options) {
   for (const stmt of originalBody) {
     if (t2.isVariableDeclaration(stmt)) {
       for (const decl of stmt.declarations) {
-        if (t2.isIdentifier(decl.id) && decl.init && t2.isCallExpression(decl.init) && t2.isIdentifier(decl.init.callee) && decl.init.callee.name === "$state") {
+        if (t2.isIdentifier(decl.id) && decl.init && t2.isCallExpression(decl.init) && t2.isIdentifier(decl.init.callee) && (decl.init.callee.name === "$state" || decl.init.callee.name === "$store")) {
           ctx.trackedVars.add(decl.id.name);
+          if (decl.init.callee.name === "$store") {
+            ctx.storeVars?.add(decl.id.name);
+          }
         }
       }
     }
@@ -24622,9 +24643,22 @@ function createHIREntrypointVisitor(t2, options) {
     Program: {
       exit(path) {
         const fileName = path.hub?.file?.opts?.filename || "<unknown>";
+        const isHookName2 = (name) => !!name && /^use[A-Z]/.test(name);
+        const getFunctionName = (fnPath) => {
+          return fnPath.isFunctionDeclaration() && fnPath.node.id ? fnPath.node.id.name : fnPath.isFunctionExpression() && fnPath.node.id ? fnPath.node.id.name : fnPath.parentPath.isVariableDeclarator() && t2.isIdentifier(fnPath.parentPath.node.id) && fnPath.parentPath.node.init === fnPath.node ? fnPath.parentPath.node.id.name : void 0;
+        };
+        const isComponentDefinition = (fnPath) => {
+          const name = getFunctionName(fnPath);
+          return name && isComponentName(name) || functionHasJSX(fnPath);
+        };
+        const isHookDefinition = (fnPath) => {
+          const name = getFunctionName(fnPath);
+          return isHookName2(name);
+        };
+        const isComponentOrHookDefinition = (fnPath) => isComponentDefinition(fnPath) || isHookDefinition(fnPath);
         const isComponentLike = (fnPath) => {
-          const name = fnPath.isFunctionDeclaration() && fnPath.node.id ? fnPath.node.id.name : fnPath.isFunctionExpression() && fnPath.node.id ? fnPath.node.id.name : fnPath.parentPath.isVariableDeclarator() && t2.isIdentifier(fnPath.parentPath.node.id) && fnPath.parentPath.node.init === fnPath.node ? fnPath.parentPath.node.id.name : void 0;
-          return name && isComponentName(name) || functionHasJSX(fnPath) || functionUsesStateLike(fnPath, t2);
+          const name = getFunctionName(fnPath);
+          return name && isComponentName(name) || isHookName2(name) || functionHasJSX(fnPath) || functionUsesStateLike(fnPath, t2);
         };
         const memoHasSideEffects = (fn) => {
           const checkNode = (node) => {
@@ -24751,6 +24785,12 @@ function createHIREntrypointVisitor(t2, options) {
                   "Destructuring $state is not supported. Use a simple identifier."
                 );
               }
+              const ownerComponent = varPath.getFunctionParent();
+              if (!ownerComponent || !isComponentOrHookDefinition(ownerComponent)) {
+                throw varPath.buildCodeFrameError(
+                  "$state() must be declared inside a component or hook function body"
+                );
+              }
               stateVars.add(varPath.node.id.name);
               if (isInsideLoop(varPath) || isInsideConditional(varPath)) {
                 throw varPath.buildCodeFrameError(
@@ -24797,6 +24837,12 @@ function createHIREntrypointVisitor(t2, options) {
           },
           CallExpression(callPath) {
             if (isStateCall(callPath.node, t2)) {
+              const ownerComponent = callPath.getFunctionParent();
+              if (!ownerComponent || !isComponentOrHookDefinition(ownerComponent)) {
+                throw callPath.buildCodeFrameError(
+                  "$state() must be declared inside a component or hook function body"
+                );
+              }
               if (isInsideLoop(callPath) || isInsideConditional(callPath)) {
                 throw callPath.buildCodeFrameError(
                   "$state() cannot be declared inside loops or conditionals"
@@ -24834,6 +24880,27 @@ function createHIREntrypointVisitor(t2, options) {
                 fileName
               );
             }
+            if (calleeId && isHookName2(calleeId)) {
+              const binding = callPath.scope.getBinding(calleeId);
+              const bindingPath = binding?.path;
+              const bindingIsHook = !bindingPath && isHookName2(calleeId) || bindingPath?.isImportSpecifier() || bindingPath?.isImportDefaultSpecifier() || bindingPath?.isFunctionDeclaration() && isHookDefinition(bindingPath) || bindingPath?.isVariableDeclarator() && (() => {
+                const init = bindingPath.get?.("init");
+                return init ? isHookDefinition(init) : false;
+              })();
+              if (bindingIsHook) {
+                const ownerFunction = callPath.getFunctionParent();
+                if (!ownerFunction || !isComponentOrHookDefinition(ownerFunction)) {
+                  throw callPath.buildCodeFrameError(
+                    `${calleeId}() must be called inside a component or hook (useX)`
+                  );
+                }
+                if (isInsideLoop(callPath) || isInsideConditional(callPath) || isInsideNestedFunction(callPath)) {
+                  throw callPath.buildCodeFrameError(
+                    `${calleeId}() must be called at the top level of a component or hook (no loops/conditions/nested functions)`
+                  );
+                }
+              }
+            }
             const allowedStateCallees = /* @__PURE__ */ new Set([
               "$effect",
               "$memo",
@@ -24868,6 +24935,68 @@ function createHIREntrypointVisitor(t2, options) {
             }
           }
         });
+        const aliasStack = [/* @__PURE__ */ new Set()];
+        const currentAliasSet = () => aliasStack[aliasStack.length - 1];
+        const rhsUsesState = (exprPath) => {
+          if (!exprPath) return false;
+          if (exprPath.isIdentifier() && t2.isIdentifier(exprPath.node) && stateVars.has(exprPath.node.name)) {
+            return true;
+          }
+          let usesState = false;
+          exprPath.traverse({
+            Identifier(idPath) {
+              if (stateVars.has(idPath.node.name)) {
+                usesState = true;
+                idPath.stop();
+              }
+            }
+          });
+          return usesState;
+        };
+        if (process.env.FICT_DEBUG_ALIAS) {
+          console.log("[fict] alias check state vars", Array.from(stateVars));
+        }
+        path.traverse({
+          Function: {
+            enter() {
+              aliasStack.push(/* @__PURE__ */ new Set());
+            },
+            exit() {
+              aliasStack.pop();
+            }
+          },
+          VariableDeclarator(varPath) {
+            const aliasSet = currentAliasSet();
+            if (aliasSet && t2.isIdentifier(varPath.node.id) && rhsUsesState(varPath.get("init"))) {
+              if (process.env.FICT_DEBUG_ALIAS) {
+                console.log("[fict] alias add from decl", varPath.node.id.name);
+              }
+              aliasSet.add(varPath.node.id.name);
+            }
+          },
+          AssignmentExpression(assignPath) {
+            const aliasSet = currentAliasSet();
+            if (!aliasSet) return;
+            if (!t2.isIdentifier(assignPath.node.left)) return;
+            const targetName = assignPath.node.left.name;
+            const rightPath = assignPath.get("right");
+            if (rhsUsesState(rightPath)) {
+              if (process.env.FICT_DEBUG_ALIAS) {
+                console.log("[fict] alias add from assign", targetName);
+              }
+              aliasSet.add(targetName);
+              return;
+            }
+            if (aliasSet.has(targetName)) {
+              if (process.env.FICT_DEBUG_ALIAS) {
+                console.log("[fict] alias reassignment detected", targetName);
+              }
+              throw assignPath.buildCodeFrameError(
+                `Alias reassignment is not supported for "${targetName}"`
+              );
+            }
+          }
+        });
         if (derivedVars.size > 0) {
           path.traverse({
             AssignmentExpression(assignPath) {
@@ -24906,7 +25035,9 @@ function createHIREntrypointVisitor(t2, options) {
         const lowered = lowerHIRWithRegions(hir, t2, options);
         path.node.body = lowered.program.body;
         path.node.directives = lowered.program.directives;
-        path.scope.crawl();
+        if (!process.env.FICT_SKIP_SCOPE_CRAWL) {
+          path.scope.crawl();
+        }
         stripMacroImports(path, t2);
       }
     }

package/package.json

@@ -1,9 +1,15 @@
 {
   "name": "@fictjs/compiler",
-  "version": "0.0.5",
+  "version": "0.0.8",
   "description": "Babel plugin for Fict Compiler",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/fictjs/fict.git",
+    "directory": "packages/compiler"
   },
   "type": "module",
   "main": "dist/index.cjs",
@@ -38,7 +44,7 @@
     "@types/babel__helper-plugin-utils": "^7.10.3",
     "@types/babel__traverse": "^7.28.0",
     "tsup": "^8.5.1",
-    "@fictjs/runtime": "0.0.5"
+    "@fictjs/runtime": "0.0.8"
   },
   "scripts": {
     "build": "tsup src/index.ts --format cjs,esm --dts",