@ones-editor/editor 5.0.5 → 5.0.6-beta.p8216.1

package/dist/index.js

@@ -25270,6 +25270,63 @@ var __publicField = (obj, key, value) => {
       focus: pos
     };
   }
+  const WIKI_MACRO_TYPE = "ones-open-wiki-macro";
+  function getWikiMacroExportSpec(data2) {
+    if (!data2 || data2.protocolVersion !== 2 || !Array.isArray(data2.exportSpec))
+      return [];
+    return data2.exportSpec.filter((spec) => {
+      if (!spec || typeof spec !== "object")
+        return false;
+      if (spec.type === "text")
+        return typeof spec.data === "string";
+      if (spec.type === "image")
+        return typeof spec.data === "string" && !!spec.data;
+      return spec.type === "link" && spec.data && typeof spec.data.title === "string" && typeof spec.data.url === "string" && /^(https?:\/\/|mailto:)/i.test(spec.data.url.trim());
+    });
+  }
+  function getWikiMacroResources(data2) {
+    if (!data2 || data2.protocolVersion !== 2)
+      return [];
+    const resources = /* @__PURE__ */ new Set();
+    if (Array.isArray(data2.resources)) {
+      data2.resources.forEach((resource) => {
+        if (typeof resource === "string" && resource)
+          resources.add(resource);
+      });
+    }
+    getWikiMacroExportSpec(data2).forEach((spec) => {
+      if (spec.type === "image" && typeof spec.data === "string" && spec.data)
+        resources.add(spec.data);
+    });
+    return Array.from(resources);
+  }
+  function replaceWikiMacroResources(data2, resources) {
+    if (!data2 || data2.protocolVersion !== 2)
+      return;
+    if (Array.isArray(data2.resources)) {
+      data2.resources = data2.resources.map((resource) => {
+        var _a;
+        return (_a = resources.get(resource)) != null ? _a : resource;
+      });
+    }
+    getWikiMacroExportSpec(data2).forEach((spec) => {
+      var _a;
+      if (spec.type === "image" && typeof spec.data === "string")
+        spec.data = (_a = resources.get(spec.data)) != null ? _a : spec.data;
+    });
+  }
+  function wikiMacroToText(data2) {
+    return getWikiMacroExportSpec(data2).map((spec) => {
+      if (spec.type === "text" && typeof spec.data === "string")
+        return spec.data;
+      if (spec.type === "link" && spec.data && typeof spec.data === "object") {
+        const link2 = spec.data;
+        if (typeof link2.title === "string" && typeof link2.url === "string")
+          return `${link2.title} ${link2.url}`;
+      }
+      return "";
+    }).filter(Boolean).join("\n");
+  }
   const logger$44 = getLogger("repair-duplicated-block-ids");
   const ROOT_CONTAINER_ID = "root";
   function buildChildContainersDelta(doc2, block) {
@@ -27120,6 +27177,9 @@ var __publicField = (obj, key, value) => {
     return text2;
   }
   function blockToText(editor, blockData, doc2, path) {
+    if (blockData.type === "embed" && blockData.embedType === WIKI_MACRO_TYPE) {
+      return wikiMacroToText(blockData.embedData);
+    }
     const blockClass = getBlockClassByType(editor, blockData.type);
     if (blockClass.convertTo) {
       return blockClass.convertTo(editor, blockData, doc2, "text", path);
@@ -29902,6 +29962,10 @@ var __publicField = (obj, key, value) => {
   function defaultGetResourceFromBlock(editor, doc2, block, resources) {
     if (block.type === "embed") {
       const embedData = block.embedData;
+      if (block.embedType === WIKI_MACRO_TYPE) {
+        getWikiMacroResources(embedData).forEach((resource) => resources.add(resource));
+        return;
+      }
       const src = embedData.src;
       if (src && typeof src === "string") {
         for (const item of src.split("|")) {
@@ -30288,6 +30352,10 @@ ${codeText}
   function defaultReplaceBlockResources(doc2, block, resources) {
     if (block.type === "embed") {
       const embedData = block.embedData;
+      if (block.embedType === WIKI_MACRO_TYPE) {
+        replaceWikiMacroResources(embedData, resources);
+        return;
+      }
       const src = embedData.src;
       if (src && typeof src === "string") {
         const newSrc = resources.get(src);
@@ -31664,6 +31732,12 @@ ${codeText}
       return this.deleteChildContainer(editor);
     }
   }
+  class AsyncAction extends Action {
+    constructor(editor, operation) {
+      super(editor, "", editor.selection.range.toDocRange());
+      this.operation = operation;
+    }
+  }
   const BATCH_ACTION_TS = 1e3 * 3;
   const logger$3f = getLogger("undo");
   class UndoManager {
@@ -31674,6 +31748,9 @@ ${codeText}
       __publicField(this, "currentGroup", null);
       __publicField(this, "groupCounter", 0);
       __publicField(this, "undoRedoing", false);
+      __publicField(this, "undoLocks", /* @__PURE__ */ new Set());
+      __publicField(this, "pendingAction");
+      __publicField(this, "resetVersion", 0);
       __publicField(this, "handleSelectionChange", (editor) => {
         if (this.currentGroup) {
           this.currentGroup.setAfterRange(editor.selection.range.toDocRange());
@@ -31689,18 +31766,25 @@ ${codeText}
       this.editor = editor;
       this.undoCursor = -1;
       this.editor.addListener("selectionChanged", this.handleSelectionChange);
+      this.editor.addListener("destroy", () => this.reset());
     }
     reset() {
+      this.resetVersion += 1;
+      this.actions.forEach((action) => this.discard(action));
       this.actions = [];
       this.undoCursor = -1;
     }
     prepareSaveUndoState() {
+      if (this.pendingAction)
+        throw new Error("An asynchronous undo action is pending");
       if (this.undoCursor !== -1) {
-        this.actions.splice(this.undoCursor);
+        this.actions.splice(this.undoCursor).forEach((action) => this.discard(action));
         this.undoCursor = -1;
       }
     }
     addAction(action) {
+      if (this.pendingAction)
+        throw new Error("An asynchronous undo action is pending");
       if (this.currentGroup) {
         this.currentGroup.addAction(action);
       } else {
@@ -31710,6 +31794,79 @@ ${codeText}
         });
       }
     }
+    addAsyncAction(operation) {
+      if (this.currentGroup)
+        throw new Error("An asynchronous undo action cannot join a synchronous group");
+      this.prepareSaveUndoState();
+      const action = new AsyncAction(this.editor, operation);
+      this.addAction(action);
+      return () => {
+        const index2 = this.actions.indexOf(action);
+        if (index2 === -1)
+          return;
+        this.actions.splice(index2, 1);
+        if (this.undoCursor !== -1 && index2 < this.undoCursor)
+          this.undoCursor -= 1;
+        this.discard(action);
+      };
+    }
+    discard(action) {
+      var _a, _b;
+      if (action instanceof AsyncAction)
+        (_b = (_a = action.operation).onDiscard) == null ? void 0 : _b.call(_a);
+    }
+    acquireUndoLock() {
+      const lock = Symbol("macro-edit-session");
+      this.undoLocks.add(lock);
+      return () => {
+        this.undoLocks.delete(lock);
+      };
+    }
+    async undoAsync() {
+      if (this.pendingAction)
+        return false;
+      const accepted = this.undo();
+      return this.pendingAction || accepted;
+    }
+    async redoAsync() {
+      if (this.pendingAction)
+        return false;
+      const accepted = this.redo();
+      return this.pendingAction || accepted;
+    }
+    runAsyncAction(action, index2, direction) {
+      const release = this.editor.acquireReadonly();
+      const resetVersion = this.resetVersion;
+      this.pendingAction = Promise.resolve().then(() => action.operation[direction]()).then((success) => {
+        if (!success)
+          return false;
+        if (this.resetVersion !== resetVersion || this.actions[index2] !== action)
+          return false;
+        this.undoCursor = direction === "undo" ? index2 : index2 + 1;
+        const range = direction === "undo" ? action.beforeRange : action.afterRange;
+        if (range) {
+          try {
+            this.editor.selection.setRange(fromDocRange(this.editor, range));
+          } catch (error2) {
+            logger$3f.warn(`failed to restore selection after asynchronous ${direction}`);
+          }
+        }
+        this.editor.input.handleChanged(action);
+        return true;
+      }).catch((error2) => {
+        try {
+          action.operation.onError(error2);
+        } catch (notificationError) {
+          logger$3f.warn("failed to report asynchronous undo error");
+        }
+        return false;
+      }).finally(() => {
+        this.pendingAction = void 0;
+        release();
+        this.checkRange();
+      });
+      return true;
+    }
     beginGroup() {
       if (this.groupCounter === 0) {
         assert(logger$3f, !this.currentGroup, "current group already exists");
@@ -31778,12 +31935,17 @@ ${codeText}
       }
     }
     undo() {
+      if (this.pendingAction || this.undoLocks.size)
+        return false;
       if (this.undoCursor === -1) {
         this.undoCursor = this.actions.length;
       }
       try {
         this.undoRedoing = true;
         while (this.undoCursor > 0) {
+          const candidate = this.actions[this.undoCursor - 1];
+          if (candidate instanceof AsyncAction)
+            return this.runAsyncAction(candidate, this.undoCursor - 1, "undo");
           this.undoCursor -= 1;
           const action = this.actions[this.undoCursor];
           if (action.undo(this.editor)) {
@@ -31811,6 +31973,8 @@ ${codeText}
       }
     }
     redo() {
+      if (this.pendingAction || this.undoLocks.size)
+        return false;
       if (this.undoCursor === -1) {
         this.undoCursor = this.actions.length;
       }
@@ -31818,6 +31982,8 @@ ${codeText}
         this.undoRedoing = true;
         while (this.undoCursor < this.actions.length) {
           const action = this.actions[this.undoCursor];
+          if (action instanceof AsyncAction)
+            return this.runAsyncAction(action, this.undoCursor, "redo");
           this.undoCursor += 1;
           if (action.redo(this.editor)) {
             try {
@@ -31846,6 +32012,8 @@ ${codeText}
       }
     }
     canUndo() {
+      if (this.pendingAction || this.undoLocks.size)
+        return false;
       if (this.actions.length === 0) {
         return false;
       }
@@ -31855,6 +32023,8 @@ ${codeText}
       return true;
     }
     canRedo() {
+      if (this.pendingAction || this.undoLocks.size)
+        return false;
       if (this.actions.length === 0) {
         return false;
       }
@@ -31880,6 +32050,8 @@ ${codeText}
         if (lastAction === action) {
           return true;
         }
+        if (lastAction instanceof AsyncAction)
+          return false;
         if (!this.undo()) {
           return false;
         }
@@ -32453,6 +32625,7 @@ ${codeText}
       __publicField(this, "_readonly", false);
       __publicField(this, "_scrollable", true);
       __publicField(this, "_destroyed", false);
+      __publicField(this, "readonlyLocks", /* @__PURE__ */ new Set());
       __publicField(this, "getColor", (index2) => {
         const colors = this.options.colors;
         if (colors.length === 0) {
@@ -32508,11 +32681,21 @@ ${codeText}
       this.emit("load", this, false);
     }
     get readonly() {
-      return this._readonly;
+      return this._readonly || this.readonlyLocks.size > 0;
+    }
+    acquireReadonly() {
+      const lock = Symbol("pending-document-action");
+      this.readonlyLocks.add(lock);
+      this.readonly = this._readonly;
+      return () => {
+        if (!this.readonlyLocks.delete(lock))
+          return;
+        this.readonly = this._readonly;
+      };
     }
     set readonly(val) {
       this._readonly = val;
-      if (val) {
+      if (this.readonly) {
         addClass(this.rootElement, "readonly");
       } else {
         removeClass(this.rootElement, "readonly");
@@ -40345,6 +40528,10 @@ ${codeText}
         });
       });
     }
+    getDocumentVersion() {
+      var _a;
+      return (_a = this.doc.version) != null ? _a : void 0;
+    }
     toJSON() {
       return editorDoc2DocObject(this.data());
     }
@@ -97862,7 +98049,7 @@ ${JSON.stringify(error2, null, 2)}`);
         }
       }
     });
-    editor.version = "5.0.5";
+    editor.version = "5.0.6-beta.p8216.1";
     return editor;
   }
   function isDoc(doc2) {
@@ -97998,7 +98185,7 @@ ${JSON.stringify(error2, null, 2)}`);
       OnesEditorDropTarget.register(editor);
       OnesEditorTocProvider.register(editor);
       OnesEditorExclusiveBlock.register(editor);
-      editor.version = "5.0.5";
+      editor.version = "5.0.6-beta.p8216.1";
       return editor;
     } catch (error2) {
       try {
@@ -98141,7 +98328,7 @@ ${JSON.stringify(error2, null, 2)}`);
         }
       }
     });
-    editor.version = "5.0.5";
+    editor.version = "5.0.6-beta.p8216.1";
     return editor;
   }
   const emojis$1 = {
@@ -144159,6 +144346,7 @@ ${JSON.stringify(error2, null, 2)}`);
   exports2.UnorderedListIcon = UnorderedListIcon;
   exports2.UnorderedListItem = UnorderedListItem;
   exports2.VideoIcon = VideoIcon;
+  exports2.WIKI_MACRO_TYPE = WIKI_MACRO_TYPE;
   exports2.WarningFilledIcon = WarningFilledIcon;
   exports2.WarningIcon = WarningIcon;
   exports2.WebPageIcon = WebPageIcon;
@@ -144514,6 +144702,8 @@ ${JSON.stringify(error2, null, 2)}`);
   exports2.getTextWidth = getTextWidth;
   exports2.getToolbar = getToolbar;
   exports2.getToolbarDefaultItems = getToolbarDefaultItems;
+  exports2.getWikiMacroExportSpec = getWikiMacroExportSpec;
+  exports2.getWikiMacroResources = getWikiMacroResources;
   exports2.groupEachCommand = groupEachCommand;
   exports2.handleBlockElementUpdated = handleBlockElementUpdated$1;
   exports2.hasAltOnly = hasAltOnly;
@@ -144652,6 +144842,7 @@ ${JSON.stringify(error2, null, 2)}`);
   exports2.replaceAllCaseInsensitive = replaceAllCaseInsensitive;
   exports2.replaceAllText = replaceAllText;
   exports2.replaceText = replaceText;
+  exports2.replaceWikiMacroResources = replaceWikiMacroResources;
   exports2.requestDownload = requestDownload;
   exports2.resetListStart = resetListStart;
   exports2.saveAs = saveAs$1;
@@ -144700,6 +144891,7 @@ ${JSON.stringify(error2, null, 2)}`);
   exports2.updateOpAttributes = updateOpAttributes;
   exports2.updateTextBlockContent = updateTextBlockContent;
   exports2.updateUrl = updateUrl;
+  exports2.wikiMacroToText = wikiMacroToText;
   for (const k in tinyTypedEmitter) {
     if (k !== "default" && !exports2.hasOwnProperty(k))
       Object.defineProperty(exports2, k, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ones-editor/editor",
-  "version": "5.0.5",
+  "version": "5.0.6-beta.p8216.1",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {