@kerebron/extension-yjs 0.6.6 → 0.7.0

package/esm/ySyncPlugin.js

@@ -1,130 +1,78 @@
-import * as Y from 'yjs';
 import { Plugin } from 'prosemirror-state';
 import { ySyncPluginKey, yUndoPluginKey } from './keys.js';
-import { defaultColors, ProsemirrorBinding } from './ProsemirrorBinding.js';
+import { PmYjsBinding } from './binding/PmYjsBinding.js';
 /**
  * This plugin listens to changes in prosemirror view and keeps yXmlState and view in sync.
  *
  * This plugin also keeps references to the type and the shared document so other plugins can access it.
  */
-export const ySyncPlugin = (schema, createWsProvider, { colors = defaultColors, colorMapping = new Map(), onFirstRender = () => {
+export const ySyncPlugin = (editor, createYjsProvider, { onFirstRender = () => {
 }, } = {}) => {
     let initialContentChanged = false;
     const plugin = new Plugin({
         props: {
-        // editable: (state) => {
-        //   const syncState = ySyncPluginKey.getState(state)!;
-        //   return syncState.snapshot && syncState.prevSnapshot;
-        // },
+            editable: (state) => {
+                return true;
+            },
         },
         key: ySyncPluginKey,
         state: {
             init: (_initargs, state) => {
-                const ydoc = new Y.Doc();
-                const yXmlFragment = ydoc.getXmlFragment('prosemirror');
-                const binding = new ProsemirrorBinding(yXmlFragment, new Map());
                 return {
-                    roomId: '',
-                    provider: undefined,
-                    binding,
-                    type: yXmlFragment,
-                    ydoc: ydoc,
-                    snapshot: undefined,
-                    prevSnapshot: undefined,
+                    binding: new PmYjsBinding(editor),
                     isChangeOrigin: false,
                     isUndoRedoOperation: false,
-                    addToHistory: true,
-                    restore: undefined,
-                    colors,
-                    colorMapping,
                     permanentUserData: undefined,
                 };
             },
             apply: (tr, pluginState) => {
-                const change = tr.getMeta(ySyncPluginKey);
-                if (change !== undefined) {
-                    pluginState = {
-                        ...pluginState,
-                        ...change,
-                    };
-                    if ('roomId' in change) {
-                        if (change.roomId) {
-                            const [provider, ydoc] = createWsProvider(change.roomId);
-                            pluginState.provider = provider;
-                            const yXmlFragment = ydoc.getXmlFragment('prosemirror');
-                            pluginState.type = yXmlFragment, pluginState.ydoc = ydoc;
-                            if (pluginState.provider) {
-                                if (pluginState.binding.prosemirrorView) {
-                                    const view = pluginState.binding.prosemirrorView;
-                                    const tr = view.state.tr.setMeta('yjs:awareness', pluginState.provider.awareness);
-                                    view.dispatch(tr);
-                                }
-                            }
+                const pluginMeta = tr.getMeta(ySyncPluginKey);
+                const changeUser = tr.getMeta('changeUser');
+                if (changeUser) {
+                    pluginState.binding.changeUser(changeUser.user);
+                }
+                if (pluginMeta?.getYDoc) {
+                    const yjs = pluginState.binding.getYjs();
+                    if (yjs) {
+                        pluginMeta.getYDoc.resolve(yjs.ydoc);
+                    }
+                    else {
+                        if (pluginMeta.getYDoc.reject) {
+                            pluginMeta.getYDoc.reject(new Error('No yjs'));
                         }
                         else {
-                            const ydoc = new Y.Doc();
-                            const yXmlFragment = ydoc.getXmlFragment('prosemirror');
-                            pluginState.type = yXmlFragment, pluginState.ydoc = ydoc;
-                            pluginState.provider = undefined;
+                            throw new Error('No yjs');
                         }
-                        pluginState.snapshot = undefined;
-                        pluginState.prevSnapshot = undefined;
-                        pluginState.isChangeOrigin = false;
-                        pluginState.isUndoRedoOperation = false;
-                        pluginState.addToHistory = true;
-                        pluginState.restore = undefined;
-                        initialContentChanged = false;
-                        pluginState.binding.changeRoom(pluginState.type);
-                        setTimeout(() => {
-                            pluginState.binding._forceRerender();
-                        }, 0);
-                        return pluginState;
                     }
+                    return pluginState;
                 }
-                pluginState.addToHistory = tr.getMeta('addToHistory') !== false;
-                // always set isChangeOrigin. If undefined, this is not change origin.
-                pluginState.isChangeOrigin = !!change?.isChangeOrigin;
-                pluginState.isUndoRedoOperation = !!change?.isChangeOrigin &&
-                    !!change?.isUndoRedoOperation;
-                const binding = pluginState.binding;
-                if (binding?.prosemirrorView) {
-                    if (change?.snapshot || change?.prevSnapshot) {
-                        // snapshot changed, rerender next
-                        setTimeout(() => {
-                            if (!binding.prosemirrorView) {
-                                return;
-                            }
-                            if (change.restore == null) {
-                                binding._renderSnapshot(change.snapshot, change.prevSnapshot, pluginState);
-                            }
-                            else {
-                                binding._renderSnapshot(change.snapshot, change.snapshot, pluginState);
-                                // reset to current prosemirror state
-                                delete pluginState.restore;
-                                delete pluginState.snapshot;
-                                delete pluginState.prevSnapshot;
-                                initialContentChanged = false;
-                                binding.mux(() => {
-                                    if (!binding.prosemirrorView) {
-                                        return;
-                                    }
-                                    binding.prosemirrorChanged(binding.prosemirrorView.state.doc);
-                                });
-                            }
-                        }, 0);
-                    }
+                if (pluginMeta?.leaveRoom) {
+                    pluginState.isChangeOrigin = false;
+                    pluginState.isUndoRedoOperation = false;
+                    initialContentChanged = false;
+                    pluginState.binding.leaveRoom(tr);
+                    return pluginState;
                 }
+                if (pluginMeta?.changeRoom) {
+                    pluginState.isChangeOrigin = false;
+                    pluginState.isUndoRedoOperation = false;
+                    initialContentChanged = false;
+                    const roomId = pluginMeta.changeRoom.roomId;
+                    pluginState.binding.changeRoom(roomId, createYjsProvider, tr);
+                    return pluginState;
+                }
+                pluginState.binding.addToYjsHistory =
+                    tr.getMeta('addToYjsHistory') !== false;
+                // always set isChangeOrigin. If undefined, this is not change origin.
+                pluginState.isChangeOrigin = !!pluginMeta?.isChangeOrigin;
+                pluginState.isUndoRedoOperation = !!pluginMeta?.isChangeOrigin &&
+                    !!pluginMeta?.isUndoRedoOperation;
                 return pluginState;
             },
         },
         view: (view) => {
             const pluginState = ySyncPluginKey.getState(view.state);
             const binding = pluginState.binding;
-            binding.initView(view);
-            if (binding.mapping.size === 0) {
-                // force rerender to update the bindings mapping
-                binding._forceRerender();
-            }
             onFirstRender();
             return {
                 update: () => {
@@ -133,31 +81,21 @@ export const ySyncPlugin = (schema, createWsProvider, { colors = defaultColors,
                         return;
                     }
                     const binding = pluginState.binding;
-                    if (!pluginState.snapshot && !pluginState.prevSnapshot) {
-                        if (
-                        // If the content doesn't change initially, we don't render anything to Yjs
-                        // If the content was cleared by a user action, we want to catch the change and
-                        // represent it in Yjs
-                        initialContentChanged ||
-                            view.state.doc.content.findDiffStart(view.state.doc.type.createAndFill().content) !== null) {
-                            initialContentChanged = true;
-                            if (pluginState.addToHistory === false &&
-                                !pluginState.isChangeOrigin) {
-                                const yUndoPluginState = yUndoPluginKey.getState(view.state);
-                                if (yUndoPluginState?.undoManager) {
-                                    yUndoPluginState.undoManager.stopCapturing();
-                                }
+                    if (
+                    // If the content doesn't change initially, we don't render anything to Yjs
+                    // If the content was cleared by a user action, we want to catch the change and
+                    // represent it in Yjs
+                    initialContentChanged ||
+                        view.state.doc.content.findDiffStart(view.state.doc.type.createAndFill().content) !== null) {
+                        initialContentChanged = true;
+                        if (pluginState.binding.addToYjsHistory === false &&
+                            !pluginState.isChangeOrigin) {
+                            const yUndoPluginState = yUndoPluginKey.getState(view.state);
+                            if (yUndoPluginState?.undoManager) {
+                                yUndoPluginState.undoManager.stopCapturing();
                             }
-                            binding.mux(() => {
-                                if (!pluginState.ydoc) {
-                                    return;
-                                }
-                                pluginState.ydoc.transact((tr) => {
-                                    tr.meta.set('addToHistory', pluginState.addToHistory);
-                                    binding.prosemirrorChanged(view.state.doc);
-                                }, ySyncPluginKey);
-                            });
                         }
+                        binding.pmChanged();
                     }
                 },
                 destroy: () => {

package/esm/ySyncPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"ySyncPlugin.js","sourceRoot":"","sources":["../src/ySyncPlugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ySyncPlugin.js","sourceRoot":"","sources":["../src/ySyncPlugin.ts"],"names":[],"mappings":"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"}

package/esm/yUndoPlugin.d.ts

@@ -1,22 +1,23 @@
-import { EditorState, Plugin } from 'prosemirror-state';
+import { Plugin } from 'prosemirror-state';
 import { UndoManager } from 'yjs';
+import * as Y from 'yjs';
 import type { Command } from '@kerebron/editor/commands';
-import { getRelativeSelection } from './ProsemirrorBinding.js';
+import { getRelativeSelection } from './ui/selection.js';
 export interface UndoPluginState {
-    undoManager: UndoManager;
-    prevSel: ReturnType<typeof getRelativeSelection> | null;
+    xmlFragment?: Y.XmlFragment;
+    undoManager?: UndoManager;
+    prevSel?: ReturnType<typeof getRelativeSelection>;
     hasUndoOps: boolean;
     hasRedoOps: boolean;
 }
-export declare const undo: (state: EditorState) => boolean;
-export declare const redo: (state: EditorState) => boolean;
+export declare const undo: Command;
+export declare const redo: Command;
 export declare const undoCommand: Command;
 export declare const redoCommand: Command;
 export declare const defaultProtectedNodes: Set<string>;
-export declare const defaultDeleteFilter: (item: import("yjs").Item, protectedNodes: Set<string>) => boolean;
-export declare const yUndoPlugin: ({ protectedNodes, trackedOrigins, undoManager, }?: {
+export declare const defaultDeleteFilter: (item: Y.Item, protectedNodes: Set<string>) => boolean;
+export declare const yUndoPlugin: ({ protectedNodes, trackedOrigins, }?: {
     protectedNodes?: Set<string>;
     trackedOrigins?: any[];
-    undoManager?: import("yjs").UndoManager | null;
-}) => Plugin<any>;
+}) => Plugin<UndoPluginState>;
 //# sourceMappingURL=yUndoPlugin.d.ts.map

package/esm/yUndoPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"yUndoPlugin.d.ts","sourceRoot":"","sources":["../src/yUndoPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAA2B,WAAW,EAAc,MAAM,KAAK,CAAC;AAEvE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAGzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAE/D,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,GAAG,IAAI,CAAC;IACxD,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,eAAO,MAAM,IAAI,GAAI,OAAO,WAAW,KAAG,OACmB,CAAC;AAE9D,eAAO,MAAM,IAAI,GAAI,OAAO,WAAW,KAAG,OACmB,CAAC;AAE9D,eAAO,MAAM,WAAW,EAAE,OAGT,CAAC;AAElB,eAAO,MAAM,WAAW,EAAE,OAGT,CAAC;AAElB,eAAO,MAAM,qBAAqB,aAAyB,CAAC;AAE5D,eAAO,MAAM,mBAAmB,GAC9B,MAAM,OAAO,KAAK,EAAE,IAAI,EACxB,gBAAgB,GAAG,CAAC,MAAM,CAAC,KAC1B,OAM8B,CAAC;AAElC,eAAO,MAAM,WAAW,GAAI,mDAIzB;IACD,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,KAAK,EAAE,WAAW,GAAG,IAAI,CAAC;CAC3C,gBAuEF,CAAC"}
+{"version":3,"file":"yUndoPlugin.d.ts","sourceRoot":"","sources":["../src/yUndoPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAA2B,WAAW,EAAc,MAAM,KAAK,CAAC;AACvE,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAEzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAGzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAIzD,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC;IAC5B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,OAAO,CAAC,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC;IAClD,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,eAAO,MAAM,IAAI,EAAE,OAIlB,CAAC;AAEF,eAAO,MAAM,IAAI,EAAE,OAIlB,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,OAGT,CAAC;AAElB,eAAO,MAAM,WAAW,EAAE,OAGT,CAAC;AAElB,eAAO,MAAM,qBAAqB,aAAyB,CAAC;AAE5D,eAAO,MAAM,mBAAmB,GAC9B,MAAM,CAAC,CAAC,IAAI,EACZ,gBAAgB,GAAG,CAAC,MAAM,CAAC,KAC1B,OAM8B,CAAC;AAElC,eAAO,MAAM,WAAW,GAAI,sCAGzB;IACD,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC;CACnB,4BAkHF,CAAC"}

package/esm/yUndoPlugin.js

@@ -1,14 +1,22 @@
 import { Plugin } from 'prosemirror-state';
 import { ContentType, Item, Text, UndoManager, XmlElement } from 'yjs';
 import { ySyncPluginKey, yUndoPluginKey } from './keys.js';
-import { getRelativeSelection } from './ProsemirrorBinding.js';
-export const undo = (state) => yUndoPluginKey.getState(state)?.undoManager?.undo() != null;
-export const redo = (state) => yUndoPluginKey.getState(state)?.undoManager?.redo() != null;
-export const undoCommand = (state, dispatch) => dispatch == null
-    ? yUndoPluginKey.getState(state)?.undoManager?.canUndo()
+import { getRelativeSelection } from './ui/selection.js';
+export const undo = (state) => {
+    const tr = state.tr;
+    tr.setMeta('preventDispatch', true);
+    return !!(yUndoPluginKey.getState(state)?.undoManager?.undo());
+};
+export const redo = (state) => {
+    const tr = state.tr;
+    tr.setMeta('preventDispatch', true);
+    return !!(yUndoPluginKey.getState(state)?.undoManager?.redo());
+};
+export const undoCommand = (state, dispatch) => !dispatch
+    ? !!(yUndoPluginKey.getState(state)?.undoManager?.canUndo())
     : undo(state);
-export const redoCommand = (state, dispatch) => dispatch == null
-    ? yUndoPluginKey.getState(state)?.undoManager?.canRedo()
+export const redoCommand = (state, dispatch) => !dispatch
+    ? !!(yUndoPluginKey.getState(state)?.undoManager?.canRedo())
     : redo(state);
 export const defaultProtectedNodes = new Set(['paragraph']);
 export const defaultDeleteFilter = (item, protectedNodes) => !(item instanceof Item) ||
@@ -17,71 +25,101 @@ export const defaultDeleteFilter = (item, protectedNodes) => !(item instanceof I
         (item.content.type instanceof XmlElement &&
             protectedNodes.has(item.content.type.nodeName))) ||
     item.content.type._length === 0;
-export const yUndoPlugin = ({ protectedNodes = defaultProtectedNodes, trackedOrigins = [], undoManager = null, } = {}) => new Plugin({
+export const yUndoPlugin = ({ protectedNodes = defaultProtectedNodes, trackedOrigins = [], } = {}) => new Plugin({
     key: yUndoPluginKey,
     state: {
-        init: (initargs, state) => {
-            // TODO: check if plugin order matches and fix
-            const ystate = ySyncPluginKey.getState(state);
-            const _undoManager = undoManager || new UndoManager(ystate.type, {
-                trackedOrigins: new Set([ySyncPluginKey].concat(trackedOrigins)),
-                deleteFilter: (item) => defaultDeleteFilter(item, protectedNodes),
-                captureTransaction: (tr) => tr.meta.get('addToHistory') !== false,
-            });
+        init: (_initargs, _state) => {
             return {
-                undoManager: _undoManager,
-                prevSel: null,
-                hasUndoOps: _undoManager.undoStack.length > 0,
-                hasRedoOps: _undoManager.redoStack.length > 0,
+                xmlFragment: undefined,
+                undoManager: undefined,
+                prevSel: undefined,
+                hasUndoOps: false,
+                hasRedoOps: false,
             };
         },
         apply: (tr, val, oldState, state) => {
-            const binding = ySyncPluginKey.getState(state).binding;
-            const undoManager = val.undoManager;
-            const hasUndoOps = undoManager.undoStack.length > 0;
-            const hasRedoOps = undoManager.redoStack.length > 0;
-            if (binding) {
+            const clearYjs = tr.getMeta('clearYjs');
+            if (clearYjs) {
+                const undoManager = val.undoManager;
+                if (undoManager) {
+                    undoManager?.destroy();
+                }
+                return {
+                    xmlFragment: undefined,
+                    undoManager: undefined,
+                    prevSel: undefined,
+                    hasUndoOps: false,
+                    hasRedoOps: false,
+                };
+            }
+            const setYjs = tr.getMeta('setYjs');
+            if (setYjs) {
+                const { xmlFragment } = setYjs;
+                const undoManager = new UndoManager(xmlFragment, {
+                    trackedOrigins: new Set([ySyncPluginKey].concat(trackedOrigins)),
+                    deleteFilter: (item) => defaultDeleteFilter(item, protectedNodes),
+                    captureTransaction: (ytr) => {
+                        return ytr.meta.get('addToYjsHistory') !== false;
+                    },
+                });
+                const ystate = ySyncPluginKey.getState(oldState);
+                undoManager.on('stack-item-added', ({ stackItem }) => {
+                    const yUndoPluginState = yUndoPluginKey.getState(oldState);
+                    const binding = ystate.binding;
+                    if (binding && yUndoPluginState) {
+                        stackItem.meta.set(binding, yUndoPluginState.prevSel);
+                    }
+                });
+                undoManager.on('stack-item-popped', ({ stackItem }) => {
+                    const binding = ystate.binding;
+                    if (binding) {
+                        const beforeTransactionSelection = stackItem.meta.get(binding);
+                        if (beforeTransactionSelection) {
+                            const selectionStash = binding.getSelectionStash();
+                            if (selectionStash) {
+                                selectionStash.overwrite(beforeTransactionSelection);
+                            }
+                        }
+                    }
+                });
                 return {
                     undoManager,
-                    prevSel: getRelativeSelection(binding, oldState),
-                    hasUndoOps,
-                    hasRedoOps,
+                    xmlFragment,
+                    prevSel: undefined,
+                    hasUndoOps: undoManager.undoStack.length > 0,
+                    hasRedoOps: undoManager.redoStack.length > 0,
                 };
             }
-            else {
+            if (val.undoManager && val.xmlFragment) {
+                const undoManager = val.undoManager;
+                const hasUndoOps = undoManager.undoStack.length > 0;
+                const hasRedoOps = undoManager.redoStack.length > 0;
+                const ystate = ySyncPluginKey.getState(state);
+                const binding = ystate.binding;
+                if (binding) {
+                    return {
+                        ...val,
+                        prevSel: getRelativeSelection(val.xmlFragment, binding.getMapping(), oldState),
+                        hasUndoOps,
+                        hasRedoOps,
+                    };
+                }
                 if (hasUndoOps !== val.hasUndoOps || hasRedoOps !== val.hasRedoOps) {
-                    return Object.assign({}, val, {
+                    return {
+                        ...val,
                         hasUndoOps: undoManager.undoStack.length > 0,
                         hasRedoOps: undoManager.redoStack.length > 0,
-                    });
-                }
-                else { // nothing changed
-                    return val;
+                    };
                 }
             }
+            return val;
         },
     },
     view: (view) => {
-        const ystate = ySyncPluginKey.getState(view.state);
-        const yUndoPlugin = yUndoPluginKey.getState(view.state);
-        const undoManager = yUndoPlugin?.undoManager;
-        if (undoManager) {
-            undoManager.on('stack-item-added', ({ stackItem }) => {
-                const binding = ystate.binding;
-                if (binding) {
-                    stackItem.meta.set(binding, yUndoPlugin.prevSel);
-                }
-            });
-            undoManager.on('stack-item-popped', ({ stackItem }) => {
-                const binding = ystate.binding;
-                if (binding) {
-                    binding.beforeTransactionSelection = stackItem.meta.get(binding) ||
-                        binding.beforeTransactionSelection;
-                }
-            });
-        }
         return {
             destroy: () => {
+                const yUndoPluginState = yUndoPluginKey.getState(view.state);
+                const undoManager = yUndoPluginState?.undoManager;
                 undoManager?.destroy();
             },
         };

package/esm/yUndoPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"yUndoPlugin.js","sourceRoot":"","sources":["../src/yUndoPlugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"yUndoPlugin.js","sourceRoot":"","sources":["../src/yUndoPlugin.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,18 +1,21 @@
 {
   "name": "@kerebron/extension-yjs",
-  "version": "0.6.6",
+  "version": "0.7.0",
   "license": "MIT",
   "module": "./esm/ExtensionYjs.js",
   "exports": {
     ".": {
       "import": "./esm/ExtensionYjs.js"
     },
+    "./YjsProvider": {
+      "import": "./esm/YjsProvider.js"
+    },
+    "./WebsocketProvider": {
+      "import": "./esm/WebsocketProvider.js"
+    },
     "./MarkYChange": {
       "import": "./esm/MarkYChange.js"
     },
-    "./userColors": {
-      "import": "./esm/userColors.js"
-    },
     "./debug": {
       "import": "./esm/debug.js"
     }
@@ -23,8 +26,8 @@
     "src"
   ],
   "dependencies": {
-    "@kerebron/editor": "0.6.6",
-    "@kerebron/extension-basic-editor": "0.6.6",
+    "@kerebron/editor": "0.7.0",
+    "@kerebron/extension-basic-editor": "0.7.0",
     "lib0": "0.2.109",
     "prosemirror-model": "1.25.3",
     "prosemirror-state": "1.4.3",