feat(json-crdt-extensions): 🎸 harden HTML import

Author: streamich

src/json-crdt-extensions/peritext/lazy/__tests__/import-html.spec.ts

@@ -1,10 +1,41 @@
+import {CommonSliceType} from '../../slice';
 import {fromHtml} from '../import-html';
 
 describe('.fromHtml()', () => {
   it('a single paragraph', () => {
     const html = '<p>Hello world</p>';
     const peritextMl = fromHtml(html);
-    console.log(peritextMl);
-    // expect(peritextMl).toEqual(['p', null, 'Hello world']);
+    expect(peritextMl).toEqual([
+      '',
+      null,
+      [CommonSliceType.p, null, 'Hello world'],
+    ]);
+  });
+
+  it('a paragraph with trailing text', () => {
+    const html = '<p>Hello world</p> more text';
+    const peritextMl = fromHtml(html);
+    expect(peritextMl).toEqual([
+      '',
+      null,
+      [CommonSliceType.p, null, 'Hello world'],
+      ' more text',
+    ]);
+  });
+
+  it('text formatted as italic', () => {
+    const html = '<p>Hello world</p>\n<p><em>italic</em> text, <i>more italic</i></p>';
+    const peritextMl = fromHtml(html);
+    expect(peritextMl).toEqual([
+      '',
+      null,
+      [CommonSliceType.p, null, 'Hello world'],
+      '\n',
+      [CommonSliceType.p, null,
+        [CommonSliceType.i, null, 'italic'],
+        ' text, ',
+        [CommonSliceType.i, null, 'more italic'],
+      ],
+    ]);
   });
 });

src/json-crdt-extensions/peritext/lazy/import-html.ts

@@ -20,10 +20,16 @@ export const fromJsonMl = (jsonml: JsonMlNode, registry: SliceRegistry = default
   } else {
     node[0] = SliceTypeName[tag as any] ?? tag;
     const attr = jsonml[1] || {};
-    const data = attr['data-attr'] !== void 0 ? JSON.parse(attr['data-attr']) : null;
+    let data = null;
+    if (attr['data-attr'] !== void 0) {
+      try {
+        data = JSON.parse(attr['data-attr']);
+      } catch {}
+    }
     const inline = attr['data-inline'] === 'true';
     if (data || inline) node[1] = {data, inline};
   }
+  if (typeof node[0] === 'number' && node[0] < 0 && node[1]) node[1].inline = true;
   return node;
 };
 

src/json-crdt-extensions/peritext/registry/registry.ts

@@ -29,3 +29,12 @@ registry.add({
     }
   },
 });
+
+registry.add({
+  type: CommonSliceType.i,
+  schema: s.con(undefined),
+  fromHtml: {
+    em: () => [CommonSliceType.i, null],
+    i: () => [CommonSliceType.i, null],
+  },
+});