@eventra_dev/eventra-cli 0.1.7 → 0.1.9

package/dist/engine/boundary.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isExternalFile = isExternalFile;
+const path_1 = __importDefault(require("path"));
+function isExternalFile(file) {
+    const normalized = path_1.default.resolve(file);
+    return (normalized.includes(`${path_1.default.sep}node_modules${path_1.default.sep}`) ||
+        normalized.includes(`${path_1.default.sep}dist${path_1.default.sep}`) ||
+        normalized.includes(`${path_1.default.sep}build${path_1.default.sep}`) ||
+        normalized.endsWith(".d.ts"));
+}

package/dist/engine/callResolver.js

@@ -12,20 +12,23 @@ function isFunctionLike(node) {
         typescript_1.default.isFunctionExpression(node) ||
         typescript_1.default.isArrowFunction(node));
 }
-function resolveFromSymbol(symbol, checker, visited = new Set()) {
+function resolveFromSymbol(symbol, checker, visited = new Set(), depth = 0) {
     if (visited.has(symbol))
         return null;
+    if (depth > 5)
+        return null;
     visited.add(symbol);
-    // alias unwrap
+    // unwrap alias
     if (symbol.flags & typescript_1.default.SymbolFlags.Alias) {
         const aliased = checker.getAliasedSymbol(symbol);
-        return resolveFromSymbol(aliased, checker, visited);
+        return resolveFromSymbol(aliased, checker, visited, depth + 1);
     }
     const decls = symbol.getDeclarations() ?? [];
     for (const decl of decls) {
         if (isFunctionLike(decl)) {
             return decl;
         }
+        // MethodSignature
         if (typescript_1.default.isMethodSignature(decl)) {
             const parent = decl.parent;
             if (typescript_1.default.isInterfaceDeclaration(parent) || typescript_1.default.isTypeLiteralNode(parent)) {
@@ -35,16 +38,16 @@ function resolveFromSymbol(symbol, checker, visited = new Set()) {
                 for (const prop of props) {
                     if (prop.name !== name)
                         continue;
-                    const resolved = resolveFromSymbol(prop, checker, visited);
+                    const resolved = resolveFromSymbol(prop, checker, visited, depth + 1);
                     if (resolved)
                         return resolved;
                 }
             }
         }
-        // fallback
+        // SAFE fallback
         const s = checker.getSymbolAtLocation(decl);
-        if (s) {
-            const resolved = resolveFromSymbol(s, checker, visited);
+        if (s && s !== symbol) {
+            const resolved = resolveFromSymbol(s, checker, visited, depth + 1);
             if (resolved)
                 return resolved;
         }
@@ -61,7 +64,7 @@ function resolveFunctionFromCall(expr, checker) {
         if (isFunctionLike(decl)) {
             return decl;
         }
-        // MethodSignature case
+        // interface method
         if (typescript_1.default.isMethodSignature(decl)) {
             const symbol = checker.getSymbolAtLocation(decl.name);
             if (symbol) {

package/dist/engine/engine.js

@@ -5,6 +5,7 @@ const languageService_1 = require("./languageService");
 const scanner_1 = require("./scanner");
 const graph_1 = require("./graph");
 const hash_1 = require("./hash");
+const boundary_1 = require("./boundary");
 class EventraEngine {
     ts;
     graph;
@@ -15,8 +16,10 @@ class EventraEngine {
         const { baseUrl, paths } = this.ts.getModuleResolutionConfig();
         this.graph = new graph_1.DependencyGraph(baseUrl, paths);
     }
+    // SCAN FILE
     scanFile(file, content, config) {
         const h = (0, hash_1.hash)(content);
+        // skip unchanged
         if (this.fileHash.get(file) === h) {
             return (this.fileResults.get(file) ?? {
                 events: new Set(),
@@ -35,24 +38,39 @@ class EventraEngine {
                 detectedComponentWrappers: new Map(),
             };
         }
+        // update dependency graph
         this.graph.update(file, source);
         const res = (0, scanner_1.scanSource)(source, checker, config);
         this.fileResults.set(file, res);
         return res;
     }
+    // UPDATE FILE (incremental)
     updateFile(file, content, config) {
         const res = this.scanFile(file, content, config);
         const dependents = this.graph.getAllDependentsDeep(file);
         for (const dep of dependents) {
+            // skip external files
+            if ((0, boundary_1.isExternalFile)(dep))
+                continue;
             const source = this.ts.getSourceFile(dep);
             const checker = this.ts.getChecker();
             if (!source || !checker)
                 continue;
+            const depContent = this.ts.getFileContent(dep);
+            if (!depContent)
+                continue;
+            const h = (0, hash_1.hash)(depContent);
+            // skip unchanged dependents
+            if (this.fileHash.get(dep) === h)
+                continue;
+            this.fileHash.set(dep, h);
+            this.graph.update(dep, source);
             const r = (0, scanner_1.scanSource)(source, checker, config);
             this.fileResults.set(dep, r);
         }
         return res;
     }
+    // GET ALL EVENTS
     getAllEvents() {
         const all = new Set();
         for (const r of this.fileResults.values()) {
@@ -60,10 +78,36 @@ class EventraEngine {
         }
         return [...all];
     }
-    removeFile(file) {
+    // REMOVE FILE
+    removeFile(file, config) {
+        this.ts.removeFile(file);
         this.fileResults.delete(file);
         this.fileHash.delete(file);
         this.graph.remove(file);
+        const dependents = this.graph.getAllDependentsDeep(file);
+        for (const dep of dependents) {
+            if ((0, boundary_1.isExternalFile)(dep))
+                continue;
+            const source = this.ts.getSourceFile(dep);
+            const checker = this.ts.getChecker();
+            if (!source || !checker)
+                continue;
+            const content = this.ts.getFileContent(dep);
+            if (!content)
+                continue;
+            const h = (0, hash_1.hash)(content);
+            // skip unchanged
+            if (this.fileHash.get(dep) === h)
+                continue;
+            this.fileHash.set(dep, h);
+            const r = (0, scanner_1.scanSource)(source, checker, config ?? {
+                events: [],
+                wrappers: [],
+                functionWrappers: [],
+                sync: { include: [], exclude: [] },
+            });
+            this.fileResults.set(dep, r);
+        }
     }
 }
 exports.EventraEngine = EventraEngine;

package/dist/engine/languageService.js

@@ -48,6 +48,9 @@ class TSService {
             },
             getScriptVersion: (file) => this.files.get(file)?.version.toString() ?? "0",
             getScriptSnapshot: (file) => {
+                if (!this.fileNames.has(file)) {
+                    return undefined;
+                }
                 const f = this.files.get(file);
                 if (f) {
                     return typescript_1.default.ScriptSnapshot.fromString(f.content);
@@ -83,6 +86,13 @@ class TSService {
     getSourceFile(file) {
         return this.getProgram()?.getSourceFile(file);
     }
+    getFileContent(file) {
+        return this.files.get(file)?.content;
+    }
+    removeFile(file) {
+        this.files.delete(file);
+        this.fileNames.delete(file);
+    }
     getModuleResolutionConfig() {
         return {
             baseUrl: this.baseUrl,

package/dist/engine/resolver.js

@@ -12,7 +12,7 @@ function resolveNodeValue(node, checker, paramMap, seen = new Set()) {
     seen.add(node);
     // param mapping
     if (typescript_1.default.isIdentifier(node) && paramMap?.has(node.text)) {
-        return resolveNodeValue(paramMap.get(node.text), checker, paramMap);
+        return resolveNodeValue(paramMap.get(node.text), checker, paramMap, seen);
     }
     if (typescript_1.default.isStringLiteral(node)) {
         return { values: [node.text], dynamic: false };
@@ -37,13 +37,16 @@ function resolveNodeValue(node, checker, paramMap, seen = new Set()) {
         let symbol = checker.getSymbolAtLocation(node);
         if (!symbol)
             return null;
+        // variable inline resolve FIRST
         for (const decl of symbol.getDeclarations() ?? []) {
             if (typescript_1.default.isVariableDeclaration(decl) && decl.initializer) {
                 return resolveNodeValue(decl.initializer, checker, paramMap, seen);
             }
         }
+        const original = symbol;
         symbol = (0, exportResolver_1.resolveExportedSymbol)(symbol, checker) ?? symbol;
-        if (symbol.flags & typescript_1.default.SymbolFlags.Alias) {
+        // avoid alias loop
+        if (symbol !== original && (symbol.flags & typescript_1.default.SymbolFlags.Alias)) {
             symbol = checker.getAliasedSymbol(symbol);
         }
         for (const decl of symbol.getDeclarations() ?? []) {

package/dist/engine/scanner.js

@@ -9,6 +9,7 @@ const resolver_1 = require("./resolver");
 const callResolver_1 = require("./callResolver");
 const exportResolver_1 = require("./exportResolver");
 const functionAnalyzer_1 = require("./functionAnalyzer");
+const boundary_1 = require("./boundary");
 const TRACKING_NAMES = new Set(["track", "event", "capture", "send"]);
 function getCallName(expr) {
     if (typescript_1.default.isIdentifier(expr))
@@ -51,7 +52,7 @@ function isPropUsedInTracking(fn, prop) {
     visit(fn);
     return found;
 }
-function scanSource(source, checker, config, visited = new Set(), depth = 0) {
+function scanSource(source, checker, config, visited = new Set(), depth = 0, inheritedParamMap) {
     const events = new Set();
     const detectedFunctionWrappers = new Set();
     const detectedComponentWrappers = new Map();
@@ -68,16 +69,16 @@ function scanSource(source, checker, config, visited = new Set(), depth = 0) {
             const isAutoWrapper = fn && (0, functionAnalyzer_1.findTrackParamIndex)(fn) !== null;
             const isTracking = isKnownWrapper ||
                 TRACKING_NAMES.has(name) ||
-                isAutoWrapper;
+                (isAutoWrapper &&
+                    fn &&
+                    !(0, boundary_1.isExternalFile)(fn.getSourceFile().fileName));
             if (!isTracking)
                 return;
-            // AUTO DETECT WRAPPER
-            if (!isKnownWrapper &&
-                fn &&
-                !TRACKING_NAMES.has(name)) {
+            if (!isKnownWrapper && isAutoWrapper && !TRACKING_NAMES.has(name)) {
                 detectedFunctionWrappers.add(name);
             }
-            const paramMap = new Map();
+            // paramMap
+            const paramMap = new Map(inheritedParamMap ?? []);
             if (fn && typescript_1.default.isFunctionLike(fn)) {
                 fn.parameters.forEach((param, i) => {
                     const arg = node.arguments[i];
@@ -110,11 +111,11 @@ function scanSource(source, checker, config, visited = new Set(), depth = 0) {
                     });
                 }
             }
-            // cross-file traversal
+            // cross-file WITH paramMap
             if (fn) {
                 const sf = fn.getSourceFile();
                 if (!visited.has(sf.fileName)) {
-                    const res = scanSource(sf, checker, config, visited, depth + 1);
+                    const res = scanSource(sf, checker, config, visited, depth + 1, paramMap);
                     res.events.forEach(e => events.add(e));
                 }
             }
@@ -127,28 +128,20 @@ function scanSource(source, checker, config, visited = new Set(), depth = 0) {
                 : node.tagName;
             let symbol = checker.getSymbolAtLocation(tagNode);
             if (symbol) {
-                const resolved = (0, exportResolver_1.resolveExportedSymbol)(symbol, checker);
-                if (resolved)
-                    symbol = resolved;
+                symbol = (0, exportResolver_1.resolveExportedSymbol)(symbol, checker) ?? symbol;
             }
             if (symbol && (symbol.flags & typescript_1.default.SymbolFlags.Alias)) {
-                const aliased = checker.getAliasedSymbol(symbol);
-                if (aliased)
-                    symbol = aliased;
+                symbol = checker.getAliasedSymbol(symbol);
             }
             if (!symbol)
                 return;
             const tagName = typescript_1.default.isPropertyAccessExpression(node.tagName)
                 ? node.tagName.name.getText()
                 : node.tagName.getText();
-            const declarations = symbol.getDeclarations();
-            if (!declarations)
-                return;
-            for (const decl of declarations) {
+            for (const decl of symbol.getDeclarations() ?? []) {
                 let fn = null;
-                if (typescript_1.default.isFunctionDeclaration(decl)) {
+                if (typescript_1.default.isFunctionDeclaration(decl))
                     fn = decl;
-                }
                 if (typescript_1.default.isVariableDeclaration(decl) && decl.initializer) {
                     const init = decl.initializer;
                     if (typescript_1.default.isArrowFunction(init) ||
@@ -159,9 +152,7 @@ function scanSource(source, checker, config, visited = new Set(), depth = 0) {
                 if (!fn)
                     continue;
                 const param = fn.parameters[0];
-                if (!param)
-                    continue;
-                if (!typescript_1.default.isObjectBindingPattern(param.name))
+                if (!param || !typescript_1.default.isObjectBindingPattern(param.name))
                     continue;
                 for (const el of param.name.elements) {
                     const prop = el.name.getText();
@@ -181,11 +172,10 @@ function scanSource(source, checker, config, visited = new Set(), depth = 0) {
                         : attr.initializer;
                     if (!expr)
                         continue;
-                    const res = (0, resolver_1.resolveNodeValue)(expr, checker);
-                    res?.values.forEach(v => {
-                        if (isValidEvent(v))
-                            events.add(v);
-                    });
+                    const paramMap = new Map();
+                    paramMap.set(prop, expr);
+                    const res = scanSource(fn.getSourceFile(), checker, config, visited, depth + 1, paramMap);
+                    res.events.forEach(e => events.add(e));
                     detectedComponentWrappers.set(tagName, prop);
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eventra_dev/eventra-cli",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Eventra CLI",
   "type": "commonjs",
   "bin": {

package/src/engine/boundary.ts

@@ -0,0 +1,12 @@
+import path from "path";
+
+export function isExternalFile(file: string) {
+  const normalized = path.resolve(file);
+
+  return (
+    normalized.includes(`${path.sep}node_modules${path.sep}`) ||
+    normalized.includes(`${path.sep}dist${path.sep}`) ||
+    normalized.includes(`${path.sep}build${path.sep}`) ||
+    normalized.endsWith(".d.ts")
+  );
+}

package/src/engine/callResolver.ts

@@ -15,15 +15,18 @@ function isFunctionLike(
 function resolveFromSymbol(
   symbol: ts.Symbol,
   checker: ts.TypeChecker,
-  visited = new Set<ts.Symbol>()
+  visited = new Set<ts.Symbol>(),
+  depth = 0
 ): ts.FunctionLikeDeclaration | null {
   if (visited.has(symbol)) return null;
+  if (depth > 5) return null;
+
   visited.add(symbol);
 
-  // alias unwrap
+  // unwrap alias
   if (symbol.flags & ts.SymbolFlags.Alias) {
     const aliased = checker.getAliasedSymbol(symbol);
-    return resolveFromSymbol(aliased, checker, visited);
+    return resolveFromSymbol(aliased, checker, visited, depth + 1);
   }
 
   const decls = symbol.getDeclarations() ?? [];
@@ -33,6 +36,7 @@ function resolveFromSymbol(
       return decl;
     }
 
+    // MethodSignature
     if (ts.isMethodSignature(decl)) {
       const parent = decl.parent;
 
@@ -45,16 +49,16 @@ function resolveFromSymbol(
         for (const prop of props) {
           if (prop.name !== name) continue;
 
-          const resolved = resolveFromSymbol(prop, checker, visited);
+          const resolved = resolveFromSymbol(prop, checker, visited, depth + 1);
           if (resolved) return resolved;
         }
       }
     }
 
-    // fallback
+    // SAFE fallback
     const s = checker.getSymbolAtLocation(decl);
-    if (s) {
-      const resolved = resolveFromSymbol(s, checker, visited);
+    if (s && s !== symbol) {
+      const resolved = resolveFromSymbol(s, checker, visited, depth + 1);
       if (resolved) return resolved;
     }
   }
@@ -71,14 +75,13 @@ export function resolveFunctionFromCall(
 
   for (const sig of signatures) {
     const decl = sig.getDeclaration();
-
     if (!decl) continue;
 
     if (isFunctionLike(decl)) {
       return decl;
     }
 
-    // MethodSignature case
+    // interface method
     if (ts.isMethodSignature(decl)) {
       const symbol = checker.getSymbolAtLocation(decl.name);
 

package/src/engine/engine.ts

@@ -3,6 +3,7 @@ import { ScanResult, scanSource } from "./scanner";
 import { DependencyGraph } from "./graph";
 import { hash } from "./hash";
 import { EventraConfig } from "../types";
+import { isExternalFile } from "./boundary";
 
 export class EventraEngine {
   private ts: TSService;
@@ -18,9 +19,15 @@ export class EventraEngine {
     this.graph = new DependencyGraph(baseUrl, paths);
   }
 
-  scanFile(file: string, content: string, config: EventraConfig): ScanResult {
+  // SCAN FILE
+  scanFile(
+    file: string,
+    content: string,
+    config: EventraConfig
+  ): ScanResult {
     const h = hash(content);
 
+    // skip unchanged
     if (this.fileHash.get(file) === h) {
       return (
         this.fileResults.get(file) ?? {
@@ -45,6 +52,7 @@ export class EventraEngine {
       };
     }
 
+    // update dependency graph
     this.graph.update(file, source);
 
     const res = scanSource(source, checker, config);
@@ -54,17 +62,37 @@ export class EventraEngine {
     return res;
   }
 
-  updateFile(file: string, content: string, config: EventraConfig) {
+  // UPDATE FILE (incremental)
+  updateFile(
+    file: string,
+    content: string,
+    config: EventraConfig
+  ) {
     const res = this.scanFile(file, content, config);
 
     const dependents = this.graph.getAllDependentsDeep(file);
 
     for (const dep of dependents) {
+      // skip external files
+      if (isExternalFile(dep)) continue;
+
       const source = this.ts.getSourceFile(dep);
       const checker = this.ts.getChecker();
 
       if (!source || !checker) continue;
 
+      const depContent = this.ts.getFileContent(dep);
+      if (!depContent) continue;
+
+      const h = hash(depContent);
+
+      // skip unchanged dependents
+      if (this.fileHash.get(dep) === h) continue;
+
+      this.fileHash.set(dep, h);
+
+      this.graph.update(dep, source);
+
       const r = scanSource(source, checker, config);
       this.fileResults.set(dep, r);
     }
@@ -72,6 +100,7 @@ export class EventraEngine {
     return res;
   }
 
+  // GET ALL EVENTS
   getAllEvents() {
     const all = new Set<string>();
 
@@ -82,9 +111,44 @@ export class EventraEngine {
     return [...all];
   }
 
-  removeFile(file: string) {
+  // REMOVE FILE
+  removeFile(file: string, config?: EventraConfig) {
+    this.ts.removeFile(file);
     this.fileResults.delete(file);
     this.fileHash.delete(file);
     this.graph.remove(file);
+    const dependents = this.graph.getAllDependentsDeep(file);
+
+    for (const dep of dependents) {
+      if (isExternalFile(dep)) continue;
+
+      const source = this.ts.getSourceFile(dep);
+      const checker = this.ts.getChecker();
+
+      if (!source || !checker) continue;
+
+      const content = this.ts.getFileContent(dep);
+      if (!content) continue;
+
+      const h = hash(content);
+
+      // skip unchanged
+      if (this.fileHash.get(dep) === h) continue;
+
+      this.fileHash.set(dep, h);
+
+      const r = scanSource(
+        source,
+        checker,
+        config ?? {
+          events: [],
+          wrappers: [],
+          functionWrappers: [],
+          sync: { include: [], exclude: [] },
+        }
+      );
+
+      this.fileResults.set(dep, r);
+    }
   }
 }

package/src/engine/languageService.ts

@@ -62,6 +62,10 @@ export class TSService {
         this.files.get(file)?.version.toString() ?? "0",
 
       getScriptSnapshot: (file) => {
+        if (!this.fileNames.has(file)) {
+          return undefined;
+        }
+
         const f = this.files.get(file);
 
         if (f) {
@@ -113,6 +117,15 @@ export class TSService {
     return this.getProgram()?.getSourceFile(file);
   }
 
+  getFileContent(file: string) {
+    return this.files.get(file)?.content;
+  }
+
+  removeFile(file: string) {
+    this.files.delete(file);
+    this.fileNames.delete(file);
+  }
+
   getModuleResolutionConfig() {
     return {
       baseUrl: this.baseUrl,

package/src/engine/resolver.ts

@@ -1,5 +1,5 @@
 import ts from "typescript";
-import {resolveExportedSymbol} from "./exportResolver";
+import { resolveExportedSymbol } from "./exportResolver";
 
 export type ResolveResult = {
   values: string[];
@@ -21,7 +21,8 @@ export function resolveNodeValue(
     return resolveNodeValue(
       paramMap.get(node.text)!,
       checker,
-      paramMap
+      paramMap,
+      seen
     );
   }
 
@@ -53,6 +54,8 @@ export function resolveNodeValue(
   if (ts.isIdentifier(node)) {
     let symbol = checker.getSymbolAtLocation(node);
     if (!symbol) return null;
+
+    // variable inline resolve FIRST
     for (const decl of symbol.getDeclarations() ?? []) {
       if (ts.isVariableDeclaration(decl) && decl.initializer) {
         return resolveNodeValue(
@@ -64,15 +67,23 @@ export function resolveNodeValue(
       }
     }
 
+    const original = symbol;
+
     symbol = resolveExportedSymbol(symbol, checker) ?? symbol;
 
-    if (symbol.flags & ts.SymbolFlags.Alias) {
+    // avoid alias loop
+    if (symbol !== original && (symbol.flags & ts.SymbolFlags.Alias)) {
       symbol = checker.getAliasedSymbol(symbol);
     }
 
     for (const decl of symbol.getDeclarations() ?? []) {
       if (ts.isVariableDeclaration(decl) && decl.initializer) {
-        return resolveNodeValue(decl.initializer, checker, paramMap, seen);
+        return resolveNodeValue(
+          decl.initializer,
+          checker,
+          paramMap,
+          seen
+        );
       }
 
       if (ts.isEnumMember(decl) && decl.initializer) {

package/src/engine/scanner.ts

@@ -4,6 +4,7 @@ import { resolveFunctionFromCall } from "./callResolver";
 import { resolveExportedSymbol } from "./exportResolver";
 import { findTrackParamIndex } from "./functionAnalyzer";
 import { EventraConfig } from "../types";
+import { isExternalFile } from "./boundary";
 
 const TRACKING_NAMES = new Set(["track", "event", "capture", "send"]);
 
@@ -70,7 +71,8 @@ export function scanSource(
   checker: ts.TypeChecker,
   config: EventraConfig,
   visited = new Set<string>(),
-  depth = 0
+  depth = 0,
+  inheritedParamMap?: Map<string, ts.Expression>
 ): ScanResult {
   const events = new Set<string>();
   const detectedFunctionWrappers = new Set<string>();
@@ -99,20 +101,18 @@ export function scanSource(
       const isTracking =
         isKnownWrapper ||
         TRACKING_NAMES.has(name) ||
-        isAutoWrapper;
+        (isAutoWrapper &&
+          fn &&
+          !isExternalFile(fn.getSourceFile().fileName));
 
       if (!isTracking) return;
 
-      // AUTO DETECT WRAPPER
-      if (
-        !isKnownWrapper &&
-        fn &&
-        !TRACKING_NAMES.has(name)
-      ) {
+      if (!isKnownWrapper && isAutoWrapper && !TRACKING_NAMES.has(name)) {
         detectedFunctionWrappers.add(name);
       }
 
-      const paramMap = new Map<string, ts.Expression>();
+      // paramMap
+      const paramMap = new Map(inheritedParamMap ?? []);
 
       if (fn && ts.isFunctionLike(fn)) {
         fn.parameters.forEach((param, i) => {
@@ -156,7 +156,7 @@ export function scanSource(
         }
       }
 
-      // cross-file traversal
+      // cross-file WITH paramMap
       if (fn) {
         const sf = fn.getSourceFile();
 
@@ -166,7 +166,8 @@ export function scanSource(
             checker,
             config,
             visited,
-            depth + 1
+            depth + 1,
+            paramMap
           );
 
           res.events.forEach(e => events.add(e));
@@ -187,13 +188,11 @@ export function scanSource(
       let symbol = checker.getSymbolAtLocation(tagNode);
 
       if (symbol) {
-        const resolved = resolveExportedSymbol(symbol, checker);
-        if (resolved) symbol = resolved;
+        symbol = resolveExportedSymbol(symbol, checker) ?? symbol;
       }
 
       if (symbol && (symbol.flags & ts.SymbolFlags.Alias)) {
-        const aliased = checker.getAliasedSymbol(symbol);
-        if (aliased) symbol = aliased;
+        symbol = checker.getAliasedSymbol(symbol);
       }
 
       if (!symbol) return;
@@ -203,19 +202,13 @@ export function scanSource(
           ? node.tagName.name.getText()
           : node.tagName.getText();
 
-      const declarations = symbol.getDeclarations();
-      if (!declarations) return;
-
-      for (const decl of declarations) {
+      for (const decl of symbol.getDeclarations() ?? []) {
         let fn: ts.FunctionLikeDeclaration | null = null;
 
-        if (ts.isFunctionDeclaration(decl)) {
-          fn = decl;
-        }
+        if (ts.isFunctionDeclaration(decl)) fn = decl;
 
         if (ts.isVariableDeclaration(decl) && decl.initializer) {
           const init = decl.initializer;
-
           if (
             ts.isArrowFunction(init) ||
             ts.isFunctionExpression(init)
@@ -227,9 +220,7 @@ export function scanSource(
         if (!fn) continue;
 
         const param = fn.parameters[0];
-        if (!param) continue;
-
-        if (!ts.isObjectBindingPattern(param.name)) continue;
+        if (!param || !ts.isObjectBindingPattern(param.name)) continue;
 
         for (const el of param.name.elements) {
           const prop = el.name.getText();
@@ -255,11 +246,19 @@ export function scanSource(
 
           if (!expr) continue;
 
-          const res = resolveNodeValue(expr, checker);
+          const paramMap = new Map<string, ts.Expression>();
+          paramMap.set(prop, expr);
 
-          res?.values.forEach(v => {
-            if (isValidEvent(v)) events.add(v);
-          });
+          const res = scanSource(
+            fn.getSourceFile(),
+            checker,
+            config,
+            visited,
+            depth + 1,
+            paramMap
+          );
+
+          res.events.forEach(e => events.add(e));
 
           detectedComponentWrappers.set(tagName, prop);
         }