@eventra_dev/eventra-cli 0.1.33 → 0.2.1

package/src/engine/scanner.ts

@@ -1,196 +1,181 @@
 import ts from "typescript";
 import { resolveNodeValue } from "./resolver";
 import { resolveFunctionFromCall } from "./callResolver";
-import { findTrackParamIndex } from "./functionAnalyzer";
 import { resolveExportedSymbol } from "./exportResolver";
 import { EventraConfig, ScanResult } from "../types";
-import { isExternalFile } from "./boundary";
 
-// UTILS
+// HELPERS
+function isValidEvent(v: string) {
+  return (
+    v &&
+    v.length > 1 &&
+    v.length < 120 &&
+    !v.includes(" ") &&
+    /^[a-zA-Z0-9._:-]+$/.test(v)
+  );
+}
+
+function getCallName(expr: ts.Expression): string {
+  if (ts.isIdentifier(expr)) return expr.text;
+  if (ts.isPropertyAccessExpression(expr)) return expr.name.text;
+  return "";
+}
+
+function getJsxTagName(tag: ts.JsxTagNameExpression): string {
+  if (ts.isIdentifier(tag)) return tag.text;
+  if (ts.isPropertyAccessExpression(tag)) return tag.name.text;
+  return tag.getText();
+}
+
 function getJsxAttrName(name: ts.JsxAttributeName): string {
   if (ts.isIdentifier(name)) return name.text;
   if (ts.isJsxNamespacedName(name)) return name.name.text;
   return "";
 }
 
-function getJsxTagName(tag: ts.JsxTagNameExpression): string {
-  if (ts.isIdentifier(tag)) return tag.text;
+// MAIN
+export function scanSource(
+  source: ts.SourceFile,
+  checker: ts.TypeChecker,
+  config: EventraConfig,
+  visited = new Set<string>(),
+  inheritedParamMap?: Map<string, ts.Expression>,
+  wrapperCache = new Map<string, string | null>()
+): ScanResult {
+  const events = new Set<string>();
+  const detectedFunctionWrappers = new Set<string>();
+  const detectedComponentWrappers = new Map<string, string>();
 
-  if (ts.isPropertyAccessExpression(tag)) {
-    return tag.name.text;
+  if (visited.has(source.fileName)) {
+    return { events, detectedFunctionWrappers, detectedComponentWrappers };
   }
 
-  return "";
-}
+  visited.add(source.fileName);
 
-function getCallName(expr: ts.Expression): string {
-  if (ts.isIdentifier(expr)) return expr.text;
-  if (ts.isPropertyAccessExpression(expr)) return expr.name.text;
-  return "";
-}
+  // TRACK DETECTION
+  function isTrackCall(expr: ts.Expression) {
+    if (ts.isIdentifier(expr)) {
+      return expr.text === "track";
+    }
 
-function isValidEvent(v: string) {
-  return (
-    v &&
-    v.length > 1 &&
-    v.length < 100 &&
-    !v.includes(" ") &&
-    /^[a-zA-Z0-9._:-]+$/.test(v)
-  );
-}
+    if (ts.isPropertyAccessExpression(expr)) {
+      return expr.name.text === "track";
+    }
 
-// COMPONENT ANALYSIS
-function getComponentPropsMap(
-  fn: ts.FunctionLikeDeclaration
-): Map<string, string> {
-  const map = new Map<string, string>();
-  const firstParam = fn.parameters[0];
-  if (!firstParam) return map;
+    return false;
+  }
 
-  // ({ event }) => ...
-  if (ts.isObjectBindingPattern(firstParam.name)) {
-    for (const el of firstParam.name.elements) {
-      if (!ts.isBindingElement(el)) continue;
+  function extractTrackCall(
+    node: ts.CallExpression,
+    paramMap: Map<string, ts.Expression>
+  ) {
+    if (!isTrackCall(node.expression)) return;
 
-      const propName =
-        el.propertyName?.getText() || el.name.getText();
+    const arg = node.arguments[0];
+    if (!arg) return;
 
-      map.set(el.name.getText(), propName);
+    const res = resolveNodeValue(arg, checker, paramMap);
+
+    for (const v of res.values) {
+      if (isValidEvent(v)) {
+        events.add(v);
+      }
     }
   }
 
-  // (props) => props.event
-  if (ts.isIdentifier(firstParam.name)) {
-    map.set(firstParam.name.text, "*");
+  // WRAPPER DETECTION
+  function isWrapperFunction(fn: ts.FunctionLikeDeclaration) {
+    let found = false;
+
+    function walk(n: ts.Node) {
+      if (found) return;
+
+      if (ts.isCallExpression(n) && isTrackCall(n.expression)) {
+        found = true;
+        return;
+      }
+
+      ts.forEachChild(n, walk);
+    }
+
+    if (fn.body) walk(fn.body);
+    return found;
   }
 
-  return map;
-}
+  // COMPONENT WRAPPER
+  function detectComponentWrapper(tag: ts.JsxTagNameExpression): string | null {
+    const tagName = getJsxTagName(tag);
+
+    if (wrapperCache.has(tagName)) {
+      return wrapperCache.get(tagName)!;
+    }
 
-function findTrackedPropName(
-  fn: ts.FunctionLikeDeclaration,
-  checker: ts.TypeChecker
-): string | null {
-  const propMap = getComponentPropsMap(fn);
-  let result: string | null = null;
+    let symbol = checker.getSymbolAtLocation(tag);
 
-  function resolveIdentifierToProp(
-    node: ts.Identifier
-  ): string | null {
-    const mapped = propMap.get(node.text);
-    if (mapped && mapped !== "*") return mapped;
+    if (symbol && (symbol.flags & ts.SymbolFlags.Alias)) {
+      symbol = checker.getAliasedSymbol(symbol);
+    }
 
-    const symbol = checker.getSymbolAtLocation(node);
-    if (!symbol) return null;
+    if (!symbol) {
+      wrapperCache.set(tagName, null);
+      return null;
+    }
+
+    symbol = resolveExportedSymbol(symbol, checker) ?? symbol;
 
     for (const decl of symbol.getDeclarations() ?? []) {
-      // const e = props.event
-      if (
-        ts.isVariableDeclaration(decl) &&
-        decl.initializer &&
-        ts.isPropertyAccessExpression(decl.initializer)
-      ) {
-        return decl.initializer.name.text;
-      }
+      let fn: ts.FunctionLikeDeclaration | null = null;
+
+      if (ts.isFunctionDeclaration(decl)) fn = decl;
 
-      // const e = event
       if (
         ts.isVariableDeclaration(decl) &&
         decl.initializer &&
-        ts.isIdentifier(decl.initializer)
+        (ts.isArrowFunction(decl.initializer) ||
+          ts.isFunctionExpression(decl.initializer))
       ) {
-        const inner = propMap.get(decl.initializer.text);
-        if (inner) return inner;
+        fn = decl.initializer;
       }
-    }
-
-    return null;
-  }
 
-  function visit(node: ts.Node) {
-    if (result) return;
+      if (!fn || !fn.body) continue;
 
-    if (ts.isCallExpression(node)) {
-      const expr = node.expression;
+      let prop: string | null = null;
 
-      const isTrack =
-        (ts.isIdentifier(expr) && expr.text === "track") ||
-        (ts.isPropertyAccessExpression(expr) &&
-          expr.name.text === "track");
+      function walk(n: ts.Node) {
+        if (prop) return;
 
-      if (!isTrack) {
-        ts.forEachChild(node, visit);
-        return;
-      }
+        if (ts.isCallExpression(n) && isTrackCall(n.expression)) {
+          const arg = n.arguments[0];
 
-      for (const arg of node.arguments) {
-        // track(event)
-        if (ts.isIdentifier(arg)) {
-          const prop = resolveIdentifierToProp(arg);
-          if (prop) {
-            result = prop;
+          if (ts.isPropertyAccessExpression(arg)) {
+            prop = arg.name.text;
             return;
           }
         }
 
-        // track(props.a.b.event)
-        if (ts.isPropertyAccessExpression(arg)) {
-          let current = arg;
+        ts.forEachChild(n, walk);
+      }
 
-          while (ts.isPropertyAccessExpression(current)) {
-            result = current.name.text;
-            return;
-          }
-        }
+      walk(fn.body);
 
-        // track(fn())
-        if (ts.isCallExpression(arg)) {
-          const inner = resolveFunctionFromCall(
-            arg.expression,
-            checker
-          );
+      wrapperCache.set(tagName, prop);
 
-          if (inner?.body) {
-            visit(inner.body);
-            if (result) return;
-          }
-        }
+      if (prop) {
+        detectedComponentWrappers.set(tagName, prop);
+        return prop;
       }
     }
 
-    ts.forEachChild(node, visit);
-  }
-
-  if (fn.body) visit(fn.body);
-
-  return result;
-}
-
-// MAIN SCANNER
-export function scanSource(
-  source: ts.SourceFile,
-  checker: ts.TypeChecker,
-  config: EventraConfig,
-  visited = new Set<string>(),
-  inheritedParamMap?: Map<string, ts.Expression>,
-  wrapperCache = new Map<string, string | null>()
-): ScanResult {
-  const events = new Set<string>();
-  const detectedFunctionWrappers = new Set<string>();
-  const detectedComponentWrappers = new Map<string, string>();
-
-  if (visited.has(source.fileName) || visited.size > 200) {
-    return { events, detectedFunctionWrappers, detectedComponentWrappers };
+    wrapperCache.set(tagName, null);
+    return null;
   }
 
-  visited.add(source.fileName);
-
+  // VISITOR
   function visit(node: ts.Node) {
-    // JSX WRAPPERS
+    // JSX
     if (ts.isJsxSelfClosingElement(node) || ts.isJsxOpeningElement(node)) {
       const tagName = getJsxTagName(node.tagName);
 
-      // skip html
       if (tagName[0] === tagName[0].toLowerCase()) {
         ts.forEachChild(node, visit);
         return;
@@ -198,48 +183,9 @@ export function scanSource(
 
       let wrapper = config.wrappers.find(w => w.name === tagName);
 
-      // AUTO DETECT
       if (!wrapper) {
-        if (wrapperCache.has(tagName)) {
-          const cached = wrapperCache.get(tagName);
-          if (cached) wrapper = { name: tagName, prop: cached };
-        } else {
-          let symbol = checker.getSymbolAtLocation(node.tagName);
-
-          if (symbol && (symbol.flags & ts.SymbolFlags.Alias)) {
-            symbol = checker.getAliasedSymbol(symbol);
-          }
-
-          if (symbol) {
-            symbol = resolveExportedSymbol(symbol, checker) ?? symbol;
-
-            for (const decl of symbol.getDeclarations() ?? []) {
-              let fn: ts.FunctionLikeDeclaration | null = null;
-
-              if (ts.isFunctionDeclaration(decl)) fn = decl;
-
-              if (
-                ts.isVariableDeclaration(decl) &&
-                decl.initializer &&
-                (ts.isArrowFunction(decl.initializer) ||
-                  ts.isFunctionExpression(decl.initializer))
-              ) {
-                fn = decl.initializer;
-              }
-
-              if (!fn) continue;
-
-              const prop = findTrackedPropName(fn, checker);
-              wrapperCache.set(tagName, prop ?? null);
-
-              if (prop) {
-                wrapper = { name: tagName, prop };
-                detectedComponentWrappers.set(tagName, prop);
-                break;
-              }
-            }
-          }
-        }
+        const prop = detectComponentWrapper(node.tagName);
+        if (prop) wrapper = { name: tagName, prop };
       }
 
       if (wrapper) {
@@ -252,16 +198,16 @@ export function scanSource(
           if (!attr.initializer) continue;
 
           if (ts.isStringLiteral(attr.initializer)) {
-            const v = attr.initializer.text;
-            if (isValidEvent(v)) events.add(v);
+            if (isValidEvent(attr.initializer.text)) {
+              events.add(attr.initializer.text);
+            }
           }
 
           if (ts.isJsxExpression(attr.initializer)) {
             const expr = attr.initializer.expression;
             if (!expr) continue;
 
-            const res = resolveNodeValue(expr, checker, inheritedParamMap);
-
+            const res = resolveNodeValue(expr, checker);
             res.values.forEach(v => {
               if (isValidEvent(v)) events.add(v);
             });
@@ -273,83 +219,38 @@ export function scanSource(
       return;
     }
 
-    // FUNCTION CALLS
+    // CALL
     if (ts.isCallExpression(node)) {
-      let trackParamIndex: number | null = null;
-      let isTracking = false;
-
-      const callName = getCallName(node.expression);
-
-      // direct .track()
-      if (
-        ts.isPropertyAccessExpression(node.expression) &&
-        node.expression.name.text === "track"
-      ) {
-        isTracking = true;
-        trackParamIndex = 0;
-      }
-
-      // config wrapper
-      const manualWrapper = config.functionWrappers.find(
-        w => w.name === callName
-      );
-
-      if (manualWrapper) {
-        isTracking = true;
-        trackParamIndex = 0;
-      }
-
-      // resolve function → check body
-      const resolvedFn = resolveFunctionFromCall(
-        node.expression,
-        checker
-      );
-
-      if (resolvedFn) {
-        const idx = findTrackParamIndex(resolvedFn);
-
-        if (idx !== null) {
-          isTracking = true;
-          trackParamIndex = idx;
-
-          if (!manualWrapper && callName !== "track") {
-            detectedFunctionWrappers.add(callName);
-          }
-        }
-      }
-
-      if (!isTracking) {
-        ts.forEachChild(node, visit);
-        return;
-      }
+      const resolvedFn = resolveFunctionFromCall(node.expression, checker);
 
       const paramMap = new Map(inheritedParamMap ?? []);
 
-      if (resolvedFn && ts.isFunctionLike(resolvedFn)) {
-        resolvedFn.parameters.forEach((param, i) => {
+      if (resolvedFn) {
+        resolvedFn.parameters.forEach((p, i) => {
           const arg = node.arguments[i];
           if (!arg) return;
 
-          if (ts.isIdentifier(param.name)) {
-            paramMap.set(param.name.text, arg);
+          if (ts.isIdentifier(p.name)) {
+            paramMap.set(p.name.text, arg);
           }
         });
       }
 
-      if (trackParamIndex !== null && node.arguments[trackParamIndex]) {
-        const res = resolveNodeValue(
-          node.arguments[trackParamIndex],
-          checker,
-          paramMap
-        );
+      extractTrackCall(node, paramMap);
 
-        res.values.forEach(v => {
-          if (isValidEvent(v)) events.add(v);
-        });
+      if (resolvedFn && isWrapperFunction(resolvedFn)) {
+        const name = getCallName(node.expression);
+
+        if (name && name !== "track") {
+          detectedFunctionWrappers.add(name);
+        }
+
+        if (resolvedFn.body) {
+          visit(resolvedFn.body);
+        }
       }
 
-      // CROSS FILE
-      if (resolvedFn) {
+      if (resolvedFn && resolvedFn.body) {
         const sf = resolvedFn.getSourceFile();
 
         if (!visited.has(sf.fileName)) {
@@ -365,6 +266,11 @@ export function scanSource(
           res.events.forEach(e => events.add(e));
         }
       }
+
+      node.arguments.forEach(visit);
+      visit(node.expression);
+
+      return;
     }
 
     ts.forEachChild(node, visit);

package/src/utils/universal.ts

@@ -243,7 +243,7 @@ export function parseUniversal(
   parts.push(...dyn.calls);
 
   return {
-    code: [...new Set(parts)].join("\n"),
+    code: content,
     deps: [...new Set(deps.filter(Boolean))],
   };
 }