@eventra_dev/eventra-cli 0.1.28 → 0.1.29

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 trackingDetector_1 = require("./trackingDetector");
 function getCallName(expr) {
     if (typescript_1.default.isIdentifier(expr))
@@ -17,23 +18,6 @@ function getCallName(expr) {
         return expr.name.text;
     return "";
 }
-function getJsxAttrName(name) {
-    if (typescript_1.default.isIdentifier(name))
-        return name.text;
-    if (typescript_1.default.isJsxNamespacedName(name))
-        return name.name.text;
-    return null;
-}
-// unwrap
-function unwrap(expr) {
-    while (typescript_1.default.isAsExpression(expr) ||
-        typescript_1.default.isParenthesizedExpression(expr) ||
-        typescript_1.default.isTypeAssertionExpression(expr) ||
-        typescript_1.default.isNonNullExpression(expr)) {
-        expr = expr.expression;
-    }
-    return expr;
-}
 function isValidEvent(v) {
     return (v &&
         v.length > 1 &&
@@ -41,29 +25,29 @@ function isValidEvent(v) {
         !v.includes(" ") &&
         /^[a-zA-Z0-9._:-]+$/.test(v));
 }
-function isPropUsedInTracking(fn, checker, prop) {
-    let found = false;
-    function visit(node) {
-        if (typescript_1.default.isCallExpression(node)) {
-            if (!(0, trackingDetector_1.isTrackingCall)(node, checker)) {
-                typescript_1.default.forEachChild(node, visit);
-                return;
-            }
-            for (const arg of node.arguments) {
-                const a = unwrap(arg);
-                if ((typescript_1.default.isIdentifier(a) && a.text === prop) ||
-                    (typescript_1.default.isPropertyAccessExpression(a) &&
-                        a.name.text === prop)) {
-                    found = true;
-                }
-            }
-        }
-        typescript_1.default.forEachChild(node, visit);
+function resolveFunctionDeep(expr, checker) {
+    let fn = (0, callResolver_1.resolveFunctionFromCall)(expr, checker);
+    if (fn)
+        return fn;
+    let symbol = checker.getSymbolAtLocation(expr);
+    if (!symbol)
+        return null;
+    if (symbol.flags & typescript_1.default.SymbolFlags.Alias) {
+        symbol = checker.getAliasedSymbol(symbol);
     }
-    if (fn.body) {
-        visit(fn.body);
+    const resolvedSymbol = (0, exportResolver_1.resolveExportedSymbol)(symbol, checker) ?? symbol;
+    for (const decl of resolvedSymbol.getDeclarations() ?? []) {
+        if (typescript_1.default.isFunctionDeclaration(decl)) {
+            return decl;
+        }
+        if (typescript_1.default.isVariableDeclaration(decl) &&
+            decl.initializer &&
+            (typescript_1.default.isArrowFunction(decl.initializer) ||
+                typescript_1.default.isFunctionExpression(decl.initializer))) {
+            return decl.initializer;
+        }
     }
-    return found;
+    return null;
 }
 function scanSource(source, checker, config, visited = new Set(), depth = 0, inheritedParamMap) {
     const events = new Set();
@@ -79,13 +63,15 @@ function scanSource(source, checker, config, visited = new Set(), depth = 0, inh
             const name = getCallName(node.expression);
             const isKnownWrapper = config.functionWrappers.some(w => w.name === name);
             const isTrackingByType = (0, trackingDetector_1.isTrackingCall)(node, checker);
-            let resolvedFn = (0, callResolver_1.resolveFunctionFromCall)(node.expression, checker);
+            const resolvedFn = resolveFunctionDeep(node.expression, checker);
             const isAutoWrapper = resolvedFn && (0, functionAnalyzer_1.findTrackParamIndex)(resolvedFn) !== null;
             let isTracking = isKnownWrapper ||
                 isTrackingByType ||
-                isAutoWrapper ||
-                name.startsWith("$");
-            // fallback track(...)
+                name.startsWith("$") ||
+                (isAutoWrapper &&
+                    resolvedFn &&
+                    resolvedFn.getSourceFile &&
+                    !(0, boundary_1.isExternalFile)(resolvedFn.getSourceFile().fileName));
             if (!isTracking) {
                 if (typescript_1.default.isPropertyAccessExpression(node.expression) &&
                     node.expression.name.text === "track") {
@@ -100,7 +86,7 @@ function scanSource(source, checker, config, visited = new Set(), depth = 0, inh
                 typescript_1.default.forEachChild(node, visit);
                 return;
             }
-            // DETECT WRAPPERS
+            // DETECT WRAPPER
             if (!isKnownWrapper &&
                 isAutoWrapper &&
                 !isTrackingByType &&
@@ -119,8 +105,7 @@ function scanSource(source, checker, config, visited = new Set(), depth = 0, inh
                     }
                 });
             }
-            let handled = false;
-            // MAIN RESOLVE
+            // STRICT EVENT RESOLVE
             if (resolvedFn) {
                 const idx = (0, functionAnalyzer_1.findTrackParamIndex)(resolvedFn);
                 if (idx !== null && node.arguments[idx]) {
@@ -129,90 +114,17 @@ function scanSource(source, checker, config, visited = new Set(), depth = 0, inh
                         if (isValidEvent(v))
                             events.add(v);
                     });
-                    handled = true;
-                }
-            }
-            // fallback
-            if (!handled) {
-                for (const arg of node.arguments) {
-                    const res = (0, resolver_1.resolveNodeValue)(arg, checker, paramMap);
-                    res.values.forEach(v => {
-                        if (isValidEvent(v))
-                            events.add(v);
-                    });
                 }
             }
-            // CROSS FILE
+            // CROSS-FILE
             if (resolvedFn) {
-                const sf = resolvedFn.getSourceFile();
-                if (!visited.has(sf.fileName)) {
+                const sf = resolvedFn.getSourceFile?.();
+                if (sf && !visited.has(sf.fileName)) {
                     const res = scanSource(sf, checker, config, visited, depth + 1, paramMap);
                     res.events.forEach(e => events.add(e));
                 }
             }
         }
-        // JSX
-        if (typescript_1.default.isJsxSelfClosingElement(node) ||
-            typescript_1.default.isJsxOpeningElement(node)) {
-            const tagNode = typescript_1.default.isPropertyAccessExpression(node.tagName)
-                ? node.tagName.name
-                : node.tagName;
-            let symbol = checker.getSymbolAtLocation(tagNode);
-            if (symbol) {
-                symbol = (0, exportResolver_1.resolveExportedSymbol)(symbol, checker) ?? symbol;
-            }
-            if (symbol && (symbol.flags & typescript_1.default.SymbolFlags.Alias)) {
-                symbol = checker.getAliasedSymbol(symbol);
-            }
-            if (!symbol) {
-                typescript_1.default.forEachChild(node, visit);
-                return;
-            }
-            const tagName = typescript_1.default.isPropertyAccessExpression(node.tagName)
-                ? node.tagName.name.getText()
-                : node.tagName.getText();
-            for (const decl of symbol.getDeclarations() ?? []) {
-                let fn = null;
-                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) ||
-                        typescript_1.default.isFunctionExpression(init)) {
-                        fn = init;
-                    }
-                }
-                if (!fn)
-                    continue;
-                const param = fn.parameters[0];
-                if (!param || !typescript_1.default.isObjectBindingPattern(param.name))
-                    continue;
-                for (const el of param.name.elements) {
-                    const prop = el.name.getText();
-                    const isEvent = isPropUsedInTracking(fn, checker, prop) ||
-                        config.wrappers.some(w => w.name === tagName && w.prop === prop);
-                    if (!isEvent)
-                        continue;
-                    const attr = node.attributes.properties.find(p => {
-                        if (!typescript_1.default.isJsxAttribute(p))
-                            return false;
-                        return getJsxAttrName(p.name) === prop;
-                    });
-                    if (!attr || !attr.initializer)
-                        continue;
-                    const expr = typescript_1.default.isJsxExpression(attr.initializer)
-                        ? attr.initializer.expression
-                        : attr.initializer;
-                    if (!expr)
-                        continue;
-                    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);
-                }
-            }
-        }
         typescript_1.default.forEachChild(node, visit);
     }
     visit(source);

package/dist/utils/universal.js

@@ -59,14 +59,13 @@ function extractJS(input) {
     }
     return result;
 }
-// Extract inline handlers (onclick="...")
+// Extract inline HTML handlers
 function extractInlineHandlers(input) {
     const result = [];
-    const regex = /\bon\w+\s*=\s*["']([^"']+)["']/g;
-    let match;
-    while ((match = regex.exec(input))) {
-        const code = match[1].trim();
-        if (code && /[a-zA-Z0-9_$]\s*\(/.test(code)) {
+    const matches = input.matchAll(/\bon\w+\s*=\s*["']([^"']+)["']/g);
+    for (const m of matches) {
+        const code = m[1];
+        if (/[a-zA-Z0-9_$]\s*\(/.test(code)) {
             result.push(code);
         }
     }
@@ -76,37 +75,20 @@ function extractInlineHandlers(input) {
 function extractDynamicImports(input, file) {
     const deps = [];
     const calls = [];
-    const regex = /import\(\s*["'](.+?)["']\s*\)/g;
-    let match;
-    while ((match = regex.exec(input))) {
-        const mod = match[1];
+    const matches = input.matchAll(/import\(\s*["'](.+?)["']\s*\)/g);
+    for (const m of matches) {
+        const mod = m[1];
         const resolved = mod.startsWith("/")
             ? path_1.default.resolve(process.cwd(), "." + mod)
             : path_1.default.resolve(path_1.default.dirname(file), mod);
         deps.push(resolved);
-    }
-    // also extract calls chained after import
-    const callRegex = /import\([^)]+\)\.then\(([^)]+)\)/g;
-    while ((match = callRegex.exec(input))) {
-        calls.push(match[1]);
+        calls.push(`import("${mod}")`);
     }
     return { deps, calls };
 }
-// Loose JS extractor
-function extractLooseJS(input) {
-    const result = [];
-    const lines = input.split("\n");
-    for (const line of lines) {
-        const l = line.trim();
-        if (!l)
-            continue;
-        if (l.startsWith("<"))
-            continue;
-        if (/[a-zA-Z0-9_$]\s*\(/.test(l)) {
-            result.push(l);
-        }
-    }
-    return result;
+// Filter only probable tracking-related code
+function isProbablyTracking(code) {
+    return /track|event|analytics/i.test(code);
 }
 // UNIVERSAL PARSER
 function parseUniversal(content, file) {
@@ -137,20 +119,20 @@ function parseUniversal(content, file) {
             parts.push(m[2]);
         }
     }
-    // REMOVE scripts
+    // REMOVE SCRIPTS → TEMPLATE PART
     const noScripts = clean.replace(/<script[\s\S]*?<\/script>/g, "");
     // INLINE HANDLERS
-    parts.push(...extractInlineHandlers(noScripts));
+    parts.push(...extractInlineHandlers(noScripts).filter(isProbablyTracking));
     // DYNAMIC IMPORTS
     const dyn = extractDynamicImports(clean, file);
     deps.push(...dyn.deps);
-    parts.push(...dyn.calls);
-    // LOOSE JS
-    parts.push(...extractLooseJS(noScripts));
+    parts.push(...dyn.calls.filter(isProbablyTracking));
     // EXPRESSIONS
     const extracted = extractJS(clean);
     for (const e of extracted) {
-        parts.push(e + ";");
+        if (isProbablyTracking(e)) {
+            parts.push(e + ";");
+        }
     }
     return {
         code: [...new Set(parts)].join("\n"),

package/package.json

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

package/src/engine/scanner.ts

@@ -13,25 +13,6 @@ function getCallName(expr: ts.Expression): string {
   return "";
 }
 
-function getJsxAttrName(name: ts.JsxAttributeName): string | null {
-  if (ts.isIdentifier(name)) return name.text;
-  if (ts.isJsxNamespacedName(name)) return name.name.text;
-  return null;
-}
-
-// unwrap
-function unwrap(expr: ts.Expression): ts.Expression {
-  while (
-    ts.isAsExpression(expr) ||
-    ts.isParenthesizedExpression(expr) ||
-    ts.isTypeAssertionExpression(expr) ||
-    ts.isNonNullExpression(expr)
-    ) {
-    expr = expr.expression;
-  }
-  return expr;
-}
-
 function isValidEvent(v: string) {
   return (
     v &&
@@ -42,41 +23,40 @@ function isValidEvent(v: string) {
   );
 }
 
-function isPropUsedInTracking(
-  fn: ts.FunctionLikeDeclaration,
-  checker: ts.TypeChecker,
-  prop: string
-) {
-  let found = false;
-
-  function visit(node: ts.Node) {
-    if (ts.isCallExpression(node)) {
-      if (!isTrackingCall(node, checker)) {
-        ts.forEachChild(node, visit);
-        return;
-      }
+function resolveFunctionDeep(
+  expr: ts.Expression,
+  checker: ts.TypeChecker
+): ts.FunctionLikeDeclaration | null {
+  let fn = resolveFunctionFromCall(expr, checker);
+  if (fn) return fn;
 
-      for (const arg of node.arguments) {
-        const a = unwrap(arg as ts.Expression);
+  let symbol = checker.getSymbolAtLocation(expr);
 
-        if (
-          (ts.isIdentifier(a) && a.text === prop) ||
-          (ts.isPropertyAccessExpression(a) &&
-            a.name.text === prop)
-        ) {
-          found = true;
-        }
-      }
-    }
+  if (!symbol) return null;
 
-    ts.forEachChild(node, visit);
+  if (symbol.flags & ts.SymbolFlags.Alias) {
+    symbol = checker.getAliasedSymbol(symbol);
   }
 
-  if (fn.body) {
-    visit(fn.body);
+  const resolvedSymbol =
+    resolveExportedSymbol(symbol, checker) ?? symbol;
+
+  for (const decl of resolvedSymbol.getDeclarations() ?? []) {
+    if (ts.isFunctionDeclaration(decl)) {
+      return decl;
+    }
+
+    if (
+      ts.isVariableDeclaration(decl) &&
+      decl.initializer &&
+      (ts.isArrowFunction(decl.initializer) ||
+        ts.isFunctionExpression(decl.initializer))
+    ) {
+      return decl.initializer;
+    }
   }
 
-  return found;
+  return null;
 }
 
 export type ScanResult = {
@@ -114,7 +94,10 @@ export function scanSource(
 
       const isTrackingByType = isTrackingCall(node, checker);
 
-      let resolvedFn = resolveFunctionFromCall(node.expression, checker);
+      const resolvedFn = resolveFunctionDeep(
+        node.expression,
+        checker
+      );
 
       const isAutoWrapper =
         resolvedFn && findTrackParamIndex(resolvedFn) !== null;
@@ -122,10 +105,12 @@ export function scanSource(
       let isTracking =
         isKnownWrapper ||
         isTrackingByType ||
-        isAutoWrapper ||
-        name.startsWith("$");
+        name.startsWith("$") ||
+        (isAutoWrapper &&
+          resolvedFn &&
+          resolvedFn.getSourceFile &&
+          !isExternalFile(resolvedFn.getSourceFile().fileName));
 
-      // fallback track(...)
       if (!isTracking) {
         if (
           ts.isPropertyAccessExpression(node.expression) &&
@@ -145,7 +130,7 @@ export function scanSource(
         return;
       }
 
-      // DETECT WRAPPERS
+      // DETECT WRAPPER
       if (
         !isKnownWrapper &&
         isAutoWrapper &&
@@ -169,9 +154,7 @@ export function scanSource(
         });
       }
 
-      let handled = false;
-
-      // MAIN RESOLVE
+      // STRICT EVENT RESOLVE
       if (resolvedFn) {
         const idx = findTrackParamIndex(resolvedFn);
 
@@ -185,27 +168,14 @@ export function scanSource(
           res.values.forEach(v => {
             if (isValidEvent(v)) events.add(v);
           });
-
-          handled = true;
-        }
-      }
-
-      // fallback
-      if (!handled) {
-        for (const arg of node.arguments) {
-          const res = resolveNodeValue(arg, checker, paramMap);
-
-          res.values.forEach(v => {
-            if (isValidEvent(v)) events.add(v);
-          });
         }
       }
 
-      // CROSS FILE
+      // CROSS-FILE
       if (resolvedFn) {
-        const sf = resolvedFn.getSourceFile();
+        const sf = resolvedFn.getSourceFile?.();
 
-        if (!visited.has(sf.fileName)) {
+        if (sf && !visited.has(sf.fileName)) {
           const res = scanSource(
             sf,
             checker,
@@ -220,100 +190,6 @@ export function scanSource(
       }
     }
 
-    // JSX
-    if (
-      ts.isJsxSelfClosingElement(node) ||
-      ts.isJsxOpeningElement(node)
-    ) {
-      const tagNode =
-        ts.isPropertyAccessExpression(node.tagName)
-          ? node.tagName.name
-          : node.tagName;
-
-      let symbol = checker.getSymbolAtLocation(tagNode);
-
-      if (symbol) {
-        symbol = resolveExportedSymbol(symbol, checker) ?? symbol;
-      }
-
-      if (symbol && (symbol.flags & ts.SymbolFlags.Alias)) {
-        symbol = checker.getAliasedSymbol(symbol);
-      }
-
-      if (!symbol) {
-        ts.forEachChild(node, visit);
-        return;
-      }
-
-      const tagName =
-        ts.isPropertyAccessExpression(node.tagName)
-          ? node.tagName.name.getText()
-          : node.tagName.getText();
-
-      for (const decl of symbol.getDeclarations() ?? []) {
-        let fn: ts.FunctionLikeDeclaration | null = null;
-
-        if (ts.isFunctionDeclaration(decl)) fn = decl;
-
-        if (ts.isVariableDeclaration(decl) && decl.initializer) {
-          const init = decl.initializer;
-
-          if (
-            ts.isArrowFunction(init) ||
-            ts.isFunctionExpression(init)
-          ) {
-            fn = init;
-          }
-        }
-
-        if (!fn) continue;
-
-        const param = fn.parameters[0];
-        if (!param || !ts.isObjectBindingPattern(param.name)) continue;
-
-        for (const el of param.name.elements) {
-          const prop = el.name.getText();
-
-          const isEvent =
-            isPropUsedInTracking(fn, checker, prop) ||
-            config.wrappers.some(
-              w => w.name === tagName && w.prop === prop
-            );
-
-          if (!isEvent) continue;
-
-          const attr = node.attributes.properties.find(p => {
-            if (!ts.isJsxAttribute(p)) return false;
-            return getJsxAttrName(p.name) === prop;
-          }) as ts.JsxAttribute | undefined;
-
-          if (!attr || !attr.initializer) continue;
-
-          const expr = ts.isJsxExpression(attr.initializer)
-            ? attr.initializer.expression
-            : attr.initializer;
-
-          if (!expr) continue;
-
-          const paramMap = new Map<string, ts.Expression>();
-          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);
-        }
-      }
-    }
-
     ts.forEachChild(node, visit);
   }
 

package/src/utils/universal.ts

@@ -64,17 +64,17 @@ function extractJS(input: string): string[] {
   return result;
 }
 
-// Extract inline handlers (onclick="...")
+// Extract inline HTML handlers
 function extractInlineHandlers(input: string): string[] {
   const result: string[] = [];
 
-  const regex = /\bon\w+\s*=\s*["']([^"']+)["']/g;
-
-  let match;
-  while ((match = regex.exec(input))) {
-    const code = match[1].trim();
+  const matches = input.matchAll(
+    /\bon\w+\s*=\s*["']([^"']+)["']/g
+  );
 
-    if (code && /[a-zA-Z0-9_$]\s*\(/.test(code)) {
+  for (const m of matches) {
+    const code = m[1];
+    if (/[a-zA-Z0-9_$]\s*\(/.test(code)) {
       result.push(code);
     }
   }
@@ -90,47 +90,27 @@ function extractDynamicImports(
   const deps: string[] = [];
   const calls: string[] = [];
 
-  const regex = /import\(\s*["'](.+?)["']\s*\)/g;
+  const matches = input.matchAll(
+    /import\(\s*["'](.+?)["']\s*\)/g
+  );
 
-  let match;
-  while ((match = regex.exec(input))) {
-    const mod = match[1];
+  for (const m of matches) {
+    const mod = m[1];
 
     const resolved = mod.startsWith("/")
       ? path.resolve(process.cwd(), "." + mod)
       : path.resolve(path.dirname(file), mod);
 
     deps.push(resolved);
-  }
-
-  // also extract calls chained after import
-  const callRegex = /import\([^)]+\)\.then\(([^)]+)\)/g;
-
-  while ((match = callRegex.exec(input))) {
-    calls.push(match[1]);
+    calls.push(`import("${mod}")`);
   }
 
   return { deps, calls };
 }
 
-// Loose JS extractor
-function extractLooseJS(input: string): string[] {
-  const result: string[] = [];
-
-  const lines = input.split("\n");
-
-  for (const line of lines) {
-    const l = line.trim();
-
-    if (!l) continue;
-    if (l.startsWith("<")) continue;
-
-    if (/[a-zA-Z0-9_$]\s*\(/.test(l)) {
-      result.push(l);
-    }
-  }
-
-  return result;
+// Filter only probable tracking-related code
+function isProbablyTracking(code: string): boolean {
+  return /track|event|analytics/i.test(code);
 }
 
 // UNIVERSAL PARSER
@@ -179,27 +159,29 @@ export function parseUniversal(
     }
   }
 
-  // REMOVE scripts
+  // REMOVE SCRIPTS → TEMPLATE PART
   const noScripts = clean.replace(
     /<script[\s\S]*?<\/script>/g,
     ""
   );
 
   // INLINE HANDLERS
-  parts.push(...extractInlineHandlers(noScripts));
+  parts.push(
+    ...extractInlineHandlers(noScripts).filter(isProbablyTracking)
+  );
 
   // DYNAMIC IMPORTS
   const dyn = extractDynamicImports(clean, file);
   deps.push(...dyn.deps);
-  parts.push(...dyn.calls);
-
-  // LOOSE JS
-  parts.push(...extractLooseJS(noScripts));
+  parts.push(...dyn.calls.filter(isProbablyTracking));
 
   // EXPRESSIONS
   const extracted = extractJS(clean);
+
   for (const e of extracted) {
-    parts.push(e + ";");
+    if (isProbablyTracking(e)) {
+      parts.push(e + ";");
+    }
   }
 
   return {