@kerebron/editor-kits 0.5.3 → 0.5.4

package/esm/YjsEditorKit.d.ts

@@ -1,13 +1,10 @@
-import * as Y from 'yjs';
 import type { AnyExtensionOrReq, EditorKit } from '@kerebron/editor';
-import { YjsProvider } from '@kerebron/extension-yjs';
 export declare class YjsEditorKit implements EditorKit {
-    private wsProvider;
-    private ydoc;
+    url: string;
+    userName: string;
     name: string;
-    requires: AnyExtensionOrReq[];
-    static createFrom(ydoc: Y.Doc, roomId: string): YjsEditorKit;
-    constructor(wsProvider: YjsProvider, ydoc: Y.Doc);
+    static createFrom(userName: string, url?: string): YjsEditorKit;
+    constructor(url: string, userName: string);
     getExtensions(): AnyExtensionOrReq[];
 }
 //# sourceMappingURL=YjsEditorKit.d.ts.map

package/esm/YjsEditorKit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"YjsEditorKit.d.ts","sourceRoot":"","sources":["../src/YjsEditorKit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAKzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAErE,OAAO,EAAgB,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEpE,qBAAa,YAAa,YAAW,SAAS;IA8BhC,OAAO,CAAC,UAAU;IAAe,OAAO,CAAC,IAAI;IA7BzD,IAAI,SAAgB;IACpB,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAE9B,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM;gBA0BzB,UAAU,EAAE,WAAW,EAAU,IAAI,EAAE,CAAC,CAAC,GAAG;IAGhE,aAAa,IAAI,iBAAiB,EAAE;CAKrC"}
+{"version":3,"file":"YjsEditorKit.d.ts","sourceRoot":"","sources":["../src/YjsEditorKit.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AASrE,qBAAa,YAAa,YAAW,SAAS;IAczB,GAAG,EAAE,MAAM;IAAS,QAAQ,EAAE,MAAM;IAbvD,IAAI,SAAgB;IAEpB,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;gBAW7B,GAAG,EAAE,MAAM,EAAS,QAAQ,EAAE,MAAM;IAGvD,aAAa,IAAI,iBAAiB,EAAE;CAqBrC"}

package/esm/YjsEditorKit.js

@@ -1,36 +1,36 @@
-import * as random from 'lib0/random';
+import * as Y from 'yjs';
 import { WebsocketProvider } from 'y-websocket';
-import { userColors } from '@kerebron/extension-yjs/userColors';
-import { ExtensionYjs } from '@kerebron/extension-yjs';
+import { ExtensionYjs, } from '@kerebron/extension-yjs';
+import { MarkYChange } from '@kerebron/extension-yjs/MarkYChange';
 export class YjsEditorKit {
-    wsProvider;
-    ydoc;
+    url;
+    userName;
     name = 'yjs-editor';
-    requires;
-    static createFrom(ydoc, roomId) {
-        const userColor = userColors[random.uint32() % userColors.length];
-        if (!roomId) {
-            throw new Error('No room id');
+    static createFrom(userName, url) {
+        if (!url) {
+            const protocol = globalThis.location.protocol === 'http:'
+                ? 'ws:'
+                : 'wss:';
+            url = protocol + '//' + globalThis.location.host + '/yjs';
         }
-        const protocol = globalThis.location.protocol === 'http:' ? 'ws:' : 'wss:';
-        const wsProvider = new WebsocketProvider(protocol + '//' + globalThis.location.host + '/yjs', roomId, ydoc);
-        wsProvider.on('status', (event) => {
-            console.log('wsProvider status', event.status); // logs "connected" or "disconnected"
-        });
-        wsProvider.awareness.setLocalStateField('user', {
-            name: 'Anonymous ' + Math.floor(Math.random() * 100),
-            color: userColor.color,
-            colorLight: userColor.light,
-        });
-        return new YjsEditorKit(wsProvider, ydoc);
+        return new YjsEditorKit(url, userName);
     }
-    constructor(wsProvider, ydoc) {
-        this.wsProvider = wsProvider;
-        this.ydoc = ydoc;
+    constructor(url, userName) {
+        this.url = url;
+        this.userName = userName;
     }
     getExtensions() {
+        const createWsProvider = (roomId) => {
+            const ydoc = new Y.Doc();
+            const wsProvider = new WebsocketProvider(this.url, roomId, ydoc);
+            wsProvider.on('status', (event) => {
+                console.log('wsProvider status', event.status); // logs "connected" or "disconnected"
+            });
+            return [wsProvider, ydoc];
+        };
         return [
-            new ExtensionYjs({ ydoc: this.ydoc, provider: this.wsProvider }),
+            new MarkYChange(),
+            new ExtensionYjs({ createWsProvider }),
         ];
     }
 }

package/esm/YjsEditorKit.js.map

@@ -1 +1 @@
-{"version":3,"file":"YjsEditorKit.js","sourceRoot":"","sources":["../src/YjsEditorKit.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIhD,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAe,MAAM,yBAAyB,CAAC;AAEpE,MAAM,OAAO,YAAY;IA8BH;IAAiC;IA7BrD,IAAI,GAAG,YAAY,CAAC;IACpB,QAAQ,CAAsB;IAE9B,MAAM,CAAC,UAAU,CAAC,IAAW,EAAE,MAAc;QAC3C,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;QAClE,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;QAChC,CAAC;QAED,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;QAC3E,MAAM,UAAU,GAAgB,IAAI,iBAAiB,CACnD,QAAQ,GAAG,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,EACnD,MAAM,EACN,IAAI,CACL,CAAC;QAEF,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;YAChC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,qCAAqC;QACvF,CAAC,CAAC,CAAC;QAEH,UAAU,CAAC,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE;YAC9C,IAAI,EAAE,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC;YACpD,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,UAAU,EAAE,SAAS,CAAC,KAAK;SAC5B,CAAC,CAAC;QAEH,OAAO,IAAI,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,YAAoB,UAAuB,EAAU,IAAW;QAA5C,eAAU,GAAV,UAAU,CAAa;QAAU,SAAI,GAAJ,IAAI,CAAO;IAChE,CAAC;IAED,aAAa;QACX,OAAO;YACL,IAAI,YAAY,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC;SACjE,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"YjsEditorKit.js","sourceRoot":"","sources":["../src/YjsEditorKit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGhD,OAAO,EAEL,YAAY,GAEb,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAElE,MAAM,OAAO,YAAY;IAcJ;IAAoB;IAbvC,IAAI,GAAG,YAAY,CAAC;IAEpB,MAAM,CAAC,UAAU,CAAC,QAAgB,EAAE,GAAY;QAC9C,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,QAAQ,KAAK,OAAO;gBACvD,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,MAAM,CAAC;YACX,GAAG,GAAG,QAAQ,GAAG,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC;QAC5D,CAAC;QAED,OAAO,IAAI,YAAY,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACzC,CAAC;IAED,YAAmB,GAAW,EAAS,QAAgB;QAApC,QAAG,GAAH,GAAG,CAAQ;QAAS,aAAQ,GAAR,QAAQ,CAAQ;IACvD,CAAC;IAED,aAAa;QACX,MAAM,gBAAgB,GAAqB,CAAC,MAAc,EAAE,EAAE;YAC5D,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC;YACzB,MAAM,UAAU,GAAgB,IAAI,iBAAiB,CACnD,IAAI,CAAC,GAAG,EACR,MAAM,EACN,IAAI,CACL,CAAC;YAEF,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;gBAChC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,qCAAqC;YACvF,CAAC,CAAC,CAAC;YAEH,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;QAEF,OAAO;YACL,IAAI,WAAW,EAAE;YACjB,IAAI,YAAY,CAAC,EAAE,gBAAgB,EAAE,CAAC;SACvC,CAAC;IACJ,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kerebron/editor-kits",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "license": "MIT",
   "module": "./esm/mod.js",
   "exports": {
@@ -33,19 +33,18 @@
     "assets"
   ],
   "dependencies": {
-    "@kerebron/editor": "0.5.3",
-    "@kerebron/extension-basic-editor": "0.5.3",
-    "@kerebron/extension-codejar": "0.5.3",
-    "@kerebron/extension-codemirror": "0.5.3",
-    "@kerebron/extension-dev-toolkit": "0.5.3",
-    "@kerebron/extension-lsp": "0.5.3",
-    "@kerebron/extension-markdown": "0.5.3",
-    "@kerebron/extension-menu": "0.5.3",
-    "@kerebron/extension-menu-legacy": "0.5.3",
-    "@kerebron/extension-odt": "0.5.3",
-    "@kerebron/extension-tables": "0.5.3",
-    "@kerebron/extension-yjs": "0.5.3",
-    "lib0": "0.2.109",
+    "@kerebron/editor": "0.5.4",
+    "@kerebron/extension-basic-editor": "0.5.4",
+    "@kerebron/extension-codejar": "0.5.4",
+    "@kerebron/extension-codemirror": "0.5.4",
+    "@kerebron/extension-dev-toolkit": "0.5.4",
+    "@kerebron/extension-lsp": "0.5.4",
+    "@kerebron/extension-markdown": "0.5.4",
+    "@kerebron/extension-menu": "0.5.4",
+    "@kerebron/extension-menu-legacy": "0.5.4",
+    "@kerebron/extension-odt": "0.5.4",
+    "@kerebron/extension-tables": "0.5.4",
+    "@kerebron/extension-yjs": "0.5.4",
     "thememirror": "2.0.1",
     "y-websocket": "3.0.0",
     "yjs": "13.6.24"

package/src/YjsEditorKit.ts

@@ -1,48 +1,51 @@
 import * as Y from 'yjs';
-import * as random from 'lib0/random';
 import { WebsocketProvider } from 'y-websocket';
 
-import { Extension } from '@kerebron/editor';
 import type { AnyExtensionOrReq, EditorKit } from '@kerebron/editor';
-import { userColors } from '@kerebron/extension-yjs/userColors';
-import { ExtensionYjs, YjsProvider } from '@kerebron/extension-yjs';
+import {
+  CreateWsProvider,
+  ExtensionYjs,
+  YjsProvider,
+} from '@kerebron/extension-yjs';
+
+import { MarkYChange } from '@kerebron/extension-yjs/MarkYChange';
 
 export class YjsEditorKit implements EditorKit {
   name = 'yjs-editor';
-  requires: AnyExtensionOrReq[];
 
-  static createFrom(ydoc: Y.Doc, roomId: string) {
-    const userColor = userColors[random.uint32() % userColors.length];
-    if (!roomId) {
-      throw new Error('No room id');
+  static createFrom(userName: string, url?: string) {
+    if (!url) {
+      const protocol = globalThis.location.protocol === 'http:'
+        ? 'ws:'
+        : 'wss:';
+      url = protocol + '//' + globalThis.location.host + '/yjs';
     }
 
-    const protocol = globalThis.location.protocol === 'http:' ? 'ws:' : 'wss:';
-    const wsProvider: YjsProvider = new WebsocketProvider(
-      protocol + '//' + globalThis.location.host + '/yjs',
-      roomId,
-      ydoc,
-    );
-
-    wsProvider.on('status', (event) => {
-      console.log('wsProvider status', event.status); // logs "connected" or "disconnected"
-    });
-
-    wsProvider.awareness.setLocalStateField('user', {
-      name: 'Anonymous ' + Math.floor(Math.random() * 100),
-      color: userColor.color,
-      colorLight: userColor.light,
-    });
-
-    return new YjsEditorKit(wsProvider, ydoc);
+    return new YjsEditorKit(url, userName);
   }
 
-  constructor(private wsProvider: YjsProvider, private ydoc: Y.Doc) {
+  constructor(public url: string, public userName: string) {
   }
 
   getExtensions(): AnyExtensionOrReq[] {
+    const createWsProvider: CreateWsProvider = (roomId: string) => {
+      const ydoc = new Y.Doc();
+      const wsProvider: YjsProvider = new WebsocketProvider(
+        this.url,
+        roomId,
+        ydoc,
+      );
+
+      wsProvider.on('status', (event) => {
+        console.log('wsProvider status', event.status); // logs "connected" or "disconnected"
+      });
+
+      return [wsProvider, ydoc];
+    };
+
     return [
-      new ExtensionYjs({ ydoc: this.ydoc, provider: this.wsProvider }),
+      new MarkYChange(),
+      new ExtensionYjs({ createWsProvider }),
     ];
   }
 }