@eventra_dev/eventra-cli 0.1.18 → 0.1.20

package/dist/commands/check.js

@@ -24,14 +24,19 @@ async function check({ fix = false }) {
     for (const file of files) {
         try {
             const raw = await promises_1.default.readFile(file, "utf-8");
-            const { content, virtualFile } = (0, processFile_1.processFile)(file, raw);
+            const { content, virtualFile, deps } = (0, processFile_1.processFile)(file, raw);
             engine.scanFile(virtualFile, content, config);
+            for (const dep of deps) {
+                try {
+                    const depRaw = await promises_1.default.readFile(dep, "utf-8");
+                    const { content: depContent, virtualFile: depVirtual, } = (0, processFile_1.processFile)(dep, depRaw);
+                    engine.scanFile(depVirtual, depContent, config);
+                }
+                catch { }
+            }
         }
         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());

package/dist/commands/sync.js

@@ -29,13 +29,21 @@ async function sync() {
     for (const file of files) {
         try {
             const raw = await promises_1.default.readFile(file, "utf-8");
-            const { content, virtualFile } = (0, processFile_1.processFile)(file, raw);
+            const { content, virtualFile, deps } = (0, processFile_1.processFile)(file, raw);
             engine["ts"].updateFile(virtualFile, content);
             fileCache.push({ file: virtualFile, content });
+            // deps
+            for (const dep of deps) {
+                try {
+                    const depRaw = await promises_1.default.readFile(dep, "utf-8");
+                    const { content: depContent, virtualFile: depVirtual, } = (0, processFile_1.processFile)(dep, depRaw);
+                    engine["ts"].updateFile(depVirtual, depContent);
+                    fileCache.push({ file: depVirtual, content: depContent });
+                }
+                catch { }
+            }
         }
-        catch {
-            // ignore
-        }
+        catch { }
     }
     for (const { file, content } of fileCache) {
         try {

package/dist/commands/watch.js

@@ -53,8 +53,17 @@ async function watch() {
         for (const file of batch) {
             try {
                 const raw = await promises_1.default.readFile(file, "utf-8");
-                const { content, virtualFile } = (0, processFile_1.processFile)(file, raw);
+                const { content, virtualFile, deps } = (0, processFile_1.processFile)(file, raw);
                 engine.updateFile(virtualFile, content, config);
+                // deps
+                for (const dep of deps) {
+                    try {
+                        const depRaw = await promises_1.default.readFile(dep, "utf-8");
+                        const { content: depContent, virtualFile: depVirtual, } = (0, processFile_1.processFile)(dep, depRaw);
+                        engine.updateFile(depVirtual, depContent, config);
+                    }
+                    catch { }
+                }
             }
             catch {
                 console.log(chalk_1.default.gray(`skip: ${file}`));

package/dist/utils/parsers/astro.js

@@ -5,29 +5,45 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseAstro = parseAstro;
 const path_1 = __importDefault(require("path"));
+const utils_1 = require("./utils");
 function parseAstro(content, file) {
     const parts = [];
+    const deps = [];
     // 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];
+        // external script
         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}"`);
+            let resolved;
+            if (src.startsWith("/")) {
+                resolved = path_1.default.join(process.cwd(), src); // FIX
+            }
+            else {
+                resolved = path_1.default.resolve(path_1.default.dirname(file), src);
+            }
+            deps.push(resolved);
+            continue;
         }
-        else {
-            parts.push(body);
+        parts.push(body);
+        const imports = body.matchAll(/import\s+.*?from\s+["'](.+?)["']/g);
+        for (const im of imports) {
+            const resolved = (0, utils_1.resolveImport)(file, im[1]);
+            if (resolved)
+                deps.push(resolved);
         }
     }
-    return parts.join("\n");
+    return {
+        code: parts.join("\n"),
+        deps,
+    };
 }

package/dist/utils/parsers/router.js

@@ -4,7 +4,10 @@ exports.detectParser = detectParser;
 const vue_1 = require("./vue");
 const svelte_1 = require("./svelte");
 const astro_1 = require("./astro");
-const fallback = (content) => content;
+const fallback = (content) => ({
+    code: content,
+    deps: [],
+});
 function detectParser(file) {
     const f = file.toLowerCase();
     if (f.endsWith(".vue"))

package/dist/utils/parsers/svelte.js

@@ -1,31 +1,30 @@
 "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;
-const path_1 = __importDefault(require("path"));
+const utils_1 = require("./utils");
 function parseSvelte(content, file) {
     const parts = [];
-    const scripts = content.matchAll(/<script([^>]*)>([\s\S]*?)<\/script>/g);
+    const deps = [];
+    // 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)
-                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;
+        const code = m[1];
+        parts.push(code);
+        // imports
+        const imports = code.matchAll(/import\s+.*?from\s+["'](.+?)["']/g);
+        for (const im of imports) {
+            const resolved = (0, utils_1.resolveImport)(file, im[1]);
+            if (resolved)
+                deps.push(resolved);
         }
-        parts.push(body);
     }
     // handlers
-    for (const h of content.matchAll(/on:\w+=\{([^}]+)\}/g)) {
-        parts.push(`${h[1]}();`);
+    const handlers = content.matchAll(/on:\w+=\{([^}]+)\}/g);
+    for (const h of handlers) {
+        parts.push(h[1] + ";");
     }
-    return parts.join("\n");
+    return {
+        code: parts.join("\n"),
+        deps,
+    };
 }

package/dist/utils/parsers/utils.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveImport = resolveImport;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+function resolveImport(from, src) {
+    if (!src.startsWith("."))
+        return null;
+    const base = path_1.default.resolve(path_1.default.dirname(from), src);
+    const exts = [".ts", ".tsx", ".js", ".jsx"];
+    for (const ext of exts) {
+        if (fs_1.default.existsSync(base + ext))
+            return base + ext;
+    }
+    if (fs_1.default.existsSync(base))
+        return base;
+    return null;
+}

package/dist/utils/parsers/vue.js

@@ -5,37 +5,55 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseVue = parseVue;
 const path_1 = __importDefault(require("path"));
+const utils_1 = require("./utils");
 function parseVue(content, file) {
     const parts = [];
+    const deps = [];
+    // SCRIPT
     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.join(process.cwd(), src)
                 : path_1.default.resolve(path_1.default.dirname(file), src);
-            parts.push(`import "${resolved}"`);
+            deps.push(resolved);
             continue;
         }
-        // script setup
         parts.push(body);
+        // imports
+        const imports = body.matchAll(/import\s+.*?from\s+["'](.+?)["']/g);
+        for (const im of imports) {
+            const resolved = (0, utils_1.resolveImport)(file, im[1]);
+            if (resolved)
+                deps.push(resolved);
+        }
     }
     // TEMPLATE
     const templateMatch = content.match(/<template[^>]*>([\s\S]*?)<\/template>/);
     let template = templateMatch?.[1] ?? "";
     template = template.replace(/<!--[\s\S]*?-->/g, "");
     // @click
-    for (const m of template.matchAll(/@[\w-]+="([^"]+)"/g)) {
-        parts.push(`${m[1]}();`);
+    const handlers = template.matchAll(/@[\w-]+="([^"]+)"/g);
+    for (const h of handlers) {
+        parts.push(h[1] + ";");
     }
     // v-on
-    for (const m of template.matchAll(/v-on:[\w-]+="([^"]+)"/g)) {
-        parts.push(`${m[1]}();`);
+    const vOn = template.matchAll(/v-on:[\w-]+="([^"]+)"/g);
+    for (const v of vOn) {
+        parts.push(v[1] + ";");
+    }
+    // :bind
+    const binds = template.matchAll(/:[\w-]+="([^"]+)"/g);
+    for (const b of binds) {
+        parts.push(b[1] + ";");
     }
-    return parts.join("\n");
+    return {
+        code: parts.join("\n"),
+        deps,
+    };
 }

package/dist/utils/processFile.js

@@ -1,18 +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");
 function processFile(file, content) {
-    const abs = path_1.default.resolve(file);
-    const parser = (0, router_1.detectParser)(abs);
-    content = parser(content, abs);
-    const isVirtual = file.endsWith(".vue") ||
+    const parser = (0, router_1.detectParser)(file);
+    const res = parser(content, file);
+    const virtualFile = file.endsWith(".vue") ||
         file.endsWith(".svelte") ||
-        file.endsWith(".astro");
-    const virtualFile = isVirtual ? abs + ".tsx" : abs;
-    return { content, virtualFile };
+        file.endsWith(".astro")
+        ? file + ".tsx"
+        : file;
+    return {
+        content: res.code,
+        virtualFile,
+        deps: res.deps,
+    };
 }

package/package.json

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

package/src/commands/check.ts

@@ -25,16 +25,26 @@ 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);
+
+      const { content, virtualFile, deps } = processFile(file, raw);
 
       engine.scanFile(virtualFile, content, config);
 
-    } catch (err) {
-      console.log(chalk.yellow(`Skipped: ${file}`));
+      for (const dep of deps) {
+        try {
+          const depRaw = await fs.readFile(dep, "utf-8");
+
+          const {
+            content: depContent,
+            virtualFile: depVirtual,
+          } = processFile(dep, depRaw);
 
-      if (err instanceof Error) {
-        console.log(chalk.gray(err.message));
+          engine.scanFile(depVirtual, depContent, config);
+        } catch {}
       }
+
+    } catch (err) {
+      console.log(chalk.yellow(`Skipped: ${file}`));
     }
   }
 

package/src/commands/sync.ts

@@ -31,12 +31,29 @@ export async function sync() {
   for (const file of files) {
     try {
       const raw = await fs.readFile(file, "utf-8");
-      const { content, virtualFile } = processFile(file, raw);
+
+      const { content, virtualFile, deps } = processFile(file, raw);
+
       engine["ts"].updateFile(virtualFile, content);
       fileCache.push({ file: virtualFile, content });
-    } catch {
-      // ignore
-    }
+
+      // deps
+      for (const dep of deps) {
+        try {
+          const depRaw = await fs.readFile(dep, "utf-8");
+
+          const {
+            content: depContent,
+            virtualFile: depVirtual,
+          } = processFile(dep, depRaw);
+
+          engine["ts"].updateFile(depVirtual, depContent);
+          fileCache.push({ file: depVirtual, content: depContent });
+
+        } catch {}
+      }
+
+    } catch {}
   }
 
   for (const { file, content } of fileCache) {

package/src/commands/watch.ts

@@ -60,10 +60,26 @@ export async function watch() {
     for (const file of batch) {
       try {
         const raw = await fs.readFile(file, "utf-8");
-        const { content, virtualFile } = processFile(file, raw);
+
+        const { content, virtualFile, deps } = processFile(file, raw);
 
         engine.updateFile(virtualFile, content, config);
 
+        // deps
+        for (const dep of deps) {
+          try {
+            const depRaw = await fs.readFile(dep, "utf-8");
+
+            const {
+              content: depContent,
+              virtualFile: depVirtual,
+            } = processFile(dep, depRaw);
+
+            engine.updateFile(depVirtual, depContent, config);
+
+          } catch {}
+        }
+
       } catch {
         console.log(chalk.gray(`skip: ${file}`));
       }

package/src/types.ts

@@ -1,6 +1,12 @@
 export type ScanMode = "strict" | "hybrid" | "discovery";
 
-export type Parser = (content: string, file: string) => string;
+export type ParseResult = {
+  code: string;
+  deps: string[];
+};
+
+export type Parser = (content: string, file: string) => ParseResult;
+
 
 export type ComponentWrapper = {
   name: string;

package/src/utils/parsers/astro.ts

@@ -1,7 +1,10 @@
 import path from "path";
+import { ParseResult } from "../../types";
+import { resolveImport } from "./utils";
 
-export function parseAstro(content: string, file: string) {
+export function parseAstro(content: string, file: string): ParseResult {
   const parts: string[] = [];
+  const deps: string[] = [];
 
   // frontmatter
   const frontmatter = content.match(/^---([\s\S]*?)---/);
@@ -9,25 +12,42 @@ export function parseAstro(content: string, file: string) {
     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];
 
+    // external script
     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);
+      let resolved: string;
 
-      parts.push(`import "${resolved}"`);
-    } else {
-      parts.push(body);
+      if (src.startsWith("/")) {
+        resolved = path.join(process.cwd(), src); // FIX
+      } else {
+        resolved = path.resolve(path.dirname(file), src);
+      }
+
+      deps.push(resolved);
+      continue;
+    }
+
+    parts.push(body);
+
+    const imports = body.matchAll(/import\s+.*?from\s+["'](.+?)["']/g);
+
+    for (const im of imports) {
+      const resolved = resolveImport(file, im[1]);
+      if (resolved) deps.push(resolved);
     }
   }
 
-  return parts.join("\n");
+  return {
+    code: parts.join("\n"),
+    deps,
+  };
 }

package/src/utils/parsers/router.ts

@@ -3,7 +3,10 @@ import { parseVue } from "./vue";
 import { parseSvelte } from "./svelte";
 import { parseAstro } from "./astro";
 
-const fallback: Parser = (content) => content;
+const fallback: Parser = (content) => ({
+  code: content,
+  deps: [],
+});
 
 export function detectParser(file: string): Parser {
   const f = file.toLowerCase();

package/src/utils/parsers/svelte.ts

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

package/src/utils/parsers/utils.ts

@@ -0,0 +1,18 @@
+import fs from "fs";
+import path from "path";
+
+export function resolveImport(from: string, src: string): string | null {
+  if (!src.startsWith(".")) return null;
+
+  const base = path.resolve(path.dirname(from), src);
+
+  const exts = [".ts", ".tsx", ".js", ".jsx"];
+
+  for (const ext of exts) {
+    if (fs.existsSync(base + ext)) return base + ext;
+  }
+
+  if (fs.existsSync(base)) return base;
+
+  return null;
+}

package/src/utils/parsers/vue.ts

@@ -1,29 +1,39 @@
 import path from "path";
+import { ParseResult } from "../../types";
+import { resolveImport } from "./utils";
 
-export function parseVue(content: string, file: string) {
+export function parseVue(content: string, file: string): ParseResult {
   const parts: string[] = [];
+  const deps: string[] = [];
 
+  // SCRIPT
   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.join(process.cwd(), src)
         : path.resolve(path.dirname(file), src);
 
-      parts.push(`import "${resolved}"`);
+      deps.push(resolved);
       continue;
     }
 
-    // script setup
     parts.push(body);
+
+    // imports
+    const imports = body.matchAll(/import\s+.*?from\s+["'](.+?)["']/g);
+
+    for (const im of imports) {
+      const resolved = resolveImport(file, im[1]);
+      if (resolved) deps.push(resolved);
+    }
   }
 
   // TEMPLATE
@@ -33,14 +43,25 @@ export function parseVue(content: string, file: string) {
   template = template.replace(/<!--[\s\S]*?-->/g, "");
 
   // @click
-  for (const m of template.matchAll(/@[\w-]+="([^"]+)"/g)) {
-    parts.push(`${m[1]}();`);
+  const handlers = template.matchAll(/@[\w-]+="([^"]+)"/g);
+  for (const h of handlers) {
+    parts.push(h[1] + ";");
   }
 
   // v-on
-  for (const m of template.matchAll(/v-on:[\w-]+="([^"]+)"/g)) {
-    parts.push(`${m[1]}();`);
+  const vOn = template.matchAll(/v-on:[\w-]+="([^"]+)"/g);
+  for (const v of vOn) {
+    parts.push(v[1] + ";");
+  }
+
+  // :bind
+  const binds = template.matchAll(/:[\w-]+="([^"]+)"/g);
+  for (const b of binds) {
+    parts.push(b[1] + ";");
   }
 
-  return parts.join("\n");
+  return {
+    code: parts.join("\n"),
+    deps,
+  };
 }

package/src/utils/processFile.ts

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