feat(yata): fix test cases

Author: vivaxy

.vscode/launch.json

@@ -4,6 +4,15 @@
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
+    {
+      "name": "prosemirror/yata npm run test",
+      "request": "launch",
+      "runtimeArgs": ["run-script", "test"],
+      "runtimeExecutable": "npm",
+      "skipFiles": ["<node_internals>/**"],
+      "type": "node",
+      "cwd": "${workspaceFolder}/libraries/prosemirror/yata"
+    },
     {
       "type": "node",
       "request": "launch",

libraries/prosemirror/yata/index.js

@@ -6,14 +6,24 @@ import { EditorState } from 'prosemirror-state';
 import { EditorView } from 'prosemirror-view';
 import { exampleSetup } from 'prosemirror-example-setup';
 import schema from './schema.js';
+import { Document } from './yata/index.js';
 
 const state = EditorState.create({
   schema,
   plugins: exampleSetup({ schema: schema }),
 });
 
+const doc = Document.fromNodes(state.doc.content);
+
 const view = new EditorView(document.querySelector('#editor'), {
   state,
+  dispatchTransaction(tr) {
+    view.updateState(view.state.apply(tr));
+    tr.steps.forEach(function (step) {
+      doc.applyStep(step);
+    });
+  },
 });
 
 window.view = view;
+window.doc = doc;

libraries/prosemirror/yata/yata/__tests__/item.test.js

@@ -9,6 +9,7 @@ import {
   NodeItem,
   sliceToItems,
 } from '../item.js';
+import { Document, Position } from '../document.js';
 
 describe('nodeToItems', function () {
   test('all nodes', function () {
@@ -27,7 +28,7 @@ describe('nodeToItems', function () {
         attrs: {},
         tagName: 'paragraph',
         type: 'openingTag',
-        closingId: null,
+        closingTagItem: null,
       },
       {
         marks: [
@@ -68,7 +69,7 @@ describe('nodeToItems', function () {
       {
         tagName: 'paragraph',
         type: 'closingTag',
-        openingId: null,
+        openingTagItem: null,
       },
     ]);
   });
@@ -117,13 +118,13 @@ describe('sliceToItems', () => {
       {
         tagName: 'paragraph',
         type: 'closingTag',
-        openingId: null,
+        openingTagItem: null,
       },
       {
         attrs: {},
         tagName: 'paragraph',
         type: 'openingTag',
-        closingId: null,
+        closingTagItem: null,
       },
       {
         marks: [
@@ -164,7 +165,7 @@ describe('sliceToItems', () => {
       {
         tagName: 'paragraph',
         type: 'closingTag',
-        openingId: null,
+        openingTagItem: null,
       },
     ]);
   });
@@ -194,3 +195,23 @@ describe('itemsToSlice', () => {
     expect(slice.size).toBe(items.length);
   });
 });
+
+describe('integrate', function () {
+  test('integrate into empty doc', function () {
+    const doc = new Document();
+    const pos = new Position(doc);
+    const item = new TextItem('1');
+    item.integrate(pos);
+    expect(doc.head).toBe(item);
+    expect(doc.clock).toBe(1);
+  });
+
+  test('integrate into tags', function () {
+    const doc = Document.fromNodes(Fragment.from([schema.node('paragraph')]));
+    const pos = new Position(doc);
+    pos.forward();
+    const item = new TextItem('1');
+    item.integrate(pos);
+    expect(doc.clock).toBe(3);
+  });
+});

libraries/prosemirror/yata/yata/document.js

@@ -2,8 +2,18 @@
  * @since 2022-03-12
  * @author vivaxy
  */
-import { ReplaceStep } from 'prosemirror-transform';
-import { ClosingTagItem, OpeningTagItem, sliceToItems } from './item.js';
+import {
+  AddMarkStep,
+  RemoveMarkStep,
+  ReplaceStep,
+  ReplaceAroundStep,
+} from 'prosemirror-transform';
+import {
+  ClosingTagItem,
+  OpeningTagItem,
+  sliceToItems,
+  fragmentToItems,
+} from './item.js';
 
 export class Position {
   constructor(doc) {
@@ -25,6 +35,9 @@ export class Position {
   }
 
   forwardItem() {
+    if (!this.canForward()) {
+      throw new Error(`Unexpected position ${this.pos + 1}`);
+    }
     this.left = this.right;
     this.right = this.right.right;
     if (!this.left.deleted) {
@@ -49,6 +62,16 @@ export class Position {
 }
 
 export class Document {
+  static fromNodes(nodes) {
+    const doc = new Document();
+    const items = fragmentToItems(nodes);
+    const pos = new Position(doc);
+    items.forEach(function (item) {
+      item.integrate(pos);
+    });
+    return doc;
+  }
+
   constructor() {
     this.head = null;
     this.client = Math.random().toString(36).slice(2);
@@ -101,13 +124,42 @@ export class Document {
   applyStep(step) {
     if (step instanceof ReplaceStep) {
       this.applyReplaceStep(step);
+    } else if (step instanceof ReplaceAroundStep) {
+      this.applyReplaceAroundStep(step);
+    } else if (step instanceof AddMarkStep) {
+      this.applyAddMarkStep(step);
+    } else if (step instanceof RemoveMarkStep) {
+      this.applyRemoveMarkStep(step);
+    } else {
+      throw new Error('Unexpected step');
     }
   }
 
   applyReplaceStep(step) {
     this.replaceItems(step.from, step.to, sliceToItems(step.slice));
   }
 
+  applyReplaceAroundStep(step) {
+    this.replaceItems(
+      step.gapTo,
+      step.to,
+      sliceToItems(step.slice).slice(step.insert),
+    );
+    this.replaceItems(
+      step.from,
+      step.gapFrom,
+      sliceToItems(step.slice).slice(0, step.insert),
+    );
+  }
+
+  applyAddMarkStep(step) {
+    // TODO
+  }
+
+  applyRemoveMarkStep(step) {
+    // TODO
+  }
+
   applyItems() {
     // TODO
   }

libraries/prosemirror/yata/yata/index.js

@@ -2,3 +2,4 @@
  * @since 2022-03-12
  * @author vivaxy
  */
+export { Document } from './document.js';

libraries/prosemirror/yata/yata/item.js

@@ -63,6 +63,10 @@ export class Item {
 
   integrate(position) {
     this.integrateSimple(position.doc, position.left, position.right);
+    if (position.left === null && position.right === null) {
+      // empty doc
+      position.doc.head = this;
+    }
     position.left = this;
   }
 
@@ -78,6 +82,7 @@ export class TextItem extends Item {
   constructor(text, marks = []) {
     super();
     this.text = text;
+    // todo marks should be items too
     this.marks = marks.map((mark) => {
       return mark.toJSON();
     });
@@ -118,7 +123,7 @@ export class OpeningTagItem extends Item {
       type: 'openingTag',
       tagName: this.tagName,
       attrs: this.attrs,
-      closingTagItem: this.closingTagItem?.id,
+      closingTagItem: this.closingTagItem.id,
     };
   }
 
@@ -214,11 +219,11 @@ export function nodeToItems(node) {
   if (node.isAtom) {
     return [new NodeItem(node.type.name, node.attrs)];
   }
-  return [
-    new OpeningTagItem(node.type.name, node.attrs),
-    ...fragmentToItems(node.content),
-    new ClosingTagItem(node.type.name, node.attrs),
-  ];
+  const openingTagItem = new OpeningTagItem(node.type.name, node.attrs);
+  const closingTagItem = new ClosingTagItem(node.type.name, node.attrs);
+  openingTagItem.closingTagItem = closingTagItem;
+  closingTagItem.openingTagItem = openingTagItem;
+  return [openingTagItem, ...fragmentToItems(node.content), closingTagItem];
 }
 
 export function itemsToSlice(items, schema) {