@kerebron/extension-yjs 0.3.1 → 0.4.0

package/esm/extension-yjs/src/ExtensionYjs.d.ts

@@ -1,12 +1,17 @@
-import type { Schema } from 'prosemirror-model';
 import type { Plugin } from 'prosemirror-state';
-import { type CoreEditor, Extension } from '../../editor/src/mod.js';
+import * as awarenessProtocol from 'y-protocols/awareness';
+import { Extension } from '../../editor/src/mod.js';
 import type { CommandFactories, CommandShortcuts } from '../../editor/src/commands/mod.js';
+export interface YjsProvider {
+    on(eventName: string, callback: (event: any) => void): void;
+    awareness: awarenessProtocol.Awareness;
+}
 export declare class ExtensionYjs extends Extension {
     name: string;
-    doc: any;
+    conflicts: string[];
+    requires: string[];
     getCommandFactories(): Partial<CommandFactories>;
     getKeyboardShortcuts(): Partial<CommandShortcuts>;
-    getProseMirrorPlugins(editor: CoreEditor, schema: Schema): Plugin[];
+    getProseMirrorPlugins(): Plugin[];
 }
 //# sourceMappingURL=ExtensionYjs.d.ts.map

package/esm/extension-yjs/src/ExtensionYjs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExtensionYjs.d.ts","sourceRoot":"","sources":["../../../src/extension-yjs/src/ExtensionYjs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,UAAU,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAErE,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,kCAAkC,CAAC;AAM1C,qBAAa,YAAa,SAAQ,SAAS;IACzC,IAAI,SAAS;IACb,GAAG,EAAE,GAAG,CAAC;IAGA,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAOhD,oBAAoB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAOjD,qBAAqB,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE;CAY7E"}
+{"version":3,"file":"ExtensionYjs.d.ts","sourceRoot":"","sources":["../../../src/extension-yjs/src/ExtensionYjs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAGhD,OAAO,KAAK,iBAAiB,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,kCAAkC,CAAC;AAM1C,MAAM,WAAW,WAAW;IAC1B,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAAC;IAC5D,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;CACxC;AAED,qBAAa,YAAa,SAAQ,SAAS;IACzC,IAAI,SAAS;IAEJ,SAAS,WAAe;IACjC,QAAQ,WAAwB;IAGvB,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAOhD,oBAAoB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAOjD,qBAAqB,IAAI,MAAM,EAAE;CAY3C"}

package/esm/extension-yjs/src/ExtensionYjs.js

@@ -1,8 +1,8 @@
 import { Extension } from '../../editor/src/mod.js';
 import { ySyncPlugin } from './ySyncPlugin.js';
-import { yCursorPlugin } from './yCursorPlugin.js';
+import { yPositionPlugin } from './yPositionPlugin.js';
 import { redo, undo, yUndoPlugin } from './yUndoPlugin.js';
-import { initProseMirrorDoc } from './lib.js';
+import { initProseMirrorDoc } from './convertUtils.js';
 export class ExtensionYjs extends Extension {
     constructor() {
         super(...arguments);
@@ -12,11 +12,17 @@ export class ExtensionYjs extends Extension {
             writable: true,
             value: 'yjs'
         });
-        Object.defineProperty(this, "doc", {
+        Object.defineProperty(this, "conflicts", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: ['history']
+        });
+        Object.defineProperty(this, "requires", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: ['remote-selection']
         });
     }
     // declare type Command = (state: EditorState, dispatch?: (tr: Transaction) => void, view?: EditorView) => boolean;
@@ -32,13 +38,13 @@ export class ExtensionYjs extends Extension {
             'Mod-y': 'redo',
         };
     }
-    getProseMirrorPlugins(editor, schema) {
+    getProseMirrorPlugins() {
         const ydoc = this.config.ydoc;
         const fragment = ydoc.getXmlFragment('prosemirror');
-        const { mapping } = initProseMirrorDoc(fragment, schema);
+        const { mapping } = initProseMirrorDoc(fragment, this.editor.schema);
         return [
             ySyncPlugin(fragment, { mapping }),
-            yCursorPlugin(this.config.provider.awareness),
+            yPositionPlugin(this.config.provider.awareness, this.editor),
             yUndoPlugin(),
         ];
     }

package/esm/extension-yjs/src/convertUtils.d.ts

@@ -0,0 +1,59 @@
+import * as Y from 'yjs';
+import { Fragment, Node, type Schema } from 'prosemirror-model';
+import { BindingMetadata } from './ySyncPlugin.js';
+export declare const createEmptyMeta: () => BindingMetadata;
+/**
+ * Utility function for converting an Y.Fragment to a ProseMirror fragment.
+ */
+export declare const yXmlFragmentToProseMirrorFragment: (yXmlFragment: Y.XmlFragment, schema: Schema) => Fragment;
+/**
+ * Utility function for converting an Y.Fragment to a ProseMirror node.
+ */
+export declare const yXmlFragmentToProseMirrorRootNode: (yXmlFragment: Y.XmlFragment, schema: Schema) => Node;
+/**
+ * The initial ProseMirror content should be supplied by Yjs. This function transforms a Y.Fragment
+ * to a ProseMirror Doc node and creates a mapping that is used by the sync plugin.
+ *
+ * @todo deprecate mapping property
+ */
+export declare const initProseMirrorDoc: (yXmlFragment: Y.XmlFragment, schema: Schema) => {
+    doc: Node;
+    meta: BindingMetadata;
+    mapping: Map<Y.AbstractType<any>, Node | Node[]>;
+};
+/**
+ * Utility method to convert a Prosemirror Doc Node into a Y.Doc.
+ *
+ * This can be used when importing existing content to Y.Doc for the first time,
+ * note that this should not be used to rehydrate a Y.Doc from a database once
+ * collaboration has begun as all history will be lost
+ */
+export declare function prosemirrorToYDoc(doc: Node, xmlFragment?: string): Y.Doc;
+/**
+ * Utility method to update an empty Y.XmlFragment with content from a Prosemirror Doc Node.
+ *
+ * This can be used when importing existing content to Y.Doc for the first time,
+ * note that this should not be used to rehydrate a Y.Doc from a database once
+ * collaboration has begun as all history will be lost
+ *
+ * Note: The Y.XmlFragment does not need to be part of a Y.Doc document at the time that this
+ * method is called, but it must be added before any other operations are performed on it.
+ */
+export declare function prosemirrorToYXmlFragment(doc: Node, xmlFragment: Y.XmlFragment): Y.XmlFragment;
+/**
+ * Utility method to convert Prosemirror compatible JSON into a Y.Doc.
+ *
+ * This can be used when importing existing content to Y.Doc for the first time,
+ * note that this should not be used to rehydrate a Y.Doc from a database once
+ * collaboration has begun as all history will be lost
+ */
+export declare function prosemirrorJSONToYDoc(schema: Schema, state: any, xmlFragment?: string): Y.Doc;
+/**
+ * Utility method to convert Prosemirror compatible JSON to a Y.XmlFragment
+ *
+ * This can be used when importing existing content to Y.Doc for the first time,
+ * note that this should not be used to rehydrate a Y.Doc from a database once
+ * collaboration has begun as all history will be lost
+ */
+export declare function prosemirrorJSONToYXmlFragment(schema: Schema, state: any, xmlFragment: Y.XmlFragment): Y.XmlFragment;
+//# sourceMappingURL=convertUtils.d.ts.map

package/esm/extension-yjs/src/convertUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"convertUtils.d.ts","sourceRoot":"","sources":["../../../src/extension-yjs/src/convertUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EACL,eAAe,EAIhB,MAAM,kBAAkB,CAAC;AAE1B,eAAO,MAAM,eAAe,QAAO,eAGjC,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,iCAAiC,GAC5C,cAAc,CAAC,CAAC,WAAW,EAC3B,QAAQ,MAAM,aAUf,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iCAAiC,GAC5C,cAAc,CAAC,CAAC,WAAW,EAC3B,QAAQ,MAAM,SAKb,CAAC;AAEJ;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAC7B,cAAc,CAAC,CAAC,WAAW,EAC3B,QAAQ,MAAM;;;;CAef,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,IAAI,EACT,WAAW,GAAE,MAAsB,GAClC,CAAC,CAAC,GAAG,CAUP;AAED;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,IAAI,EACT,WAAW,EAAE,CAAC,CAAC,WAAW,GACzB,CAAC,CAAC,WAAW,CAOf;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,GAAG,EACV,WAAW,GAAE,MAAsB,GAClC,CAAC,CAAC,GAAG,CAGP;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,GAAG,EACV,WAAW,EAAE,CAAC,CAAC,WAAW,GACzB,CAAC,CAAC,WAAW,CAGf"}

package/esm/extension-yjs/src/convertUtils.js

@@ -0,0 +1,88 @@
+import * as Y from 'yjs';
+import { Fragment, Node } from 'prosemirror-model';
+import { createNodeFromYElement, updateYFragment, } from './ySyncPlugin.js';
+export const createEmptyMeta = () => ({
+    mapping: new Map(),
+    isOMark: new Map(),
+});
+/**
+ * Utility function for converting an Y.Fragment to a ProseMirror fragment.
+ */
+export const yXmlFragmentToProseMirrorFragment = (yXmlFragment, schema) => {
+    const fragmentContent = yXmlFragment.toArray().map((t) => createNodeFromYElement(
+    /** @type {Y.XmlElement} */ (t), schema, createEmptyMeta())).filter((n) => n !== null);
+    return Fragment.fromArray(fragmentContent);
+};
+/**
+ * Utility function for converting an Y.Fragment to a ProseMirror node.
+ */
+export const yXmlFragmentToProseMirrorRootNode = (yXmlFragment, schema) => schema.topNodeType.create(null, yXmlFragmentToProseMirrorFragment(yXmlFragment, schema));
+/**
+ * The initial ProseMirror content should be supplied by Yjs. This function transforms a Y.Fragment
+ * to a ProseMirror Doc node and creates a mapping that is used by the sync plugin.
+ *
+ * @todo deprecate mapping property
+ */
+export const initProseMirrorDoc = (yXmlFragment, schema) => {
+    const meta = createEmptyMeta();
+    const fragmentContent = yXmlFragment.toArray().map((t) => createNodeFromYElement(t, schema, meta)).filter((n) => n !== null);
+    const doc = schema.topNodeType.create(null, Fragment.fromArray(fragmentContent));
+    return { doc, meta, mapping: meta.mapping };
+};
+/**
+ * Utility method to convert a Prosemirror Doc Node into a Y.Doc.
+ *
+ * This can be used when importing existing content to Y.Doc for the first time,
+ * note that this should not be used to rehydrate a Y.Doc from a database once
+ * collaboration has begun as all history will be lost
+ */
+export function prosemirrorToYDoc(doc, xmlFragment = 'prosemirror') {
+    const ydoc = new Y.Doc();
+    const type = 
+    /** @type {Y.XmlFragment} */ (ydoc.get(xmlFragment, Y.XmlFragment));
+    if (!type.doc) {
+        return ydoc;
+    }
+    prosemirrorToYXmlFragment(doc, type);
+    return type.doc;
+}
+/**
+ * Utility method to update an empty Y.XmlFragment with content from a Prosemirror Doc Node.
+ *
+ * This can be used when importing existing content to Y.Doc for the first time,
+ * note that this should not be used to rehydrate a Y.Doc from a database once
+ * collaboration has begun as all history will be lost
+ *
+ * Note: The Y.XmlFragment does not need to be part of a Y.Doc document at the time that this
+ * method is called, but it must be added before any other operations are performed on it.
+ */
+export function prosemirrorToYXmlFragment(doc, xmlFragment) {
+    const type = xmlFragment || new Y.XmlFragment();
+    const ydoc = type.doc
+        ? type.doc
+        : { transact: (transaction) => transaction(undefined) };
+    updateYFragment(ydoc, type, doc, { mapping: new Map(), isOMark: new Map() });
+    return type;
+}
+/**
+ * Utility method to convert Prosemirror compatible JSON into a Y.Doc.
+ *
+ * This can be used when importing existing content to Y.Doc for the first time,
+ * note that this should not be used to rehydrate a Y.Doc from a database once
+ * collaboration has begun as all history will be lost
+ */
+export function prosemirrorJSONToYDoc(schema, state, xmlFragment = 'prosemirror') {
+    const doc = Node.fromJSON(schema, state);
+    return prosemirrorToYDoc(doc, xmlFragment);
+}
+/**
+ * Utility method to convert Prosemirror compatible JSON to a Y.XmlFragment
+ *
+ * This can be used when importing existing content to Y.Doc for the first time,
+ * note that this should not be used to rehydrate a Y.Doc from a database once
+ * collaboration has begun as all history will be lost
+ */
+export function prosemirrorJSONToYXmlFragment(schema, state, xmlFragment) {
+    const doc = Node.fromJSON(schema, state);
+    return prosemirrorToYXmlFragment(doc, xmlFragment);
+}

package/esm/extension-yjs/src/keys.d.ts

@@ -8,8 +8,4 @@ export declare const ySyncPluginKey: PluginKey<any>;
  * The unique prosemirror plugin key for undoPlugin
  */
 export declare const yUndoPluginKey: PluginKey<UndoPluginState>;
-/**
- * The unique prosemirror plugin key for cursorPlugin
- */
-export declare const yCursorPluginKey: PluginKey<any>;
 //# sourceMappingURL=keys.d.ts.map

package/esm/extension-yjs/src/keys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../../src/extension-yjs/src/keys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,eAAO,MAAM,cAAc,gBAA0B,CAAC;AAEtD;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,SAAS,CAAC,eAAe,CAErD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,gBAA8B,CAAC"}
+{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../../src/extension-yjs/src/keys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,eAAO,MAAM,cAAc,gBAA0B,CAAC;AAEtD;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,SAAS,CAAC,eAAe,CAErD,CAAC"}

package/esm/extension-yjs/src/keys.js

@@ -7,7 +7,3 @@ export const ySyncPluginKey = new PluginKey('y-sync');
  * The unique prosemirror plugin key for undoPlugin
  */
 export const yUndoPluginKey = new PluginKey('y-undo');
-/**
- * The unique prosemirror plugin key for cursorPlugin
- */
-export const yCursorPluginKey = new PluginKey('yjs-cursor');

package/esm/extension-yjs/src/lib.d.ts

@@ -0,0 +1,15 @@
+import * as Y from 'yjs';
+import { type EditorView } from 'prosemirror-view';
+import { type Node } from 'prosemirror-model';
+/**
+ * Either a node if type is YXmlElement or an Array of text nodes if YXmlText
+ */
+type ProsemirrorMapping = Map<Y.AbstractType<any>, Node>;
+export declare const setMeta: (view: EditorView, key: any, value: any) => void;
+/**
+ * Transforms a Prosemirror based absolute position to a Yjs Cursor (relative position in the Yjs model).
+ */
+export declare const absolutePositionToRelativePosition: (pos: number, type: Y.XmlFragment, mapping: ProsemirrorMapping) => any;
+export declare const relativePositionToAbsolutePosition: (yDoc: Y.Doc, documentType: Y.XmlFragment, relPos: any, mapping: ProsemirrorMapping) => null | number;
+export {};
+//# sourceMappingURL=lib.d.ts.map

package/esm/extension-yjs/src/lib.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../../src/extension-yjs/src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAI9C;;GAEG;AACH,KAAK,kBAAkB,GAAG,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;AA2BzD,eAAO,MAAM,OAAO,GAAI,MAAM,UAAU,EAAE,QAAG,EAAE,UAAK,SAYnD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kCAAkC,GAC7C,KAAK,MAAM,EACX,MAAM,CAAC,CAAC,WAAW,EACnB,SAAS,kBAAkB,KAC1B,GA+FF,CAAC;AAaF,eAAO,MAAM,kCAAkC,GAC7C,MAAM,CAAC,CAAC,GAAG,EACX,cAAc,CAAC,CAAC,WAAW,EAC3B,QAAQ,GAAG,EACX,SAAS,kBAAkB,KAC1B,IAAI,GAAG,MA2DT,CAAC"}

package/esm/extension-yjs/src/lib.js

@@ -1,9 +1,4 @@
 import * as Y from 'yjs';
-import { Fragment, Node } from 'prosemirror-model';
-import * as error from 'lib0/error';
-import * as map from 'lib0/map';
-import * as eventloop from 'lib0/eventloop';
-import { createEmptyMeta, createNodeFromYElement, updateYFragment, } from './ySyncPlugin.js';
 import { ySyncPluginKey } from './keys.js';
 /**
  * Is null if no timeout is in progress.
@@ -14,6 +9,9 @@ let viewsToUpdate = null;
 const updateMetas = () => {
     const ups = viewsToUpdate;
     viewsToUpdate = null;
+    if (!ups) {
+        return;
+    }
     ups.forEach((metas, view) => {
         const tr = view.state.tr;
         const syncState = ySyncPluginKey.getState(view.state);
@@ -28,9 +26,14 @@ const updateMetas = () => {
 export const setMeta = (view, key, value) => {
     if (!viewsToUpdate) {
         viewsToUpdate = new Map();
-        eventloop.timeout(0, updateMetas);
+        setTimeout(updateMetas, 0);
+    }
+    let subMap = viewsToUpdate.get(view);
+    if (subMap === undefined) {
+        subMap = new Map();
+        viewsToUpdate.set(view, subMap);
     }
-    map.setIfUndefined(viewsToUpdate, view, map.create).set(key, value);
+    subMap.set(key, value);
 };
 /**
  * Transforms a Prosemirror based absolute position to a Yjs Cursor (relative position in the Yjs model).
@@ -40,9 +43,6 @@ export const absolutePositionToRelativePosition = (pos, type, mapping) => {
         // if the type is later populated, we want to retain the 0 position (hence assoc=-1)
         return Y.createRelativePositionFromTypeIndex(type, 0, type.length === 0 ? -1 : 0);
     }
-    /**
-     * @type {any}
-     */
     let n = type._first === null
         ? null
         : /** @type {Y.ContentType} */ (type._first.content).type;
@@ -94,7 +94,7 @@ export const absolutePositionToRelativePosition = (pos, type, mapping) => {
                         return new Y.RelativePosition(n._item === null ? null : n._item.id, n._item === null ? Y.findRootTypeKey(n) : null, null);
                     }
                     do {
-                        n = /** @type {Y.Item} */ (n._item).parent;
+                        n = n._item.parent;
                         pos--;
                     } while (n !== type && /** @type {Y.Item} */ (n._item).next === null);
                     // if n is null at this point, we have an unexpected case
@@ -108,7 +108,7 @@ export const absolutePositionToRelativePosition = (pos, type, mapping) => {
             }
         }
         if (n === null) {
-            throw error.unexpectedCase();
+            throw new Error('Unexpected case');
         }
         if (pos === 0 && n.constructor !== Y.XmlText && n !== type) { // TODO: set to <= 0
             return createRelativePosition(n._item.parent, n._item);
@@ -127,8 +127,8 @@ const createRelativePosition = (type, item) => {
     }
     return new Y.RelativePosition(typeid, tname, item.id);
 };
-export const relativePositionToAbsolutePosition = (y, documentType, relPos, mapping) => {
-    const decodedPos = Y.createAbsolutePositionFromRelativePosition(relPos, y);
+export const relativePositionToAbsolutePosition = (yDoc, documentType, relPos, mapping) => {
+    const decodedPos = Y.createAbsolutePositionFromRelativePosition(relPos, yDoc);
     if (decodedPos === null ||
         (decodedPos.type !== documentType &&
             !Y.isParentOf(documentType, decodedPos.type._item))) {
@@ -136,7 +136,7 @@ export const relativePositionToAbsolutePosition = (y, documentType, relPos, mapp
     }
     let type = decodedPos.type;
     let pos = 0;
-    if (type.constructor === Y.XmlText) {
+    if (type instanceof Y.XmlText) {
         pos = decodedPos.index;
     }
     else if (type._item === null || !type._item.deleted) {
@@ -150,7 +150,8 @@ export const relativePositionToAbsolutePosition = (y, documentType, relPos, mapp
                     pos += t._length;
                 }
                 else {
-                    pos += /** @type {any} */ (mapping.get(t)).nodeSize;
+                    const node = mapping.get(t);
+                    pos += node?.nodeSize || 0;
                 }
             }
             n = n.right;
@@ -158,15 +159,16 @@ export const relativePositionToAbsolutePosition = (y, documentType, relPos, mapp
         pos += 1; // increase because we go out of n
     }
     while (type !== documentType && type._item !== null) {
-        // @ts-ignore
         const parent = type._item.parent;
-        // @ts-ignore
+        if (parent instanceof Y.ID || parent === null) {
+            continue;
+        }
         if (parent._item === null || !parent._item.deleted) {
             pos += 1; // the start tag
             let n = /** @type {Y.AbstractType} */ (parent)._first;
             // now iterate until we found type
             while (n !== null) {
-                const contentType = /** @type {Y.ContentType} */ (n.content).type;
+                const contentType = n.content.type;
                 if (contentType === type) {
                     break;
                 }
@@ -175,95 +177,14 @@ export const relativePositionToAbsolutePosition = (y, documentType, relPos, mapp
                         pos += contentType._length;
                     }
                     else {
-                        pos += /** @type {any} */ (mapping.get(contentType)).nodeSize;
+                        const node = mapping.get(contentType);
+                        pos += node?.nodeSize || 0;
                     }
                 }
                 n = n.right;
             }
         }
-        type = /** @type {Y.AbstractType} */ (parent);
+        type = parent;
     }
     return pos - 1; // we don't count the most outer tag, because it is a fragment
 };
-/**
- * Utility function for converting an Y.Fragment to a ProseMirror fragment.
- */
-export const yXmlFragmentToProseMirrorFragment = (yXmlFragment, schema) => {
-    const fragmentContent = yXmlFragment.toArray().map((t) => createNodeFromYElement(
-    /** @type {Y.XmlElement} */ (t), schema, createEmptyMeta())).filter((n) => n !== null);
-    return Fragment.fromArray(fragmentContent);
-};
-/**
- * Utility function for converting an Y.Fragment to a ProseMirror node.
- */
-export const yXmlFragmentToProseMirrorRootNode = (yXmlFragment, schema) => schema.topNodeType.create(null, yXmlFragmentToProseMirrorFragment(yXmlFragment, schema));
-/**
- * The initial ProseMirror content should be supplied by Yjs. This function transforms a Y.Fragment
- * to a ProseMirror Doc node and creates a mapping that is used by the sync plugin.
- *
- * @todo deprecate mapping property
- */
-export const initProseMirrorDoc = (yXmlFragment, schema) => {
-    const meta = createEmptyMeta();
-    const fragmentContent = yXmlFragment.toArray().map((t) => createNodeFromYElement(
-    /** @type {Y.XmlElement} */ (t), schema, meta)).filter((n) => n !== null);
-    const doc = schema.topNodeType.create(null, Fragment.fromArray(fragmentContent));
-    return { doc, meta, mapping: meta.mapping };
-};
-/**
- * Utility method to convert a Prosemirror Doc Node into a Y.Doc.
- *
- * This can be used when importing existing content to Y.Doc for the first time,
- * note that this should not be used to rehydrate a Y.Doc from a database once
- * collaboration has begun as all history will be lost
- */
-export function prosemirrorToYDoc(doc, xmlFragment = 'prosemirror') {
-    const ydoc = new Y.Doc();
-    const type = 
-    /** @type {Y.XmlFragment} */ (ydoc.get(xmlFragment, Y.XmlFragment));
-    if (!type.doc) {
-        return ydoc;
-    }
-    prosemirrorToYXmlFragment(doc, type);
-    return type.doc;
-}
-/**
- * Utility method to update an empty Y.XmlFragment with content from a Prosemirror Doc Node.
- *
- * This can be used when importing existing content to Y.Doc for the first time,
- * note that this should not be used to rehydrate a Y.Doc from a database once
- * collaboration has begun as all history will be lost
- *
- * Note: The Y.XmlFragment does not need to be part of a Y.Doc document at the time that this
- * method is called, but it must be added before any other operations are performed on it.
- */
-export function prosemirrorToYXmlFragment(doc, xmlFragment) {
-    const type = xmlFragment || new Y.XmlFragment();
-    const ydoc = type.doc
-        ? type.doc
-        : { transact: (transaction) => transaction(undefined) };
-    updateYFragment(ydoc, type, doc, { mapping: new Map(), isOMark: new Map() });
-    return type;
-}
-/**
- * Utility method to convert Prosemirror compatible JSON into a Y.Doc.
- *
- * This can be used when importing existing content to Y.Doc for the first time,
- * note that this should not be used to rehydrate a Y.Doc from a database once
- * collaboration has begun as all history will be lost
- */
-export function prosemirrorJSONToYDoc(schema, state, xmlFragment = 'prosemirror') {
-    const doc = Node.fromJSON(schema, state);
-    return prosemirrorToYDoc(doc, xmlFragment);
-}
-/**
- * Utility method to convert Prosemirror compatible JSON to a Y.XmlFragment
- *
- * This can be used when importing existing content to Y.Doc for the first time,
- * note that this should not be used to rehydrate a Y.Doc from a database once
- * collaboration has begun as all history will be lost
- */
-export function prosemirrorJSONToYXmlFragment(schema, state, xmlFragment) {
-    const doc = Node.fromJSON(schema, state);
-    return prosemirrorToYXmlFragment(doc, xmlFragment);
-}

package/esm/extension-yjs/src/yPositionPlugin.d.ts

@@ -0,0 +1,14 @@
+import * as awarenessProtocol from 'y-protocols/awareness';
+import { Plugin, PluginKey } from 'prosemirror-state';
+import type { CoreEditor } from '../../editor/src/mod.js';
+export declare const yPositionPluginKey: PluginKey<any>;
+interface PositionPluginConfig {
+    getSelection?: (arg0: any) => any;
+}
+/**
+ * Default awareness state filter
+ */
+export declare const defaultAwarenessStateFilter: (currentClientId: number, userClientId: number, _user: any) => boolean;
+export declare const yPositionPlugin: (awareness: awarenessProtocol.Awareness, editor: CoreEditor, { getSelection, }?: PositionPluginConfig, cursorStateField?: string) => Plugin<any>;
+export {};
+//# sourceMappingURL=yPositionPlugin.d.ts.map

package/esm/extension-yjs/src/yPositionPlugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"yPositionPlugin.d.ts","sourceRoot":"","sources":["../../../src/extension-yjs/src/yPositionPlugin.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,iBAAiB,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAe,MAAM,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAc1D,eAAO,MAAM,kBAAkB,gBAAgC,CAAC;AAYhE,UAAU,oBAAoB;IAC5B,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC;CACnC;AAED;;GAEG;AACH,eAAO,MAAM,2BAA2B,GACtC,iBAAiB,MAAM,EACvB,cAAc,MAAM,EACpB,OAAO,GAAG,KACT,OAA2C,CAAC;AAE/C,eAAO,MAAM,eAAe,GAC1B,WAAW,iBAAiB,CAAC,SAAS,EACtC,QAAQ,UAAU,EAClB,oBAEG,oBAAyB,EAC5B,mBAAkB,MAAiB,gBAiLpC,CAAC"}

package/esm/extension-yjs/src/yPositionPlugin.js

@@ -0,0 +1,121 @@
+import * as Y from 'yjs';
+import { Plugin, PluginKey } from 'prosemirror-state';
+import { remoteSelectionPluginKey } from '../../extension-basic-editor/src/remote-selection/ExtensionRemoteSelection.js';
+import { absolutePositionToRelativePosition, relativePositionToAbsolutePosition, setMeta, } from './lib.js';
+import { ySyncPluginKey } from './keys.js';
+export const yPositionPluginKey = new PluginKey('yjs-position');
+/**
+ * Default awareness state filter
+ */
+export const defaultAwarenessStateFilter = (currentClientId, userClientId, _user) => currentClientId !== userClientId;
+export const yPositionPlugin = (awareness, editor, { getSelection = (state) => state.selection, } = {}, cursorStateField = 'cursor') => {
+    return new Plugin({
+        key: yPositionPluginKey,
+        view: (view) => {
+            const extension = editor.getExtension('remote-selection');
+            const awarenessListener = ({ added, updated, removed }) => {
+                const clients = added.concat(updated).concat(removed);
+                if (clients.findIndex((id) => id !== awareness.doc.clientID) ===
+                    -1) {
+                    return;
+                }
+                if (view.docView) {
+                    setMeta(view, remoteSelectionPluginKey, {
+                        remotePositionUpdated: true,
+                    });
+                }
+                const remoteStates = [];
+                const ystate = ySyncPluginKey.getState(view.state);
+                const y = ystate.doc;
+                awareness.getStates().forEach((aw, clientId) => {
+                    if (!defaultAwarenessStateFilter(y.clientID, clientId, aw)) {
+                        return;
+                    }
+                    if (!aw.cursor) {
+                        return;
+                    }
+                    let anchor = relativePositionToAbsolutePosition(y, ystate.type, Y.createRelativePositionFromJSON(aw.cursor.anchor), ystate.binding.mapping);
+                    let head = relativePositionToAbsolutePosition(y, ystate.type, Y.createRelativePositionFromJSON(aw.cursor.head), ystate.binding.mapping);
+                    if (anchor !== null && head !== null) {
+                        remoteStates.push({
+                            clientId,
+                            user: {
+                                name: aw.user?.name,
+                                color: aw.user?.color,
+                                colorLight: aw.user?.colorLight,
+                            },
+                            cursor: {
+                                anchor,
+                                head,
+                            },
+                        });
+                    }
+                });
+                extension.setRemoteStates(remoteStates);
+                // view.dispatch({ annotations: [yRemoteSelectionsAnnotation.of([])] });
+            };
+            {
+                // if (
+                //   ystate.snapshot != null || ystate.prevSnapshot != null ||
+                //   ystate.binding.mapping.size === 0
+                // ) {
+                //   // do not render cursors while snapshot is active
+                //   return DecorationSet.create(state.doc, []);
+                // }
+            }
+            const updateAwareness = (selectionAnchor, selectionHead) => {
+                const ystate = ySyncPluginKey.getState(view.state);
+                const current = awareness.getLocalState() || {};
+                const anchor = absolutePositionToRelativePosition(selectionAnchor, ystate.type, ystate.binding.mapping);
+                const head = absolutePositionToRelativePosition(selectionHead, ystate.type, ystate.binding.mapping);
+                if (current.cursor == null ||
+                    !Y.compareRelativePositions(Y.createRelativePositionFromJSON(current.cursor.anchor), anchor) ||
+                    !Y.compareRelativePositions(Y.createRelativePositionFromJSON(current.cursor.head), head)) {
+                    awareness.setLocalStateField(cursorStateField, {
+                        anchor,
+                        head,
+                    });
+                }
+            };
+            const clearAwareness = () => {
+                const ystate = ySyncPluginKey.getState(view.state);
+                const current = awareness.getLocalState() || {};
+                if (current.cursor != null &&
+                    relativePositionToAbsolutePosition(ystate.doc, ystate.type, Y.createRelativePositionFromJSON(current.cursor.anchor), ystate.binding.mapping) !== null) {
+                    // delete cursor information if current cursor information is owned by this editor binding
+                    awareness.setLocalStateField(cursorStateField, null);
+                }
+            };
+            const updateCursorInfo = () => {
+                if (view.hasFocus()) {
+                    const selection = getSelection(view.state);
+                    updateAwareness(selection.anchor, selection.head);
+                }
+                else {
+                    // clearAwareness();
+                }
+            };
+            const localPositionChangedListener = (event) => {
+                const { detail } = event;
+                updateAwareness(detail.anchor, detail.head);
+            };
+            editor.addEventListener('localPositionChanged', localPositionChangedListener);
+            awareness.on('change', awarenessListener);
+            view.dom.addEventListener('focusin', updateCursorInfo);
+            view.dom.addEventListener('focusout', updateCursorInfo);
+            return {
+                update: updateCursorInfo,
+                destroy: () => {
+                    view.dom.removeEventListener('focusin', updateCursorInfo);
+                    view.dom.removeEventListener('focusout', updateCursorInfo);
+                    awareness.off('change', awarenessListener);
+                    awareness.setLocalStateField(cursorStateField, null);
+                    editor.removeEventListener('localPositionChanged', localPositionChangedListener);
+                },
+            };
+        },
+        updateCursorInfo(state) {
+            throw new Error('TODO: merge with updateCursorInfo above');
+        },
+    });
+};