@ones-editor/editor 3.0.18 → 3.0.19-beta.2

package/@ones-editor/versions/src/history-diff.d.ts

@@ -0,0 +1,12 @@
+import type { OnesEditorVersionsProvider } from './types';
+import type { DocObject, OnesEditor, OnesEditorBlockRenderer, OnesEditorDocHistoryData, OnesEditorDocServer, OnesEditorDocVersionHelper } from '../../../@ones-editor/core';
+export interface CreateOnesEditorHistoryDiffOptions {
+    server: OnesEditorDocServer;
+    provider: OnesEditorVersionsProvider;
+    doc: DocObject;
+    historyData: OnesEditorDocHistoryData[];
+    versionHelper: Pick<OnesEditorDocVersionHelper, 'parseHistoryData'>;
+    editorOptions?: unknown;
+    textRenders?: OnesEditorBlockRenderer[];
+}
+export declare function createOnesEditorHistoryDiff(parent: HTMLElement, options: CreateOnesEditorHistoryDiffOptions): Promise<OnesEditor>;

package/@ones-editor/versions/src/history-doc/history-doc.d.ts

@@ -1,4 +1,4 @@
-import { DocBlock, DocBlockDelta, DocBlockText, DocBlockTextActions, DocObject, EventCallbacks, OnesEditorDoc, OnesEditorDocCallbacks, OnesEditorUser, UploadResourceResult, OnesEditorDocServerMeta, OnesEditorDocServer } from '../../../../@ones-editor/core';
+import { BuildResourceUrlOptions, DocBlock, DocBlockDelta, DocBlockText, DocBlockTextActions, DocObject, EventCallbacks, OnesEditorDoc, OnesEditorDocCallbacks, OnesEditorUser, UploadResourceResult, OnesEditorDocServerMeta, OnesEditorDocServer } from '../../../../@ones-editor/core';
 import { HistoryUser } from '../types';
 export default class HistoryDoc extends EventCallbacks<OnesEditorDocCallbacks> implements OnesEditorDoc {
     private server;
@@ -21,7 +21,7 @@ export default class HistoryDoc extends EventCallbacks<OnesEditorDocCallbacks> i
     uploadResource(): Promise<UploadResourceResult>;
     addResources(resourceIds: string[]): Promise<string[]>;
     getServerMeta(): OnesEditorDocServerMeta;
-    buildResourceUrl(src: string): string;
+    buildResourceUrl(src: string, options?: BuildResourceUrlOptions): string;
     request<T>(): Promise<T>;
     broadcastMessage(): void;
     getUser(): OnesEditorUser;

package/@ones-editor/versions/src/index.d.ts

@@ -1,5 +1,7 @@
 import './index.scss';
 import './locale';
 export { OnesEditorVersionsDialog } from './version-dialog';
+export { createOnesEditorHistoryDiff } from './history-diff';
 export { HISTORY_TOOLTIP_IDENTIFIER } from './constant';
 export * from './types';
+export type { CreateOnesEditorHistoryDiffOptions } from './history-diff';

package/@ones-editor/versions/src/version-dialog/play-history.d.ts

@@ -1,3 +1,3 @@
 import type { OnesEditorDocHistoryData, OnesEditorDocVersionHelper } from '../../../../@ones-editor/core';
 import HistoryDoc from '../history-doc';
-export declare function playHistoryData(doc: HistoryDoc, versionHelper: OnesEditorDocVersionHelper, historyData: OnesEditorDocHistoryData[]): Promise<void>;
+export declare function playHistoryData(doc: HistoryDoc, versionHelper: Pick<OnesEditorDocVersionHelper, 'parseHistoryData'>, historyData: OnesEditorDocHistoryData[]): Promise<void>;

package/dist/history-diff.d.ts

@@ -0,0 +1,12 @@
+import type { CreateOnesEditorOptions } from './types';
+import type { EditorDoc } from '../@ones-editor/sharedb-doc';
+import type { DocObject, OnesEditor, OnesEditorBlockRenderer, OnesEditorDocServer, OnesEditorDocVersionHelper } from '../@ones-editor/core';
+export interface CreateDocHistoryDiffEditorOptions {
+    data: string | EditorDoc | DocObject;
+    ops?: unknown[];
+    editorOptions: CreateOnesEditorOptions;
+    server?: OnesEditorDocServer;
+    versionHelper?: Pick<OnesEditorDocVersionHelper, 'parseHistoryData'>;
+    textRenders?: OnesEditorBlockRenderer[];
+}
+export declare function createDocHistoryDiffEditor(parent: HTMLElement, options: CreateDocHistoryDiffEditorOptions): Promise<OnesEditor>;

package/dist/index.d.ts

@@ -49,6 +49,8 @@ export * from './helper';
 export { OnesEditorComments, OnesEditorCommentsRender } from '../@ones-editor/comments';
 export * from '../@ones-editor/cke-html';
 export { type DocListBlock } from '../@ones-editor/list-block';
+export { createDocHistoryDiffEditor } from './history-diff';
+export type { CreateDocHistoryDiffEditorOptions } from './history-diff';
 export declare function getDefaultOnesEditorOptions(options: CreateOnesEditorOptions): {
     id: string | undefined;
     scrollContainer: HTMLElement | undefined;
@@ -61,7 +63,7 @@ export declare function getDefaultOnesEditorOptions(options: CreateOnesEditorOpt
         embeds: import("@ones-editor/core").Embed[];
         boxes: import("@ones-editor/core").Box[];
         commandProviders: (import("@ones-editor/core").OnesEditorCommandProvider | TableBlockCommandProvider)[];
-        decorators: (RemoteCaretsDecorator | CodeTextDecorator)[];
+        decorators: (CodeTextDecorator | RemoteCaretsDecorator)[];
         insertions: import("@ones-editor/core").Insertion[];
         blockHooks: (import("@ones-editor/core").OnesEditorBlockHook | BlockExclusiveHook)[];
         textRenders: OnesEditorBlockRenderer[];

package/dist/index.js

@@ -39402,40 +39402,41 @@ ${codeText}
       return false;
     }
     const firstOp = ops[0];
-    if (typeof firstOp !== "object") {
+    if (!firstOp || typeof firstOp !== "object") {
       return false;
     }
     if (!firstOp.i || Object.keys(firstOp).length !== 1) {
       return false;
     }
-    for (let i = 1; i < ops.length; i++) {
+    for (let i = 1; i < ops.length; ) {
       const nextOp = ops[i];
-      if (!Array.isArray(nextOp)) {
+      const isArrayInsertOp = Array.isArray(nextOp);
+      if (isArrayInsertOp && nextOp.length !== 2) {
         return false;
       }
-      if (nextOp.length !== 2) {
-        return false;
-      }
-      const key = nextOp[0];
+      const key = isArrayInsertOp ? nextOp[0] : nextOp;
       if (typeof key !== "string") {
         return false;
       }
-      const op = nextOp[1];
-      if (typeof op !== "object") {
+      const op = isArrayInsertOp ? nextOp[1] : ops[i + 1];
+      if (!op || typeof op !== "object") {
         return false;
       }
       if (op.i === void 0 || Object.keys(op).length !== 1) {
         return false;
       }
+      i += isArrayInsertOp ? 1 : 2;
     }
     const blockData = firstOp.i;
     assert(logger$2Y, blockData.id, "block id is required");
     assert(logger$2Y, blockData.type, "block type is required");
-    for (let i = 1; i < ops.length; i++) {
+    for (let i = 1; i < ops.length; ) {
       const nextOp = ops[i];
-      const key = nextOp[0];
-      const op = nextOp[1];
+      const isArrayInsertOp = Array.isArray(nextOp);
+      const key = isArrayInsertOp ? nextOp[0] : nextOp;
+      const op = isArrayInsertOp ? nextOp[1] : ops[i + 1];
       blockData[key] = op.i;
+      i += isArrayInsertOp ? 1 : 2;
     }
     parser.onInsertBlock(containerId, blockIndex, blockData);
     return true;
@@ -39577,6 +39578,19 @@ ${codeText}
       }
     }
   }
+  function parseBlockOps(containerId, ops, parseType, handler) {
+    if (ops.length === 0) {
+      return;
+    }
+    if (Array.isArray(ops[0])) {
+      const blockOpsList = parseType === "remove" ? ops.concat().reverse() : ops;
+      blockOpsList.forEach((op) => {
+        parseBlockOp(containerId, op, parseType, handler);
+      });
+      return;
+    }
+    parseBlockOp(containerId, ops, parseType, handler);
+  }
   function parseOp(ops, parseType, handler) {
     const firstOp = ops[0];
     if (Array.isArray(firstOp)) {
@@ -39597,15 +39611,7 @@ ${codeText}
     }
     const containerId = rootKey;
     if (Array.isArray(ops[1])) {
-      if (parseType === "remove") {
-        ops.slice(1).reverse().forEach((op) => {
-          parseBlockOp(containerId, op, parseType, handler);
-        });
-      } else {
-        ops.slice(1).forEach((op) => {
-          parseBlockOp(containerId, op, parseType, handler);
-        });
-      }
+      parseBlockOps(containerId, ops.slice(1), parseType, handler);
     } else {
       if (typeof ops[1] === "object") {
         const action = ops[1];
@@ -39619,6 +39625,7 @@ ${codeText}
             handler.onCreateContainer(containerId, action.i);
           }
         }
+        parseBlockOps(containerId, ops.slice(2), parseType, handler);
       } else {
         assert(logger$2Y, typeof ops[1] === "number", `invalid ops[1], not a number: ${JSON.stringify(ops)}`);
         parseBlockOp(containerId, ops.slice(1), parseType, handler);
@@ -83165,12 +83172,12 @@ ${docStr}
       var _a, _b, _c;
       return (_c = (_b = (_a = this.server).getServerMeta) == null ? void 0 : _b.call(_a)) != null ? _c : {};
     }
-    buildResourceUrl(src) {
+    buildResourceUrl(src, options) {
       var _a;
       if ((_a = this.editorOptions) == null ? void 0 : _a.buildResourceUrl) {
-        return this.editorOptions.buildResourceUrl(this, src);
+        return this.editorOptions.buildResourceUrl(this, src, options);
       }
-      return this.server.buildResourceUrl(src);
+      return this.server.buildResourceUrl(src, options);
     }
     request() {
       disableLocalActions();
@@ -83942,7 +83949,7 @@ ${docStr}
           const getReferenceClientRect2 = () => this.getReferenceClientRect(reference);
           instance.setProps({
             appendTo: () => {
-              const editorContainer = document.querySelector(".version-dialog-editor");
+              const editorContainer = document.querySelector(".version-dialog-editor") || this.editor.rootElement.parentElement || this.editor.rootElement;
               return editorContainer;
             },
             getReferenceClientRect: getReferenceClientRect2,
@@ -83988,6 +83995,9 @@ ${docStr}
     }
     getPseudoMaskRect(reference) {
       const currentRootContainer = document.getElementById("ones-editor-container-root");
+      if (!currentRootContainer) {
+        return null;
+      }
       const editorRootRect = currentRootContainer.getBoundingClientRect();
       const safetyLeftOffset = editorRootRect.left - this.gap;
       const internalProcess = (pseudoHolder) => {
@@ -84315,6 +84325,19 @@ ${docStr}
       (_c = this.editor) == null ? void 0 : _c.destroy();
     }
   }
+  async function createOnesEditorHistoryDiff(parent, options) {
+    var _a;
+    const historyDoc = new HistoryDoc(options.server, options.doc, options.editorOptions);
+    const viewer = options.provider.createHistoryEditor(parent, historyDoc);
+    viewer.editorBlockRenders.registerRender(new OnesEditorHistoryRender());
+    viewer.editorBoxes.registerBoxClass(HistoryDeletedTextBox);
+    (_a = options.textRenders) == null ? void 0 : _a.forEach((render) => viewer.editorBlockRenders.registerRender(render));
+    OnesEditorHistoryTooltip.register(viewer);
+    addClass(viewer.rootElement, HistoryClass.HISTORY);
+    viewer.rootElement.style.setProperty("--history-mask-identifier", `"${HISTORY_MASK_IDENTIFIER}"`);
+    await playHistoryData(historyDoc, options.versionHelper, options.historyData);
+    return viewer;
+  }
   const zhCN$e = {
     expandCollapseButton: {
       expand: "\u5C55\u5F00",
@@ -86748,7 +86771,7 @@ ${docStr}
     },
     convertTo: convertTo$6
   };
-  const MERMAID_SCRIPTS = "https://cdn.jsdelivr.net/npm/mermaid@11.15.0/dist/mermaid.min.js";
+  const MERMAID_SCRIPTS = "https://cdn.jsdelivr.net/npm/mermaid@9.0.1/dist/mermaid.min.js";
   const FLOWCHART_SCRIPTS = ["//cdnjs.cloudflare.com/ajax/libs/raphael/2.3.0/raphael.min.js", "//cdnjs.cloudflare.com/ajax/libs/flowchart/1.15.0/flowchart.min.js"];
   const PLANTUML_PRE = "https://www.plantuml.com/plantuml/svg";
   const GRAPH_MIN_HEIGHT = 150;
@@ -87465,17 +87488,22 @@ ${docStr}
     const mermaid = window.mermaid;
     assert(logger$l, mermaid, "Resource load failed: Mermaid javaScript resource injection failed");
     const id = genId();
-    let svgCode = "";
-    try {
-      const result = await mermaid.render(id, code);
-      svgCode = typeof result === "string" ? result : result.svg;
-    } catch (err) {
-      err.message = err.str || err.message;
-      const delId = `d${id}`;
-      const el = document.getElementById(delId);
-      el == null ? void 0 : el.remove();
-      throw err;
-    }
+    const promise = new Promise((resolve, reject) => {
+      try {
+        mermaid.mermaidAPI.render(id, code, (svgCode2) => {
+          setTimeout(() => {
+            resolve(svgCode2);
+          });
+        });
+      } catch (err) {
+        err.message = err.str;
+        const delId = `d${id}`;
+        const el = document.getElementById(delId);
+        el == null ? void 0 : el.remove();
+        reject(err);
+      }
+    });
+    const svgCode = await promise;
     const domParser = new DOMParser();
     const xml = domParser.parseFromString(svgCode, "image/svg+xml");
     const xmlSvg = xml.firstChild;
@@ -97076,6 +97104,137 @@ ${JSON.stringify(error2, null, 2)}`);
   function combineRichTextValue(value1, value2) {
     return combineCkeHtml(value1, value2);
   }
+  const DefaultHistoryDiffUser = {
+    userId: "history-diff",
+    displayName: ""
+  };
+  const isRecord = (value) => {
+    return Boolean(value && typeof value === "object" && !Array.isArray(value));
+  };
+  const isDocObject = (value) => {
+    const blocks = value.blocks;
+    return Boolean(blocks && typeof blocks === "object" && Array.isArray(blocks.root));
+  };
+  const trimTrailingSlash = (value) => {
+    return value.replace(/\/+$/, "");
+  };
+  const buildDocApiServer = (editorOptions) => {
+    const serverUrl = trimTrailingSlash(editorOptions.serverUrl);
+    const { appId, docId } = editorOptions;
+    if (!serverUrl || !appId || !docId) {
+      return editorOptions.serverUrl;
+    }
+    const docApiServer = serverUrl + "/" + appId + "/" + docId;
+    if (docApiServer.startsWith("ws://")) {
+      return `http://${docApiServer.substring(5)}`;
+    }
+    if (docApiServer.startsWith("wss://")) {
+      return `https://${docApiServer.substring(6)}`;
+    }
+    return docApiServer;
+  };
+  const parseDocData = (data2) => {
+    if (typeof data2 !== "string") {
+      return data2;
+    }
+    const parsed = JSON.parse(data2);
+    if (!isRecord(parsed)) {
+      throw new Error("invalid history diff doc data");
+    }
+    return parsed;
+  };
+  const toDocObject = (data2) => {
+    const parsed = parseDocData(data2);
+    if (isDocObject(parsed)) {
+      return parsed;
+    }
+    return editorDoc2DocObject(parsed);
+  };
+  const getHistoryDiffUser = (op) => {
+    var _a;
+    const createdBy = (_a = op.meta) == null ? void 0 : _a.createdBy;
+    const user = op.user || createdBy;
+    return {
+      userId: (user == null ? void 0 : user.userId) || DefaultHistoryDiffUser.userId,
+      displayName: (user == null ? void 0 : user.displayName) || DefaultHistoryDiffUser.displayName
+    };
+  };
+  const getHistoryDiffOp = (op) => {
+    if (Array.isArray(op.op)) {
+      return op.op;
+    }
+    if (Array.isArray(op.ops)) {
+      return op.ops;
+    }
+    return [];
+  };
+  const toHistoryData = (ops = []) => {
+    return ops.reduce((historyData, op) => {
+      if (!isRecord(op)) {
+        return historyData;
+      }
+      const opData = op;
+      const user = getHistoryDiffUser(opData);
+      const normalizedOp = getHistoryDiffOp(opData);
+      if (normalizedOp.length === 0) {
+        return historyData;
+      }
+      historyData.push({
+        user,
+        data: {
+          ...opData,
+          meta: {
+            ...isRecord(opData.meta) ? opData.meta : {},
+            createdBy: user
+          },
+          op: normalizedOp
+        }
+      });
+      return historyData;
+    }, []);
+  };
+  class HistoryDiffVersionHelper {
+    parseHistoryData(historyData, handler) {
+      const data2 = historyData.data;
+      parseOps(data2.op || [], handler, true);
+    }
+  }
+  class HistoryDiffDocServer {
+    constructor(editorOptions) {
+      __publicField(this, "remoteUsers", new RemoteUsers());
+      this.editorOptions = editorOptions;
+    }
+    buildResourceUrl(resourceId, options) {
+      return resourceId;
+    }
+    getRemoteUsers() {
+      return this.remoteUsers;
+    }
+    getServerMeta() {
+      return {
+        appId: this.editorOptions.appId,
+        docId: this.editorOptions.docId,
+        serverId: this.editorOptions.serverUrl,
+        apiServer: buildDocApiServer(this.editorOptions)
+      };
+    }
+  }
+  async function createDocHistoryDiffEditor(parent, options) {
+    const doc2 = toDocObject(options.data);
+    const historyData = toHistoryData(options.ops);
+    const server = options.server || new HistoryDiffDocServer(options.editorOptions);
+    const versionHelper = options.versionHelper || new HistoryDiffVersionHelper();
+    const provider = new ShareDBDocVersionsProvider(options.editorOptions);
+    return createOnesEditorHistoryDiff(parent, {
+      server,
+      provider,
+      doc: doc2,
+      historyData,
+      versionHelper,
+      editorOptions: options.editorOptions,
+      textRenders: options.textRenders
+    });
+  }
   const logger = getLogger("create-editor");
   function getHooks(options, local) {
     var _a;
@@ -97335,7 +97494,7 @@ ${JSON.stringify(error2, null, 2)}`);
         }
       }
     });
-    editor.version = "3.0.18";
+    editor.version = "3.0.19-beta.2";
     return editor;
   }
   function isDoc(doc2) {
@@ -97469,7 +97628,7 @@ ${JSON.stringify(error2, null, 2)}`);
     OnesEditorDropTarget.register(editor);
     OnesEditorTocProvider.register(editor);
     OnesEditorExclusiveBlock.register(editor);
-    editor.version = "3.0.18";
+    editor.version = "3.0.19-beta.2";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {
@@ -97604,7 +97763,7 @@ ${JSON.stringify(error2, null, 2)}`);
         }
       }
     });
-    editor.version = "3.0.18";
+    editor.version = "3.0.19-beta.2";
     return editor;
   }
   const emojis$1 = {
@@ -143701,6 +143860,7 @@ ${JSON.stringify(error2, null, 2)}`);
   exports2.createContainer = createContainer$1;
   exports2.createContainerElement = createContainerElement;
   exports2.createDeleteOps = createDeleteOps;
+  exports2.createDocHistoryDiffEditor = createDocHistoryDiffEditor;
   exports2.createEditor = createEditor;
   exports2.createEditorSelectionRange = createEditorSelectionRange;
   exports2.createElement = createElement;
@@ -143720,6 +143880,7 @@ ${JSON.stringify(error2, null, 2)}`);
   exports2.createMobileBottomMenu = createMobileBottomMenu;
   exports2.createMouseEventFromTouchEvent = createMouseEventFromTouchEvent;
   exports2.createOnesEditor = createOnesEditor;
+  exports2.createOnesEditorHistoryDiff = createOnesEditorHistoryDiff;
   exports2.createRange = createRange;
   exports2.createRichText = createRichText;
   exports2.createRootContainer = createRootContainer;
@@ -144088,6 +144249,7 @@ ${JSON.stringify(error2, null, 2)}`);
   exports2.mergeText = mergeText;
   exports2.multiSplitText = multiSplitText;
   exports2.overflowText = overflowText;
+  exports2.parseOps = parseOps;
   exports2.parseShortcut = parseShortcut;
   exports2.patchNode = patchNode;
   exports2.pointInRect = pointInRect;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ones-editor/editor",
-  "version": "3.0.18",
+  "version": "3.0.19-beta.2",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {
@@ -48,7 +48,7 @@
     "marked-extended-latex": "^1.1.0",
     "markmap-common": "0.15.3",
     "markmap-view": "0.15.4",
-    "mermaid": "11.15.0",
+    "mermaid": "^9.1.0",
     "mime-db": "^1.52.0",
     "nanoid": "^3.2.0",
     "ot-json1": "^1.0.2",