@eventra_dev/eventra-cli 0.1.21 → 0.1.22

package/dist/utils/processFile.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processFile = processFile;
 const path_1 = __importDefault(require("path"));
-const universal_1 = require("./parsers/universal");
+const universal_1 = require("./universal");
 function processFile(file, content) {
     const { code, deps } = (0, universal_1.parseUniversal)(content, file);
     const ext = path_1.default.extname(file);

package/dist/utils/{parsers/universal.js → universal.js}

@@ -5,6 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseUniversal = parseUniversal;
 const path_1 = __importDefault(require("path"));
+/**
+ * exact JS:
+ * - {...}
+ * - attr="..."
+ * - Vue / Svelte handlers
+ */
 function extractJS(input) {
     const result = [];
     let i = 0;
@@ -29,7 +35,7 @@ function extractJS(input) {
             i++;
             continue;
         }
-        //  { ... }
+        // { ... }
         if (ch === "{") {
             let depth = 1;
             let j = i + 1;
@@ -66,7 +72,7 @@ function extractJS(input) {
                 continue;
             }
         }
-        //  attr="..."
+        // attr="..."
         if (ch === "=" && (input[i + 1] === '"' || input[i + 1] === "'")) {
             const quote = input[i + 1];
             let j = i + 2;
@@ -90,7 +96,7 @@ function extractJS(input) {
         }
         i++;
     }
-    // Vue / Svelte handlers
+    // Vue / Svelte / JSX handlers
     const extra = [
         /@[\w-]+\s*=\s*["']([\s\S]*?)["']/g,
         /v-on:[\w-]+\s*=\s*["']([\s\S]*?)["']/g,
@@ -107,17 +113,37 @@ function extractJS(input) {
     }
     return result;
 }
+function extractLooseJS(input) {
+    const result = [];
+    const lines = input.split("\n");
+    for (const line of lines) {
+        const l = line.trim();
+        if (!l)
+            continue;
+        if (l.startsWith("<"))
+            continue;
+        if (l.includes("(") ||
+            l.includes("=") ||
+            l.includes("=>") ||
+            l.includes("function") ||
+            l.includes("track")) {
+            result.push(l);
+        }
+    }
+    return result;
+}
 /**
+ * Universal:
  * - Astro
  * - Vue
  * - Svelte
- * - HTML + JS
- * - SSR / mixed files
+ * - React / JSX
+ * - Node / backend
  */
 function parseUniversal(content, file) {
     const parts = [];
     const deps = [];
-    //  Astro frontmatter
+    //  Astro frontmatter ---
     const fm = content.match(/^---([\s\S]*?)---/);
     if (fm?.[1])
         parts.push(fm[1]);
@@ -136,13 +162,11 @@ function parseUniversal(content, file) {
         if (m[1].trim())
             parts.push(m[1]);
     }
-    // JS <script>
     const noScripts = content.replace(/<script[\s\S]*?<\/script>/g, "");
-    const noHtml = noScripts
-        .replace(/<[^>]+>/g, "\n")
-        .replace(/\n+/g, "\n");
-    if (noHtml.trim())
-        parts.push(noHtml);
+    const loose = extractLooseJS(noScripts);
+    for (const l of loose) {
+        parts.push(l);
+    }
     // expressions
     const extracted = extractJS(content);
     for (const e of extracted) {

package/package.json

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

package/src/utils/processFile.ts

@@ -1,5 +1,5 @@
 import path from "path";
-import { parseUniversal } from "./parsers/universal";
+import { parseUniversal } from "./universal";
 
 export function processFile(file: string, content: string) {
   const { code, deps } = parseUniversal(content, file);

package/src/utils/{parsers/universal.ts → universal.ts}

@@ -1,6 +1,12 @@
 import path from "path";
-import { ParseResult } from "../../types";
+import { ParseResult } from "../types";
 
+/**
+ * exact JS:
+ * - {...}
+ * - attr="..."
+ * - Vue / Svelte handlers
+ */
 function extractJS(input: string): string[] {
   const result: string[] = [];
 
@@ -29,7 +35,7 @@ function extractJS(input: string): string[] {
       continue;
     }
 
-    //  { ... }
+    // { ... }
     if (ch === "{") {
       let depth = 1;
       let j = i + 1;
@@ -68,7 +74,7 @@ function extractJS(input: string): string[] {
       }
     }
 
-    //  attr="..."
+    // attr="..."
     if (ch === "=" && (input[i + 1] === '"' || input[i + 1] === "'")) {
       const quote = input[i + 1];
       let j = i + 2;
@@ -98,7 +104,7 @@ function extractJS(input: string): string[] {
     i++;
   }
 
-  // Vue / Svelte handlers
+  // Vue / Svelte / JSX handlers
   const extra = [
     /@[\w-]+\s*=\s*["']([\s\S]*?)["']/g,
     /v-on:[\w-]+\s*=\s*["']([\s\S]*?)["']/g,
@@ -117,12 +123,38 @@ function extractJS(input: string): string[] {
   return result;
 }
 
+function extractLooseJS(input: string): string[] {
+  const result: string[] = [];
+
+  const lines = input.split("\n");
+
+  for (const line of lines) {
+    const l = line.trim();
+
+    if (!l) continue;
+    if (l.startsWith("<")) continue;
+
+    if (
+      l.includes("(") ||
+      l.includes("=") ||
+      l.includes("=>") ||
+      l.includes("function") ||
+      l.includes("track")
+    ) {
+      result.push(l);
+    }
+  }
+
+  return result;
+}
+
 /**
+ * Universal:
  * - Astro
  * - Vue
  * - Svelte
- * - HTML + JS
- * - SSR / mixed files
+ * - React / JSX
+ * - Node / backend
  */
 
 export function parseUniversal(
@@ -132,7 +164,7 @@ export function parseUniversal(
   const parts: string[] = [];
   const deps: string[] = [];
 
-  //  Astro frontmatter
+  //  Astro frontmatter ---
   const fm = content.match(/^---([\s\S]*?)---/);
   if (fm?.[1]) parts.push(fm[1]);
 
@@ -160,17 +192,16 @@ export function parseUniversal(
     if (m[1].trim()) parts.push(m[1]);
   }
 
-  // JS <script>
   const noScripts = content.replace(
     /<script[\s\S]*?<\/script>/g,
     ""
   );
 
-  const noHtml = noScripts
-    .replace(/<[^>]+>/g, "\n")
-    .replace(/\n+/g, "\n");
+  const loose = extractLooseJS(noScripts);
 
-  if (noHtml.trim()) parts.push(noHtml);
+  for (const l of loose) {
+    parts.push(l);
+  }
 
   // expressions
   const extracted = extractJS(content);

package/dist/utils/parsers/router.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.detectParser = detectParser;
-const universal_1 = require("./universal");
-function detectParser() {
-    return universal_1.parseUniversal;
-}

package/dist/utils/parsers/utils.js

@@ -1,21 +0,0 @@
-"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/src/utils/parsers/router.ts

@@ -1,6 +0,0 @@
-import { Parser } from "../../types";
-import { parseUniversal } from "./universal";
-
-export function detectParser(): Parser {
-  return parseUniversal;
-}

package/src/utils/parsers/utils.ts

@@ -1,18 +0,0 @@
-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;
-}