@thyn/core 0.0.351 → 0.0.352

package/dist/plugin/utils.js

@@ -168,13 +168,13 @@ export function splitScript(script) {
     let inString = false;
     let stringChar = "";
     let inMultiLineComment = false;
+    let escaped = false;
     // Helper function to check if import is complete without semicolon
-    function isImportComplete(line, braceCount, inString) {
+    function isImportComplete(lineIndex, braceCount, inString) {
         // If we have balanced braces and not in a string, check if next non-empty line starts a new statement
         if (braceCount === 0 && !inString) {
             // Look ahead to see if next line starts a new statement/declaration
-            const nextLineIndex = lines.indexOf(line) + 1;
-            for (let i = nextLineIndex; i < lines.length; i++) {
+            for (let i = lineIndex + 1; i < lines.length; i++) {
                 const nextLine = lines[i].trim();
                 if (!nextLine || nextLine.startsWith("//") || nextLine.startsWith("/*")) {
                     continue; // Skip empty lines and comments
@@ -188,6 +188,7 @@ export function splitScript(script) {
         }
         return false;
     }
+    // Process each line, maintaining string/comment state
     for (let i = 0; i < lines.length; i++) {
         const line = lines[i];
         const trimmed = line.trim();
@@ -199,13 +200,34 @@ export function splitScript(script) {
             else {
                 body.push(line);
             }
-            if (line.includes("*/")) {
-                inMultiLineComment = false;
+            // Check for end of multi-line comment, tracking strings
+            for (let j = 0; j < line.length; j++) {
+                const char = line[j];
+                if (escaped) {
+                    escaped = false;
+                    continue;
+                }
+                if (char === '\\' && inString) {
+                    escaped = true;
+                    continue;
+                }
+                if (!inString && (char === '"' || char === "'" || char === '`')) {
+                    inString = true;
+                    stringChar = char;
+                }
+                else if (inString && char === stringChar) {
+                    inString = false;
+                    stringChar = "";
+                }
+                else if (!inString && char === '*' && line[j + 1] === '/') {
+                    inMultiLineComment = false;
+                    break;
+                }
             }
             continue;
         }
-        // Check for start of multi-line comment
-        if (line.includes("/*") && !inString) {
+        // Check for start of multi-line comment (only if not in string)
+        if (!inString && line.includes("/*")) {
             inMultiLineComment = true;
             if (inImport) {
                 currentImport.push(line);
@@ -213,15 +235,37 @@ export function splitScript(script) {
             else {
                 body.push(line);
             }
-            if (!line.includes("*/")) {
-                continue;
+            // Check if comment ends on same line
+            for (let j = 0; j < line.length; j++) {
+                const char = line[j];
+                if (escaped) {
+                    escaped = false;
+                    continue;
+                }
+                if (char === '\\' && inString) {
+                    escaped = true;
+                    continue;
+                }
+                if (!inString && (char === '"' || char === "'" || char === '`')) {
+                    inString = true;
+                    stringChar = char;
+                }
+                else if (inString && char === stringChar) {
+                    inString = false;
+                    stringChar = "";
+                }
+                else if (!inString && char === '*' && line[j + 1] === '/') {
+                    inMultiLineComment = false;
+                    break;
+                }
             }
-            else {
-                inMultiLineComment = false;
+            if (!inMultiLineComment) {
+                // Comment ended on same line
+                continue;
             }
         }
-        // Skip single-line comments when not in import
-        if (trimmed.startsWith("//") && !inImport) {
+        // Skip single-line comments when not in import (only if not in string)
+        if (!inString && !inImport && trimmed.startsWith("//")) {
             body.push(line);
             continue;
         }
@@ -230,37 +274,46 @@ export function splitScript(script) {
             body.push(line);
             continue;
         }
-        // Start of import statement
-        if (!inImport && trimmed.startsWith("import")) {
+        // Process the line character by character to maintain string state
+        let lineBraceCount = 0;
+        let lineInString = inString;
+        let lineStringChar = stringChar;
+        let lineEscaped = false;
+        for (let j = 0; j < line.length; j++) {
+            const char = line[j];
+            if (lineEscaped) {
+                lineEscaped = false;
+                continue;
+            }
+            if (char === '\\' && lineInString) {
+                lineEscaped = true;
+                continue;
+            }
+            if (!lineInString && (char === '"' || char === "'" || char === '`')) {
+                lineInString = true;
+                lineStringChar = char;
+            }
+            else if (lineInString && char === lineStringChar) {
+                lineInString = false;
+                lineStringChar = "";
+            }
+            else if (!lineInString && char === '{') {
+                lineBraceCount++;
+            }
+            else if (!lineInString && char === '}') {
+                lineBraceCount--;
+            }
+        }
+        // Start of import statement (only if not inside a string)
+        if (!inImport && !inString && trimmed.startsWith("import")) {
             inImport = true;
             currentImport = [line];
-            braceCount = 0;
-            inString = false;
-            // Count braces and track strings in the import line
-            for (let j = 0; j < line.length; j++) {
-                const char = line[j];
-                if (inString) {
-                    if (char === stringChar && line[j - 1] !== "\\") {
-                        inString = false;
-                        stringChar = "";
-                    }
-                }
-                else {
-                    if (char === '"' || char === "'" || char === "`") {
-                        inString = true;
-                        stringChar = char;
-                    }
-                    else if (char === "{") {
-                        braceCount++;
-                    }
-                    else if (char === "}") {
-                        braceCount--;
-                    }
-                }
-            }
-            // Check if import is complete
+            braceCount = lineBraceCount;
+            inString = lineInString;
+            stringChar = lineStringChar;
+            // Check if import is complete on this line
             if ((trimmed.endsWith(";") ||
-                isImportComplete(trimmed, braceCount, inString)) &&
+                isImportComplete(i, braceCount, inString)) &&
                 braceCount === 0 && !inString) {
                 imports.push(currentImport.join("\n"));
                 currentImport = [];
@@ -269,31 +322,12 @@ export function splitScript(script) {
         } // Continue import statement
         else if (inImport) {
             currentImport.push(line);
-            // Count braces and track strings in the current line
-            for (let j = 0; j < line.length; j++) {
-                const char = line[j];
-                if (inString) {
-                    if (char === stringChar && line[j - 1] !== "\\") {
-                        inString = false;
-                        stringChar = "";
-                    }
-                }
-                else {
-                    if (char === '"' || char === "'" || char === "`") {
-                        inString = true;
-                        stringChar = char;
-                    }
-                    else if (char === "{") {
-                        braceCount++;
-                    }
-                    else if (char === "}") {
-                        braceCount--;
-                    }
-                }
-            }
+            braceCount += lineBraceCount;
+            inString = lineInString;
+            stringChar = lineStringChar;
             // Check if import is complete
             if ((trimmed.endsWith(";") ||
-                isImportComplete(trimmed, braceCount, inString)) &&
+                isImportComplete(i, braceCount, inString)) &&
                 braceCount === 0 && !inString) {
                 imports.push(currentImport.join("\n"));
                 currentImport = [];
@@ -302,11 +336,21 @@ export function splitScript(script) {
         } // Regular body content
         else {
             body.push(line);
+            // Update global string state
+            inString = lineInString;
+            stringChar = lineStringChar;
         }
     }
-    // Handle unterminated import (likely malformed)
+    // Handle unterminated import (likely malformed or still in string)
     if (currentImport.length > 0) {
-        imports.push(currentImport.join("\n"));
+        if (inImport && !inString) {
+            // Import seems complete but wasn't captured properly
+            imports.push(currentImport.join("\n"));
+        }
+        else {
+            // Still in string or incomplete, treat as body
+            body.push(...currentImport);
+        }
     }
     return {
         imports: imports.filter((imp) => imp.trim()),

package/docs/package-lock.json

@@ -8,7 +8,7 @@
       "name": "thyn-app",
       "version": "0.0.0",
       "devDependencies": {
-        "@thyn/core": "^0.0.350",
+        "@thyn/core": "^0.0.351",
         "vite": "^6.3.5"
       }
     },
@@ -742,9 +742,9 @@
       ]
     },
     "node_modules/@thyn/core": {
-      "version": "0.0.350",
-      "resolved": "https://registry.npmjs.org/@thyn/core/-/core-0.0.350.tgz",
-      "integrity": "sha512-SZTB1jjjsXEkZg1BlH7s4Lhe8kWN/74ufNlNMnI86x+9tiyc0yvMLh+GFhe7VkIS//NrEwdgjR3ktpJlGeMEfA==",
+      "version": "0.0.351",
+      "resolved": "https://registry.npmjs.org/@thyn/core/-/core-0.0.351.tgz",
+      "integrity": "sha512-67M0/0wrdz1mNIMZ9V7Nq1jEO1C1iLdoG9rnjFcDGlDQRFM/HlNizvVWOaq2RfapVpgtRqIsKAA5iBloLE2GIA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

package/docs/package.json

@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@thyn/core": "^0.0.350",
+    "@thyn/core": "^0.0.351",
     "vite": "^6.3.5"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thyn/core",
-  "version": "0.0.351",
+  "version": "0.0.352",
   "type": "module",
   "main": "dist/index.js",
   "exports": {

package/src/plugin/utils.ts

@@ -186,20 +186,20 @@ export function splitScript(script: string) {
   const lines = script.split("\n");
   const imports = [];
   const body = [];
-  let currentImport = [];
+  let currentImport: string[] = [];
   let inImport = false;
   let braceCount = 0;
   let inString = false;
   let stringChar = "";
   let inMultiLineComment = false;
+  let escaped = false;
 
   // Helper function to check if import is complete without semicolon
-  function isImportComplete(line, braceCount, inString) {
+  function isImportComplete(lineIndex: number, braceCount: number, inString: boolean): boolean {
     // If we have balanced braces and not in a string, check if next non-empty line starts a new statement
     if (braceCount === 0 && !inString) {
       // Look ahead to see if next line starts a new statement/declaration
-      const nextLineIndex = lines.indexOf(line) + 1;
-      for (let i = nextLineIndex; i < lines.length; i++) {
+      for (let i = lineIndex + 1; i < lines.length; i++) {
         const nextLine = lines[i].trim();
         if (
           !nextLine || nextLine.startsWith("//") || nextLine.startsWith("/*")
@@ -216,6 +216,7 @@ export function splitScript(script: string) {
     return false;
   }
 
+  // Process each line, maintaining string/comment state
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i];
     const trimmed = line.trim();
@@ -228,14 +229,33 @@ export function splitScript(script: string) {
         body.push(line);
       }
 
-      if (line.includes("*/")) {
-        inMultiLineComment = false;
+      // Check for end of multi-line comment, tracking strings
+      for (let j = 0; j < line.length; j++) {
+        const char = line[j];
+        if (escaped) {
+          escaped = false;
+          continue;
+        }
+        if (char === '\\' && inString) {
+          escaped = true;
+          continue;
+        }
+        if (!inString && (char === '"' || char === "'" || char === '`')) {
+          inString = true;
+          stringChar = char;
+        } else if (inString && char === stringChar) {
+          inString = false;
+          stringChar = "";
+        } else if (!inString && char === '*' && line[j + 1] === '/') {
+          inMultiLineComment = false;
+          break;
+        }
       }
       continue;
     }
 
-    // Check for start of multi-line comment
-    if (line.includes("/*") && !inString) {
+    // Check for start of multi-line comment (only if not in string)
+    if (!inString && line.includes("/*")) {
       inMultiLineComment = true;
       if (inImport) {
         currentImport.push(line);
@@ -243,15 +263,37 @@ export function splitScript(script: string) {
         body.push(line);
       }
 
-      if (!line.includes("*/")) {
+      // Check if comment ends on same line
+      for (let j = 0; j < line.length; j++) {
+        const char = line[j];
+        if (escaped) {
+          escaped = false;
+          continue;
+        }
+        if (char === '\\' && inString) {
+          escaped = true;
+          continue;
+        }
+        if (!inString && (char === '"' || char === "'" || char === '`')) {
+          inString = true;
+          stringChar = char;
+        } else if (inString && char === stringChar) {
+          inString = false;
+          stringChar = "";
+        } else if (!inString && char === '*' && line[j + 1] === '/') {
+          inMultiLineComment = false;
+          break;
+        }
+      }
+      
+      if (!inMultiLineComment) {
+        // Comment ended on same line
         continue;
-      } else {
-        inMultiLineComment = false;
       }
     }
 
-    // Skip single-line comments when not in import
-    if (trimmed.startsWith("//") && !inImport) {
+    // Skip single-line comments when not in import (only if not in string)
+    if (!inString && !inImport && trimmed.startsWith("//")) {
       body.push(line);
       continue;
     }
@@ -262,38 +304,50 @@ export function splitScript(script: string) {
       continue;
     }
 
-    // Start of import statement
-    if (!inImport && trimmed.startsWith("import")) {
-      inImport = true;
-      currentImport = [line];
-      braceCount = 0;
-      inString = false;
+    // Process the line character by character to maintain string state
+    let lineBraceCount = 0;
+    let lineInString = inString;
+    let lineStringChar = stringChar;
+    let lineEscaped = false;
 
-      // Count braces and track strings in the import line
-      for (let j = 0; j < line.length; j++) {
-        const char = line[j];
+    for (let j = 0; j < line.length; j++) {
+      const char = line[j];
 
-        if (inString) {
-          if (char === stringChar && line[j - 1] !== "\\") {
-            inString = false;
-            stringChar = "";
-          }
-        } else {
-          if (char === '"' || char === "'" || char === "`") {
-            inString = true;
-            stringChar = char;
-          } else if (char === "{") {
-            braceCount++;
-          } else if (char === "}") {
-            braceCount--;
-          }
-        }
+      if (lineEscaped) {
+        lineEscaped = false;
+        continue;
       }
 
-      // Check if import is complete
+      if (char === '\\' && lineInString) {
+        lineEscaped = true;
+        continue;
+      }
+
+      if (!lineInString && (char === '"' || char === "'" || char === '`')) {
+        lineInString = true;
+        lineStringChar = char;
+      } else if (lineInString && char === lineStringChar) {
+        lineInString = false;
+        lineStringChar = "";
+      } else if (!lineInString && char === '{') {
+        lineBraceCount++;
+      } else if (!lineInString && char === '}') {
+        lineBraceCount--;
+      }
+    }
+
+    // Start of import statement (only if not inside a string)
+    if (!inImport && !inString && trimmed.startsWith("import")) {
+      inImport = true;
+      currentImport = [line];
+      braceCount = lineBraceCount;
+      inString = lineInString;
+      stringChar = lineStringChar;
+
+      // Check if import is complete on this line
       if (
         (trimmed.endsWith(";") ||
-          isImportComplete(trimmed, braceCount, inString)) &&
+          isImportComplete(i, braceCount, inString)) &&
         braceCount === 0 && !inString
       ) {
         imports.push(currentImport.join("\n"));
@@ -303,32 +357,14 @@ export function splitScript(script: string) {
     } // Continue import statement
     else if (inImport) {
       currentImport.push(line);
-
-      // Count braces and track strings in the current line
-      for (let j = 0; j < line.length; j++) {
-        const char = line[j];
-
-        if (inString) {
-          if (char === stringChar && line[j - 1] !== "\\") {
-            inString = false;
-            stringChar = "";
-          }
-        } else {
-          if (char === '"' || char === "'" || char === "`") {
-            inString = true;
-            stringChar = char;
-          } else if (char === "{") {
-            braceCount++;
-          } else if (char === "}") {
-            braceCount--;
-          }
-        }
-      }
+      braceCount += lineBraceCount;
+      inString = lineInString;
+      stringChar = lineStringChar;
 
       // Check if import is complete
       if (
         (trimmed.endsWith(";") ||
-          isImportComplete(trimmed, braceCount, inString)) &&
+          isImportComplete(i, braceCount, inString)) &&
         braceCount === 0 && !inString
       ) {
         imports.push(currentImport.join("\n"));
@@ -338,12 +374,21 @@ export function splitScript(script: string) {
     } // Regular body content
     else {
       body.push(line);
+      // Update global string state
+      inString = lineInString;
+      stringChar = lineStringChar;
     }
   }
 
-  // Handle unterminated import (likely malformed)
+  // Handle unterminated import (likely malformed or still in string)
   if (currentImport.length > 0) {
-    imports.push(currentImport.join("\n"));
+    if (inImport && !inString) {
+      // Import seems complete but wasn't captured properly
+      imports.push(currentImport.join("\n"));
+    } else {
+      // Still in string or incomplete, treat as body
+      body.push(...currentImport);
+    }
   }
 
   return {

package/tests/ImportInString.test.ts

@@ -0,0 +1,15 @@
+import { describe, expect, it } from "vitest";
+import ImportInString from "./ImportInString.thyn";
+
+describe("ImportInString component", () => {
+  it("should not treat imports inside string literals as real imports", () => {
+    const root = ImportInString();
+    expect(root.textContent).toBe("42");
+  });
+
+  it("should include the import statements in the codeSnippet", () => {
+    const root = ImportInString();
+    // The codeSnippet should be available (this tests the script was parsed correctly)
+    expect(root).toBeTruthy();
+  });
+});

package/tests/ImportInString.thyn

@@ -0,0 +1,15 @@
+<script>
+  const codeSnippet = `// main.js
+import { mount } from '@thyn/core';
+import App from './App.thyn';
+
+mount(App, document.body);`;
+
+  const value = 42;
+</script>
+
+<div>{{ value }}</div>
+
+<style>
+  div { color: red; }
+</style>