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

streamich · Jan 4, 2025 · b142e28 · b142e28
1 parent 5196bd6
commit b142e28
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/src/json-crdt-extensions/peritext/lazy/export-markdown.ts b/src/json-crdt-extensions/peritext/lazy/export-markdown.ts
@@ -6,9 +6,7 @@ import type {PeritextMlNode} from '../block/types';
 
 export const toMdast = (json: PeritextMlNode): IRoot => {
   const hast = toHast(json);
-  // console.log(hast);
   const mdast = _toMdast(hast) as IRoot;
-  // console.log(mdast);
   return mdast;
 };
 

diff --git a/src/json-crdt-extensions/peritext/registry/registry.ts b/src/json-crdt-extensions/peritext/registry/registry.ts
@@ -26,8 +26,14 @@ registry.def(CommonSliceType.b, undefSchema, SliceBehavior.One, true, {
   },
 });
 
+registry.def(CommonSliceType.s, undefSchema, SliceBehavior.One, true, {
+  fromHtml: {
+    s: () => [CommonSliceType.s, null],
+    strike: () => [CommonSliceType.s, null],
+  },
+});
+
 registry.def(CommonSliceType.u, undefSchema, SliceBehavior.One, true);
-registry.def(CommonSliceType.s, undefSchema, SliceBehavior.One, true);
 registry.def(CommonSliceType.code, undefSchema, SliceBehavior.One, true);
 registry.def(CommonSliceType.mark, undefSchema, SliceBehavior.One, true);
 registry.def(CommonSliceType.kbd, undefSchema, SliceBehavior.One, true);

diff --git a/src/json-crdt-extensions/quill-delta/QuillDeltaApi.ts b/src/json-crdt-extensions/quill-delta/QuillDeltaApi.ts
@@ -1,11 +1,11 @@
 import {QuillConst} from './constants';
-import type {PathStep} from '@jsonjoy.com/json-pointer';
-import type {QuillDeltaNode} from './QuillDeltaNode';
 import {NodeApi} from '../../json-crdt/model/api/nodes';
 import {konst} from '../../json-crdt-patch/builder/Konst';
 import {SliceBehavior} from '../peritext/slice/constants';
 import {PersistedSlice} from '../peritext/slice/PersistedSlice';
 import {diffAttributes, getAttributes, removeErasures} from './util';
+import type {PathStep} from '@jsonjoy.com/json-pointer';
+import type {QuillDeltaNode} from './QuillDeltaNode';
 import type {ArrApi, ArrNode, ExtApi, StrApi} from '../../json-crdt';
 import type {
   QuillDeltaAttributes,

diff --git a/src/json-crdt-extensions/quill-delta/QuillDeltaNode.ts b/src/json-crdt-extensions/quill-delta/QuillDeltaNode.ts
@@ -1,16 +1,17 @@
 import {isEmpty} from '@jsonjoy.com/util/lib/isEmpty';
 import {deepEqual} from '@jsonjoy.com/util/lib/json-equal/deepEqual';
-import type {StrNode} from '../../json-crdt/nodes/str/StrNode';
-import type {ArrNode} from '../../json-crdt/nodes/arr/ArrNode';
 import {Peritext} from '../peritext';
 import {ExtensionId} from '../constants';
 import {MNEMONIC, QuillConst} from './constants';
 import {ExtNode} from '../../json-crdt/extensions/ExtNode';
 import {getAttributes} from './util';
 import {updateRga} from '../../json-crdt/hash';
-import type {QuillDataNode, QuillDeltaAttributes, QuillDeltaOp, QuillDeltaOpInsert} from './types';
+import type {StrNode} from '../../json-crdt/nodes/str/StrNode';
+import type {ArrNode} from '../../json-crdt/nodes/arr/ArrNode';
 import type {StringChunk} from '../peritext/util/types';
 import type {OverlayTuple} from '../peritext/overlay/types';
+import type {QuillDataNode, QuillDeltaAttributes, QuillDeltaOp, QuillDeltaOpInsert} from './types';
+import {Point} from '../peritext/rga/Point';
 
 export class QuillDeltaNode extends ExtNode<QuillDataNode> {
   public readonly txt: Peritext<string>;