fix: improve fallback content printint

marko-js · Oct 24, 2024 · c2e2995 · c2e2995
1 parent 2559fa8
commit c2e2995
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 4 deletions.
diff --git a/src/__tests__/__snapshots__/script-with-type.expected/auto.marko b/src/__tests__/__snapshots__/script-with-type.expected/auto.marko
@@ -0,0 +1,8 @@
+<script nonce=$global.cspNonce type="speculationrules">
+  {
+    "prerender": [{
+      "where": { "href_matches": "/*" },
+      "eagerness": "moderate"
+    }]
+  }
+</script>
diff --git a/src/__tests__/__snapshots__/script-with-type.expected/concise.marko b/src/__tests__/__snapshots__/script-with-type.expected/concise.marko
@@ -0,0 +1,9 @@
+script nonce=$global.cspNonce type="speculationrules"
+  --
+  {
+    "prerender": [{
+      "where": { "href_matches": "/*" },
+      "eagerness": "moderate"
+    }]
+  }
+  --
diff --git a/src/__tests__/__snapshots__/script-with-type.expected/html.marko b/src/__tests__/__snapshots__/script-with-type.expected/html.marko
@@ -0,0 +1,8 @@
+<script nonce=$global.cspNonce type="speculationrules">
+  {
+    "prerender": [{
+      "where": { "href_matches": "/*" },
+      "eagerness": "moderate"
+    }]
+  }
+</script>
diff --git a/src/__tests__/__snapshots__/script-with-type.expected/with-parens.marko b/src/__tests__/__snapshots__/script-with-type.expected/with-parens.marko
@@ -0,0 +1,8 @@
+<script nonce=$global.cspNonce type="speculationrules">
+  {
+    "prerender": [{
+      "where": { "href_matches": "/*" },
+      "eagerness": "moderate"
+    }]
+  }
+</script>
diff --git a/src/__tests__/fixtures/script-with-type.marko b/src/__tests__/fixtures/script-with-type.marko
@@ -0,0 +1,8 @@
+<script nonce=$global.cspNonce type="speculationrules">
+  {
+    "prerender": [{
+      "where": { "href_matches": "/*" },
+      "eagerness": "moderate"
+    }]
+  }
+</script>
diff --git a/src/index.ts b/src/index.ts
@@ -734,7 +734,9 @@ export const printers: Record<string, Printer<types.Node>> = {
                         : b.ifBreak("--", " --", { groupId }),
                       opts.markoSyntax === "html" ? "" : b.line,
                       replaceEmbeddedPlaceholders(
-                        await toDoc(embeddedCode, { parser: scriptParser }),
+                        await toDoc(embeddedCode, {
+                          parser: scriptParser,
+                        }).catch(() => embeddedCode.trim()),
                         placeholders,
                       ),
                       opts.markoSyntax === "html"
@@ -781,7 +783,12 @@ export const printers: Record<string, Printer<types.Node>> = {
                           "style",
                           !lang || lang === ".css" ? "" : lang,
                           " {",
-                          b.indent([b.line, await toDoc(code, { parser })]),
+                          b.indent([
+                            b.line,
+                            await toDoc(code, { parser }).catch(() =>
+                              code.trim(),
+                            ),
+                          ]),
                           b.line,
                           "}",
                         ]),
@@ -888,14 +895,15 @@ export const printers: Record<string, Printer<types.Node>> = {
                           : b.ifBreak("--", " --", { groupId }),
                         opts.markoSyntax === "html" ? "" : b.line,
                         replaceEmbeddedPlaceholders(
-                          await toDoc(embeddedCode, { parser }),
+                          await toDoc(embeddedCode, { parser }).catch(() =>
+                            embeddedCode.trim(),
+                          ),
                           placeholders,
                         ),
                         opts.markoSyntax === "html"
                           ? ""
                           : b.ifBreak([b.softline, "--"]),
                       ]);
-
                       doc.push(b.indent([wrapSep, bodyDoc]));
 
                       if (opts.markoSyntax === "html") {