feat(json-crdt-extensions): 🎸 use registry in HTML import

Author: streamich

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

@@ -1,31 +1,38 @@
 import {html as _html} from 'very-small-parser/lib/html';
 import {fromHast as _fromHast} from 'very-small-parser/lib/html/json-ml/fromHast';
 import {SliceTypeName} from '../slice';
+import {registry as defaultRegistry} from '../registry/registry';
 import type {JsonMlNode} from 'very-small-parser/lib/html/json-ml/types';
 import type {THtmlToken} from 'very-small-parser/lib/html/types';
 import type {PeritextMlNode} from '../block/types';
+import type {SliceRegistry} from '../registry/SliceRegistry';
 
-export const fromJsonMl = (jsonml: JsonMlNode): PeritextMlNode => {
+export const fromJsonMl = (jsonml: JsonMlNode, registry: SliceRegistry = defaultRegistry): PeritextMlNode => {
   if (typeof jsonml === 'string') return jsonml;
-  const [tag, attr = {}, ...children] = jsonml;
-  const type = SliceTypeName[tag as any] ?? tag;
-  const data = attr['data-attr'] !== void 0 ? JSON.parse(attr['data-attr']) : null;
-  // console.log('tag', tag);
-  // const namedTag = tag === '' ? tag : tag;
-  // const peritextTag = namedTag ?? (attr?.inline ? 'span' : 'div');
-  // const peritextAttr = attr && attr['data-attr'] !== void 0 ? {data: JSON.parse(attr['data-attr'])} : null;
-  const peritextNode: PeritextMlNode = [type, {}];
-  const length = children.length;
-  for (let i = 0; i < length; i++) peritextNode.push(fromJsonMl(children[i]));
-  return peritextNode;
+  const tag = jsonml[0];
+  const length = jsonml.length;
+  const node: PeritextMlNode = [tag, null];
+  for (let i = 2; i < length; i++) node.push(fromJsonMl(jsonml[i] as JsonMlNode, registry));
+  const res = registry.fromHtml(jsonml);
+  if (res) {
+    node[0] = res[0];
+    node[1] = res[1];
+  } 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;
+    const inline = attr['data-inline'] === 'true';
+    if (data || inline) node[1] = {data, inline};
+  }
+  return node;
 };
 
-export const fromHast = (hast: THtmlToken): PeritextMlNode => {
+export const fromHast = (hast: THtmlToken, registry?: SliceRegistry): PeritextMlNode => {
   const jsonml = _fromHast(hast);
-  return fromJsonMl(jsonml);
+  return fromJsonMl(jsonml, registry);
 };
 
-export const fromHtml = (html: string): PeritextMlNode => {
+export const fromHtml = (html: string, registry?: SliceRegistry): PeritextMlNode => {
   const hast = _html.parsef(html);
-  return fromHast(hast);
+  return fromHast(hast, registry);
 };

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

@@ -26,7 +26,7 @@ export class SliceRegistry {
     return converter ? converter(el) : undefined;
   }
 
-  public fromHtml(el: JsonMlElement): ReturnType<FromHtmlConverter<any, any>> | undefined {
+  public fromHtml(el: JsonMlElement): PeritextMlElement | undefined {
     const tag = el[0] + '';
     const converters = this.fromHtmlMap.get(tag);
     if (converters) {

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

@@ -25,7 +25,7 @@ registry.add({
         href: attr.href ?? '',
         title: attr.title ?? '',
       };
-      return [CommonSliceType.a, data];
+      return [CommonSliceType.a, {data, inline: true}];
     }
   },
 });

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

@@ -9,12 +9,12 @@ export interface SliceTypeDefinition<Type extends number | string = number | str
   schema: Schema;
   toHtml?: ToHtmlConverter<PeritextMlElement<Type, JsonNodeView<SchemaToJsonNode<Schema>>, Inline>>;
   fromHtml?: {
-    [htmlTag: string]: FromHtmlConverter<Type, JsonNodeView<SchemaToJsonNode<Schema>>>;
+    [htmlTag: string]: FromHtmlConverter<PeritextMlElement<Type, JsonNodeView<SchemaToJsonNode<Schema>>, Inline>>;
   };
 }
 
 export type ToHtmlConverter<El extends PeritextMlElement<any, any, any> = PeritextMlElement<string | number, unknown, boolean>> =
   (element: El) => [tag: string, attr: Record<string, string> | null];
 
-export type FromHtmlConverter<Type extends number | string = string | number, Data = unknown> =
-  (jsonml: JsonMlElement) => [type: Type, data: Data];
+export type FromHtmlConverter<El extends PeritextMlElement<any, any, any> = PeritextMlElement<string | number, unknown, boolean>> =
+  (jsonml: JsonMlElement) => El;