@eventra_dev/eventra-cli 0.1.29 → 0.1.31

package/src/utils/universal.ts

@@ -1,100 +1,132 @@
 import path from "path";
 import { ParseResult } from "../types";
 
-// Strip comments (HTML + JS)
+// SAFE COMMENT STRIP
 function stripComments(input: string): string {
   return input
     .replace(/<!--[\s\S]*?-->/g, "")
-    .replace(/\/\*[\s\S]*?\*\//g, "")
-    .replace(/\/\/.*$/gm, "");
+    .replace(/\/\*[\s\S]*?\*\//g, "");
 }
 
-// Extract JS expressions inside {}
-function extractJS(input: string): string[] {
-  const result: string[] = [];
+// TRACK FILTER
+function looksLikeTracking(code: string) {
+  return /\btrack\w*\s*\(/.test(code);
+}
 
-  let i = 0;
-  const len = input.length;
+// SAFE {} PARSER
+function extractBracedExpressions(input: string): string[] {
+  const result: string[] = [];
 
-  let inString: '"' | "'" | "`" | null = null;
-  let escape = false;
+  let depth = 0;
+  let start = -1;
 
-  while (i < len) {
-    const ch = input[i];
+  for (let i = 0; i < input.length; i++) {
+    const char = input[i];
 
-    if (inString) {
-      if (escape) escape = false;
-      else if (ch === "\\") escape = true;
-      else if (ch === inString) inString = null;
-      i++;
-      continue;
+    if (char === "{") {
+      if (depth === 0) start = i + 1;
+      depth++;
+    } else if (char === "}") {
+      depth--;
+      if (depth === 0 && start !== -1) {
+        const expr = input.slice(start, i);
+        if (looksLikeTracking(expr)) {
+          result.push(expr);
+        }
+        start = -1;
+      }
     }
+  }
 
-    if (ch === '"' || ch === "'" || ch === "`") {
-      inString = ch;
-      i++;
-      continue;
-    }
+  return result;
+}
 
-    if (ch === "{") {
-      let depth = 1;
-      let j = i + 1;
+// HTML handlers
+function extractHTMLHandlers(input: string): string[] {
+  const result: string[] = [];
 
-      while (j < len && depth > 0) {
-        if (input[j] === "{") depth++;
-        else if (input[j] === "}") depth--;
-        j++;
-      }
+  const regex = /\bon\w+\s*=\s*["']([^"']+)["']/g;
 
-      if (depth === 0) {
-        const expr = input.slice(i + 1, j - 1).trim();
+  for (const m of input.matchAll(regex)) {
+    if (looksLikeTracking(m[1])) {
+      result.push(m[1]);
+    }
+  }
 
-        if (expr && /[a-zA-Z0-9_$]\s*\(/.test(expr)) {
-          result.push(expr);
-        }
+  return result;
+}
 
-        i = j;
-        continue;
-      }
-    }
+// VUE handlers
+function extractVueHandlers(input: string): string[] {
+  const result: string[] = [];
+
+  const regex = /(?:@|v-on:)[\w:-]+\s*=\s*["']([^"']+)["']/g;
 
-    i++;
+  for (const m of input.matchAll(regex)) {
+    if (looksLikeTracking(m[1])) {
+      result.push(m[1]);
+    }
   }
 
   return result;
 }
 
-// Extract inline HTML handlers
-function extractInlineHandlers(input: string): string[] {
+// SVELTE handlers
+function extractSvelteHandlers(input: string): string[] {
   const result: string[] = [];
 
-  const matches = input.matchAll(
-    /\bon\w+\s*=\s*["']([^"']+)["']/g
-  );
+  const regex = /\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);
+  for (const m of input.matchAll(regex)) {
+    if (looksLikeTracking(m[1])) {
+      result.push(m[1]);
     }
   }
 
   return result;
 }
 
-// Extract dynamic imports
-function extractDynamicImports(
-  input: string,
-  file: string
-): { deps: string[]; calls: string[] } {
+// SCRIPT EXTRACTION
+function extractScripts(input: string, file: string) {
+  const scripts: string[] = [];
   const deps: string[] = [];
-  const calls: string[] = [];
 
-  const matches = input.matchAll(
-    /import\(\s*["'](.+?)["']\s*\)/g
-  );
+  // src scripts
+  const srcRegex =
+    /<script\b[^>]*?\bsrc=["'](.+?)["'][^>]*>/g;
 
-  for (const m of matches) {
+  for (const m of input.matchAll(srcRegex)) {
+    const src = m[1];
+
+    const resolved = src.startsWith("/")
+      ? path.resolve(process.cwd(), "." + src)
+      : path.resolve(path.dirname(file), src);
+
+    deps.push(resolved);
+  }
+
+  // inline scripts
+  const scriptRegex =
+    /<script\b[^>]*>([\s\S]*?)<\/script>/g;
+
+  for (const m of input.matchAll(scriptRegex)) {
+    if (m[1]?.trim()) {
+      scripts.push(m[1]);
+    }
+  }
+
+  const noScripts = input.replace(scriptRegex, "");
+
+  return { scripts, deps, noScripts };
+}
+
+// DYNAMIC IMPORTS
+function extractDynamicImports(input: string, file: string) {
+  const deps: string[] = [];
+
+  const regex = /import\(\s*["'](.+?)["']\s*\)/g;
+
+  for (const m of input.matchAll(regex)) {
     const mod = m[1];
 
     const resolved = mod.startsWith("/")
@@ -102,18 +134,12 @@ function extractDynamicImports(
       : path.resolve(path.dirname(file), mod);
 
     deps.push(resolved);
-    calls.push(`import("${mod}")`);
   }
 
-  return { deps, calls };
+  return deps;
 }
 
-// Filter only probable tracking-related code
-function isProbablyTracking(code: string): boolean {
-  return /track|event|analytics/i.test(code);
-}
-
-// UNIVERSAL PARSER
+// MAIN
 export function parseUniversal(
   content: string,
   file: string
@@ -123,66 +149,29 @@ export function parseUniversal(
 
   const clean = stripComments(content);
 
-  // ASTRO FRONTMATTER
+  /* ---------- ASTRO FRONTMATTER ---------- */
   const fm = clean.match(/^---([\s\S]*?)---/);
   if (fm?.[1]) {
     parts.push(fm[1]);
   }
 
-  // <script src="">
-  const scriptSrc = clean.matchAll(
-    /<script\b[^>]*?\bsrc=["'](.+?)["'][^>]*>/g
-  );
-
-  for (const s of scriptSrc) {
-    const src = s[1];
-
-    const resolved = src.startsWith("/")
-      ? path.resolve(process.cwd(), "." + src)
-      : path.resolve(path.dirname(file), src);
-
-    deps.push(resolved);
-  }
-
-  // INLINE <script>
-  const scripts = clean.matchAll(
-    /<script\b([^>]*)>([\s\S]*?)<\/script>/g
-  );
+  /* ---------- SCRIPTS ---------- */
+  const { scripts, deps: scriptDeps, noScripts } =
+    extractScripts(clean, file);
 
-  for (const m of scripts) {
-    const attrs = m[1];
+  parts.push(...scripts);
+  deps.push(...scriptDeps);
 
-    if (/type=["']application\/json/.test(attrs)) continue;
+  /* ---------- HANDLERS ---------- */
+  parts.push(...extractHTMLHandlers(noScripts));
+  parts.push(...extractVueHandlers(noScripts));
+  parts.push(...extractSvelteHandlers(noScripts));
 
-    if (m[2].trim()) {
-      parts.push(m[2]);
-    }
-  }
-
-  // REMOVE SCRIPTS → TEMPLATE PART
-  const noScripts = clean.replace(
-    /<script[\s\S]*?<\/script>/g,
-    ""
-  );
-
-  // INLINE HANDLERS
-  parts.push(
-    ...extractInlineHandlers(noScripts).filter(isProbablyTracking)
-  );
-
-  // DYNAMIC IMPORTS
-  const dyn = extractDynamicImports(clean, file);
-  deps.push(...dyn.deps);
-  parts.push(...dyn.calls.filter(isProbablyTracking));
+  /* ---------- JSX / TEMPLATE ---------- */
+  parts.push(...extractBracedExpressions(clean));
 
-  // EXPRESSIONS
-  const extracted = extractJS(clean);
-
-  for (const e of extracted) {
-    if (isProbablyTracking(e)) {
-      parts.push(e + ";");
-    }
-  }
+  /* ---------- IMPORTS ---------- */
+  deps.push(...extractDynamicImports(clean, file));
 
   return {
     code: [...new Set(parts)].join("\n"),

package/tests/run.ts

@@ -40,7 +40,6 @@ function ensureTestConfig(dir: string) {
     events: [],
     wrappers: [],
     functionWrappers: [],
-    aliases: {},
     sync: {
       include: [
         "**/*.{ts,tsx,js,jsx,vue,svelte,astro}"

package/dist/engine/trackingDetector.js

@@ -1,68 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isTrackingCall = isTrackingCall;
-const typescript_1 = __importDefault(require("typescript"));
-function isStringLike(type) {
-    return ((type.flags & typescript_1.default.TypeFlags.StringLike) !== 0 ||
-        (type.flags & typescript_1.default.TypeFlags.StringLiteral) !== 0);
-}
-function hasTrackLikeSignature(type, checker) {
-    const sigs = type.getCallSignatures();
-    for (const sig of sigs) {
-        const params = sig.getParameters();
-        if (!params.length)
-            continue;
-        const t = checker.getTypeOfSymbolAtLocation(params[0], params[0].valueDeclaration);
-        if (isStringLike(t)) {
-            return true;
-        }
-    }
-    return false;
-}
-function isEventraLikeType(type, checker) {
-    const props = type.getProperties();
-    for (const prop of props) {
-        const decl = prop.valueDeclaration ?? prop.declarations?.[0];
-        if (!decl)
-            continue;
-        const t = checker.getTypeOfSymbolAtLocation(prop, decl);
-        if (hasTrackLikeSignature(t, checker)) {
-            return true;
-        }
-    }
-    return false;
-}
-function isTrackingCall(node, checker) {
-    const expr = node.expression;
-    // fn(...)
-    if (typescript_1.default.isIdentifier(expr)) {
-        const type = checker.getTypeAtLocation(expr);
-        if (hasTrackLikeSignature(type, checker)) {
-            return true;
-        }
-    }
-    // obj.method(...)
-    if (typescript_1.default.isPropertyAccessExpression(expr)) {
-        const objType = checker.getTypeAtLocation(expr.expression);
-        // объект похож на tracker
-        if (isEventraLikeType(objType, checker)) {
-            return true;
-        }
-        // fallback
-        const methodType = checker.getTypeAtLocation(expr.name);
-        if (hasTrackLikeSignature(methodType, checker)) {
-            return true;
-        }
-    }
-    // obj["track"](...)
-    if (typescript_1.default.isElementAccessExpression(expr)) {
-        const objType = checker.getTypeAtLocation(expr.expression);
-        if (isEventraLikeType(objType, checker)) {
-            return true;
-        }
-    }
-    return false;
-}

package/src/engine/trackingDetector.ts

@@ -1,94 +0,0 @@
-import ts from "typescript";
-
-function isStringLike(type: ts.Type) {
-  return (
-    (type.flags & ts.TypeFlags.StringLike) !== 0 ||
-    (type.flags & ts.TypeFlags.StringLiteral) !== 0
-  );
-}
-
-function hasTrackLikeSignature(
-  type: ts.Type,
-  checker: ts.TypeChecker
-): boolean {
-  const sigs = type.getCallSignatures();
-
-  for (const sig of sigs) {
-    const params = sig.getParameters();
-    if (!params.length) continue;
-
-    const t = checker.getTypeOfSymbolAtLocation(
-      params[0],
-      params[0].valueDeclaration!
-    );
-
-    if (isStringLike(t)) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-function isEventraLikeType(
-  type: ts.Type,
-  checker: ts.TypeChecker
-): boolean {
-  const props = type.getProperties();
-
-  for (const prop of props) {
-    const decl = prop.valueDeclaration ?? prop.declarations?.[0];
-    if (!decl) continue;
-
-    const t = checker.getTypeOfSymbolAtLocation(prop, decl);
-
-    if (hasTrackLikeSignature(t, checker)) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-export function isTrackingCall(
-  node: ts.CallExpression,
-  checker: ts.TypeChecker
-): boolean {
-  const expr = node.expression;
-
-  // fn(...)
-  if (ts.isIdentifier(expr)) {
-    const type = checker.getTypeAtLocation(expr);
-    if (hasTrackLikeSignature(type, checker)) {
-      return true;
-    }
-  }
-
-  // obj.method(...)
-  if (ts.isPropertyAccessExpression(expr)) {
-    const objType = checker.getTypeAtLocation(expr.expression);
-
-    // объект похож на tracker
-    if (isEventraLikeType(objType, checker)) {
-      return true;
-    }
-
-    // fallback
-    const methodType = checker.getTypeAtLocation(expr.name);
-
-    if (hasTrackLikeSignature(methodType, checker)) {
-      return true;
-    }
-  }
-
-  // obj["track"](...)
-  if (ts.isElementAccessExpression(expr)) {
-    const objType = checker.getTypeAtLocation(expr.expression);
-
-    if (isEventraLikeType(objType, checker)) {
-      return true;
-    }
-  }
-
-  return false;
-}