From 230cb77270d0a6e7f7d6d4719495d8eb2ccf90fe Mon Sep 17 00:00:00 2001
From: Curran <curran.kelleher@gmail.com>
Date: Sun, 28 Jan 2024 11:09:32 -0500
Subject: [PATCH 1/4] Fix #419

---
 test/printer/index.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/test/printer/index.ts b/test/printer/index.ts
index dd558328..7fd19f64 100644
--- a/test/printer/index.ts
+++ b/test/printer/index.ts
@@ -1,7 +1,7 @@
 import test from 'ava';
 import { readdirSync, readFileSync, existsSync } from 'fs';
 import { format } from 'prettier';
-import * as SveltePlugin from '../../src'
+import * as SveltePlugin from '../../src';
 
 let files = readdirSync('test/printer/samples').filter(
     (name) => name.endsWith('.html') || name.endsWith('.md'),
@@ -15,6 +15,14 @@ if (process.env.CI && hasOnly) {
 }
 
 for (const file of files) {
+    // TODO make this work
+    // See https://github.com/sveltejs/prettier-plugin-svelte/issues/414
+    // It's skipped for now because it's failing, and prevents
+    // the test suite from running successfully.
+    if (file === 'no-tag-snippings.html') {
+        continue;
+    }
+
     const ending = file.split('.').pop();
     const input = readFileSync(`test/printer/samples/${file}`, 'utf-8').replace(/\r?\n/g, '\n');
     const options = readOptions(
@@ -23,7 +31,7 @@ for (const file of files) {
 
     test(`printer: ${file.slice(0, file.length - `.${ending}`.length)}`, async (t) => {
         const actualOutput = await format(input, {
-            parser: (ending === 'html' ? 'svelte' : 'markdown'),
+            parser: ending === 'html' ? 'svelte' : 'markdown',
             plugins: [SveltePlugin],
             tabWidth: 4,
             ...options,

From f45aa4d5d503e496f69f30698de2a62b010be50b Mon Sep 17 00:00:00 2001
From: Curran <curran.kelleher@gmail.com>
Date: Sun, 28 Jan 2024 11:12:50 -0500
Subject: [PATCH 2/4] Fix #418

---
 src/base64-string.ts      | 12 ++++++++++++
 src/embed.ts              |  3 ++-
 src/lib/snipTagContent.ts |  6 ++++--
 3 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 src/base64-string.ts

diff --git a/src/base64-string.ts b/src/base64-string.ts
new file mode 100644
index 00000000..30bb2abe
--- /dev/null
+++ b/src/base64-string.ts
@@ -0,0 +1,12 @@
+// Base64 string encoding and decoding module.
+// Uses Buffer for Node.js and btoa/atob for browser environments.
+
+export const stringToBase64 =
+    typeof Buffer !== 'undefined'
+        ? (str: string) => Buffer.from(str).toString('base64')
+        : (str: string) => btoa(str);
+
+export const base64ToString =
+    typeof Buffer !== 'undefined'
+        ? (str: string) => Buffer.from(str, 'base64').toString()
+        : (str: string) => atob(str);
diff --git a/src/embed.ts b/src/embed.ts
index 4c433b5e..6c50f6e6 100644
--- a/src/embed.ts
+++ b/src/embed.ts
@@ -20,6 +20,7 @@ import {
 } from './print/node-helpers';
 import { CommentNode, ElementNode, Node, ScriptNode, StyleNode } from './print/nodes';
 import { extractAttributes } from './lib/extractAttributes';
+import { base64ToString } from './base64-string';
 
 const {
     builders: { group, hardline, softline, indent, dedent, literalline },
@@ -252,7 +253,7 @@ function getSnippedContent(node: Node) {
     const encodedContent = getAttributeTextValue(snippedTagContentAttribute, node);
 
     if (encodedContent) {
-        return Buffer.from(encodedContent, 'base64').toString('utf-8');
+        return base64ToString(encodedContent);
     } else {
         return '';
     }
diff --git a/src/lib/snipTagContent.ts b/src/lib/snipTagContent.ts
index 89337266..cb02d8d3 100644
--- a/src/lib/snipTagContent.ts
+++ b/src/lib/snipTagContent.ts
@@ -1,3 +1,5 @@
+import { base64ToString, stringToBase64 } from '../base64-string';
+
 export const snippedTagContentAttribute = '✂prettier:content✂';
 
 const scriptRegex =
@@ -42,7 +44,7 @@ export function snipScriptAndStyleTagContent(source: string): string {
             if (match.startsWith('<!--') || withinOtherSpan(index)) {
                 return match;
             }
-            const encodedContent = Buffer.from(content).toString('base64');
+            const encodedContent = stringToBase64(content);
             const newContent = `<${tagName}${attributes} ${snippedTagContentAttribute}="${encodedContent}">${placeholder}</${tagName}>`;
 
             // Adjust the spans because the source now has a different content length
@@ -97,7 +99,7 @@ const regex = /(<\w+.*?)\s*✂prettier:content✂="(.*?)">.*?(?=<\/)/gi;
 
 export function unsnipContent(text: string): string {
     return text.replace(regex, (_, start, encodedContent) => {
-        const content = Buffer.from(encodedContent, 'base64').toString('utf8');
+        const content = base64ToString(encodedContent);
         return `${start}>${content}`;
     });
 }

From e7ca4be6794c854475ec7bebf3e68e51aa3647a6 Mon Sep 17 00:00:00 2001
From: Curran Kelleher <68416+curran@users.noreply.github.com>
Date: Mon, 29 Jan 2024 08:54:34 -0500
Subject: [PATCH 3/4] Apply suggestions from code review

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 test/printer/index.ts | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/test/printer/index.ts b/test/printer/index.ts
index 7fd19f64..dd558328 100644
--- a/test/printer/index.ts
+++ b/test/printer/index.ts
@@ -1,7 +1,7 @@
 import test from 'ava';
 import { readdirSync, readFileSync, existsSync } from 'fs';
 import { format } from 'prettier';
-import * as SveltePlugin from '../../src';
+import * as SveltePlugin from '../../src'
 
 let files = readdirSync('test/printer/samples').filter(
     (name) => name.endsWith('.html') || name.endsWith('.md'),
@@ -15,14 +15,6 @@ if (process.env.CI && hasOnly) {
 }
 
 for (const file of files) {
-    // TODO make this work
-    // See https://github.com/sveltejs/prettier-plugin-svelte/issues/414
-    // It's skipped for now because it's failing, and prevents
-    // the test suite from running successfully.
-    if (file === 'no-tag-snippings.html') {
-        continue;
-    }
-
     const ending = file.split('.').pop();
     const input = readFileSync(`test/printer/samples/${file}`, 'utf-8').replace(/\r?\n/g, '\n');
     const options = readOptions(
@@ -31,7 +23,7 @@ for (const file of files) {
 
     test(`printer: ${file.slice(0, file.length - `.${ending}`.length)}`, async (t) => {
         const actualOutput = await format(input, {
-            parser: ending === 'html' ? 'svelte' : 'markdown',
+            parser: (ending === 'html' ? 'svelte' : 'markdown'),
             plugins: [SveltePlugin],
             tabWidth: 4,
             ...options,

From e1c6983f2fb1d7cdbf4cc490a48cc7df0896eecb Mon Sep 17 00:00:00 2001
From: Curran <curran.kelleher@gmail.com>
Date: Mon, 29 Jan 2024 08:59:32 -0500
Subject: [PATCH 4/4] Handle non-ASCII text in browser environments

---
 src/base64-string.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/base64-string.ts b/src/base64-string.ts
index 30bb2abe..887084f1 100644
--- a/src/base64-string.ts
+++ b/src/base64-string.ts
@@ -1,12 +1,20 @@
 // Base64 string encoding and decoding module.
 // Uses Buffer for Node.js and btoa/atob for browser environments.
+// We use TextEncoder/TextDecoder for browser environments because
+// they can handle non-ASCII characters, unlike btoa/atob.
 
 export const stringToBase64 =
     typeof Buffer !== 'undefined'
         ? (str: string) => Buffer.from(str).toString('base64')
-        : (str: string) => btoa(str);
+        : (str: string) =>
+              btoa(
+                  new TextEncoder()
+                      .encode(str)
+                      .reduce((acc, byte) => acc + String.fromCharCode(byte), ''),
+              );
 
 export const base64ToString =
     typeof Buffer !== 'undefined'
         ? (str: string) => Buffer.from(str, 'base64').toString()
-        : (str: string) => atob(str);
+        : (str: string) =>
+              new TextDecoder().decode(Uint8Array.from(atob(str), (c) => c.charCodeAt(0)));