@thyn/core 0.0.353 → 0.0.354

package/README.md

@@ -35,7 +35,7 @@ npm run dev
 </button>
 
 <style>
-  /* Styles are scoped by default to prevent style bleeding 🎉 */
+  /* Styles are scoped by default to prevent style bleeding */
   button {
     background: #333;
     border: 0;

package/dist/plugin/index.js

@@ -879,7 +879,7 @@ export async function transformSFC(source, id) {
     s.append([
         "",
         `export default function ${name}($props) {`,
-        ...body.map((l) => "  " + l),
+        ...body.map((l) => (l.shouldIndent ? "  " + l.text : l.text)),
         removeUnusedThynVars(`  ${transformed} return ${root};`),
         `}`,
     ].join("\n"));

package/dist/plugin/utils.js

@@ -268,7 +268,7 @@ export function splitScript(script) {
                 currentImport.push(line);
             }
             else {
-                body.push(line);
+                body.push({ text: line, shouldIndent: true });
             }
             // Check for end of multi-line comment, tracking strings
             for (let j = 0; j < line.length; j++) {
@@ -303,7 +303,7 @@ export function splitScript(script) {
                 currentImport.push(line);
             }
             else {
-                body.push(line);
+                body.push({ text: line, shouldIndent: !inString });
             }
             // Check if comment ends on same line
             for (let j = 0; j < line.length; j++) {
@@ -336,12 +336,12 @@ export function splitScript(script) {
         }
         // Skip single-line comments when not in import (only if not in string)
         if (!inString && !inImport && trimmed.startsWith("//")) {
-            body.push(line);
+            body.push({ text: line, shouldIndent: true });
             continue;
         }
         // Skip empty lines when not in import
         if (!trimmed && !inImport) {
-            body.push(line);
+            body.push({ text: line, shouldIndent: true });
             continue;
         }
         // Process the line character by character to maintain string state
@@ -405,7 +405,7 @@ export function splitScript(script) {
             }
         } // Regular body content
         else {
-            body.push(line);
+            body.push({ text: line, shouldIndent: !inString });
             // Update global string state
             inString = lineInString;
             stringChar = lineStringChar;
@@ -419,11 +419,15 @@ export function splitScript(script) {
         }
         else {
             // Still in string or incomplete, treat as body
-            body.push(...currentImport);
+            // We can't know for sure about indentation here, but if it was part of an import or string,
+            // it likely follows previous logic. For safety, if we are in string, don't indent.
+            for (const l of currentImport) {
+                body.push({ text: l, shouldIndent: !inString });
+            }
         }
     }
     return {
         imports: imports.filter((imp) => imp.trim()),
-        body: body.length > 0 ? body : [""],
+        body: body.length > 0 ? body : [{ text: "", shouldIndent: true }],
     };
 }

package/docs/package-lock.json

@@ -8,7 +8,7 @@
       "name": "thyn-app",
       "version": "0.0.0",
       "devDependencies": {
-        "@thyn/core": "^0.0.352",
+        "@thyn/core": "^0.0.353",
         "vite": "^6.3.5"
       }
     },
@@ -742,9 +742,9 @@
       ]
     },
     "node_modules/@thyn/core": {
-      "version": "0.0.352",
-      "resolved": "https://registry.npmjs.org/@thyn/core/-/core-0.0.352.tgz",
-      "integrity": "sha512-XvVkZ63CdWxF+OIOnLoxPOesQ0OFlfr/1CY4/LNrZO2QTK4/I92cRlbDaW1ajN3YDSuvf7BeEuWZe5hYn8Jd/Q==",
+      "version": "0.0.353",
+      "resolved": "https://registry.npmjs.org/@thyn/core/-/core-0.0.353.tgz",
+      "integrity": "sha512-vg8X99bz1H+cCJtwPY8chIRBiRA+R26uI5XOOqXxL+jW2qWzZd7PID0EzkYi3zbfbCX0I3u5A+kfjbBJucFYAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

package/docs/package.json

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

package/docs/src/pages/Home.thyn

@@ -49,11 +49,7 @@ mount(App, document.body);`;
   <div class="compiled-wrapper">
     <div>
       <h4>source</h4>
-      <pre>
-        <code class="code language-javascript">
-            {{ codeSnippet }}
-        </code>
-      </pre>
+      <pre><code class="code language-javascript">{{ codeSnippet }}</code></pre>
     </div>
     <div>
       <h4>compiled</h4>

package/package.json

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

package/src/plugin/index.ts

@@ -977,7 +977,7 @@ export async function transformSFC(source: string, id: string) {
   s.append([
     "",
     `export default function ${name}($props) {`,
-    ...body.map((l) => "  " + l),
+    ...body.map((l: any) => (l.shouldIndent ? "  " + l.text : l.text)),
     removeUnusedThynVars(`  ${transformed} return ${root};`),
     `}`,
   ].join("\n"));

package/src/plugin/utils.ts

@@ -304,7 +304,7 @@ export function splitScript(script: string) {
       if (inImport) {
         currentImport.push(line);
       } else {
-        body.push(line);
+        body.push({ text: line, shouldIndent: true });
       }
 
       // Check for end of multi-line comment, tracking strings
@@ -338,7 +338,7 @@ export function splitScript(script: string) {
       if (inImport) {
         currentImport.push(line);
       } else {
-        body.push(line);
+        body.push({ text: line, shouldIndent: !inString });
       }
 
       // Check if comment ends on same line
@@ -372,13 +372,13 @@ export function splitScript(script: string) {
 
     // Skip single-line comments when not in import (only if not in string)
     if (!inString && !inImport && trimmed.startsWith("//")) {
-      body.push(line);
+      body.push({ text: line, shouldIndent: true });
       continue;
     }
 
     // Skip empty lines when not in import
     if (!trimmed && !inImport) {
-      body.push(line);
+      body.push({ text: line, shouldIndent: true });
       continue;
     }
 
@@ -451,7 +451,7 @@ export function splitScript(script: string) {
       }
     } // Regular body content
     else {
-      body.push(line);
+      body.push({ text: line, shouldIndent: !inString });
       // Update global string state
       inString = lineInString;
       stringChar = lineStringChar;
@@ -465,12 +465,16 @@ export function splitScript(script: string) {
       imports.push(currentImport.join("\n"));
     } else {
       // Still in string or incomplete, treat as body
-      body.push(...currentImport);
+      // We can't know for sure about indentation here, but if it was part of an import or string,
+      // it likely follows previous logic. For safety, if we are in string, don't indent.
+      for(const l of currentImport) {
+          body.push({ text: l, shouldIndent: !inString });
+      }
     }
   }
 
   return {
     imports: imports.filter((imp) => imp.trim()),
-    body: body.length > 0 ? body : [""],
+    body: body.length > 0 ? body : [{ text: "", shouldIndent: true }],
   };
 }

package/tests/CodeSnippet.test.ts

@@ -16,6 +16,17 @@ describe("CodeSnippet component", () => {
     expect(display.textContent).toContain("button {");
   });
 
+  it("should not add extra indentation to template literals", () => {
+    const root = CodeSnippet();
+    const display = root.querySelector('.display');
+    const text = display.textContent;
+
+    // Check that <script> is at the start of the line (no extra indentation)
+    expect(text).toContain("\n<script>");
+    // Check that const count has exactly 2 spaces (as in source), not 4
+    expect(text).toContain("\n  const count");
+  });
+
   it("should apply the component's actual style, not style from codeSnippet", () => {
     const root = CodeSnippet();
     const display = root.querySelector('.display');