@kerebron/extension-yjs 0.3.1 → 0.3.2

package/LICENSE

@@ -0,0 +1,23 @@
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

package/README.md

@@ -0,0 +1,67 @@
+# Kerebron - Prosemirror based online editor kit
+
+## Watch a Demo
+
+<a href="https://youtube.com/shorts/OdJjhAPj-wA?feature=share" target="_blank">
+  <img src="https://github.com/user-attachments/assets/b63ec84a-0ed2-4f98-920c-76f6d3215168" alt="Alt Text" width="200">
+</a>
+
+## Playground Demo
+
+[playground](https://demo.kerebron.com) - be nice.
+
+## Overview
+
+Using vanilla Prosemirror modules is often impossible because of
+incompatibilities.
+
+Kerebron forks several prosemirror projects into one monorepo in order to keep
+them in sync.
+
+Project is inspired on https://tiptap.dev/, but instead of building wrapper
+around a wrapper it borrows concept of extension and command manager.
+
+It has simplified tooling (deno), fewer dependencies and resulting in lower
+number of output npm modules.
+
+**Work in progress**
+
+## Development
+
+To start example server:
+
+```
+deno task -f server-deno-hono start
+```
+
+## Examples
+
+TODO
+
+## Build
+
+### Build static examples
+
+```shell
+deno task -r build
+```
+
+### NPM packages are generated using DNT
+
+- https://deno.com/blog/publish-esm-cjs-module-dnt - the easiest way to publish
+  a hybrid npm module for ESM and CommonJS
+- https://github.com/denoland/dnt
+- https://gaubee.com/article/Publishing-Your-Deno-Project-as-a-Monorepo-using-dnt/
+
+To generate npm packages
+
+```shell
+deno -A ./build/build_npm.ts
+```
+
+## Run through docker
+
+```
+docker build . -t editor-test
+docker run -it -p 8000:8000 -v $PWD:/usr/src/app editor-test
+```

package/esm/editor/src/types.d.ts

@@ -8,7 +8,7 @@ export type AnyExtensionOrReq = AnyExtension | {
 };
 export type Content = JSONContent | JSONContent[] | null;
 export interface EditorOptions {
-    element: Element;
+    element: HTMLElement;
     content: Content;
     parseOptions: ParseOptions;
     extensions: AnyExtensionOrReq[];

package/esm/editor/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/editor/src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,IAAI,eAAe,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC/E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI,CAAC;AACnD,MAAM,MAAM,iBAAiB,GAAG,YAAY,GAAG;IAC7C,QAAQ,EAAE,KAAK,CAAC,iBAAiB,GAAG,MAAM,CAAC,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG,WAAW,GAAG,WAAW,EAAE,GAAG,IAAI,CAAC;AAEzD,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,CAAC,EAAE;QACN,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,EAAE,CAAC;IACJ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI;IACzB,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,CAAC,CAAC;IACtC,OAAO,EAAE,CAAC,CAAC;IACX,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,CAAC,CAAC;CACtC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/editor/src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,IAAI,eAAe,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC/E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI,CAAC;AACnD,MAAM,MAAM,iBAAiB,GAAG,YAAY,GAAG;IAC7C,QAAQ,EAAE,KAAK,CAAC,iBAAiB,GAAG,MAAM,CAAC,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG,WAAW,GAAG,WAAW,EAAE,GAAG,IAAI,CAAC;AAEzD,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,WAAW,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,CAAC,EAAE;QACN,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,EAAE,CAAC;IACJ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI;IACzB,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,CAAC,CAAC;IACtC,OAAO,EAAE,CAAC,CAAC;IACX,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,CAAC,CAAC;CACtC,CAAC"}

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;AAChD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAGhD,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"}

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

@@ -2,7 +2,7 @@ import { Extension } from '../../editor/src/mod.js';
 import { ySyncPlugin } from './ySyncPlugin.js';
 import { yCursorPlugin } from './yCursorPlugin.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);

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/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,MA6DT,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;
@@ -160,13 +161,16 @@ export const relativePositionToAbsolutePosition = (y, documentType, relPos, mapp
     while (type !== documentType && type._item !== null) {
         // @ts-ignore
         const parent = type._item.parent;
+        if (parent instanceof Y.ID || parent === null) {
+            continue;
+        }
         // @ts-ignore
         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 +179,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/ySyncPlugin.d.ts

@@ -1,13 +1,13 @@
 import * as Y from 'yjs';
 import * as PModel from 'prosemirror-model';
-import { Transaction } from 'prosemirror-state';
 import { MarkType, Node, Schema } from 'prosemirror-model';
 import { EditorState } from 'prosemirror-state';
-interface BindingMetadata {
+import { EditorView } from 'prosemirror-view';
+export type TransactFunc<T> = (f: (arg0?: Y.Transaction) => T, origin?: any) => T;
+export interface BindingMetadata {
     mapping: ProsemirrorMapping;
     isOMark: Map<MarkType, boolean>;
 }
-export declare const createEmptyMeta: () => BindingMetadata;
 export declare const isVisible: (item: Y.Item, snapshot: Y.Snapshot) => boolean;
 type ProsemirrorMapping = Map<Y.AbstractType<any>, PModel.Node | Array<PModel.Node>>;
 interface ColorDef {
@@ -27,44 +27,51 @@ interface YSyncOpts {
  * This plugin also keeps references to the type and the shared document so other plugins can access it.
  */
 export declare const ySyncPlugin: (yXmlFragment: Y.XmlFragment, { colors, colorMapping, permanentUserData, onFirstRender, mapping, }?: YSyncOpts) => any;
-export declare const getRelativeSelection: (pmbinding: ProsemirrorBinding, state: EditorState) => {
-    type: any;
-    anchor: any;
-    head: any;
-};
+interface TransactionSelection {
+    type: string;
+    anchor: Y.RelativePosition;
+    head: Y.RelativePosition;
+}
+export declare const getRelativeSelection: (pmbinding: ProsemirrorBinding, state: EditorState) => TransactionSelection;
+interface PluginState {
+    addToHistory: boolean;
+    isChangeOrigin: boolean;
+    restore: any;
+    snapshot?: Y.Snapshot;
+    prevSnapshot?: Y.Snapshot;
+    isUndoRedoOperation: boolean;
+    colors: Array<ColorDef>;
+    colorMapping: Map<string, ColorDef>;
+    permanentUserData: Y.PermanentUserData;
+}
 /**
  * Binding for prosemirror.
  *
  * @protected
  */
-export declare class ProsemirrorBinding {
-    doc: Y.Doc;
-    private type;
+export declare class ProsemirrorBinding implements BindingMetadata {
+    mapping: ProsemirrorMapping;
+    ydoc: Y.Doc;
+    isOMark: Map<MarkType, boolean>;
+    type: Y.XmlFragment;
     private mux;
-    private prosemirrorView;
-    private isOMark;
-    private _observeFunction;
-    private mapping;
+    prosemirrorView: EditorView | null;
     private _beforeTransactionSelection;
     private beforeAllTransactions;
     private afterAllTransactions;
+    private _observeFunction;
     private _domSelectionInView;
-    get beforeTransactionSelection(): null;
-    set beforeTransactionSelection(value: null);
+    get beforeTransactionSelection(): TransactionSelection;
+    set beforeTransactionSelection(value: TransactionSelection);
     constructor(yXmlFragment: Y.XmlFragment, mapping?: ProsemirrorMapping);
-    /**
-     * Create a transaction for changing the prosemirror state.
-     *
-     * @returns
-     */
-    get _tr(): Transaction;
-    _isLocalCursorInView(): false | null;
+    debug(msg?: string): void;
+    _isLocalCursorInView(): boolean;
     _isDomSelectionInView(): boolean;
     renderSnapshot(snapshot: Y.Snapshot, prevSnapshot: Y.Snapshot): void;
     unrenderSnapshot(): void;
     _forceRerender(): void;
-    _renderSnapshot(snapshot: Y.Snapshot | Uint8Array, prevSnapshot: Y.Snapshot | Uint8Array, pluginState: Object): void;
-    _typeChanged(events: Array<Y.YEvent<any>>, transaction: Y.Transaction): void;
+    _renderSnapshot(snapshot: Y.Snapshot | Uint8Array, prevSnapshot: Y.Snapshot | Uint8Array, pluginState: PluginState): void;
+    yXmlChanged(events: Array<Y.YEvent<any>>, transaction: Y.Transaction): void;
     _prosemirrorChanged(doc: Node): void;
     /**
      * View is ready to listen to changes. Register observers.
@@ -72,7 +79,7 @@ export declare class ProsemirrorBinding {
     initView(prosemirrorView: any): void;
     destroy(): void;
 }
-export declare const createNodeFromYElement: (el: Y.XmlElement, schema: any, meta: BindingMetadata, snapshot: Y.Snapshot, prevSnapshot: Y.Snapshot, computeYChange: (arg0: "removed" | "added", arg1: Y.ID) => any) => PModel.Node | null;
+export declare const createNodeFromYElement: (el: Y.XmlElement, schema: any, meta: BindingMetadata, snapshot?: Y.Snapshot, prevSnapshot?: Y.Snapshot, computeYChange?: (arg0: "removed" | "added", arg1: Y.ID) => any) => PModel.Node | null;
 export declare const yattr2markname: (attrName: string) => string;
 /**
  * @todo move this to markstoattributes
@@ -89,7 +96,7 @@ export declare const attributesToMarks: (attrs: {
  * @unstable
  */
 export declare const updateYFragment: (y: {
-    transact: Function;
-}, yDomFragment: Y.XmlFragment, pNode: any, meta: BindingMetadata) => void;
+    transact: TransactFunc<void>;
+}, yDomFragment: Y.XmlFragment, pNode: Node, meta: BindingMetadata) => void;
 export {};
 //# sourceMappingURL=ySyncPlugin.d.ts.map

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

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

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

@@ -15,10 +15,6 @@ import * as map from 'lib0/map';
 import { ySyncPluginKey, yUndoPluginKey } from './keys.js';
 import * as utils from './utils.js';
 import { absolutePositionToRelativePosition, relativePositionToAbsolutePosition, } from './lib.js';
-export const createEmptyMeta = () => ({
-    mapping: new Map(),
-    isOMark: new Map(),
-});
 export const isVisible = (item, snapshot) => snapshot === undefined
     ? !item.deleted
     : (snapshot.sv.has(item.id.client) && /** @type {number} */
@@ -38,7 +34,7 @@ const getUserColor = (colorMapping, colors, user) => {
         }
         colorMapping.set(user, random.oneOf(colors));
     }
-    return /** @type {ColorDef} */ (colorMapping.get(user));
+    return colorMapping.get(user);
 };
 /**
  * This plugin listens to changes in prosemirror view and keeps yXmlState and view in sync.
@@ -94,7 +90,7 @@ export const ySyncPlugin = (yXmlFragment, { colors = defaultColors, colorMapping
                     if (change !== undefined &&
                         (change.snapshot != null || change.prevSnapshot != null)) {
                         // snapshot changed, rerender next
-                        eventloop.timeout(0, () => {
+                        setTimeout(() => {
                             if (binding.prosemirrorView == null) {
                                 return;
                             }
@@ -111,7 +107,7 @@ export const ySyncPlugin = (yXmlFragment, { colors = defaultColors, colorMapping
                                     binding._prosemirrorChanged(binding.prosemirrorView.state.doc);
                                 });
                             }
-                        });
+                        }, 0);
                     }
                 }
                 return pluginState;
@@ -138,14 +134,12 @@ export const ySyncPlugin = (yXmlFragment, { colors = defaultColors, colorMapping
                             if (pluginState.addToHistory === false &&
                                 !pluginState.isChangeOrigin) {
                                 const yUndoPluginState = yUndoPluginKey.getState(view.state);
-                                const um = yUndoPluginState &&
-                                    yUndoPluginState.undoManager;
-                                if (um) {
-                                    um.stopCapturing();
+                                if (yUndoPluginState?.undoManager) {
+                                    yUndoPluginState.undoManager.stopCapturing();
                                 }
                             }
                             binding.mux(() => {
-                                /** @type {Y.Doc} */ (pluginState.doc).transact((tr) => {
+                                pluginState.doc.transact((tr) => {
                                     tr.meta.set('addToHistory', pluginState.addToHistory);
                                     binding._prosemirrorChanged(view.state.doc);
                                 }, ySyncPluginKey);
@@ -167,12 +161,12 @@ const restoreRelativeSelection = (tr, relSel, binding) => {
             tr.setSelection(new AllSelection(tr.doc));
         }
         else if (relSel.type === 'node') {
-            const anchor = relativePositionToAbsolutePosition(binding.doc, binding.type, relSel.anchor, binding.mapping);
+            const anchor = relativePositionToAbsolutePosition(binding.ydoc, binding.type, relSel.anchor, binding.mapping);
             tr.setSelection(NodeSelection.create(tr.doc, anchor));
         }
         else {
-            const anchor = relativePositionToAbsolutePosition(binding.doc, binding.type, relSel.anchor, binding.mapping);
-            const head = relativePositionToAbsolutePosition(binding.doc, binding.type, relSel.head, binding.mapping);
+            const anchor = relativePositionToAbsolutePosition(binding.ydoc, binding.type, relSel.anchor, binding.mapping);
+            const head = relativePositionToAbsolutePosition(binding.ydoc, binding.type, relSel.head, binding.mapping);
             if (anchor !== null && head !== null) {
                 const sel = TextSelection.between(tr.doc.resolve(anchor), tr.doc.resolve(head));
                 tr.setSelection(sel);
@@ -180,8 +174,20 @@ const restoreRelativeSelection = (tr, relSel, binding) => {
         }
     }
 };
+function getSelectionType(selection) {
+    if (selection instanceof TextSelection) {
+        return 'text';
+    }
+    if (selection instanceof AllSelection) {
+        return 'all';
+    }
+    if (selection instanceof NodeSelection) {
+        return 'node';
+    }
+    return 'other_selection';
+}
 export const getRelativeSelection = (pmbinding, state) => ({
-    type: /** @type {any} */ (state.selection).jsonID,
+    type: getSelectionType(state.selection),
     anchor: absolutePositionToRelativePosition(state.selection.anchor, pmbinding.type, pmbinding.mapping),
     head: absolutePositionToRelativePosition(state.selection.head, pmbinding.type, pmbinding.mapping),
 });
@@ -198,61 +204,61 @@ export class ProsemirrorBinding {
         this._beforeTransactionSelection = value;
     }
     constructor(yXmlFragment, mapping = new Map()) {
-        Object.defineProperty(this, "doc", {
+        Object.defineProperty(this, "mapping", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: mapping
         });
-        Object.defineProperty(this, "type", {
+        Object.defineProperty(this, "ydoc", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "mux", {
+        Object.defineProperty(this, "isOMark", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "prosemirrorView", {
+        Object.defineProperty(this, "type", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "isOMark", {
+        Object.defineProperty(this, "mux", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "_observeFunction", {
+        Object.defineProperty(this, "prosemirrorView", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "mapping", {
+        Object.defineProperty(this, "_beforeTransactionSelection", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "_beforeTransactionSelection", {
+        Object.defineProperty(this, "beforeAllTransactions", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "beforeAllTransactions", {
+        Object.defineProperty(this, "afterAllTransactions", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "afterAllTransactions", {
+        Object.defineProperty(this, "_observeFunction", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -262,18 +268,17 @@ export class ProsemirrorBinding {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: false
         });
         this.type = yXmlFragment;
         this.prosemirrorView = null;
         this.mux = createMutex();
-        this.mapping = mapping;
         /**
          * Is overlapping mark - i.e. mark does not exclude itself.
          */
         this.isOMark = new Map();
-        this._observeFunction = this._typeChanged.bind(this);
-        this.doc = yXmlFragment.doc;
+        this._observeFunction = (event, transaction) => this.yXmlChanged(event, transaction);
+        this.ydoc = yXmlFragment.doc;
         /**
          * current selection as relative positions in the Yjs model
          */
@@ -287,31 +292,26 @@ export class ProsemirrorBinding {
         this.afterAllTransactions = () => {
             this._beforeTransactionSelection = null;
         };
-        this._domSelectionInView = null;
+        this._domSelectionInView = false;
     }
-    /**
-     * Create a transaction for changing the prosemirror state.
-     *
-     * @returns
-     */
-    get _tr() {
-        return this.prosemirrorView.state.tr.setMeta('addToHistory', false);
+    debug(msg = 'ydoc.prosemirror') {
+        console.log(msg, this.type.toString());
     }
     _isLocalCursorInView() {
-        if (!this.prosemirrorView.hasFocus())
+        if (!this.prosemirrorView?.hasFocus())
             return false;
-        if (environment.isBrowser && this._domSelectionInView === null) {
+        if (environment.isBrowser && this._domSelectionInView === false) {
             // Calculate the domSelectionInView and clear by next tick after all events are finished
             eventloop.timeout(0, () => {
-                this._domSelectionInView = null;
+                this._domSelectionInView = false;
             });
             this._domSelectionInView = this._isDomSelectionInView();
         }
         return this._domSelectionInView;
     }
     _isDomSelectionInView() {
-        const selection = this.prosemirrorView.root.getSelection(); // https://stackoverflow.com/questions/62054839/shadowroot-getselection
-        if (selection == null || selection.anchorNode == null)
+        const selection = this.prosemirrorView?.root?.getSelection(); // https://stackoverflow.com/questions/62054839/shadowroot-getselection
+        if (!selection || selection.anchorNode == null)
             return false;
         const range = dom.doc.createRange(); // https://github.com/yjs/y-prosemirror/pull/193
         range.setStart(selection.anchorNode, selection.anchorOffset);
@@ -337,15 +337,22 @@ export class ProsemirrorBinding {
         if (!prevSnapshot) {
             prevSnapshot = Y.createSnapshot(Y.createDeleteSet(), new Map());
         }
-        this.prosemirrorView.dispatch(this._tr.setMeta(ySyncPluginKey, { snapshot, prevSnapshot }));
+        if (this.prosemirrorView) {
+            const _tr = this.prosemirrorView.state.tr.setMeta('addToHistory', false);
+            this.prosemirrorView.dispatch(_tr.setMeta(ySyncPluginKey, { snapshot, prevSnapshot }));
+        }
     }
     unrenderSnapshot() {
         this.mapping.clear();
         this.mux(() => {
-            const fragmentContent = this.type.toArray().map((t) => createNodeFromYElement(
-            /** @type {Y.XmlElement} */ (t), this.prosemirrorView.state.schema, this)).filter((n) => n !== null);
+            if (!this.prosemirrorView) {
+                return;
+            }
+            const state = this.prosemirrorView.state;
+            const fragmentContent = this.type.toArray().map((t) => createNodeFromYElement(t, state.schema, this)).filter((n) => n !== null);
             // @ts-ignore
-            const tr = this._tr.replace(0, this.prosemirrorView.state.doc.content.size, new PModel.Slice(PModel.Fragment.from(fragmentContent), 0, 0));
+            const _tr = state.tr.setMeta('addToHistory', false);
+            const tr = _tr.replace(0, state.doc.content.size, new PModel.Slice(PModel.Fragment.from(fragmentContent), 0, 0));
             tr.setMeta(ySyncPluginKey, { snapshot: null, prevSnapshot: null });
             this.prosemirrorView.dispatch(tr);
         });
@@ -353,16 +360,21 @@ export class ProsemirrorBinding {
     _forceRerender() {
         this.mapping.clear();
         this.mux(() => {
+            if (!this.prosemirrorView) {
+                return;
+            }
+            const state = this.prosemirrorView.state;
             // If this is a forced rerender, this might neither happen as a pm change nor within a Yjs
             // transaction. Then the "before selection" doesn't exist. In this case, we need to create a
             // relative position before replacing content. Fixes #126
             const sel = this._beforeTransactionSelection !== null
                 ? null
-                : this.prosemirrorView.state.selection;
+                : state.selection;
             const fragmentContent = this.type.toArray().map((t) => createNodeFromYElement(
-            /** @type {Y.XmlElement} */ (t), this.prosemirrorView.state.schema, this)).filter((n) => n !== null);
+            /** @type {Y.XmlElement} */ (t), state.schema, this)).filter((n) => n !== null);
             // @ts-ignore
-            const tr = this._tr.replace(0, this.prosemirrorView.state.doc.content.size, new PModel.Slice(PModel.Fragment.from(fragmentContent), 0, 0));
+            const _tr = state.tr.setMeta('addToHistory', false);
+            const tr = _tr.replace(0, state.doc.content.size, new PModel.Slice(PModel.Fragment.from(fragmentContent), 0, 0));
             if (sel) {
                 /**
                  * If the Prosemirror document we just created from this.type is
@@ -380,10 +392,10 @@ export class ProsemirrorBinding {
         /**
          * The document that contains the full history of this document.
          */
-        let historyDoc = this.doc;
+        let historyDoc = this.ydoc;
         let historyType = this.type;
         if (!snapshot) {
-            snapshot = Y.snapshot(this.doc);
+            snapshot = Y.snapshot(this.ydoc);
         }
         if (snapshot instanceof Uint8Array || prevSnapshot instanceof Uint8Array) {
             if (!(snapshot instanceof Uint8Array) ||
@@ -401,7 +413,7 @@ export class ProsemirrorBinding {
                  * If is a root type, we need to find the root key in the initial document
                  * and use it to get the history type.
                  */
-                const rootKey = Array.from(this.doc.share.keys()).find((key) => this.doc.share.get(key) === this.type);
+                const rootKey = Array.from(this.ydoc.share.keys()).find((key) => this.ydoc.share.get(key) === this.type);
                 historyType = historyDoc.getXmlFragment(rootKey);
             }
             else {
@@ -452,13 +464,13 @@ export class ProsemirrorBinding {
                         return null;
                     }
                 }).filter((n) => n !== null);
-                // @ts-ignore
-                const tr = this._tr.replace(0, this.prosemirrorView.state.doc.content.size, new PModel.Slice(PModel.Fragment.from(fragmentContent), 0, 0));
+                const _tr = this.prosemirrorView.state.tr.setMeta('addToHistory', false);
+                const tr = _tr.replace(0, this.prosemirrorView.state.doc.content.size, new PModel.Slice(PModel.Fragment.from(fragmentContent), 0, 0));
                 this.prosemirrorView.dispatch(tr.setMeta(ySyncPluginKey, { isChangeOrigin: true }));
             }, ySyncPluginKey);
         });
     }
-    _typeChanged(events, transaction) {
+    yXmlChanged(events, transaction) {
         if (this.prosemirrorView == null)
             return;
         const syncState = ySyncPluginKey.getState(this.prosemirrorView.state);
@@ -480,11 +492,20 @@ export class ProsemirrorBinding {
             });
             transaction.changed.forEach(delType);
             transaction.changedParentTypes.forEach(delType);
+            if (!this.prosemirrorView) {
+                return;
+            }
+            const state = this.prosemirrorView.state;
             const fragmentContent = this.type.toArray().map((t) => createNodeIfNotExists(
-            /** @type {Y.XmlElement | Y.XmlHook} */ (t), this.prosemirrorView.state.schema, this)).filter((n) => n !== null);
-            // @ts-ignore
-            let tr = this._tr.replace(0, this.prosemirrorView.state.doc.content.size, new PModel.Slice(PModel.Fragment.from(fragmentContent), 0, 0));
-            restoreRelativeSelection(tr, this._beforeTransactionSelection, this);
+            /** @type {Y.XmlElement | Y.XmlHook} */ (t), state.schema, this)).filter((n) => n !== null);
+            const _tr = state.tr.setMeta('addToHistory', false);
+            let tr = _tr.replace(0, state.doc.content.size, new PModel.Slice(PModel.Fragment.from(fragmentContent), 0, 0));
+            try {
+                restoreRelativeSelection(tr, this._beforeTransactionSelection, this);
+            }
+            catch (err) {
+                console.warn(err);
+            }
             tr = tr.setMeta(ySyncPluginKey, {
                 isChangeOrigin: true,
                 isUndoRedoOperation: transaction.origin instanceof Y.UndoManager,
@@ -496,8 +517,8 @@ export class ProsemirrorBinding {
         });
     }
     _prosemirrorChanged(doc) {
-        this.doc.transact(() => {
-            updateYFragment(this.doc, this.type, doc, this);
+        this.ydoc.transact(() => {
+            updateYFragment(this.ydoc, this.type, doc, this);
             this._beforeTransactionSelection = getRelativeSelection(this, this.prosemirrorView.state);
         }, ySyncPluginKey);
     }
@@ -508,8 +529,8 @@ export class ProsemirrorBinding {
         if (this.prosemirrorView != null)
             this.destroy();
         this.prosemirrorView = prosemirrorView;
-        this.doc.on('beforeAllTransactions', this.beforeAllTransactions);
-        this.doc.on('afterAllTransactions', this.afterAllTransactions);
+        this.ydoc.on('beforeAllTransactions', this.beforeAllTransactions);
+        this.ydoc.on('afterAllTransactions', this.afterAllTransactions);
         this.type.observeDeep(this._observeFunction);
     }
     destroy() {
@@ -517,12 +538,12 @@ export class ProsemirrorBinding {
             return;
         this.prosemirrorView = null;
         this.type.unobserveDeep(this._observeFunction);
-        this.doc.off('beforeAllTransactions', this.beforeAllTransactions);
-        this.doc.off('afterAllTransactions', this.afterAllTransactions);
+        this.ydoc.off('beforeAllTransactions', this.beforeAllTransactions);
+        this.ydoc.off('afterAllTransactions', this.afterAllTransactions);
     }
 }
 const createNodeIfNotExists = (el, schema, meta, snapshot, prevSnapshot, computeYChange) => {
-    const node = /** @type {PModel.Node} */ (meta.mapping.get(el));
+    const node = meta.mapping.get(el);
     if (node === undefined) {
         if (el instanceof Y.XmlElement) {
             return createNodeFromYElement(el, schema, meta, snapshot, prevSnapshot, computeYChange);
@@ -757,9 +778,6 @@ const computeChildEqualityFactor = (ytype, pnode, meta) => {
 };
 const ytextTrans = (ytext) => {
     let str = '';
-    /**
-     * @type {Y.Item|null}
-     */
     let n = ytext._start;
     const nAttrs = {};
     while (n !== null) {

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

@@ -1 +1 @@
-{"version":3,"file":"yUndoPlugin.d.ts","sourceRoot":"","sources":["../../../src/extension-yjs/src/yUndoPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,EAA2B,WAAW,EAAc,MAAM,KAAK,CAAC;AAEvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAGxD,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,gBAoEF,CAAC"}
+{"version":3,"file":"yUndoPlugin.d.ts","sourceRoot":"","sources":["../../../src/extension-yjs/src/yUndoPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,EAA2B,WAAW,EAAc,MAAM,KAAK,CAAC;AAEvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAGxD,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"}

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

@@ -63,23 +63,26 @@ export const yUndoPlugin = ({ protectedNodes = defaultProtectedNodes, trackedOri
     },
     view: (view) => {
         const ystate = ySyncPluginKey.getState(view.state);
-        const undoManager = yUndoPluginKey.getState(view.state).undoManager;
-        undoManager.on('stack-item-added', ({ stackItem }) => {
-            const binding = ystate.binding;
-            if (binding) {
-                stackItem.meta.set(binding, yUndoPluginKey.getState(view.state).prevSel);
-            }
-        });
-        undoManager.on('stack-item-popped', ({ stackItem }) => {
-            const binding = ystate.binding;
-            if (binding) {
-                binding.beforeTransactionSelection = stackItem.meta.get(binding) ||
-                    binding.beforeTransactionSelection;
-            }
-        });
+        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: () => {
-                undoManager.destroy();
+                undoManager?.destroy();
             },
         };
     },

package/esm/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kerebron/extension-yjs",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "license": "MIT",
   "module": "./esm/extension-yjs/src/ExtensionYjs.js",
   "exports": {
@@ -13,7 +13,7 @@
   },
   "scripts": {},
   "dependencies": {
-    "prosemirror-model": "1.25.2",
+    "prosemirror-model": "1.25.3",
     "prosemirror-state": "1.4.3",
     "prosemirror-transform": "1.10.4",
     "prosemirror-view": "1.40.0",