@eventra_dev/eventra-cli 0.1.2 → 0.1.4

package/README.md

@@ -1,4 +1,3 @@
-
 <p align="center">
 <img src="./assets/eventra-icon-animated.svg" width="120">
 </p>
@@ -49,13 +48,54 @@ Creates `eventra.json` configuration file.
 
 Scans your project and discovers events automatically.
 
-Supports:
+### Supports:
 
 - track("event")
 - analytics.track("event")
-- function wrappers
-- component wrappers
-- aliases
+
+- Variables
+```ts
+const EVENT = "click"
+track(EVENT)
+```
+
+- Enums
+```ts
+track(EVENTS.CLICK)
+```
+
+- Template strings
+```ts
+track(`click_${type}`)
+```
+
+- Conditionals
+```ts
+track(condition ? "a" : "b")
+```
+
+- Object format
+```ts
+track({ event: "click" })
+```
+
+- Function wrappers
+```ts
+const trackFeature = (name: string) => {
+  track(name)
+}
+
+trackFeature("click")
+```
+
+- Multi-argument wrappers
+```ts
+trackFeature("test", "click")
+```
+
+- Cross-file tracking
+
+- Vue / Svelte / Astro support
 
 ---
 
@@ -70,34 +110,19 @@ eventra check
 ### Detects:
 
 - New events
-- Unresolved dynamic events
-
-### Output example:
-
-```
-New events:
-+ user_click (src/Button.tsx:42)
-
-Dynamic:
-- eventName (src/App.tsx:10)
-```
+- Removed events
+- Dynamic values
 
 ---
 
 ## eventra check --fix
 
-Interactive auto-fix mode.
+Auto-fix mode.
 
 ```bash
 eventra check --fix
 ```
 
-### What it does:
-
-- Adds new events to config
-- Resolves dynamic events via alias
-- Allows skipping dynamic values
-
 ---
 
 ## eventra watch
@@ -108,13 +133,6 @@ Real-time event detection.
 eventra watch
 ```
 
-### Features:
-
-- Detects new events instantly
-- Debounced updates
-- No duplicates
-- Ignores temp files
-
 ---
 
 ## eventra send
@@ -129,8 +147,6 @@ eventra send
 
 # Configuration
 
-Example `eventra.json`:
-
 ```json
 {
   "apiKey": "",
@@ -147,53 +163,12 @@ Example `eventra.json`:
 
 ---
 
-# Key Concepts
-
-### Aliases
-
-```ts
-const EVENT = "user_click";
-track(EVENT);
-```
-
-Auto-resolved → `user_click`
-
----
-
-### Dynamic events
-
-```ts
-track(eventName);
-```
-
-Must be:
-
-- aliased
-- or skipped (`__skip__`)
-
----
-
-### File tracking
-
-All events include:
-
-```
-event_name (file:line)
-```
-
----
-
 # Supported Frameworks
 
-Frontend:
-
 - React
 - Vue
 - Svelte
 - Astro
-
-Backend:
-
 - Node.js
 - Express
 - NestJS

package/dist/commands/check.js

@@ -27,26 +27,37 @@ async function check({ fix = false }) {
             const { content, virtualFile } = (0, processFile_1.processFile)(file, raw);
             engine.scanFile(virtualFile, content);
         }
-        catch {
-            console.log(chalk_1.default.gray(`Skipped: ${file}`));
+        catch (err) {
+            console.log(chalk_1.default.yellow(`Skipped: ${file}`));
+            if (err instanceof Error) {
+                console.log(chalk_1.default.gray(err.message));
+            }
         }
     }
     const found = new Set(engine.getAllEvents());
     const known = new Set(config.events ?? []);
     const newEvents = [...found].filter(e => !known.has(e));
+    const removed = [...known].filter(e => !found.has(e));
     if (fix) {
+        const merged = new Set(config.events ?? []);
         newEvents.forEach(e => {
-            config.events.push(e);
+            merged.add(e);
             console.log(chalk_1.default.green(`+ ${e}`));
         });
-        config.events = [...new Set(config.events)].sort();
+        config.events = [...merged].sort();
         await (0, config_1.saveConfig)(config);
         console.log(chalk_1.default.green("\nFixed"));
         return;
     }
-    if (newEvents.length) {
-        console.log(chalk_1.default.red("\nNew events:"));
-        newEvents.forEach(e => console.log(chalk_1.default.red(`+ ${e}`)));
+    if (newEvents.length || removed.length) {
+        if (newEvents.length) {
+            console.log(chalk_1.default.red("\nNew events:"));
+            newEvents.forEach(e => console.log(chalk_1.default.red(`+ ${e}`)));
+        }
+        if (removed.length) {
+            console.log(chalk_1.default.yellow("\nRemoved events:"));
+            removed.forEach(e => console.log(chalk_1.default.yellow(`- ${e}`)));
+        }
         process.exit(1);
     }
     console.log(chalk_1.default.green("\nAll good"));

package/dist/commands/send.js

@@ -47,6 +47,8 @@ async function send() {
     }
     console.log("");
     console.log(chalk_1.default.blue(`Sending ${config.events.length} events...`));
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), 10000);
     try {
         const res = await fetch(endpoint, {
             method: "POST",
@@ -61,7 +63,8 @@ async function send() {
                     version: CLI_VERSION,
                     runtime: "node"
                 }
-            })
+            }),
+            signal: controller.signal
         });
         if (!res.ok) {
             console.log(chalk_1.default.red(`Request failed (${res.status})`));
@@ -99,4 +102,7 @@ async function send() {
             console.log(chalk_1.default.gray(err.message));
         }
     }
+    finally {
+        clearTimeout(timeout);
+    }
 }

package/dist/commands/sync.js

@@ -29,9 +29,11 @@ async function sync() {
             const { content, virtualFile } = (0, processFile_1.processFile)(file, raw);
             engine.scanFile(virtualFile, content);
         }
-        catch (e) {
-            console.log(chalk_1.default.red(`ERROR: ${file}`));
-            console.error(e);
+        catch (err) {
+            console.log(chalk_1.default.yellow(`Skipped: ${file}`));
+            if (err instanceof Error) {
+                console.log(chalk_1.default.gray(err.message));
+            }
         }
     }
     const events = engine.getAllEvents().sort();

package/dist/commands/watch.js

@@ -10,28 +10,7 @@ const promises_1 = __importDefault(require("fs/promises"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const config_1 = require("../utils/config");
 const engine_1 = require("../engine/engine");
-const router_1 = require("../utils/parsers/router");
-const vue_1 = require("../utils/parsers/vue");
-const svelte_1 = require("../utils/parsers/svelte");
-const astro_1 = require("../utils/parsers/astro");
-// PREPROCESS (CONTENT)
-function preprocess(file, content) {
-    const parser = (0, router_1.detectParser)(file);
-    if (parser === "vue")
-        return (0, vue_1.parseVue)(content);
-    if (parser === "svelte")
-        return (0, svelte_1.parseSvelte)(content);
-    if (parser === "astro")
-        return (0, astro_1.parseAstro)(content);
-    return content;
-}
-// VIRTUAL FILE (PATH)
-function toVirtualFile(file) {
-    return file.endsWith(".vue")
-        ? file + ".tsx"
-        : file;
-}
-// WATCH
+const processFile_1 = require("../utils/processFile");
 async function watch() {
     const config = await (0, config_1.loadConfig)();
     if (!config)
@@ -40,17 +19,11 @@ async function watch() {
     const files = await (0, fast_glob_1.default)(config.sync.include, {
         ignore: config.sync.exclude,
     });
-    if (!files.length) {
-        console.log(chalk_1.default.yellow("No files found"));
-        return;
-    }
     const engine = new engine_1.EventraEngine(process.cwd());
-    // INITIAL SCAN
     for (const file of files) {
         try {
             const raw = await promises_1.default.readFile(file, "utf-8");
-            const content = preprocess(file, raw);
-            const virtualFile = toVirtualFile(file);
+            const { content, virtualFile } = (0, processFile_1.processFile)(file, raw);
             engine.scanFile(virtualFile, content);
         }
         catch {
@@ -60,9 +33,9 @@ async function watch() {
     config.events = engine.getAllEvents().sort();
     await (0, config_1.saveConfig)(config);
     console.log(chalk_1.default.gray(`Initial: ${config.events.length} events\n`));
-    // STATE
     let locked = false;
     let queued = new Set();
+    let timer = null;
     const run = async () => {
         if (locked)
             return;
@@ -72,8 +45,7 @@ async function watch() {
         for (const file of batch) {
             try {
                 const raw = await promises_1.default.readFile(file, "utf-8");
-                const content = preprocess(file, raw);
-                const virtualFile = toVirtualFile(file);
+                const { content, virtualFile } = (0, processFile_1.processFile)(file, raw);
                 engine.updateFile(virtualFile, content);
             }
             catch {
@@ -94,39 +66,25 @@ async function watch() {
     };
     const schedule = (file) => {
         queued.add(file);
-        setTimeout(run, 50);
+        if (timer)
+            clearTimeout(timer);
+        timer = setTimeout(run, 100);
     };
-    // WATCHER
     const watcher = chokidar_1.default.watch(config.sync.include, {
         ignored: config.sync.exclude,
         ignoreInitial: true,
-        awaitWriteFinish: {
-            stabilityThreshold: 50,
-            pollInterval: 10,
-        },
     });
     watcher
-        .on("add", (file) => {
-        console.log(chalk_1.default.gray(`add: ${file}`));
-        schedule(file);
-    })
-        .on("change", (file) => {
-        console.log(chalk_1.default.gray(`change: ${file}`));
-        schedule(file);
-    })
+        .on("add", schedule)
+        .on("change", schedule)
         .on("unlink", async (file) => {
         console.log(chalk_1.default.gray(`remove: ${file}`));
-        const virtualFile = toVirtualFile(file);
-        engine.removeFile?.(virtualFile);
+        const { virtualFile } = (0, processFile_1.processFile)(file, "");
+        engine.removeFile(virtualFile);
         const next = engine.getAllEvents();
-        const removed = config.events.filter(e => !next.includes(e));
-        if (removed.length) {
-            removed.forEach(e => console.log(chalk_1.default.red(`- ${e}`)));
-            config.events = next.sort();
-            await (0, config_1.saveConfig)(config);
-        }
+        config.events = next.sort();
+        await (0, config_1.saveConfig)(config);
     });
-    // EXIT
     process.on("SIGINT", async () => {
         console.log(chalk_1.default.yellow("\nStopping watcher..."));
         await watcher.close();

package/dist/engine/callResolver.js

@@ -6,29 +6,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveFunctionFromCall = resolveFunctionFromCall;
 const typescript_1 = __importDefault(require("typescript"));
 function resolveFunctionFromCall(expr, checker) {
-    let symbol = checker.getSymbolAtLocation(expr);
-    if (!symbol && typescript_1.default.isPropertyAccessExpression(expr)) {
-        symbol = checker.getSymbolAtLocation(expr.name);
-    }
-    if (!symbol)
-        return null;
-    if (symbol.flags & typescript_1.default.SymbolFlags.Alias) {
-        symbol = checker.getAliasedSymbol(symbol);
-    }
-    for (const decl of symbol.getDeclarations() ?? []) {
-        if (typescript_1.default.isFunctionDeclaration(decl) ||
-            typescript_1.default.isMethodDeclaration(decl) ||
-            typescript_1.default.isFunctionExpression(decl) ||
-            typescript_1.default.isArrowFunction(decl)) {
+    const type = checker.getTypeAtLocation(expr);
+    const signatures = type.getCallSignatures();
+    for (const sig of signatures) {
+        const decl = sig.getDeclaration();
+        if (decl &&
+            (typescript_1.default.isFunctionDeclaration(decl) ||
+                typescript_1.default.isMethodDeclaration(decl) ||
+                typescript_1.default.isFunctionExpression(decl) ||
+                typescript_1.default.isArrowFunction(decl))) {
             return decl;
         }
-        if (typescript_1.default.isVariableDeclaration(decl) && decl.initializer) {
-            const init = decl.initializer;
-            if (typescript_1.default.isArrowFunction(init) ||
-                typescript_1.default.isFunctionExpression(init)) {
-                return init;
-            }
-        }
     }
     return null;
 }

package/dist/engine/engine.js

@@ -30,7 +30,17 @@ class EventraEngine {
         return events;
     }
     updateFile(file, content) {
-        return this.scanFile(file, content);
+        const events = this.scanFile(file, content);
+        const dependents = this.graph.getDependents(file);
+        for (const dep of dependents) {
+            const source = this.ts.getSourceFile(dep);
+            const checker = this.ts.getChecker();
+            if (!source || !checker)
+                continue;
+            const ev = (0, scanner_1.scanSource)(source, checker);
+            this.fileEvents.set(dep, ev);
+        }
+        return events;
     }
     getAllEvents() {
         const all = new Set();
@@ -42,6 +52,7 @@ class EventraEngine {
     removeFile(file) {
         this.fileEvents.delete(file);
         this.fileHash.delete(file);
+        this.graph.remove(file);
     }
 }
 exports.EventraEngine = EventraEngine;

package/dist/engine/functionAnalyzer.js

@@ -0,0 +1,45 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findTrackParamIndex = findTrackParamIndex;
+const typescript_1 = __importDefault(require("typescript"));
+function findTrackParamIndex(fn) {
+    const paramIndex = new Map();
+    fn.parameters.forEach((p, i) => {
+        if (typescript_1.default.isIdentifier(p.name)) {
+            paramIndex.set(p.name.text, i);
+        }
+    });
+    let result = null;
+    function visit(node) {
+        if (typescript_1.default.isCallExpression(node)) {
+            const name = getCallName(node.expression);
+            if (/(track|event|capture|send)/i.test(name)) {
+                for (const arg of node.arguments) {
+                    if (typescript_1.default.isIdentifier(arg)) {
+                        const idx = paramIndex.get(arg.text);
+                        if (idx !== undefined) {
+                            result = idx;
+                            return;
+                        }
+                    }
+                }
+            }
+        }
+        typescript_1.default.forEachChild(node, visit);
+    }
+    if (fn.body) {
+        visit(fn.body);
+    }
+    return result;
+}
+function getCallName(expr) {
+    if (typescript_1.default.isIdentifier(expr))
+        return expr.text;
+    if (typescript_1.default.isPropertyAccessExpression(expr)) {
+        return expr.name.text;
+    }
+    return "";
+}

package/dist/engine/graph.js

@@ -5,21 +5,89 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DependencyGraph = void 0;
 const typescript_1 = __importDefault(require("typescript"));
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
 class DependencyGraph {
     reverse = new Map();
+    exports = new Map();
+    normalize(file) {
+        return path_1.default.resolve(file);
+    }
+    resolveImport(from, module) {
+        if (!module.startsWith("."))
+            return null;
+        const base = path_1.default.resolve(path_1.default.dirname(from), module);
+        const tryFiles = [
+            base,
+            base + ".ts",
+            base + ".tsx",
+            base + ".js",
+            base + ".jsx",
+            path_1.default.join(base, "index.ts"),
+            path_1.default.join(base, "index.tsx"),
+            path_1.default.join(base, "index.js"),
+        ];
+        for (const f of tryFiles) {
+            if (fs_1.default.existsSync(f)) {
+                return this.normalize(f);
+            }
+        }
+        return this.normalize(base);
+    }
     update(file, source) {
+        const normalizedFile = this.normalize(file);
+        this.exports.set(normalizedFile, new Set());
         for (const stmt of source.statements) {
-            if (!typescript_1.default.isImportDeclaration(stmt))
-                continue;
-            const module = stmt.moduleSpecifier.getText().replace(/['"]/g, "");
-            if (!this.reverse.has(module)) {
-                this.reverse.set(module, new Set());
+            // IMPORT
+            if (typescript_1.default.isImportDeclaration(stmt)) {
+                const module = stmt.moduleSpecifier.getText().replace(/['"]/g, "");
+                const resolved = this.resolveImport(normalizedFile, module);
+                if (!resolved)
+                    continue;
+                if (!this.reverse.has(resolved)) {
+                    this.reverse.set(resolved, new Set());
+                }
+                this.reverse.get(resolved).add(normalizedFile);
+            }
+            // EXPORT
+            if (typescript_1.default.isExportDeclaration(stmt) && stmt.moduleSpecifier) {
+                const module = stmt.moduleSpecifier.getText().replace(/['"]/g, "");
+                const resolved = this.resolveImport(normalizedFile, module);
+                if (!resolved)
+                    continue;
+                if (!this.exports.has(normalizedFile)) {
+                    this.exports.set(normalizedFile, new Set());
+                }
+                this.exports.get(normalizedFile).add(resolved);
+                if (!this.reverse.has(resolved)) {
+                    this.reverse.set(resolved, new Set());
+                }
+                this.reverse.get(resolved).add(normalizedFile);
             }
-            this.reverse.get(module).add(file);
         }
     }
+    getAllRelated(file, visited = new Set()) {
+        const normalized = this.normalize(file);
+        if (visited.has(normalized))
+            return visited;
+        visited.add(normalized);
+        const deps = this.exports.get(normalized);
+        if (!deps)
+            return visited;
+        for (const dep of deps) {
+            this.getAllRelated(dep, visited);
+        }
+        return visited;
+    }
     getDependents(file) {
-        return [...(this.reverse.get(file) ?? [])];
+        return [...(this.reverse.get(this.normalize(file)) ?? [])];
+    }
+    remove(file) {
+        const normalized = this.normalize(file);
+        this.exports.delete(normalized);
+        for (const set of this.reverse.values()) {
+            set.delete(normalized);
+        }
     }
 }
 exports.DependencyGraph = DependencyGraph;

package/dist/engine/languageService.js

@@ -9,11 +9,29 @@ const fs_1 = __importDefault(require("fs"));
 class TSService {
     root;
     files = new Map();
+    fileNames = new Set();
     service;
     constructor(root) {
         this.root = root;
+        const configPath = typescript_1.default.findConfigFile(root, typescript_1.default.sys.fileExists, "tsconfig.json");
+        let compilerOptions = {
+            allowJs: true,
+            jsx: typescript_1.default.JsxEmit.Preserve,
+            moduleResolution: typescript_1.default.ModuleResolutionKind.Node16,
+            target: typescript_1.default.ScriptTarget.ESNext,
+            esModuleInterop: true,
+            allowSyntheticDefaultImports: true,
+        };
+        if (configPath) {
+            const configFile = typescript_1.default.readConfigFile(configPath, typescript_1.default.sys.readFile);
+            const parsed = typescript_1.default.parseJsonConfigFileContent(configFile.config, typescript_1.default.sys, root);
+            compilerOptions = {
+                ...compilerOptions,
+                ...parsed.options,
+            };
+        }
         const host = {
-            getScriptFileNames: () => [...this.files.keys()],
+            getScriptFileNames: () => [...this.fileNames],
             getScriptVersion: (file) => this.files.get(file)?.version.toString() ?? "0",
             getScriptSnapshot: (file) => {
                 const f = this.files.get(file);
@@ -26,24 +44,11 @@ class TSService {
                 return undefined;
             },
             getCurrentDirectory: () => this.root,
-            getCompilationSettings: () => ({
-                allowJs: true,
-                jsx: typescript_1.default.JsxEmit.Preserve,
-                moduleResolution: typescript_1.default.ModuleResolutionKind.Node16,
-                target: typescript_1.default.ScriptTarget.ESNext,
-                esModuleInterop: true,
-                allowSyntheticDefaultImports: true,
-            }),
+            getCompilationSettings: () => compilerOptions,
             getDefaultLibFileName: (opts) => typescript_1.default.getDefaultLibFilePath(opts),
-            readFile: (fileName, encoding) => {
-                try {
-                    return fs_1.default.readFileSync(fileName, encoding);
-                }
-                catch (err) {
-                    return undefined;
-                }
-            },
-            fileExists: fs_1.default.existsSync,
+            readFile: typescript_1.default.sys.readFile,
+            fileExists: typescript_1.default.sys.fileExists,
+            readDirectory: typescript_1.default.sys.readDirectory,
         };
         this.service = typescript_1.default.createLanguageService(host);
     }
@@ -53,6 +58,7 @@ class TSService {
             content,
             version: prev ? prev.version + 1 : 1,
         });
+        this.fileNames.add(file);
     }
     getProgram() {
         return this.service.getProgram();