@eventra_dev/eventra-cli 0.3.2 → 0.3.4

package/dist/analysis/scanner/sinkDetector.js

@@ -1,5 +1,4 @@
 "use strict";
-// src/analysis/scanner/sinkDetector.ts
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -7,69 +6,39 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.detectTrackSink = detectTrackSink;
 const typescript_1 = __importDefault(require("typescript"));
 function isElementTrackProperty(expr) {
-    return (typescript_1.default.isElementAccessExpression(expr)
-        && expr.argumentExpression
-        && typescript_1.default.isStringLiteral(expr.argumentExpression)
-        && expr.argumentExpression.text
-            === "track");
+    return (typescript_1.default.isElementAccessExpression(expr) && expr.argumentExpression && typescript_1.default.isStringLiteral(expr.argumentExpression) && expr.argumentExpression.text === "track");
 }
 function isTrackIdentifier(expr) {
-    return (typescript_1.default.isIdentifier(expr)
-        && expr.text === "track");
+    return (typescript_1.default.isIdentifier(expr) && expr.text === "track");
 }
 function isTrackProperty(expr) {
-    return (typescript_1.default.isPropertyAccessExpression(expr)
-        && expr.name.text
-            === "track");
+    return (typescript_1.default.isPropertyAccessExpression(expr) && expr.name.text === "track");
 }
 function isOptionalTrackProperty(expr) {
-    return (typescript_1.default.isPropertyAccessChain(expr)
-        && expr.name.text
-            === "track");
+    return (typescript_1.default.isPropertyAccessChain(expr) && expr.name.text === "track");
 }
 function extractTrackedArguments(call) {
     const result = [];
-    if (call.arguments.length
-        === 0) {
+    if (call.arguments.length === 0) {
         return result;
     }
-    //
-    // ONLY FIRST ARGUMENT
-    // IS EVENT SINK
-    //
-    // track(name, payload)
-    //       ^^^^
-    //
     const first = call.arguments[0];
-    //
-    // track({
-    //   event: "signup"
-    // })
-    //
     if (typescript_1.default.isObjectLiteralExpression(first)) {
         for (const property of first.properties) {
-            if (!typescript_1.default.isPropertyAssignment(property)) {
+            if (!typescript_1.default.isPropertyAssignment(property) && !typescript_1.default.isShorthandPropertyAssignment(property)) {
                 continue;
             }
-            const name = property.name
-                .getText();
-            if (name !== "event"
-                && name !== "name"
-                && name !== "type") {
+            const name = property.name.getText();
+            if (name !== "event" && name !== "name" && name !== "type") {
                 continue;
             }
             result.push({
                 index: 0,
-                propertyPath: [
-                    name,
-                ],
+                propertyPath: [name],
             });
         }
         return result;
     }
-    //
-    // track(name)
-    //
     result.push({
         index: 0,
         propertyPath: [],
@@ -78,10 +47,7 @@ function extractTrackedArguments(call) {
 }
 function detectTrackSink(call) {
     const expression = call.expression;
-    if (!isTrackIdentifier(expression)
-        && !isTrackProperty(expression)
-        && !isOptionalTrackProperty(expression)
-        && !isElementTrackProperty(expression)) {
+    if (!isTrackIdentifier(expression) && !isTrackProperty(expression) && !isOptionalTrackProperty(expression) && !isElementTrackProperty(expression)) {
         return null;
     }
     return {

package/dist/analysis/shared/evaluationContext.js

@@ -1,5 +1,4 @@
 "use strict";
-// src/analysis/shared/evaluationContext.ts
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createEvaluationContext = createEvaluationContext;
 function createEvaluationContext() {

package/dist/analysis/symbols/symbolUtils.js

@@ -1,5 +1,4 @@
 "use strict";
-// src/analysis/symbols/symbolUtils.ts
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -7,60 +6,38 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFunctionSymbol = getFunctionSymbol;
 const typescript_1 = __importDefault(require("typescript"));
 function getFunctionSymbol(node, checker) {
-    //
     // function foo() {}
-    //
-    if (typescript_1.default.isFunctionDeclaration(node)
-        && node.name) {
+    if (typescript_1.default.isFunctionDeclaration(node) && node.name) {
         return checker.getSymbolAtLocation(node.name);
     }
-    //
     // class method() {}
-    //
-    if (typescript_1.default.isMethodDeclaration(node)
-        && typescript_1.default.isIdentifier(node.name)) {
+    if (typescript_1.default.isMethodDeclaration(node) && typescript_1.default.isIdentifier(node.name)) {
         return checker.getSymbolAtLocation(node.name);
     }
-    //
     // object literal method
-    //
     // const obj = {
     //   foo() {}
     // }
-    //
-    if (typescript_1.default.isMethodDeclaration(node)
-        && typescript_1.default.isComputedPropertyName(node.name)) {
+    if (typescript_1.default.isMethodDeclaration(node) && typescript_1.default.isComputedPropertyName(node.name)) {
         return checker.getSymbolAtLocation(node.name.expression);
     }
-    //
     // const foo = () => {}
-    //
     const parent = node.parent;
-    if (typescript_1.default.isVariableDeclaration(parent)
-        && typescript_1.default.isIdentifier(parent.name)) {
+    if (typescript_1.default.isVariableDeclaration(parent) && typescript_1.default.isIdentifier(parent.name)) {
         return checker.getSymbolAtLocation(parent.name);
     }
-    //
     // class field = () => {}
-    //
-    if (typescript_1.default.isPropertyDeclaration(parent)
-        && typescript_1.default.isIdentifier(parent.name)) {
+    if (typescript_1.default.isPropertyDeclaration(parent) && typescript_1.default.isIdentifier(parent.name)) {
         return checker.getSymbolAtLocation(parent.name);
     }
-    //
     // object property
-    //
     // const x = {
     //   foo: () => {}
     // }
-    //
-    if (typescript_1.default.isPropertyAssignment(parent)
-        && typescript_1.default.isIdentifier(parent.name)) {
+    if (typescript_1.default.isPropertyAssignment(parent) && typescript_1.default.isIdentifier(parent.name)) {
         return checker.getSymbolAtLocation(parent.name);
     }
-    //
     // export default function() {}
-    //
     if (typescript_1.default.isExportAssignment(parent)) {
         return checker.getSymbolAtLocation(node);
     }

package/dist/analysis/symbols/wrapperRegistry.js

@@ -10,46 +10,46 @@ function isSymbol(value) {
     return "flags" in value;
 }
 class WrapperRegistry {
+    checker;
+    exportCache;
     wrappers = new WeakMap();
-    normalize(symbol, checker, exportCache) {
-        return ((0, exportResolver_1.resolveExportedSymbol)(symbol, checker, exportCache)
-            ?? symbol);
+    constructor(checker, exportCache) {
+        this.checker = checker;
+        this.exportCache = exportCache;
     }
-    set(semantic, checker, exportCache) {
-        this.wrappers.set(this.normalize(semantic.symbol, checker, exportCache), semantic);
+    normalize(symbol) {
+        return ((0, exportResolver_1.resolveExportedSymbol)(symbol, this.checker, this.exportCache) ?? symbol);
     }
-    get(target, checker, exportCache) {
+    set(semantic) {
+        this.wrappers.set(this.normalize(semantic.symbol), semantic);
+    }
+    get(target) {
         if (isSymbol(target)) {
-            return this.wrappers.get(this.normalize(target, checker, exportCache));
+            return this.wrappers.get(this.normalize(target));
         }
         let symbol;
-        if (typescript_1.default.isFunctionDeclaration(target)
-            && target.name) {
-            symbol =
-                checker.getSymbolAtLocation(target.name);
+        if (typescript_1.default.isFunctionDeclaration(target) && target.name) {
+            symbol = this.checker.getSymbolAtLocation(target.name);
         }
-        else if (typescript_1.default.isMethodDeclaration(target)
-            && typescript_1.default.isIdentifier(target.name)) {
-            symbol =
-                checker.getSymbolAtLocation(target.name);
+        else if (typescript_1.default.isMethodDeclaration(target) && typescript_1.default.isIdentifier(target.name)) {
+            symbol = this.checker.getSymbolAtLocation(target.name);
         }
-        else if (target.parent
-            && typescript_1.default.isVariableDeclaration(target.parent)
-            && typescript_1.default.isIdentifier(target.parent.name)) {
-            symbol =
-                checker.getSymbolAtLocation(target.parent.name);
+        else if (target.parent && typescript_1.default.isVariableDeclaration(target.parent) && typescript_1.default.isIdentifier(target.parent.name)) {
+            symbol = this.checker.getSymbolAtLocation(target.parent.name);
         }
         if (!symbol) {
             return undefined;
         }
-        return this.wrappers.get(this.normalize(symbol, checker, exportCache));
+        return this.wrappers.get(this.normalize(symbol));
+    }
+    has(symbol) {
+        return this.wrappers.has(this.normalize(symbol));
     }
-    has(symbol, checker, exportCache) {
-        return this.wrappers.has(this.normalize(symbol, checker, exportCache));
+    delete(symbol) {
+        this.wrappers.delete(this.normalize(symbol));
     }
     clear() {
-        this.wrappers =
-            new WeakMap();
+        this.wrappers = new WeakMap();
     }
 }
 exports.WrapperRegistry = WrapperRegistry;

package/dist/cli/check.js

@@ -1,5 +1,4 @@
 "use strict";
-// src/commands/check.ts
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -51,20 +50,19 @@ async function check({ fix = false }) {
     const { engine } = await (0, projectScanner_1.scanProject)(config);
     const found = new Set(engine.getAllEvents());
     const known = new Set(config.events ?? []);
-    const added = [...found]
-        .filter(e => !known.has(e));
-    const removed = [...known]
-        .filter(e => !found.has(e));
+    const added = [...found].filter(e => !known.has(e));
+    const removed = [...known].filter(e => !found.has(e));
     if (fix) {
-        config.events =
-            [...found].sort();
+        const nextConfig = {
+            ...config,
+            events: [...found].sort(),
+        };
         const { saveConfig } = await Promise.resolve().then(() => __importStar(require("../config/config")));
-        await saveConfig(config);
+        await saveConfig(nextConfig);
         console.log(chalk_1.default.green("Synced"));
         return;
     }
-    if (added.length
-        || removed.length) {
+    if (added.length || removed.length) {
         added.forEach(e => console.log(chalk_1.default.red(`+ ${e}`)));
         removed.forEach(e => console.log(chalk_1.default.yellow(`- ${e}`)));
         process.exit(1);

package/dist/cli/init.js

@@ -9,109 +9,45 @@ const inquirer_1 = __importDefault(require("inquirer"));
 const config_1 = require("../config/config");
 async function init() {
     console.log(chalk_1.default.blue("Initializing Eventra..."));
-    // API KEY ENDPOINT
-    const { apiKey, endpoint } = await inquirer_1.default.prompt([
+    const { apiKey, endpoint, } = await inquirer_1.default.prompt([
         {
             type: "input",
             name: "apiKey",
-            message: "API Key (optional):"
+            message: "API Key (optional):",
         },
         {
             type: "input",
             name: "endpoint",
             message: "Custom endpoint (optional):",
-            default: "https://api.eventra.dev/api/v1/cli/events"
-        }
+            default: "https://api.eventra.dev/api/v1/cli/events",
+        },
     ]);
-    console.log(chalk_1.default.gray("\nEventra automatically detects:"));
+    console.log("");
+    console.log(chalk_1.default.gray("Eventra automatically detects:"));
     console.log(chalk_1.default.gray("• track('event')"));
-    console.log(chalk_1.default.gray("• tracker.track('event')"));
-    const wrappers = [];
-    const functionWrappers = [];
-    // COMPONENT WRAPPERS
-    console.log(chalk_1.default.blue("\nComponent wrappers"));
-    let addComponent = true;
-    while (addComponent) {
-        const { useWrapper } = await inquirer_1.default.prompt([
-            {
-                type: "confirm",
-                name: "useWrapper",
-                message: "Add component wrapper?",
-                default: false
-            }
-        ]);
-        if (!useWrapper)
-            break;
-        const { name, prop } = await inquirer_1.default.prompt([
-            {
-                type: "input",
-                name: "name",
-                message: "Component name:",
-                validate: (v) => v ? true : "Required"
-            },
-            {
-                type: "input",
-                name: "prop",
-                message: "Event prop:",
-                default: "event"
-            }
-        ]);
-        wrappers.push({
-            name,
-            prop
-        });
-    }
-    // FUNCTION WRAPPERS
-    console.log(chalk_1.default.blue("\nFunction wrappers"));
-    let addFunction = true;
-    while (addFunction) {
-        const { useWrapper } = await inquirer_1.default.prompt([
-            {
-                type: "confirm",
-                name: "useWrapper",
-                message: "Add function wrapper?",
-                default: false
-            }
-        ]);
-        if (!useWrapper)
-            break;
-        const { name, event } = await inquirer_1.default.prompt([
-            {
-                type: "input",
-                name: "name",
-                message: "Function name:"
-            },
-            {
-                type: "input",
-                name: "event",
-                message: "Event field (leave empty if string argument):",
-                default: ""
-            }
-        ]);
-        functionWrappers.push({
-            name,
-            event: event || undefined
-        });
-    }
+    console.log(chalk_1.default.gray("• analytics.track('event')"));
+    console.log(chalk_1.default.gray("• semantic parameter propagation"));
+    console.log(chalk_1.default.gray("• cross-file wrappers"));
+    console.log(chalk_1.default.gray("• parameter propagation"));
+    console.log("");
     const config = {
         apiKey,
         endpoint,
         events: [],
-        wrappers,
-        functionWrappers,
         sync: {
             include: [
-                "**/*.{ts,tsx,js,jsx,vue,svelte,astro}"
+                "**/*.{ts,tsx,js,jsx}",
             ],
             exclude: [
                 "node_modules",
                 "dist",
                 ".next",
-                ".git"
-            ]
-        }
+                ".git",
+            ],
+        },
     };
     await (0, config_1.saveConfig)(config);
-    console.log(chalk_1.default.green("\neventra.json created"));
-    console.log(chalk_1.default.gray("\nRun `eventra sync`"));
+    console.log(chalk_1.default.green("eventra.json created"));
+    console.log("");
+    console.log(chalk_1.default.gray("Run `eventra sync`"));
 }

package/dist/cli/send.js

@@ -11,8 +11,7 @@ const package_json_1 = __importDefault(require("../../package.json"));
 const CLI_VERSION = package_json_1.default.version;
 async function send() {
     const config = await (0, config_1.loadConfig)();
-    const endpoint = config?.endpoint ||
-        process.env.EVENTRA_ENDPOINT;
+    const endpoint = config?.endpoint || process.env.EVENTRA_ENDPOINT;
     if (!config) {
         console.log(chalk_1.default.red("eventra.json not found. Run 'eventra init'"));
         return;
@@ -28,8 +27,10 @@ async function send() {
             }
         ]);
         apiKey = answers.apiKey;
-        config.apiKey = apiKey;
-        await (0, config_1.saveConfig)(config);
+        await (0, config_1.saveConfig)({
+            ...config,
+            apiKey,
+        });
         console.log(chalk_1.default.green("API key saved"));
     }
     // no events
@@ -72,7 +73,8 @@ async function send() {
                 const text = await res.text();
                 console.log(chalk_1.default.gray(text));
             }
-            catch { }
+            catch {
+            }
             return;
         }
         const data = await res.json();

package/dist/cli/sync.js

@@ -1,5 +1,4 @@
 "use strict";
-// src/commands/sync.ts
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -11,46 +10,12 @@ const projectScanner_1 = require("../core/projectScanner");
 async function sync() {
     const config = await (0, config_1.loadConfig)();
     if (!config) {
+        console.log(chalk_1.default.red("eventra.json not found"));
         return;
     }
     console.log(chalk_1.default.blue("Scanning..."));
-    const { engine, results, } = await (0, projectScanner_1.scanProject)(config);
-    const detectedFn = new Set();
-    const detectedCmp = new Map();
-    for (const result of results.values()) {
-        result
-            .detectedFunctionWrappers
-            .forEach(w => detectedFn.add(w));
-        result
-            .detectedComponentWrappers
-            .forEach((v, k) => detectedCmp.set(k, v));
-    }
-    const events = engine
-        .getAllEvents()
-        .sort();
-    config.events =
-        events;
-    config.functionWrappers =
-        mergeUnique(config.functionWrappers
-            ?? [], [...detectedFn]
-            .map(name => ({
-            name
-        })), w => w.name);
-    config.wrappers =
-        mergeUnique(config.wrappers
-            ?? [], [...detectedCmp.entries()]
-            .map(([name, prop]) => ({
-            name,
-            prop,
-        })), w => `${w.name}:${w.prop}`);
-    await (0, config_1.saveConfig)(config);
+    const { engine } = await (0, projectScanner_1.scanProject)(config);
+    const events = engine.getAllEvents().sort();
+    await (0, config_1.saveConfig)({ ...config, events });
     console.log(chalk_1.default.green(`Found ${events.length} events`));
 }
-function mergeUnique(a, b, key) {
-    const map = new Map();
-    [...b, ...a]
-        .forEach(item => map.set(key(item), item));
-    return [
-        ...map.values()
-    ];
-}

package/dist/cli/watch.js

@@ -16,6 +16,7 @@ const getVirtualFile_1 = require("../filesystem/getVirtualFile");
 async function watch() {
     const config = await (0, config_1.loadConfig)();
     if (!config) {
+        console.log(chalk_1.default.red("eventra.json not found"));
         return;
     }
     console.log(chalk_1.default.blue("Watching...\n"));
@@ -23,13 +24,15 @@ async function watch() {
     const fileDeps = new Map();
     const cache = new Map();
     const watchedDeps = new Set();
-    const normalize = (f) => path_1.default.resolve(f)
-        .replace(/\\/g, "/");
+    const normalize = (file) => {
+        return path_1.default.resolve(file).replace(/\\/g, "/");
+    };
     // INITIAL LOAD
     const files = await (0, fast_glob_1.default)(config.sync.include, {
         ignore: config.sync.exclude,
         absolute: true,
     });
+    engine.beginPreload();
     for (const file of files) {
         try {
             const abs = normalize(file);
@@ -38,22 +41,21 @@ async function watch() {
             cache.set(abs, parsed);
             await engine.preloadFile((0, getVirtualFile_1.getVirtualFile)(abs), parsed.content);
             await engine.updateFile((0, getVirtualFile_1.getVirtualFile)(abs), parsed.content, config);
-            fileDeps.set(abs, new Set(parsed.dependencies.map(d => normalize(d))));
+            fileDeps.set(abs, new Set(parsed.dependencies.map(dep => normalize(dep))));
+        }
+        catch {
+            // ignore invalid files
         }
-        catch { }
     }
-    config.events =
-        engine.getAllEvents()
-            .sort();
-    await (0, config_1.saveConfig)(config);
-    console.log(chalk_1.default.gray(`Initial: ${config.events.length}\n`));
-    // WATCHER
-    const watcher = chokidar_1.default.watch([
-        ...files.map(normalize),
-        ...watchedDeps,
-    ], {
-        ignoreInitial: true
+    engine.endPreload();
+    const initialEvents = engine.getAllEvents().sort();
+    await (0, config_1.saveConfig)({
+        ...config,
+        events: initialEvents,
     });
+    console.log(chalk_1.default.gray(`Initial: ${initialEvents.length}\n`));
+    // WATCHER
+    const watcher = chokidar_1.default.watch([...files.map(normalize), ...watchedDeps], { ignoreInitial: true });
     const queue = new Map();
     let timer = null;
     const run = async () => {
@@ -67,22 +69,23 @@ async function watch() {
                 await engine.updateFile((0, getVirtualFile_1.getVirtualFile)(file), parsed.content, config);
                 // dependency diff
                 const abs = normalize(file);
-                const prevDeps = fileDeps.get(abs)
-                    ?? new Set();
-                const nextDeps = new Set(parsed.dependencies.map(d => normalize(d)));
-                // add new deps
+                const prevDeps = fileDeps.get(abs) ?? new Set();
+                const nextDeps = new Set(parsed.dependencies.map(dep => normalize(dep)));
+                // add deps
                 for (const dep of nextDeps) {
-                    if (!prevDeps.has(dep)) {
-                        watcher.add(dep);
-                        watchedDeps.add(dep);
+                    if (prevDeps.has(dep)) {
+                        continue;
                     }
+                    watcher.add(dep);
+                    watchedDeps.add(dep);
                 }
-                // remove old deps
+                // remove deps
                 for (const dep of prevDeps) {
-                    if (!nextDeps.has(dep)) {
-                        watcher.unwatch(dep);
-                        watchedDeps.delete(dep);
+                    if (nextDeps.has(dep)) {
+                        continue;
                     }
+                    watcher.unwatch(dep);
+                    watchedDeps.delete(dep);
                 }
                 fileDeps.set(abs, nextDeps);
             }
@@ -90,12 +93,12 @@ async function watch() {
                 console.log(chalk_1.default.gray(`skip: ${file}`));
             }
         }
-        const next = engine.getAllEvents()
-            .sort();
-        config.events =
-            next;
-        await (0, config_1.saveConfig)(config);
-        console.log(chalk_1.default.green(`Updated: ${next.length}`));
+        const nextEvents = engine.getAllEvents().sort();
+        await (0, config_1.saveConfig)({
+            ...config,
+            events: nextEvents,
+        });
+        console.log(chalk_1.default.green(`Updated: ${nextEvents.length}`));
     };
     const schedule = (file) => {
         const abs = normalize(file);
@@ -103,8 +106,7 @@ async function watch() {
         if (timer) {
             clearTimeout(timer);
         }
-        timer =
-            setTimeout(run, 200);
+        timer = setTimeout(run, 200);
     };
     watcher
         .on("change", schedule)
@@ -112,12 +114,12 @@ async function watch() {
         .on("unlink", async (file) => {
         const abs = normalize(file);
         await engine.removeFile((0, getVirtualFile_1.getVirtualFile)(abs), config);
-        const next = engine.getAllEvents()
-            .sort();
-        config.events =
-            next;
-        await (0, config_1.saveConfig)(config);
-        console.log(chalk_1.default.red(`Removed → ${next.length}`));
+        const nextEvents = engine.getAllEvents().sort();
+        await (0, config_1.saveConfig)({
+            ...config,
+            events: nextEvents,
+        });
+        console.log(chalk_1.default.red(`Removed → ${nextEvents.length}`));
     });
     process.on("SIGINT", async () => {
         await watcher.close();