@eventra_dev/eventra-cli 0.1.16 → 0.1.18

package/dist/commands/check.js

@@ -38,17 +38,18 @@ async function check({ fix = false }) {
     const known = new Set(config.events ?? []);
     const newEvents = [...found].filter(e => !known.has(e));
     const removed = [...known].filter(e => !found.has(e));
+    // FIX MODE
     if (fix) {
-        const merged = new Set(config.events ?? []);
-        newEvents.forEach(e => {
-            merged.add(e);
-            console.log(chalk_1.default.green(`+ ${e}`));
-        });
-        config.events = [...merged].sort();
+        const next = new Set();
+        found.forEach(e => next.add(e));
+        newEvents.forEach(e => console.log(chalk_1.default.green(`+ ${e}`)));
+        removed.forEach(e => console.log(chalk_1.default.red(`- ${e}`)));
+        config.events = [...next].sort();
         await (0, config_1.saveConfig)(config);
-        console.log(chalk_1.default.green("\nFixed"));
+        console.log(chalk_1.default.green(`\nSynced (${config.events.length} events)`));
         return;
     }
+    // CHECK MODE
     if (newEvents.length || removed.length) {
         if (newEvents.length) {
             console.log(chalk_1.default.red("\nNew events:"));

package/dist/commands/watch.js

@@ -12,13 +12,7 @@ const path_1 = __importDefault(require("path"));
 const config_1 = require("../utils/config");
 const engine_1 = require("../engine/engine");
 const processFile_1 = require("../utils/processFile");
-const toVirtual = async (file) => {
-    const abs = path_1.default.resolve(file);
-    const raw = await promises_1.default.readFile(abs, "utf-8");
-    return (0, processFile_1.processFile)(abs, raw);
-};
 async function watch() {
-    process.env.EVENTRA_WATCH = "1";
     const config = await (0, config_1.loadConfig)();
     if (!config)
         return;
@@ -34,7 +28,6 @@ async function watch() {
             const abs = path_1.default.resolve(file);
             const raw = await promises_1.default.readFile(abs, "utf-8");
             const { content, virtualFile } = (0, processFile_1.processFile)(abs, raw);
-            engine["ts"].updateFile(virtualFile, content);
             fileCache.push({ file: virtualFile, content });
         }
         catch {
@@ -59,7 +52,8 @@ async function watch() {
         queued.clear();
         for (const file of batch) {
             try {
-                const { content, virtualFile } = await toVirtual(file);
+                const raw = await promises_1.default.readFile(file, "utf-8");
+                const { content, virtualFile } = (0, processFile_1.processFile)(file, raw);
                 engine.updateFile(virtualFile, content, config);
             }
             catch {

package/dist/engine/scanner.js

@@ -87,6 +87,7 @@ function scanSource(source, checker, config, visited = new Set(), depth = 0, inh
             const isAutoWrapper = resolvedFn && (0, functionAnalyzer_1.findTrackParamIndex)(resolvedFn) !== null;
             const isTracking = isKnownWrapper ||
                 TRACKING_NAMES.has(name) ||
+                name.startsWith("$") || // NUXT FIX
                 (isAutoWrapper &&
                     resolvedFn &&
                     !(0, boundary_1.isExternalFile)(resolvedFn.getSourceFile().fileName));
@@ -97,7 +98,6 @@ function scanSource(source, checker, config, visited = new Set(), depth = 0, inh
             if (!isKnownWrapper && isAutoWrapper && !TRACKING_NAMES.has(name)) {
                 detectedFunctionWrappers.add(name);
             }
-            // paramMap (chain support)
             const paramMap = new Map(inheritedParamMap ?? []);
             if (resolvedFn && typescript_1.default.isFunctionLike(resolvedFn)) {
                 resolvedFn.parameters.forEach((param, i) => {
@@ -110,6 +110,7 @@ function scanSource(source, checker, config, visited = new Set(), depth = 0, inh
                 });
             }
             let handled = false;
+            // MAIN RESOLVE
             if (resolvedFn) {
                 const idx = (0, functionAnalyzer_1.findTrackParamIndex)(resolvedFn);
                 if (idx !== null && node.arguments[idx]) {
@@ -121,6 +122,7 @@ function scanSource(source, checker, config, visited = new Set(), depth = 0, inh
                     handled = true;
                 }
             }
+            // FALLBACK
             if (!handled) {
                 for (const arg of node.arguments) {
                     const res = (0, resolver_1.resolveNodeValue)(arg, checker, paramMap);
@@ -130,7 +132,7 @@ function scanSource(source, checker, config, visited = new Set(), depth = 0, inh
                     });
                 }
             }
-            // cross-file with paramMap
+            // CROSS FILE
             if (resolvedFn) {
                 const sf = resolvedFn.getSourceFile();
                 if (!visited.has(sf.fileName)) {

package/dist/utils/parsers/astro.js

@@ -1,13 +1,33 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseAstro = parseAstro;
-function parseAstro(content) {
-    const frontmatter = content.match(/---([\s\S]*?)---/);
-    const scripts = [
-        ...content.matchAll(/<script[^>]*>([\s\S]*?)<\/script>/g)
-    ];
-    return [
-        frontmatter?.[1] ?? "",
-        ...scripts.map(s => s[1])
-    ].join("\n");
+const path_1 = __importDefault(require("path"));
+function parseAstro(content, file) {
+    const parts = [];
+    // frontmatter
+    const frontmatter = content.match(/^---([\s\S]*?)---/);
+    if (frontmatter?.[1]) {
+        parts.push(frontmatter[1]);
+    }
+    const scripts = content.matchAll(/<script([^>]*)>([\s\S]*?)<\/script>/g);
+    for (const m of scripts) {
+        const attrs = m[1];
+        const body = m[2];
+        if (attrs.includes("src")) {
+            const src = attrs.match(/src=["'](.+?)["']/)?.[1];
+            if (!src)
+                continue;
+            const resolved = src.startsWith("/")
+                ? path_1.default.resolve(process.cwd(), src.slice(1))
+                : path_1.default.resolve(path_1.default.dirname(file), src);
+            parts.push(`import "${resolved}"`);
+        }
+        else {
+            parts.push(body);
+        }
+    }
+    return parts.join("\n");
 }

package/dist/utils/parsers/router.js

@@ -1,13 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.detectParser = detectParser;
+const vue_1 = require("./vue");
+const svelte_1 = require("./svelte");
+const astro_1 = require("./astro");
+const fallback = (content) => content;
 function detectParser(file) {
-    file = file.toLowerCase();
-    if (file.endsWith(".vue"))
-        return "vue";
-    if (file.endsWith(".svelte"))
-        return "svelte";
-    if (file.endsWith(".astro"))
-        return "astro";
-    return "ts";
+    const f = file.toLowerCase();
+    if (f.endsWith(".vue"))
+        return vue_1.parseVue;
+    if (f.endsWith(".svelte"))
+        return svelte_1.parseSvelte;
+    if (f.endsWith(".astro"))
+        return astro_1.parseAstro;
+    return fallback;
 }

package/dist/utils/parsers/svelte.js

@@ -1,9 +1,31 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseSvelte = parseSvelte;
-function parseSvelte(content) {
-    const scriptMatches = [
-        ...content.matchAll(/<script[^>]*>([\s\S]*?)<\/script>/g)
-    ];
-    return scriptMatches.map(m => m[1]).join("\n");
+const path_1 = __importDefault(require("path"));
+function parseSvelte(content, file) {
+    const parts = [];
+    const scripts = content.matchAll(/<script([^>]*)>([\s\S]*?)<\/script>/g);
+    for (const m of scripts) {
+        const attrs = m[1];
+        const body = m[2];
+        if (attrs.includes("src")) {
+            const src = attrs.match(/src=["'](.+?)["']/)?.[1];
+            if (!src)
+                continue;
+            const resolved = src.startsWith("/")
+                ? path_1.default.resolve(process.cwd(), src.slice(1))
+                : path_1.default.resolve(path_1.default.dirname(file), src);
+            parts.push(`import "${resolved}"`);
+            continue;
+        }
+        parts.push(body);
+    }
+    // handlers
+    for (const h of content.matchAll(/on:\w+=\{([^}]+)\}/g)) {
+        parts.push(`${h[1]}();`);
+    }
+    return parts.join("\n");
 }

package/dist/utils/parsers/vue.js

@@ -1,31 +1,41 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseVue = parseVue;
-function parseVue(content) {
-    const scriptMatches = [
-        ...content.matchAll(/<script[^>]*>([\s\S]*?)<\/script>/g)
-    ];
-    const script = scriptMatches.map(m => m[1]).join("\n");
-    // template
-    const templateMatch = content.match(/<template>([\s\S]*?)<\/template>/);
+const path_1 = __importDefault(require("path"));
+function parseVue(content, file) {
+    const parts = [];
+    const scripts = content.matchAll(/<script([^>]*)>([\s\S]*?)<\/script>/g);
+    for (const m of scripts) {
+        const attrs = m[1];
+        const body = m[2];
+        // src
+        if (attrs.includes("src")) {
+            const src = attrs.match(/src=["'](.+?)["']/)?.[1];
+            if (!src)
+                continue;
+            const resolved = src.startsWith("/")
+                ? path_1.default.resolve(process.cwd(), src.slice(1))
+                : path_1.default.resolve(path_1.default.dirname(file), src);
+            parts.push(`import "${resolved}"`);
+            continue;
+        }
+        // script setup
+        parts.push(body);
+    }
+    // TEMPLATE
+    const templateMatch = content.match(/<template[^>]*>([\s\S]*?)<\/template>/);
     let template = templateMatch?.[1] ?? "";
     template = template.replace(/<!--[\s\S]*?-->/g, "");
-    // Vue → JSX
-    template = template
-        .replace(/\bclass=/g, "className=")
-        .replace(/\bfor=/g, "htmlFor=")
-        .replace(/@(\w+)=/g, (_, e) => {
-        const name = e.charAt(0).toUpperCase() + e.slice(1);
-        return `on${name}=`;
-    })
-        .replace(/v-if="[^"]+"/g, "")
-        .replace(/v-for="[^"]+"/g, "");
-    const jsx = `
-const __VUE_JSX__ = (
-  <>
-    ${template}
-  </>
-);
-`;
-    return script + "\n" + jsx;
+    // @click
+    for (const m of template.matchAll(/@[\w-]+="([^"]+)"/g)) {
+        parts.push(`${m[1]}();`);
+    }
+    // v-on
+    for (const m of template.matchAll(/v-on:[\w-]+="([^"]+)"/g)) {
+        parts.push(`${m[1]}();`);
+    }
+    return parts.join("\n");
 }

package/dist/utils/processFile.js

@@ -1,22 +1,18 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processFile = processFile;
+const path_1 = __importDefault(require("path"));
 const router_1 = require("./parsers/router");
-const vue_1 = require("./parsers/vue");
-const svelte_1 = require("./parsers/svelte");
-const astro_1 = require("./parsers/astro");
 function processFile(file, content) {
-    const parser = (0, router_1.detectParser)(file);
-    if (parser === "vue")
-        content = (0, vue_1.parseVue)(content);
-    if (parser === "svelte")
-        content = (0, svelte_1.parseSvelte)(content);
-    if (parser === "astro")
-        content = (0, astro_1.parseAstro)(content);
-    const virtualFile = file.endsWith(".vue") ||
+    const abs = path_1.default.resolve(file);
+    const parser = (0, router_1.detectParser)(abs);
+    content = parser(content, abs);
+    const isVirtual = file.endsWith(".vue") ||
         file.endsWith(".svelte") ||
-        file.endsWith(".astro")
-        ? file + ".tsx"
-        : file;
+        file.endsWith(".astro");
+    const virtualFile = isVirtual ? abs + ".tsx" : abs;
     return { content, virtualFile };
 }

package/package.json

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

package/src/commands/check.ts

@@ -25,7 +25,6 @@ export async function check({ fix = false }: { fix?: boolean }) {
   for (const file of files) {
     try {
       const raw = await fs.readFile(file, "utf-8");
-
       const { content, virtualFile } = processFile(file, raw);
 
       engine.scanFile(virtualFile, content, config);
@@ -45,31 +44,45 @@ export async function check({ fix = false }: { fix?: boolean }) {
   const newEvents = [...found].filter(e => !known.has(e));
   const removed = [...known].filter(e => !found.has(e));
 
+  // FIX MODE
   if (fix) {
-    const merged = new Set(config.events ?? []);
+    const next = new Set<string>();
+
+    found.forEach(e => next.add(e));
 
-    newEvents.forEach(e => {
-      merged.add(e);
-      console.log(chalk.green(`+ ${e}`));
-    });
+    newEvents.forEach(e =>
+      console.log(chalk.green(`+ ${e}`))
+    );
 
-    config.events = [...merged].sort();
+    removed.forEach(e =>
+      console.log(chalk.red(`- ${e}`))
+    );
+
+    config.events = [...next].sort();
 
     await saveConfig(config);
 
-    console.log(chalk.green("\nFixed"));
+    console.log(
+      chalk.green(`\nSynced (${config.events.length} events)`)
+    );
+
     return;
   }
 
+  // CHECK MODE
   if (newEvents.length || removed.length) {
     if (newEvents.length) {
       console.log(chalk.red("\nNew events:"));
-      newEvents.forEach(e => console.log(chalk.red(`+ ${e}`)));
+      newEvents.forEach(e =>
+        console.log(chalk.red(`+ ${e}`))
+      );
     }
 
     if (removed.length) {
       console.log(chalk.yellow("\nRemoved events:"));
-      removed.forEach(e => console.log(chalk.yellow(`- ${e}`)));
+      removed.forEach(e =>
+        console.log(chalk.yellow(`- ${e}`))
+      );
     }
 
     process.exit(1);

package/src/commands/watch.ts

@@ -8,15 +8,7 @@ import { loadConfig, saveConfig } from "../utils/config";
 import { EventraEngine } from "../engine/engine";
 import { processFile } from "../utils/processFile";
 
-const toVirtual = async (file: string) => {
-  const abs = path.resolve(file);
-  const raw = await fs.readFile(abs, "utf-8");
-  return processFile(abs, raw);
-};
-
 export async function watch() {
-  process.env.EVENTRA_WATCH = "1";
-
   const config = await loadConfig();
   if (!config) return;
 
@@ -36,7 +28,6 @@ export async function watch() {
       const abs = path.resolve(file);
       const raw = await fs.readFile(abs, "utf-8");
       const { content, virtualFile } = processFile(abs, raw);
-      engine["ts"].updateFile(virtualFile, content);
       fileCache.push({ file: virtualFile, content });
     } catch {
       console.log(chalk.gray(`skip: ${file}`));
@@ -68,7 +59,8 @@ export async function watch() {
 
     for (const file of batch) {
       try {
-        const { content, virtualFile } = await toVirtual(file);
+        const raw = await fs.readFile(file, "utf-8");
+        const { content, virtualFile } = processFile(file, raw);
 
         engine.updateFile(virtualFile, content, config);
 

package/src/engine/scanner.ts

@@ -126,6 +126,7 @@ export function scanSource(
       const isTracking =
         isKnownWrapper ||
         TRACKING_NAMES.has(name) ||
+        name.startsWith("$") || // NUXT FIX
         (isAutoWrapper &&
           resolvedFn &&
           !isExternalFile(resolvedFn.getSourceFile().fileName));
@@ -139,7 +140,6 @@ export function scanSource(
         detectedFunctionWrappers.add(name);
       }
 
-      // paramMap (chain support)
       const paramMap = new Map(inheritedParamMap ?? []);
 
       if (resolvedFn && ts.isFunctionLike(resolvedFn)) {
@@ -155,6 +155,7 @@ export function scanSource(
 
       let handled = false;
 
+      // MAIN RESOLVE
       if (resolvedFn) {
         const idx = findTrackParamIndex(resolvedFn);
 
@@ -173,6 +174,7 @@ export function scanSource(
         }
       }
 
+      // FALLBACK
       if (!handled) {
         for (const arg of node.arguments) {
           const res = resolveNodeValue(arg, checker, paramMap);
@@ -183,7 +185,7 @@ export function scanSource(
         }
       }
 
-      // cross-file with paramMap
+      // CROSS FILE
       if (resolvedFn) {
         const sf = resolvedFn.getSourceFile();
 

package/src/types.ts

@@ -1,5 +1,7 @@
 export type ScanMode = "strict" | "hybrid" | "discovery";
 
+export type Parser = (content: string, file: string) => string;
+
 export type ComponentWrapper = {
   name: string;
   prop: string;
@@ -23,8 +25,3 @@ export type EventraConfig = {
     exclude: string[];
   };
 };
-
-export type ResolveResult = {
-  values: string[];
-  dynamic: boolean;
-};

package/src/utils/parsers/astro.ts

@@ -1,12 +1,33 @@
-export function parseAstro(content: string) {
-  const frontmatter = content.match(/---([\s\S]*?)---/);
+import path from "path";
 
-  const scripts = [
-    ...content.matchAll(/<script[^>]*>([\s\S]*?)<\/script>/g)
-  ];
+export function parseAstro(content: string, file: string) {
+  const parts: string[] = [];
 
-  return [
-    frontmatter?.[1] ?? "",
-    ...scripts.map(s => s[1])
-  ].join("\n");
+  // frontmatter
+  const frontmatter = content.match(/^---([\s\S]*?)---/);
+  if (frontmatter?.[1]) {
+    parts.push(frontmatter[1]);
+  }
+
+  const scripts = content.matchAll(/<script([^>]*)>([\s\S]*?)<\/script>/g);
+
+  for (const m of scripts) {
+    const attrs = m[1];
+    const body = m[2];
+
+    if (attrs.includes("src")) {
+      const src = attrs.match(/src=["'](.+?)["']/)?.[1];
+      if (!src) continue;
+
+      const resolved = src.startsWith("/")
+        ? path.resolve(process.cwd(), src.slice(1))
+        : path.resolve(path.dirname(file), src);
+
+      parts.push(`import "${resolved}"`);
+    } else {
+      parts.push(body);
+    }
+  }
+
+  return parts.join("\n");
 }

package/src/utils/parsers/router.ts

@@ -1,9 +1,16 @@
-export function detectParser(file: string) {
-  file = file.toLowerCase();
+import { Parser } from "../../types";
+import { parseVue } from "./vue";
+import { parseSvelte } from "./svelte";
+import { parseAstro } from "./astro";
 
-  if (file.endsWith(".vue")) return "vue";
-  if (file.endsWith(".svelte")) return "svelte";
-  if (file.endsWith(".astro")) return "astro";
+const fallback: Parser = (content) => content;
 
-  return "ts";
+export function detectParser(file: string): Parser {
+  const f = file.toLowerCase();
+
+  if (f.endsWith(".vue")) return parseVue;
+  if (f.endsWith(".svelte")) return parseSvelte;
+  if (f.endsWith(".astro")) return parseAstro;
+
+  return fallback;
 }

package/src/utils/parsers/svelte.ts

@@ -1,7 +1,33 @@
-export function parseSvelte(content: string) {
-  const scriptMatches = [
-    ...content.matchAll(/<script[^>]*>([\s\S]*?)<\/script>/g)
-  ];
+import path from "path";
 
-  return scriptMatches.map(m => m[1]).join("\n");
+export function parseSvelte(content: string, file: string) {
+  const parts: string[] = [];
+
+  const scripts = content.matchAll(/<script([^>]*)>([\s\S]*?)<\/script>/g);
+
+  for (const m of scripts) {
+    const attrs = m[1];
+    const body = m[2];
+
+    if (attrs.includes("src")) {
+      const src = attrs.match(/src=["'](.+?)["']/)?.[1];
+      if (!src) continue;
+
+      const resolved = src.startsWith("/")
+        ? path.resolve(process.cwd(), src.slice(1))
+        : path.resolve(path.dirname(file), src);
+
+      parts.push(`import "${resolved}"`);
+      continue;
+    }
+
+    parts.push(body);
+  }
+
+  // handlers
+  for (const h of content.matchAll(/on:\w+=\{([^}]+)\}/g)) {
+    parts.push(`${h[1]}();`);
+  }
+
+  return parts.join("\n");
 }

package/src/utils/parsers/vue.ts

@@ -1,34 +1,46 @@
-export function parseVue(content: string) {
-  const scriptMatches = [
-    ...content.matchAll(/<script[^>]*>([\s\S]*?)<\/script>/g)
-  ];
+import path from "path";
 
-  const script = scriptMatches.map(m => m[1]).join("\n");
+export function parseVue(content: string, file: string) {
+  const parts: string[] = [];
 
-  // template
-  const templateMatch = content.match(/<template>([\s\S]*?)<\/template>/);
+  const scripts = content.matchAll(/<script([^>]*)>([\s\S]*?)<\/script>/g);
+
+  for (const m of scripts) {
+    const attrs = m[1];
+    const body = m[2];
+
+    // src
+    if (attrs.includes("src")) {
+      const src = attrs.match(/src=["'](.+?)["']/)?.[1];
+      if (!src) continue;
+
+      const resolved = src.startsWith("/")
+        ? path.resolve(process.cwd(), src.slice(1))
+        : path.resolve(path.dirname(file), src);
+
+      parts.push(`import "${resolved}"`);
+      continue;
+    }
+
+    // script setup
+    parts.push(body);
+  }
+
+  // TEMPLATE
+  const templateMatch = content.match(/<template[^>]*>([\s\S]*?)<\/template>/);
   let template = templateMatch?.[1] ?? "";
 
   template = template.replace(/<!--[\s\S]*?-->/g, "");
 
-  // Vue → JSX
-  template = template
-    .replace(/\bclass=/g, "className=")
-    .replace(/\bfor=/g, "htmlFor=")
-    .replace(/@(\w+)=/g, (_, e) => {
-      const name = e.charAt(0).toUpperCase() + e.slice(1);
-      return `on${name}=`;
-    })
-    .replace(/v-if="[^"]+"/g, "")
-    .replace(/v-for="[^"]+"/g, "");
-
-  const jsx = `
-const __VUE_JSX__ = (
-  <>
-    ${template}
-  </>
-);
-`;
-
-  return script + "\n" + jsx;
+  // @click
+  for (const m of template.matchAll(/@[\w-]+="([^"]+)"/g)) {
+    parts.push(`${m[1]}();`);
+  }
+
+  // v-on
+  for (const m of template.matchAll(/v-on:[\w-]+="([^"]+)"/g)) {
+    parts.push(`${m[1]}();`);
+  }
+
+  return parts.join("\n");
 }

package/src/utils/processFile.ts

@@ -1,21 +1,18 @@
+import path from "path";
 import { detectParser } from "./parsers/router";
-import { parseVue } from "./parsers/vue";
-import { parseSvelte } from "./parsers/svelte";
-import { parseAstro } from "./parsers/astro";
 
 export function processFile(file: string, content: string) {
-  const parser = detectParser(file);
+  const abs = path.resolve(file);
 
-  if (parser === "vue") content = parseVue(content);
-  if (parser === "svelte") content = parseSvelte(content);
-  if (parser === "astro") content = parseAstro(content);
+  const parser = detectParser(abs);
+  content = parser(content, abs);
 
-  const virtualFile =
+  const isVirtual =
     file.endsWith(".vue") ||
     file.endsWith(".svelte") ||
-    file.endsWith(".astro")
-      ? file + ".tsx"
-      : file;
+    file.endsWith(".astro");
+
+  const virtualFile = isVirtual ? abs + ".tsx" : abs;
 
   return { content, virtualFile };
 }