@eventra_dev/eventra-cli 0.1.19 → 0.1.20

package/dist/utils/parsers/astro.js

@@ -5,6 +5,7 @@ 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 = [];
@@ -23,13 +24,22 @@ function parseAstro(content, file) {
             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);
+            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 {

package/dist/utils/parsers/svelte.js

@@ -1,15 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseSvelte = parseSvelte;
-function parseSvelte(content) {
+const utils_1 = require("./utils");
+function parseSvelte(content, file) {
     const parts = [];
     const deps = [];
     // script
     const scripts = content.matchAll(/<script[^>]*>([\s\S]*?)<\/script>/g);
     for (const m of scripts) {
-        parts.push(m[1]);
+        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);
+        }
     }
-    // on:click={...}
+    // handlers
     const handlers = content.matchAll(/on:\w+=\{([^}]+)\}/g);
     for (const h of handlers) {
         parts.push(h[1] + ";");

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,6 +5,7 @@ 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 = [];
@@ -18,12 +19,19 @@ function parseVue(content, file) {
             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);
             deps.push(resolved);
             continue;
         }
         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>/);
@@ -39,7 +47,7 @@ function parseVue(content, file) {
     for (const v of vOn) {
         parts.push(v[1] + ";");
     }
-    // :prop
+    // :bind
     const binds = template.matchAll(/:[\w-]+="([^"]+)"/g);
     for (const b of binds) {
         parts.push(b[1] + ";");

package/package.json

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

package/src/utils/parsers/astro.ts

@@ -1,5 +1,6 @@
 import path from "path";
 import { ParseResult } from "../../types";
+import { resolveImport } from "./utils";
 
 export function parseAstro(content: string, file: string): ParseResult {
   const parts: string[] = [];
@@ -23,13 +24,25 @@ export function parseAstro(content: string, file: string): ParseResult {
       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;
+
+      if (src.startsWith("/")) {
+        resolved = path.join(process.cwd(), src); // FIX
+      } else {
+        resolved = path.resolve(path.dirname(file), src);
+      }
 
       deps.push(resolved);
-    } else {
-      parts.push(body);
+      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);
     }
   }
 

package/src/utils/parsers/svelte.ts

@@ -1,16 +1,28 @@
 import { ParseResult } from "../../types";
+import { resolveImport } from "./utils";
 
-export function parseSvelte(content: string): ParseResult {
+export function parseSvelte(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) {
-    parts.push(m[1]);
+    const code = m[1];
+
+    parts.push(code);
+
+    // imports
+    const imports = code.matchAll(/import\s+.*?from\s+["'](.+?)["']/g);
+
+    for (const im of imports) {
+      const resolved = resolveImport(file, im[1]);
+      if (resolved) deps.push(resolved);
+    }
   }
 
-  // on:click={...}
+  // handlers
   const handlers = content.matchAll(/on:\w+=\{([^}]+)\}/g);
 
   for (const h of handlers) {

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,5 +1,6 @@
 import path from "path";
 import { ParseResult } from "../../types";
+import { resolveImport } from "./utils";
 
 export function parseVue(content: string, file: string): ParseResult {
   const parts: string[] = [];
@@ -17,7 +18,7 @@ export function parseVue(content: string, file: string): ParseResult {
       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);
 
       deps.push(resolved);
@@ -25,6 +26,14 @@ export function parseVue(content: string, file: string): ParseResult {
     }
 
     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
@@ -45,7 +54,7 @@ export function parseVue(content: string, file: string): ParseResult {
     parts.push(v[1] + ";");
   }
 
-  // :prop
+  // :bind
   const binds = template.matchAll(/:[\w-]+="([^"]+)"/g);
   for (const b of binds) {
     parts.push(b[1] + ";");