@eventra_dev/eventra-cli 0.1.16 → 0.1.17

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/utils/parsers/astro.js

@@ -2,12 +2,31 @@
 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 parts = [];
+    // frontmatter
+    const frontmatter = content.match(/^---([\s\S]*?)---/);
+    if (frontmatter?.[1]) {
+        parts.push(frontmatter[1]);
+    }
+    // scripts
+    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) {
+                parts.push(`import "${src}"`);
+            }
+        }
+        else {
+            parts.push(body);
+        }
+    }
+    // inline handlers
+    const inlineJS = content.matchAll(/on\w+="([^"]+)"/g);
+    for (const m of inlineJS) {
+        parts.push(m[1] + ";");
+    }
+    return parts.join("\n");
 }

package/dist/utils/parsers/svelte.js

@@ -2,8 +2,16 @@
 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 parts = [];
+    // scripts
+    const scripts = content.matchAll(/<script[^>]*>([\s\S]*?)<\/script>/g);
+    for (const m of scripts) {
+        parts.push(m[1]);
+    }
+    // on:click / on:*
+    const handlers = content.matchAll(/on:\w+=\{([^}]+)\}/g);
+    for (const h of handlers) {
+        parts.push(h[1] + ";");
+    }
+    return parts.join("\n");
 }

package/dist/utils/parsers/vue.js

@@ -2,30 +2,40 @@
 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 parts = [];
+    // --- SCRIPT ---
+    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) {
+                parts.push(`import "${src}"`);
+            }
+            continue;
+        }
+        parts.push(body);
+    }
+    // --- TEMPLATE ---
+    const templateMatch = content.match(/<template[^>]*>([\s\S]*?)<\/template>/);
     let template = templateMatch?.[1] ?? "";
+    // remove comments
     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;
+    // --- event handlers (@click)
+    const handlers = template.matchAll(/@[\w-]+="([^"]+)"/g);
+    for (const h of handlers) {
+        parts.push(h[1] + ";");
+    }
+    // --- v-on
+    const vOn = template.matchAll(/v-on:[\w-]+="([^"]+)"/g);
+    for (const v of vOn) {
+        parts.push(v[1] + ";");
+    }
+    // --- :prop bindings
+    const binds = template.matchAll(/:[\w-]+="([^"]+)"/g);
+    for (const b of binds) {
+        parts.push(b[1] + ";");
+    }
+    return parts.join("\n");
 }

package/package.json

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

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/utils/parsers/astro.ts

@@ -1,12 +1,35 @@
 export function parseAstro(content: string) {
-  const frontmatter = content.match(/---([\s\S]*?)---/);
+  const parts: string[] = [];
 
-  const scripts = [
-    ...content.matchAll(/<script[^>]*>([\s\S]*?)<\/script>/g)
-  ];
+  // frontmatter
+  const frontmatter = content.match(/^---([\s\S]*?)---/);
+  if (frontmatter?.[1]) {
+    parts.push(frontmatter[1]);
+  }
 
-  return [
-    frontmatter?.[1] ?? "",
-    ...scripts.map(s => s[1])
-  ].join("\n");
+  // scripts
+  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) {
+        parts.push(`import "${src}"`);
+      }
+    } else {
+      parts.push(body);
+    }
+  }
+
+  // inline handlers
+  const inlineJS = content.matchAll(/on\w+="([^"]+)"/g);
+
+  for (const m of inlineJS) {
+    parts.push(m[1] + ";");
+  }
+
+  return parts.join("\n");
 }

package/src/utils/parsers/svelte.ts

@@ -1,7 +1,17 @@
 export function parseSvelte(content: string) {
-  const scriptMatches = [
-    ...content.matchAll(/<script[^>]*>([\s\S]*?)<\/script>/g)
-  ];
+  const parts: string[] = [];
 
-  return scriptMatches.map(m => m[1]).join("\n");
+  // scripts
+  const scripts = content.matchAll(/<script[^>]*>([\s\S]*?)<\/script>/g);
+  for (const m of scripts) {
+    parts.push(m[1]);
+  }
+
+  // on:click / on:*
+  const handlers = content.matchAll(/on:\w+=\{([^}]+)\}/g);
+  for (const h of handlers) {
+    parts.push(h[1] + ";");
+  }
+
+  return parts.join("\n");
 }

package/src/utils/parsers/vue.ts

@@ -1,34 +1,48 @@
 export function parseVue(content: string) {
-  const scriptMatches = [
-    ...content.matchAll(/<script[^>]*>([\s\S]*?)<\/script>/g)
-  ];
+  const parts: string[] = [];
 
-  const script = scriptMatches.map(m => m[1]).join("\n");
+  // --- SCRIPT ---
+  const scripts = content.matchAll(/<script([^>]*)>([\s\S]*?)<\/script>/g);
 
-  // template
-  const templateMatch = content.match(/<template>([\s\S]*?)<\/template>/);
+  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) {
+        parts.push(`import "${src}"`);
+      }
+      continue;
+    }
+
+    parts.push(body);
+  }
+
+  // --- TEMPLATE ---
+  const templateMatch = content.match(/<template[^>]*>([\s\S]*?)<\/template>/);
   let template = templateMatch?.[1] ?? "";
 
+  // remove comments
   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;
+  // --- event handlers (@click)
+  const handlers = template.matchAll(/@[\w-]+="([^"]+)"/g);
+  for (const h of handlers) {
+    parts.push(h[1] + ";");
+  }
+
+  // --- v-on
+  const vOn = template.matchAll(/v-on:[\w-]+="([^"]+)"/g);
+  for (const v of vOn) {
+    parts.push(v[1] + ";");
+  }
+
+  // --- :prop bindings
+  const binds = template.matchAll(/:[\w-]+="([^"]+)"/g);
+  for (const b of binds) {
+    parts.push(b[1] + ";");
+  }
+
+  return parts.join("\n");
 }