@ones-editor/editor 3.0.19-beta.1 → 3.0.19

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/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();
@@ -86764,7 +86771,7 @@ ${docStr}
     },
     convertTo: convertTo$6
   };
-  const MERMAID_SCRIPTS = "https://cdn.jsdelivr.net/npm/mermaid@9.0.1/dist/mermaid.min.js";
+  const MERMAID_SCRIPTS = "https://cdn.jsdelivr.net/npm/mermaid@11.15.0/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;
@@ -87481,22 +87488,17 @@ ${docStr}
     const mermaid = window.mermaid;
     assert(logger$l, mermaid, "Resource load failed: Mermaid javaScript resource injection failed");
     const id = genId();
-    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;
+    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 domParser = new DOMParser();
     const xml = domParser.parseFromString(svgCode, "image/svg+xml");
     const xmlSvg = xml.firstChild;
@@ -97108,6 +97110,24 @@ ${JSON.stringify(error2, null, 2)}`);
     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;
@@ -97190,7 +97210,7 @@ ${JSON.stringify(error2, null, 2)}`);
         appId: this.editorOptions.appId,
         docId: this.editorOptions.docId,
         serverId: this.editorOptions.serverUrl,
-        apiServer: this.editorOptions.serverUrl
+        apiServer: buildDocApiServer(this.editorOptions)
       };
     }
   }
@@ -97469,7 +97489,7 @@ ${JSON.stringify(error2, null, 2)}`);
         }
       }
     });
-    editor.version = "3.0.19-beta.1";
+    editor.version = "3.0.19";
     return editor;
   }
   function isDoc(doc2) {
@@ -97603,7 +97623,7 @@ ${JSON.stringify(error2, null, 2)}`);
     OnesEditorDropTarget.register(editor);
     OnesEditorTocProvider.register(editor);
     OnesEditorExclusiveBlock.register(editor);
-    editor.version = "3.0.19-beta.1";
+    editor.version = "3.0.19";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {
@@ -97738,7 +97758,7 @@ ${JSON.stringify(error2, null, 2)}`);
         }
       }
     });
-    editor.version = "3.0.19-beta.1";
+    editor.version = "3.0.19";
     return editor;
   }
   const emojis$1 = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ones-editor/editor",
-  "version": "3.0.19-beta.1",
+  "version": "3.0.19",
   "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": "^9.1.0",
+    "mermaid": "11.15.0",
     "mime-db": "^1.52.0",
     "nanoid": "^3.2.0",
     "ot-json1": "^1.0.2",