fix: improve fallback content printint

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

Hide file tree

Showing 10 changed files with 59 additions and 32 deletions.
diff --git a/src/__tests__/__snapshots__/ignore-embedded-script-errors.expected/auto.marko b/src/__tests__/__snapshots__/ignore-embedded-script-errors.expected/auto.marko
@@ -1,18 +1,12 @@
-style {
-  invalid { color blue; }
-}
+style { invalid { color blue; } }
 
 <style>
-  
   body 
       color: blue;
-
 </style>
 
 <script>
-  
   console->log(
   'a'
   );
-
 </script>
diff --git a/src/__tests__/__snapshots__/ignore-embedded-script-errors.expected/concise.marko b/src/__tests__/__snapshots__/ignore-embedded-script-errors.expected/concise.marko
@@ -1,20 +1,14 @@
-style {
-  invalid { color blue; }
-}
+style { invalid { color blue; } }
 
 style
   --
-  
   body 
       color: blue;
-
   --
 
 script
   --
-  
   console->log(
   'a'
   );
-
   --
diff --git a/src/__tests__/__snapshots__/ignore-embedded-script-errors.expected/html.marko b/src/__tests__/__snapshots__/ignore-embedded-script-errors.expected/html.marko
@@ -1,18 +1,12 @@
-style {
-  invalid { color blue; }
-}
+style { invalid { color blue; } }
 
 <style>
-  
   body 
       color: blue;
-
 </style>
 
 <script>
-  
   console->log(
   'a'
   );
-
 </script>
diff --git a/src/__tests__/__snapshots__/ignore-embedded-script-errors.expected/with-parens.marko b/src/__tests__/__snapshots__/ignore-embedded-script-errors.expected/with-parens.marko
@@ -1,18 +1,12 @@
-style {
-  invalid { color blue; }
-}
+style { invalid { color blue; } }
 
 <style>
-  
   body 
       color: blue;
-
 </style>
 
 <script>
-  
   console->log(
   'a'
   );
-
 </script>
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,11 @@ 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(() =>
+                          asLiteralTextContent(embeddedCode.trim()),
+                        ),
                         placeholders,
                       ),
                       opts.markoSyntax === "html"
@@ -781,7 +785,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(() =>
+                              asLiteralTextContent(code.trim()),
+                            ),
+                          ]),
                           b.line,
                           "}",
                         ]),
@@ -888,14 +897,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(() =>
+                            asLiteralTextContent(embeddedCode.trim()),
+                          ),
                           placeholders,
                         ),
                         opts.markoSyntax === "html"
                           ? ""
                           : b.ifBreak([b.softline, "--"]),
                       ]);
-
                       doc.push(b.indent([wrapSep, bodyDoc]));
 
                       if (opts.markoSyntax === "html") {