fix(core): no indent based on first line

Signed-off-by: 90dy <90dy@proton.me>

Author: 90dy

deno.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.5.23",
+  "version": "0.5.24",
   "author": "90dy",
   "license": "MIT",
   "workspace": [

src/core/deno.json

@@ -20,5 +20,5 @@
   "exports": {
     ".": "./mod.ts"
   },
-  "version": "0.5.23"
+  "version": "0.5.24"
 }

src/core/mod.ts

@@ -338,7 +338,11 @@ class TemplateClass<T = unknown> extends String {
 
     }
     if (options?.indent === false) {
-      str = str.replace(/^\s+/gm, "");
+      // Get the first non-empty line to determine the indentation
+      const lines = str.split("\n");
+      const nonEmptyLine = lines.find(line => line.trim() !== "") || "";
+      const indent = nonEmptyLine.match(/^\s+/)?.[0]?.length || 0;
+      str = lines.map(line => line.slice(indent)).join("\n");
     }
 
 

src/core/mod_test.ts

@@ -193,8 +193,10 @@ Deno.test("Template indentation works correctly", () => {
   assertEquals(indented.toString() !== original.toString(), true);
   assertEquals(noIndent.toString() !== original.toString(), true);
 
+  console.error("Indented Template:", indented.toString());
+  console.error("No Indent Template:", noIndent.toString());
   // Test that noIndent template has no leading whitespace
-  assertEquals(noIndent.toString().startsWith("<div>"), true);
+  assertEquals(noIndent.toString().startsWith("\n<div>"), true);
 });
 
 Deno.test("Custom extension template works correctly", () => {

src/gen/deno.json

@@ -29,5 +29,5 @@
   "bin": {
     "tmpl-gen": "./runner.ts"
   },
-  "version": "0.5.23"
+  "version": "0.5.24"
 }

src/gen/fixtures/test-no-indent.sh

@@ -0,0 +1,20 @@
+
+sudo mkdir -p $(dirname /etc/kubernetes/encryption-config.yaml)
+cat <<EOF | sudo tee /etc/kubernetes/encryption-config.yaml
+
+apiVersion: apiserver.config.k8s.io/v1
+kind: EncryptionConfiguration
+resources:
+  - resources:
+      - secrets
+    providers:
+      - aescbc:
+          keys:
+            - name: aescbc-key-20250508
+      - secretbox:
+          keys:
+            - name: secretbox-key-20250508
+      - identity: {}
+
+
+EOF

src/gen/fixtures/test-no-indent.sh.ts

@@ -0,0 +1,23 @@
+import { sh } from '@tmpl/core'
+
+export default sh`
+      sudo mkdir -p $(dirname /etc/kubernetes/encryption-config.yaml)
+      cat <<EOF | sudo tee /etc/kubernetes/encryption-config.yaml
+
+      apiVersion: apiserver.config.k8s.io/v1
+      kind: EncryptionConfiguration
+      resources:
+        - resources:
+            - secrets
+          providers:
+            - aescbc:
+                keys:
+                  - name: aescbc-key-20250508
+            - secretbox:
+                keys:
+                  - name: secretbox-key-20250508
+            - identity: {}
+
+
+      EOF
+`.noindent()

vscode-extension/package.json

@@ -3,7 +3,7 @@
   "displayName": "TypeScript Template Engine",
   "description": "Use TypeScript as a template engine with syntax highlighting for template tag functions",
   "publisher": "90dy",
-  "version": "0.5.23",
+  "version": "0.5.24",
   "icon": "icon.png",
   "engines": {
     "vscode": "^1.60.0"