Merge pull request #915 from metp/main

Fix data URL crash for Unicode characters

Author: kaisalmen

packages/wrapper/src/editorApp.ts

@@ -279,7 +279,14 @@ export class EditorApp {
 }
 
 export const verifyUrlOrCreateDataUrl = (input: string | URL) => {
-    return (input instanceof URL) ? input.href : new URL(`data:text/plain;base64,${btoa(input)}`).href;
+    if (input instanceof URL) {
+        return input.href;
+    } else {
+        const bytes = new TextEncoder().encode(input);
+        const binString = Array.from(bytes, (b) => String.fromCodePoint(b)).join('');
+        const base64 = btoa(binString);
+        return new URL(`data:text/plain;base64,${base64}`).href;
+    }
 };
 
 export const didModelContentChange = (textModels: TextModels, onTextChanged?: (textChanges: TextContents) => void) => {

packages/wrapper/test/editorApp.test.ts

@@ -22,7 +22,18 @@ describe('Test EditorApp', () => {
     test('verifyUrlorCreateDataUrl: url', async () => {
         const url = new URL('../../../node_modules/langium-statemachine-dsl/syntaxes/statemachine.tmLanguage.json', window.location.href);
         const text = await (await fetch(url)).text();
-        expect(verifyUrlOrCreateDataUrl(text)).toBe(`data:text/plain;base64,${btoa(text)}`);
+        const bytes = new TextEncoder().encode(text);
+        const binString = Array.from(bytes, (b) => String.fromCodePoint(b)).join('');
+        const base64 = btoa(binString);
+        expect(verifyUrlOrCreateDataUrl(text)).toBe(`data:text/plain;base64,${base64}`);
+    });
+
+    test('verifyUrlorCreateDataUrl: url', () => {
+        const text = '✓✓';
+        const bytes = new TextEncoder().encode(text);
+        const binString = Array.from(bytes, (b) => String.fromCodePoint(b)).join('');
+        const base64 = btoa(binString);
+        expect(verifyUrlOrCreateDataUrl(text)).toBe(`data:text/plain;base64,${base64}`);
     });
 
     test('config defaults', () => {