sinwan-compiler 0.2.3 → 0.2.5

package/dist/{chunk-w580fdrf.js → chunk-m4rk009c.js}

@@ -46,7 +46,7 @@ function isBuiltinReactiveProp(componentName, attrName) {
 function isBuiltinControlFlowComponent(componentName) {
   return !!componentName && BUILTIN_REACTIVE_PROPS.has(componentName);
 }
-function trackReactiveImports(ast) {
+function trackReactiveImports2(ast) {
   const names = {
     createMutable: new Set,
     createStore: new Set,
@@ -57,13 +57,13 @@ function trackReactiveImports(ast) {
     cc: new Set
   };
   traverse(ast, {
-    ImportDeclaration(path2) {
-      const source = path2.node.source.value;
+    ImportDeclaration(path) {
+      const source = path.node.source.value;
       const reactiveAllowed = REACTIVE_SOURCE_MODULES[source];
       const componentAllowed = COMPONENT_FACTORY_MODULES[source];
       if (!reactiveAllowed && !componentAllowed)
         return;
-      for (const spec of path2.node.specifiers) {
+      for (const spec of path.node.specifiers) {
         if (!t.isImportSpecifier(spec))
           continue;
         const imported = t.isIdentifier(spec.imported) ? spec.imported.name : spec.imported.value;
@@ -127,8 +127,8 @@ function isUseFetchCall(expr, names) {
   }
   return false;
 }
-function trackLocalScopeBindings(path2, names, scope) {
-  path2.traverse({
+function trackLocalScopeBindings(path, names, scope) {
+  path.traverse({
     VariableDeclarator(p) {
       const id = p.node.id;
       const init = p.node.init;
@@ -174,7 +174,7 @@ function trackLocalScopeBindings(path2, names, scope) {
       }
     }
   });
-  path2.traverse({
+  path.traverse({
     VariableDeclarator(p) {
       const id = p.node.id;
       const init = p.node.init;
@@ -200,7 +200,7 @@ function trackLocalScopeBindings(path2, names, scope) {
       }
     }
   });
-  path2.traverse({
+  path.traverse({
     "FunctionDeclaration|VariableDeclarator"(p) {
       const node = p.node;
       let fn = null;
@@ -242,7 +242,7 @@ function trackPropBindings(scope, params, reactiveProps) {
     }
   }
 }
-function getAllPropNames(params) {
+function getAllPropNames2(params) {
   if (!params)
     return new Set;
   if (t.isIdentifier(params))
@@ -269,9 +269,10 @@ function resolveLocalObjectLiteral(fn, name) {
     for (const decl of stmt.declarations) {
       if (!t.isIdentifier(decl.id) || decl.id.name !== name)
         continue;
-      if (decl.init && t.isObjectExpression(decl.init)) {
-        return decl.init;
-      }
+      const init = decl.init;
+      if (!t.isObjectExpression(init))
+        continue;
+      return init;
     }
   }
   return null;
@@ -281,7 +282,7 @@ function analyzeObjectLiteralSpread(spread, fullScope, calleeReactive) {
     if (t.isObjectProperty(prop) && !prop.computed) {
       const key = prop.key;
       const name = t.isIdentifier(key) ? key.name : t.isStringLiteral(key) ? key.value : null;
-      if (name && containsReactiveValue(prop.value, fullScope)) {
+      if (name && containsReactiveValue2(prop.value, fullScope)) {
         calleeReactive.add(name);
       }
     }
@@ -291,7 +292,7 @@ function isMemberLike(node) {
   return t.isMemberExpression(node) || t.isOptionalMemberExpression(node);
 }
 function getMemberExpressionRootAndPath(node) {
-  const path2 = [];
+  const path = [];
   let current = node;
   while (true) {
     if (t.isTSNonNullExpression(current)) {
@@ -303,14 +304,14 @@ function getMemberExpressionRootAndPath(node) {
         return null;
       if (!t.isIdentifier(current.property))
         return null;
-      path2.push(current.property.name);
+      path.push(current.property.name);
       current = current.object;
       continue;
     }
     break;
   }
   if (t.isIdentifier(current)) {
-    return { root: current.name, path: path2.reverse() };
+    return { root: current.name, path: path.reverse() };
   }
   return null;
 }
@@ -319,13 +320,13 @@ function isReactiveRead(node, scope) {
     return isReactiveRead(node.expression, scope);
   }
   if (t.isIdentifier(node)) {
-    const binding2 = scope.bindings.get(node.name);
-    if (!binding2)
+    const binding = scope.bindings.get(node.name);
+    if (!binding)
       return false;
-    if (binding2.kind === "prop") {
+    if (binding.kind === "prop") {
       return true;
     }
-    if (binding2.kind === "mutable" && binding2.path.length > 0) {
+    if (binding.kind === "mutable" && binding.path.length > 0) {
       return true;
     }
     return false;
@@ -359,15 +360,15 @@ function isGetterCall(node, scope) {
   const binding = scope.bindings.get(callee.name);
   return binding?.kind === "getter";
 }
-function isReactiveValue(node, scope) {
+function isReactiveValue2(node, scope) {
   if (t.isTSNonNullExpression(node)) {
-    return isReactiveValue(node.expression, scope);
+    return isReactiveValue2(node.expression, scope);
   }
   if (t.isIdentifier(node)) {
-    const binding2 = scope.bindings.get(node.name);
-    if (!binding2)
+    const binding = scope.bindings.get(node.name);
+    if (!binding)
       return false;
-    return binding2.kind === "prop" || binding2.kind === "signal" || binding2.kind === "computed" || binding2.kind === "mutable";
+    return binding.kind === "prop" || binding.kind === "signal" || binding.kind === "computed" || binding.kind === "mutable";
   }
   if (!isMemberLike(node))
     return false;
@@ -388,7 +389,7 @@ function isReactiveValue(node, scope) {
   }
   return false;
 }
-function containsReactiveValue(expr, scope) {
+function containsReactiveValue2(expr, scope) {
   let found = false;
   function visit(node) {
     if (found)
@@ -396,7 +397,7 @@ function containsReactiveValue(expr, scope) {
     if (!node || typeof node !== "object")
       return;
     if (isMemberLike(node) || t.isTSNonNullExpression(node) || t.isIdentifier(node)) {
-      if (isReactiveValue(node, scope)) {
+      if (isReactiveValue2(node, scope)) {
         found = true;
         return;
       }
@@ -503,24 +504,21 @@ function getComponentExpressionInfo(exprPath) {
   }
   return { isComponent: true, componentName, attributeName };
 }
-function isReactiveComponentProp(info, componentNames, reactiveProps, importedReactiveProps) {
-  if (!info.isComponent || !info.componentName || !info.attributeName) {
-    return false;
-  }
-  if (isBuiltinReactiveProp(info.componentName, info.attributeName)) {
+function isReactiveComponentProp(componentName, attributeName, componentNames, reactiveProps, importedReactiveProps) {
+  if (isBuiltinReactiveProp(componentName, attributeName)) {
     return true;
   }
-  const componentFn = componentNames.get(info.componentName);
+  const componentFn = componentNames.get(componentName);
   if (componentFn) {
     const props = reactiveProps.get(componentFn);
     if (!props)
       return false;
-    return props.has(info.attributeName);
+    return props.has(attributeName);
   }
-  const importedProps = importedReactiveProps.get(info.componentName);
+  const importedProps = importedReactiveProps.get(componentName);
   if (!importedProps)
     return false;
-  return importedProps.has(info.attributeName);
+  return importedProps.has(attributeName);
 }
 function shouldWrap(expr, scope) {
   if (t.isArrowFunctionExpression(expr) || t.isFunctionExpression(expr))
@@ -615,43 +613,34 @@ function createBindingDescriptor(expr, exprPath, options) {
   }
   return t.callExpression(t.identifier("_$bindText"), [wrapExpression(expr)]);
 }
-function collectComponentFunctions(ast, ccNames) {
+function collectComponentFunctions2(ast, ccNames) {
   const functions = new Set;
   const names = new Map;
   const exported = new Set;
   if (ccNames.size === 0)
     return { functions, names, exported };
   traverse(ast, {
-    CallExpression(path2) {
-      const callee = path2.node.callee;
+    CallExpression(path) {
+      const callee = path.node.callee;
       if (!t.isIdentifier(callee) || !ccNames.has(callee.name))
         return;
-      const firstArg = path2.node.arguments[0];
+      const firstArg = path.node.arguments[0];
       if (!firstArg || !t.isFunction(firstArg))
         return;
       const componentFn = firstArg;
       functions.add(componentFn);
-      const parent = path2.parentPath;
+      const parent = path.parentPath;
       if (parent && parent.isVariableDeclarator && parent.isVariableDeclarator()) {
         const id = parent.node.id;
         if (t.isIdentifier(id)) {
           names.set(id.name, componentFn);
         }
-      } else if (parent && parent.isExportNamedDeclaration && parent.isExportNamedDeclaration()) {
-        const declaration = parent.node.declaration;
-        if (t.isVariableDeclaration(declaration)) {
-          for (const decl of declaration.declarations) {
-            if (t.isIdentifier(decl.id)) {
-              names.set(decl.id.name, componentFn);
-            }
-          }
-        }
       }
     }
   });
   traverse(ast, {
-    ExportNamedDeclaration(path2) {
-      const declaration = path2.node.declaration;
+    ExportNamedDeclaration(path) {
+      const declaration = path.node.declaration;
       if (!t.isVariableDeclaration(declaration))
         return;
       for (const decl of declaration.declarations) {
@@ -667,8 +656,8 @@ function collectComponentFunctions(ast, ccNames) {
         exported.add(firstArg);
       }
     },
-    ExportDefaultDeclaration(path2) {
-      const decl = path2.node.declaration;
+    ExportDefaultDeclaration(path) {
+      const decl = path.node.declaration;
       if (t.isIdentifier(decl)) {
         const componentFn = names.get(decl.name);
         if (componentFn) {
@@ -687,36 +676,36 @@ function collectComponentFunctions(ast, ccNames) {
   });
   return { functions, names, exported };
 }
-function computeLocalScopes(ast, names) {
+function computeLocalScopes2(ast, names) {
   const scopes = new Map;
   traverse(ast, {
-    Function(path2) {
+    Function(path) {
       const scope = { bindings: new Map };
-      trackLocalScopeBindings(path2, names, scope);
-      scopes.set(path2.node, scope);
+      trackLocalScopeBindings(path, names, scope);
+      scopes.set(path.node, scope);
     }
   });
   return scopes;
 }
-function collectComponentCallGraph(ast, componentNames) {
+function collectComponentCallGraph2(ast, componentNames) {
   const callGraph = new Map;
   if (componentNames.size === 0)
     return callGraph;
   traverse(ast, {
-    JSXElement(path2) {
-      const name = path2.node.openingElement.name;
+    JSXElement(path) {
+      const name = path.node.openingElement.name;
       if (!t.isJSXIdentifier(name))
         return;
       const callee = componentNames.get(name.name);
       if (!callee)
         return;
-      const callerPath = path2.findParent((p) => p.isFunction());
+      const callerPath = path.findParent((p) => p.isFunction());
       const callerFn = callerPath ? callerPath.node : null;
       if (!callerFn)
         return;
       const props = [];
       const spreads = [];
-      for (const attr of path2.node.openingElement.attributes) {
+      for (const attr of path.node.openingElement.attributes) {
         if (t.isJSXSpreadAttribute(attr)) {
           if (attr.argument) {
             spreads.push(attr.argument);
@@ -736,7 +725,7 @@ function collectComponentCallGraph(ast, componentNames) {
         }
       }
       const childExprs = [];
-      for (const child of path2.node.children) {
+      for (const child of path.node.children) {
         if (t.isJSXExpressionContainer(child)) {
           const expr = child.expression;
           if (!expr || t.isJSXEmptyExpression(expr))
@@ -756,7 +745,7 @@ function collectComponentCallGraph(ast, componentNames) {
   });
   return callGraph;
 }
-function buildFullScope(localScopes, fn, reactiveProps) {
+function buildFullScope2(localScopes, fn, reactiveProps) {
   const localScope = localScopes.get(fn);
   if (!localScope)
     return null;
@@ -764,7 +753,7 @@ function buildFullScope(localScopes, fn, reactiveProps) {
   trackPropBindings(fullScope, fn.params[0], reactiveProps);
   return fullScope;
 }
-function propagateReactiveProps(localScopes, callGraph, componentFunctions) {
+function propagateReactiveProps2(localScopes, callGraph, componentFunctions) {
   const reactiveProps = new Map;
   for (const [callerFn, sites] of callGraph) {
     const localScope = localScopes.get(callerFn);
@@ -773,7 +762,7 @@ function propagateReactiveProps(localScopes, callGraph, componentFunctions) {
     for (const site of sites) {
       const calleeReactive = reactiveProps.get(site.callee) ?? new Set;
       for (const prop of site.props) {
-        if (containsReactiveValue(prop.value, localScope)) {
+        if (containsReactiveValue2(prop.value, localScope)) {
           calleeReactive.add(prop.name);
         }
       }
@@ -785,7 +774,7 @@ function propagateReactiveProps(localScopes, callGraph, componentFunctions) {
     const callerFn = worklist.values().next().value;
     worklist.delete(callerFn);
     const callerReactive = reactiveProps.get(callerFn) ?? new Set;
-    const fullScope = buildFullScope(localScopes, callerFn, callerReactive);
+    const fullScope = buildFullScope2(localScopes, callerFn, callerReactive);
     if (!fullScope)
       continue;
     const sites = callGraph.get(callerFn) ?? [];
@@ -793,7 +782,7 @@ function propagateReactiveProps(localScopes, callGraph, componentFunctions) {
       const calleeReactive = reactiveProps.get(site.callee) ?? new Set;
       const initialSize = calleeReactive.size;
       for (const prop of site.props) {
-        if (containsReactiveValue(prop.value, fullScope)) {
+        if (containsReactiveValue2(prop.value, fullScope)) {
           calleeReactive.add(prop.name);
         }
       }
@@ -802,7 +791,7 @@ function propagateReactiveProps(localScopes, callGraph, componentFunctions) {
         if (resolved) {
           analyzeObjectLiteralSpread(resolved, fullScope, calleeReactive);
         } else {
-          const allCalleeProps = getAllPropNames(site.callee.params[0]);
+          const allCalleeProps = getAllPropNames2(site.callee.params[0]);
           for (const propName of allCalleeProps) {
             calleeReactive.add(propName);
           }
@@ -816,13 +805,13 @@ function propagateReactiveProps(localScopes, callGraph, componentFunctions) {
   }
   return reactiveProps;
 }
-function wrapReactiveExpressions(ast, options = {}) {
+function wrapReactiveExpressions2(ast, options = {}) {
   let metadata = null;
   if (options.analyzeMetadata) {
     metadata = options.analyzeMetadata;
   } else if (options.analyze && options.filename) {
     try {
-      metadata = loadMetadata(options.analyze);
+      metadata = loadMetadata2(options.analyze);
     } catch {
       metadata = null;
     }
@@ -906,15 +895,6 @@ function wrapReactiveExpressions(ast, options = {}) {
         if (t.isIdentifier(id)) {
           componentNames.set(id.name, componentFn);
         }
-      } else if (parent && parent.isExportNamedDeclaration && parent.isExportNamedDeclaration()) {
-        const declaration = parent.node.declaration;
-        if (t.isVariableDeclaration(declaration)) {
-          for (const decl of declaration.declarations) {
-            if (t.isIdentifier(decl.id)) {
-              componentNames.set(decl.id.name, componentFn);
-            }
-          }
-        }
       }
     },
     ExportNamedDeclaration(p) {
@@ -1028,48 +1008,48 @@ function wrapReactiveExpressions(ast, options = {}) {
   const hasAnyImport = Object.values(names).some((s) => s.size > 0);
   if (!hasAnyImport)
     return;
-  const reactiveProps = propagateReactiveProps(localScopes, callGraph, componentFunctions);
+  const reactiveProps = propagateReactiveProps2(localScopes, callGraph, componentFunctions);
   let needsResolve = false;
   traverse(ast, {
-    Function(path2) {
-      const scope = localScopes.get(path2.node);
+    Function(path) {
+      const scope = localScopes.get(path.node);
       if (!scope)
         return;
-      const isComponent = componentFunctions.has(path2.node);
+      const isComponent = componentFunctions.has(path.node);
       if (isComponent) {
-        const isExported = exported.has(path2.node);
+        const isExported = exported.has(path.node);
         if (isExported) {
           let props = null;
           if (metadata && absoluteFilename) {
             const fileProps = metadata.get(absoluteFilename);
-            const exportName = exportNameByFn.get(path2.node);
+            const exportName = exportNameByFn.get(path.node);
             if (fileProps && exportName) {
               props = fileProps.get(exportName) ?? null;
             }
           }
           if (props) {
-            trackPropBindings(scope, path2.node.params[0], props);
+            trackPropBindings(scope, path.node.params[0], props);
           } else {
-            const allProps = getAllPropNames(path2.node.params[0]);
-            trackPropBindings(scope, path2.node.params[0], allProps);
+            const allProps = getAllPropNames2(path.node.params[0]);
+            trackPropBindings(scope, path.node.params[0], allProps);
           }
-        } else if (reactiveProps.has(path2.node)) {
-          const props = reactiveProps.get(path2.node);
-          trackPropBindings(scope, path2.node.params[0], props);
+        } else if (reactiveProps.has(path.node)) {
+          const props = reactiveProps.get(path.node);
+          trackPropBindings(scope, path.node.params[0], props);
         } else {
-          const allProps = getAllPropNames(path2.node.params[0]);
-          trackPropBindings(scope, path2.node.params[0], allProps);
+          const allProps = getAllPropNames2(path.node.params[0]);
+          trackPropBindings(scope, path.node.params[0], allProps);
         }
       }
       if (scope.bindings.size === 0)
         return;
-      path2.traverse({
+      path.traverse({
         JSXExpressionContainer(exprPath) {
           const expr = exprPath.node.expression;
           const compInfo = getComponentExpressionInfo(exprPath);
           if (compInfo.isComponent) {
             if (compInfo.attributeName !== null) {
-              if (!isReactiveComponentProp(compInfo, componentNames, reactiveProps, importedReactiveProps)) {
+              if (!compInfo.componentName || !isReactiveComponentProp(compInfo.componentName, compInfo.attributeName, componentNames, reactiveProps, importedReactiveProps)) {
                 return;
               }
             } else {
@@ -1126,11 +1106,9 @@ function containsJsx(node, enterFunctions) {
       continue;
     const val = node[key];
     if (Array.isArray(val)) {
-      for (const item of val) {
-        if (item && typeof item === "object" && containsJsx(item, enterFunctions)) {
-          return true;
-        }
-      }
+      const foundInArray = val.some((item) => Boolean(item) && typeof item === "object" && containsJsx(item, enterFunctions));
+      if (foundInArray)
+        return true;
     } else if (val && typeof val === "object" && containsJsx(val, enterFunctions)) {
       return true;
     }
@@ -1167,11 +1145,11 @@ function isComponentArity(fn) {
 function collectCcAliases(ast) {
   const aliases = new Set;
   traverse2(ast, {
-    ImportDeclaration(path2) {
-      const source = path2.node.source.value;
+    ImportDeclaration(path) {
+      const source = path.node.source.value;
       if (!CC_SOURCE_MODULES.has(source))
         return;
-      for (const spec of path2.node.specifiers) {
+      for (const spec of path.node.specifiers) {
         if (!t2.isImportSpecifier(spec))
           continue;
         const imported = t2.isIdentifier(spec.imported) ? spec.imported.name : spec.imported.value;
@@ -1186,44 +1164,40 @@ function collectCcAliases(ast) {
 function ccCall(arg, ccName) {
   return t2.callExpression(t2.identifier(ccName), [arg]);
 }
-function autoWrapComponents(ast, filename) {
+function autoWrapComponents2(ast, filename) {
   const { aliases, alreadyImported } = collectCcAliases(ast);
   const ccName = aliases.values().next().value;
   let changed = false;
   const wrapIfCandidate = (fnPath, name) => {
     if (name !== null && !isComponentName(name))
-      return "not-candidate";
+      return false;
     const fn = fnPath.node;
     if (!isComponentArity(fn))
-      return "not-candidate";
+      return false;
     if (!functionReturnsJsx(fnPath))
-      return "not-candidate";
-    return "wrapped";
+      return false;
+    return true;
   };
   traverse2(ast, {
-    ExportNamedDeclaration(path2) {
-      const decl = path2.node.declaration;
+    ExportNamedDeclaration(path) {
+      const decl = path.node.declaration;
       if (!decl)
         return;
       if (t2.isFunctionDeclaration(decl) && decl.id) {
         const name = decl.id.name;
-        if (!isComponentName(name))
-          return;
-        const fnPath = path2.get("declaration");
-        if (!isComponentArity(decl))
-          return;
-        if (!functionReturnsJsx(fnPath))
+        const fnPath = path.get("declaration");
+        if (!wrapIfCandidate(fnPath, name))
           return;
         const fnExpr = t2.functionExpression(decl.id, decl.params, decl.body, decl.generator, decl.async);
         const varDecl = t2.variableDeclaration("const", [
           t2.variableDeclarator(t2.identifier(name), ccCall(fnExpr, ccName ?? "cc"))
         ]);
-        path2.replaceWith(t2.exportNamedDeclaration(varDecl, []));
+        path.replaceWith(t2.exportNamedDeclaration(varDecl, []));
         changed = true;
         return;
       }
       if (t2.isVariableDeclaration(decl)) {
-        for (const dPath of path2.get("declaration.declarations")) {
+        for (const dPath of path.get("declaration.declarations")) {
           const id = dPath.node.id;
           if (!t2.isIdentifier(id) || !isComponentName(id.name))
             continue;
@@ -1236,9 +1210,7 @@ function autoWrapComponents(ast, filename) {
           if (!t2.isFunction(init))
             continue;
           const initPath = dPath.get("init");
-          if (!isComponentArity(init))
-            continue;
-          if (!functionReturnsJsx(initPath))
+          if (!wrapIfCandidate(initPath, id.name))
             continue;
           dPath.node.init = ccCall(init, ccName ?? "cc");
           changed = true;
@@ -1246,41 +1218,33 @@ function autoWrapComponents(ast, filename) {
         return;
       }
     },
-    ExportDefaultDeclaration(path2) {
-      const decl = path2.node.declaration;
+    ExportDefaultDeclaration(path) {
+      const decl = path.node.declaration;
       if (t2.isFunctionDeclaration(decl) && decl.id) {
         const name = decl.id.name;
-        if (!isComponentName(name))
-          return;
-        const fnPath = path2.get("declaration");
-        if (!isComponentArity(decl))
-          return;
-        if (!functionReturnsJsx(fnPath))
+        const fnPath = path.get("declaration");
+        if (!wrapIfCandidate(fnPath, name))
           return;
         const fnDecl = t2.functionDeclaration(decl.id, decl.params, decl.body, decl.generator, decl.async);
         const exportDefault = t2.exportDefaultDeclaration(ccCall(t2.identifier(name), ccName ?? "cc"));
-        path2.replaceWithMultiple([fnDecl, exportDefault]);
+        path.replaceWithMultiple([fnDecl, exportDefault]);
         changed = true;
         return;
       }
       if (t2.isFunctionDeclaration(decl) && !decl.id) {
-        const fnPath = path2.get("declaration");
-        if (!isComponentArity(decl))
-          return;
-        if (!functionReturnsJsx(fnPath))
+        const fnPath = path.get("declaration");
+        if (!wrapIfCandidate(fnPath, null))
           return;
         const fnExpr = t2.functionExpression(null, decl.params, decl.body, decl.generator, decl.async);
-        path2.node.declaration = ccCall(fnExpr, ccName ?? "cc");
+        path.node.declaration = ccCall(fnExpr, ccName ?? "cc");
         changed = true;
         return;
       }
       if (t2.isArrowFunctionExpression(decl) || t2.isFunctionExpression(decl)) {
-        const declPath = path2.get("declaration");
-        if (!isComponentArity(decl))
-          return;
-        if (!functionReturnsJsx(declPath))
+        const declPath = path.get("declaration");
+        if (!wrapIfCandidate(declPath, null))
           return;
-        path2.node.declaration = ccCall(decl, ccName ?? "cc");
+        path.node.declaration = ccCall(decl, ccName ?? "cc");
         changed = true;
         return;
       }
@@ -1303,11 +1267,11 @@ function refKey(ref) {
 function findFunctionByRef(ast, ref) {
   let found = null;
   traverse3(ast, {
-    Function(path3) {
-      const node = path3.node;
+    Function(path) {
+      const node = path.node;
       if (node.start === ref.start && node.end === ref.end) {
         found = node;
-        path3.stop();
+        path.stop();
       }
     }
   });
@@ -1407,16 +1371,18 @@ function restoreModule(filePath, serialized) {
     const callerFn = findFunctionByRef(ast, ref);
     if (!callerFn)
       return null;
-    localCallGraph.set(callerFn, sites.map((s) => {
+    const restored = [];
+    for (const s of sites) {
       const callee = findFunctionByRef(ast, s.callee);
       if (!callee)
-        throw new Error("Failed to restore callee");
-      return {
+        return null;
+      restored.push({
         callee,
         props: s.props,
         spreads: s.spreads
-      };
-    }));
+      });
+    }
+    localCallGraph.set(callerFn, restored);
   }
   const importedCallSites = [];
   for (const s of serialized.importedCallSites) {
@@ -1459,9 +1425,9 @@ function parseRefKey(key) {
 function collectImports(ast) {
   const imports = new Map;
   traverse3(ast, {
-    ImportDeclaration(path3) {
-      const source = path3.node.source.value;
-      for (const spec of path3.node.specifiers) {
+    ImportDeclaration(path) {
+      const source = path.node.source.value;
+      for (const spec of path.node.specifiers) {
         if (t3.isImportSpecifier(spec)) {
           const localName = spec.local.name;
           const importedName = t3.isIdentifier(spec.imported) ? spec.imported.name : spec.imported.value;
@@ -1477,8 +1443,8 @@ function collectImports(ast) {
 function collectImportedCallSites(ast, componentNames, imports) {
   const sites = [];
   traverse3(ast, {
-    JSXElement(path3) {
-      const name = path3.node.openingElement.name;
+    JSXElement(path) {
+      const name = path.node.openingElement.name;
       if (!t3.isJSXIdentifier(name))
         return;
       const tagName = name.name;
@@ -1489,13 +1455,13 @@ function collectImportedCallSites(ast, componentNames, imports) {
       const importInfo = imports.get(tagName);
       if (!importInfo)
         return;
-      const callerPath = path3.findParent((p) => p.isFunction());
+      const callerPath = path.findParent((p) => p.isFunction());
       if (!callerPath)
         return;
       const callerFn = callerPath.node;
       const props = [];
       const spreads = [];
-      for (const attr of path3.node.openingElement.attributes) {
+      for (const attr of path.node.openingElement.attributes) {
         if (t3.isJSXSpreadAttribute(attr)) {
           if (attr.argument) {
             spreads.push(attr.argument);
@@ -1515,7 +1481,7 @@ function collectImportedCallSites(ast, componentNames, imports) {
         }
       }
       const childExprs = [];
-      for (const child of path3.node.children) {
+      for (const child of path.node.children) {
         if (t3.isJSXExpressionContainer(child)) {
           const expr = child.expression;
           if (!expr || t3.isJSXEmptyExpression(expr))
@@ -1539,20 +1505,20 @@ function collectImportedCallSites(ast, componentNames, imports) {
   });
   return sites;
 }
-function analyzeModule(code, filePath) {
+function analyzeModule2(code, filePath) {
   const ast = parse(code, {
     sourceType: "module",
     plugins: ["jsx", "typescript"]
   });
-  autoWrapComponents(ast, filePath);
-  const names = trackReactiveImports(ast);
+  autoWrapComponents2(ast, filePath);
+  const names = trackReactiveImports2(ast);
   const {
     functions,
     names: componentNames,
     exported
-  } = collectComponentFunctions(ast, names.cc);
-  const localScopes = computeLocalScopes(ast, names);
-  const localCallGraph = collectComponentCallGraph(ast, componentNames);
+  } = collectComponentFunctions2(ast, names.cc);
+  const localScopes = computeLocalScopes2(ast, names);
+  const localCallGraph = collectComponentCallGraph2(ast, componentNames);
   const imports = collectImports(ast);
   const importedCallSites = collectImportedCallSites(ast, componentNames, imports);
   const exports = new Map;
@@ -1563,8 +1529,8 @@ function analyzeModule(code, filePath) {
     }
   }
   traverse3(ast, {
-    ExportDefaultDeclaration(path3) {
-      const decl = path3.node.declaration;
+    ExportDefaultDeclaration(path) {
+      const decl = path.node.declaration;
       if (t3.isIdentifier(decl)) {
         const fn = componentNames.get(decl.name);
         if (fn)
@@ -1955,20 +1921,20 @@ function findFiles(root, extensions) {
   walk(root);
   return files;
 }
-function analyzeProject(options) {
+function analyzeProject2(options) {
   const extensions = options.extensions ?? [".tsx", ".ts", ".jsx", ".js"];
-  const resolve3 = options.resolve ?? createResolver(options.root, extensions, options.tsConfigPath, options.bunfigPath, options.workspaces);
+  const resolve = options.resolve ?? createResolver(options.root, extensions, options.tsConfigPath, options.bunfigPath, options.workspaces);
   const modules = new Map;
   const providedFiles = options.files;
   if (providedFiles) {
     for (const [filePath, code] of Object.entries(providedFiles)) {
-      modules.set(filePath, analyzeModule(code, filePath));
+      modules.set(filePath, analyzeModule2(code, filePath));
     }
   } else {
     const files = findFiles(options.root, extensions);
     for (const file of files) {
       const code = fs.readFileSync(file, "utf-8");
-      modules.set(file, analyzeModule(code, file));
+      modules.set(file, analyzeModule2(code, file));
     }
   }
   function ensureAnalyzed(filePath) {
@@ -1976,7 +1942,7 @@ function analyzeProject(options) {
       return modules.get(filePath);
     try {
       const code = fs.readFileSync(filePath, "utf-8");
-      const mod = analyzeModule(code, filePath);
+      const mod = analyzeModule2(code, filePath);
       modules.set(filePath, mod);
       return mod;
     } catch {
@@ -1999,13 +1965,13 @@ function analyzeProject(options) {
       globalCallGraph.set(callerFn, list);
     }
   }
-  const reactiveProps = buildProjectReactiveProps(modules, resolve3, globalLocalScopes, globalCallGraph, globalComponentFunctions, ensureAnalyzed);
+  const reactiveProps = buildProjectReactiveProps(modules, resolve, globalLocalScopes, globalCallGraph, globalComponentFunctions, ensureAnalyzed);
   return { modules, reactiveProps };
 }
-function buildProjectReactiveProps(modules, resolve3, globalLocalScopes, globalCallGraph, globalComponentFunctions, ensureAnalyzed) {
+function buildProjectReactiveProps(modules, resolve, globalLocalScopes, globalCallGraph, globalComponentFunctions, ensureAnalyzed) {
   for (const mod of modules.values()) {
     for (const site of mod.importedCallSites) {
-      const resolvedFile = resolve3(site.source, mod.filePath);
+      const resolvedFile = resolve(site.source, mod.filePath);
       if (!resolvedFile)
         continue;
       let targetMod = modules.get(resolvedFile);
@@ -2019,9 +1985,9 @@ function buildProjectReactiveProps(modules, resolve3, globalLocalScopes, globalC
             globalComponentFunctions.add(fn);
           }
           for (const [callerFn, sites] of targetMod.localCallGraph) {
-            const list2 = globalCallGraph.get(callerFn) ?? [];
-            list2.push(...sites);
-            globalCallGraph.set(callerFn, list2);
+            const list = globalCallGraph.get(callerFn) ?? [];
+            list.push(...sites);
+            globalCallGraph.set(callerFn, list);
           }
         }
       }
@@ -2039,7 +2005,7 @@ function buildProjectReactiveProps(modules, resolve3, globalLocalScopes, globalC
       globalCallGraph.set(site.caller, list);
     }
   }
-  const globalReactiveProps = propagateReactiveProps(globalLocalScopes, globalCallGraph, globalComponentFunctions);
+  const globalReactiveProps = propagateReactiveProps2(globalLocalScopes, globalCallGraph, globalComponentFunctions);
   const reactiveProps = new Map;
   for (const mod of modules.values()) {
     const fileMap = new Map;
@@ -2056,7 +2022,7 @@ function buildProjectReactiveProps(modules, resolve3, globalLocalScopes, globalC
   return reactiveProps;
 }
 
-class AnalyzerCache {
+class AnalyzerCache2 {
   root;
   extensions;
   tsConfigPath;
@@ -2095,7 +2061,7 @@ class AnalyzerCache {
   }
   update(filePath, code) {
     const oldMod = this.modules.get(filePath);
-    const newMod = analyzeModule(code, filePath);
+    const newMod = analyzeModule2(code, filePath);
     this.modules.set(filePath, newMod);
     if (oldMod)
       this.removeImporters(oldMod);
@@ -2105,12 +2071,19 @@ class AnalyzerCache {
   }
   remove(filePath) {
     const oldMod = this.modules.get(filePath);
-    const affectedImporters = new Set(this.importers.get(filePath) ?? []);
+    const affected = new Set(this.importers.get(filePath) ?? []);
+    if (oldMod) {
+      for (const site of oldMod.importedCallSites) {
+        const resolved = this.resolve(site.source, oldMod.filePath);
+        if (resolved)
+          affected.add(resolved);
+      }
+    }
     this.modules.delete(filePath);
     this.importers.delete(filePath);
     if (oldMod)
       this.removeImporters(oldMod);
-    this.recomputeFor(affectedImporters);
+    this.recomputeFor(affected);
     this.save();
   }
   save() {
@@ -2186,7 +2159,7 @@ class AnalyzerCache {
       return this.modules.get(filePath);
     try {
       const code = fs.readFileSync(filePath, "utf-8");
-      const mod = analyzeModule(code, filePath);
+      const mod = analyzeModule2(code, filePath);
       this.modules.set(filePath, mod);
       return mod;
     } catch {
@@ -2254,37 +2227,11 @@ class AnalyzerCache {
       }
     }
   }
-  recompute() {
-    const affected = this.collectAffected(Array.from(this.modules.keys()));
-    const subgraphModules = new Map;
-    for (const filePath of affected) {
-      const mod = this.modules.get(filePath);
-      if (mod)
-        subgraphModules.set(filePath, mod);
-    }
-    const globalLocalScopes = new Map;
-    const globalCallGraph = new Map;
-    const globalComponentFunctions = new Set;
-    for (const mod of subgraphModules.values()) {
-      for (const [fn, scope] of mod.localScopes) {
-        globalLocalScopes.set(fn, scope);
-      }
-      for (const fn of mod.componentFunctions) {
-        globalComponentFunctions.add(fn);
-      }
-      for (const [callerFn, sites] of mod.localCallGraph) {
-        const list = globalCallGraph.get(callerFn) ?? [];
-        list.push(...sites);
-        globalCallGraph.set(callerFn, list);
-      }
-    }
-    this.reactiveProps = buildProjectReactiveProps(subgraphModules, this.resolve, globalLocalScopes, globalCallGraph, globalComponentFunctions);
-  }
 }
-function analyze(options) {
+function analyze2(options) {
   const tsConfigPath = options.tsConfigPath ?? path2.join(options.root, "tsconfig.json");
   const bunfigPath = options.bunfigPath ?? path2.join(options.root, "bunfig.toml");
-  const project = analyzeProject({
+  const project = analyzeProject2({
     root: options.root,
     extensions: options.extensions,
     resolve: options.resolve,
@@ -2306,24 +2253,24 @@ function analyze(options) {
   }
   fs.writeFileSync(options.outFile, JSON.stringify(serialized, null, 2));
 }
-function loadMetadata(filePath) {
+function loadMetadata2(filePath) {
   if (!fs.existsSync(filePath)) {
     return new Map;
   }
   const raw = JSON.parse(fs.readFileSync(filePath, "utf-8"));
   const result = new Map;
-  for (const [filePath2, fileMap] of Object.entries(raw)) {
+  for (const [filePath, fileMap] of Object.entries(raw)) {
     const map = new Map;
     for (const [exportName, props] of Object.entries(fileMap)) {
       map.set(exportName, new Set(props));
     }
-    result.set(filePath2, map);
+    result.set(filePath, map);
   }
   return result;
 }
 
 // src/cli.ts
-function runAnalyzeCli(args = process.argv.slice(2)) {
+function runAnalyzeCli2(args = process.argv.slice(2)) {
   let command;
   let root;
   let outFile;
@@ -2352,11 +2299,14 @@ function runAnalyzeCli(args = process.argv.slice(2)) {
   }
   root = root ?? process.cwd();
   outFile = outFile ?? path3.join(root, ".sinwan/reactive-props.json");
-  analyze({ root, outFile, tsConfigPath, bunfigPath, workspaces });
+  analyze2({ root, outFile, tsConfigPath, bunfigPath, workspaces });
   console.log(`[sinwan] analyzed ${root} -> ${outFile}`);
 }
-if (import.meta.main) {
-  runAnalyzeCli();
+function runCliIfMain2(isMain = import.meta.main, args) {
+  if (!isMain)
+    return;
+  runAnalyzeCli2(args);
 }
+runCliIfMain2();
 
-export { autoWrapComponents, analyzeModule, analyzeProject, AnalyzerCache, analyze, loadMetadata, trackReactiveImports, getAllPropNames, isReactiveValue, containsReactiveValue, collectComponentFunctions, computeLocalScopes, collectComponentCallGraph, buildFullScope, propagateReactiveProps, wrapReactiveExpressions, runAnalyzeCli };
+export { autoWrapComponents2, analyzeModule2, analyzeProject2, AnalyzerCache2, analyze2, loadMetadata2, trackReactiveImports2, getAllPropNames2, isReactiveValue2, containsReactiveValue2, collectComponentFunctions2, computeLocalScopes2, collectComponentCallGraph2, buildFullScope2, propagateReactiveProps2, wrapReactiveExpressions2, runAnalyzeCli2, runCliIfMain2 };