fix: always use trimmedText

Sec-ant · Dec 11, 2023 · dfb01a9 · dfb01a9
1 parent 8fc7c6a
commit dfb01a9
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 6 deletions.
diff --git a/src/embedded/css/embedder.ts b/src/embedded/css/embedder.ts
@@ -37,9 +37,14 @@ export const embedder: Embedder<Options> = async (
   const leadingWhitespaces = text.match(/^\s+/)?.[0] ?? "";
   const trailingWhitespaces = text.match(/\s+$/)?.[0] ?? "";
 
+  const trimmedText = text.slice(
+    leadingWhitespaces.length,
+    -trailingWhitespaces.length || undefined,
+  );
+
   const expressionDocs = printTemplateExpressions(path, print);
 
-  const doc = await textToDoc(text, {
+  const doc = await textToDoc(trimmedText, {
     ...options,
     parser: "scss",
   });

diff --git a/src/embedded/es/embedder.ts b/src/embedded/es/embedder.ts
@@ -37,9 +37,14 @@ export const embedder: Embedder<Options> = async (
   const leadingWhitespaces = text.match(/^\s+/)?.[0] ?? "";
   const trailingWhitespaces = text.match(/\s+$/)?.[0] ?? "";
 
+  const trimmedText = text.slice(
+    leadingWhitespaces.length,
+    -trailingWhitespaces.length || undefined,
+  );
+
   const expressionDocs = printTemplateExpressions(path, print);
 
-  const doc = await textToDoc(text, {
+  const doc = await textToDoc(trimmedText, {
     ...options,
     parser: options.embeddedEsParser ?? "babel",
   });

diff --git a/src/embedded/html/embedder.ts b/src/embedded/html/embedder.ts
@@ -34,9 +34,14 @@ export const embedder: Embedder<Options> = async (
   const leadingWhitespaces = text.match(/^\s+/)?.[0] ?? "";
   const trailingWhitespaces = text.match(/\s+$/)?.[0] ?? "";
 
+  const trimmedText = text.slice(
+    leadingWhitespaces.length,
+    -trailingWhitespaces.length || undefined,
+  );
+
   const expressionDocs = printTemplateExpressions(path, print);
 
-  const doc = await textToDoc(text, {
+  const doc = await textToDoc(trimmedText, {
     ...options,
     parser: "html",
   });

diff --git a/src/embedded/markdown/embedder.ts b/src/embedded/markdown/embedder.ts
@@ -37,9 +37,14 @@ export const embedder: Embedder<Options> = async (
   const leadingWhitespaces = text.match(/^\s+/)?.[0] ?? "";
   const trailingWhitespaces = text.match(/\s+$/)?.[0] ?? "";
 
+  const trimmedText = text.slice(
+    leadingWhitespaces.length,
+    -trailingWhitespaces.length || undefined,
+  );
+
   const expressionDocs = printTemplateExpressions(path, print);
 
-  const doc = await textToDoc(text, {
+  const doc = await textToDoc(trimmedText, {
     ...options,
     parser: "markdown",
     __inJsTemplate: true,

diff --git a/src/embedded/sql/embedder.ts b/src/embedded/sql/embedder.ts
@@ -40,9 +40,14 @@ export const embedder: Embedder<Options> = async (
   const leadingWhitespaces = text.match(/^\s+/)?.[0] ?? "";
   const trailingWhitespaces = text.match(/\s+$/)?.[0] ?? "";
 
+  const trimmedText = text.slice(
+    leadingWhitespaces.length,
+    -trailingWhitespaces.length || undefined,
+  );
+
   const expressionDocs = printTemplateExpressions(path, print);
 
-  const doc = await textToDoc(text, {
+  const doc = await textToDoc(trimmedText, {
     ...options,
     parser: "sql",
   });

diff --git a/src/embedded/ts/embedder.ts b/src/embedded/ts/embedder.ts
@@ -37,9 +37,14 @@ export const embedder: Embedder<Options> = async (
   const leadingWhitespaces = text.match(/^\s+/)?.[0] ?? "";
   const trailingWhitespaces = text.match(/\s+$/)?.[0] ?? "";
 
+  const trimmedText = text.slice(
+    leadingWhitespaces.length,
+    -trailingWhitespaces.length || undefined,
+  );
+
   const expressionDocs = printTemplateExpressions(path, print);
 
-  const doc = await textToDoc(text, {
+  const doc = await textToDoc(trimmedText, {
     ...options,
     parser: options.embeddedTsParser ?? "typescript",
     // set filepath to undefined to enable jsx auto detection: