@harbour-enterprises/superdoc 0.21.0-next.1 → 0.21.0-next.2

package/dist/super-editor.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const superEditor_es = require("./chunks/super-editor.es-BWdUsCXq.cjs");
+const superEditor_es = require("./chunks/super-editor.es-Dd0joLAR.cjs");
 require("./chunks/vue-DWle4Cai.cjs");
 exports.AIWriter = superEditor_es.AIWriter;
 exports.AnnotatorHelpers = superEditor_es.AnnotatorHelpers;

package/dist/super-editor.es.js

@@ -1,4 +1,4 @@
-import { A, a, _, C, D, E, b, S, c, d, e, f, g, T, h, i, j, k, l, m, n, o, p, r, q } from "./chunks/super-editor.es-DQx0kzCl.es.js";
+import { A, a, _, C, D, E, b, S, c, d, e, f, g, T, h, i, j, k, l, m, n, o, p, r, q } from "./chunks/super-editor.es-CKw7iZcz.es.js";
 import "./chunks/vue-CXxsqYcP.es.js";
 export {
   A as AIWriter,

package/dist/superdoc.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const superEditor_es = require("./chunks/super-editor.es-BWdUsCXq.cjs");
-const superdoc = require("./chunks/index-C0XOj4vH.cjs");
+const superEditor_es = require("./chunks/super-editor.es-Dd0joLAR.cjs");
+const superdoc = require("./chunks/index-BB3Qn69u.cjs");
 require("./chunks/vue-DWle4Cai.cjs");
 require("./chunks/jszip-b7l8QkfH.cjs");
 const blankDocx = require("./chunks/blank-docx-CPqX9RF5.cjs");

package/dist/superdoc.es.js

@@ -1,5 +1,5 @@
-import { a, E, b, S, d, i, j, n, r, p, q } from "./chunks/super-editor.es-DQx0kzCl.es.js";
-import { D, H, P, S as S2, m, l } from "./chunks/index-BiZcP3bK.es.js";
+import { a, E, b, S, d, i, j, n, r, p, q } from "./chunks/super-editor.es-CKw7iZcz.es.js";
+import { D, H, P, S as S2, m, l } from "./chunks/index-C-44kxYe.es.js";
 import "./chunks/vue-CXxsqYcP.es.js";
 import "./chunks/jszip-B8KIZSNe.es.js";
 import { B } from "./chunks/blank-docx-iwdyG9RH.es.js";

package/dist/superdoc.umd.js

@@ -19126,7 +19126,7 @@
       navigator.platform
     );
   };
-  const isRegExp = (value) => {
+  const isRegExp$1 = (value) => {
     return Object.prototype.toString.call(value) === "[object RegExp]";
   };
   function objectIncludes(obj1, obj2, options = { strict: true }) {
@@ -19134,7 +19134,7 @@
     if (!keys2.length) return true;
     return keys2.every((key2) => {
       if (options.strict) return obj2[key2] === obj1[key2];
-      if (isRegExp(obj2[key2])) return obj2[key2].test(obj1[key2]);
+      if (isRegExp$1(obj2[key2])) return obj2[key2].test(obj1[key2]);
       return obj2[key2] === obj1[key2];
     });
   }
@@ -35561,7 +35561,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         if (filteredMarks.length !== existingMarks2.length) {
           if (filteredMarks.length) child = { ...child, marks: filteredMarks };
           else {
-            const { marks, ...rest } = child;
+            const { marks: _removedMarks, ...rest } = child;
             child = rest;
           }
         }
@@ -37278,7 +37278,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
   }
   const inputRuleMatcherHandler = (text, match) => {
-    if (isRegExp(match)) {
+    if (isRegExp$1(match)) {
       return match.exec(text);
     }
     const inputRuleMatch = match(text);
@@ -55166,6 +55166,33 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     return DecorationSet.create(state2.doc, decorations);
   };
   const CommentMarkName = "commentMark";
+  const resolveCommentMeta = ({ converter, importedId }) => {
+    const comments = converter?.comments || [];
+    const matchingImportedComment = comments.find((c2) => c2.importedId == importedId);
+    const resolvedCommentId = matchingImportedComment?.commentId ?? (importedId ? String(importedId) : v4$1());
+    const internal = matchingImportedComment?.internal ?? matchingImportedComment?.isInternal ?? false;
+    return {
+      resolvedCommentId,
+      importedId,
+      internal,
+      matchingImportedComment
+    };
+  };
+  const ensureFallbackComment = ({ converter, matchingImportedComment, commentId, importedId }) => {
+    if (matchingImportedComment || !converter) return;
+    converter.comments = converter.comments || [];
+    const alreadyExists = converter.comments.some((comment) => comment.commentId === commentId);
+    if (alreadyExists) return;
+    converter.comments.push({
+      commentId,
+      importedId,
+      textJson: null,
+      creatorName: null,
+      creatorEmail: null,
+      createdTime: null,
+      isDone: false
+    });
+  };
   const removeCommentsById = ({ commentId, state: state2, tr, dispatch }) => {
     const positions = getCommentPositionsById(commentId, state2.doc);
     positions.forEach(({ from: from2, to }) => {
@@ -55259,24 +55286,31 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       const { type: type2 } = node;
       const commentNodes = ["commentRangeStart", "commentRangeEnd", "commentReference"];
       if (!commentNodes.includes(type2.name)) return;
-      const matchingImportedComment = converter.comments?.find((c2) => c2.importedId == node.attrs["w:id"]) || {};
-      const { commentId } = matchingImportedComment;
-      if (!commentId) return;
+      const { resolvedCommentId, importedId, internal, matchingImportedComment } = resolveCommentMeta({
+        converter,
+        importedId: node.attrs["w:id"]
+      });
       if (type2.name === "commentRangeStart") {
         toMark.push({
-          "w:id": commentId,
-          importedId: node.attrs["w:id"],
-          internal: false,
+          commentId: resolvedCommentId,
+          importedId,
+          internal,
           start: pos
         });
+        ensureFallbackComment({
+          converter,
+          matchingImportedComment,
+          commentId: resolvedCommentId,
+          importedId
+        });
         toDelete.push({ start: pos, end: pos + 1 });
       } else if (type2.name === "commentRangeEnd") {
-        const itemToMark = toMark.find((p2) => p2.importedId === node.attrs["w:id"]);
+        const itemToMark = toMark.find((p2) => p2.importedId === importedId);
         if (!itemToMark) return;
         const { start: start2 } = itemToMark;
         const markAttrs = {
-          commentId,
-          importedId: node.attrs["w:id"],
+          commentId: itemToMark.commentId,
+          importedId,
           internal: itemToMark.internal
         };
         tr.addMark(start2, pos + 1, schema.marks[CommentMarkName].create(markAttrs));
@@ -76563,8 +76597,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   }
   class SearchQuery {
     /**
-    Create a query object.
-    */
+      Create a query object.
+      */
     constructor(config2) {
       this.search = config2.search;
       this.caseSensitive = !!config2.caseSensitive;
@@ -76577,72 +76611,70 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       this.impl = !this.valid ? nullQuery : this.regexp ? new RegExpQuery(this) : new StringQuery(this);
     }
     /**
-    Compare this query to another query.
-    */
+      Compare this query to another query.
+      */
     eq(other) {
       return this.search == other.search && this.replace == other.replace && this.caseSensitive == other.caseSensitive && this.regexp == other.regexp && this.wholeWord == other.wholeWord;
     }
     /**
-    Find the next occurrence of this query in the given range.
-    */
+      Find the next occurrence of this query in the given range.
+      */
     findNext(state2, from2 = 0, to = state2.doc.content.size) {
       for (; ; ) {
-        if (from2 >= to)
-          return null;
+        if (from2 >= to) return null;
         let result = this.impl.findNext(state2, from2, to);
-        if (!result || this.checkResult(state2, result))
-          return result;
+        if (!result || this.checkResult(state2, result)) return result;
         from2 = result.from + 1;
       }
     }
     /**
-    Find the previous occurrence of this query in the given range.
-    Note that, if `to` is given, it should be _less_ than `from`.
-    */
+      Find the previous occurrence of this query in the given range.
+      Note that, if `to` is given, it should be _less_ than `from`.
+      */
     findPrev(state2, from2 = state2.doc.content.size, to = 0) {
       for (; ; ) {
-        if (from2 <= to)
-          return null;
+        if (from2 <= to) return null;
         let result = this.impl.findPrev(state2, from2, to);
-        if (!result || this.checkResult(state2, result))
-          return result;
+        if (!result || this.checkResult(state2, result)) return result;
         from2 = result.to - 1;
       }
     }
     /**
-    @internal
-    */
+      @internal
+      */
     checkResult(state2, result) {
       return (!this.wholeWord || checkWordBoundary(state2, result.from) && checkWordBoundary(state2, result.to)) && (!this.filter || this.filter(state2, result));
     }
     /**
-    @internal
-    */
+      @internal
+      */
     unquote(string) {
       return this.literal ? string : string.replace(/\\([nrt\\])/g, (_2, ch) => ch == "n" ? "\n" : ch == "r" ? "\r" : ch == "t" ? "	" : "\\");
     }
     /**
-    Get the ranges that should be replaced for this result. This can
-    return multiple ranges when `this.replace` contains
-    `$1`/`$&`-style placeholders, in which case the preserved
-    content is skipped by the replacements.
-    
-    Ranges are sorted by position, and `from`/`to` positions all
-    refer to positions in `state.doc`. When applying these, you'll
-    want to either apply them from back to front, or map these
-    positions through your transaction's current mapping.
-    */
+      Get the ranges that should be replaced for this result. This can
+      return multiple ranges when `this.replace` contains
+      `$1`/`$&`-style placeholders, in which case the preserved
+      content is skipped by the replacements.
+      
+      Ranges are sorted by position, and `from`/`to` positions all
+      refer to positions in `state.doc`. When applying these, you'll
+      want to either apply them from back to front, or map these
+      positions through your transaction's current mapping.
+      */
     getReplacements(state2, result) {
       let $from = state2.doc.resolve(result.from);
       let marks = $from.marksAcross(state2.doc.resolve(result.to));
       let ranges = [];
       let frag = Fragment.empty, pos = result.from, { match } = result;
       let groups = match ? getGroupIndices(match) : [[0, result.to - result.from]];
-      let replParts = parseReplacement(this.unquote(this.replace)), groupSpan;
+      let replParts = parseReplacement(this.unquote(this.replace));
       for (let part of replParts) {
         if (typeof part == "string") {
           frag = frag.addToEnd(state2.schema.text(part, marks));
-        } else if (groupSpan = groups[part.group]) {
+        } else {
+          const groupSpan = groups[part.group];
+          if (!groupSpan) continue;
           let from2 = result.matchStart + groupSpan[0], to = result.matchStart + groupSpan[1];
           if (part.copy) {
             frag = frag.append(state2.doc.slice(from2, to).content);
@@ -76672,8 +76704,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     constructor(query) {
       this.query = query;
       let string = query.unquote(query.search);
-      if (!query.caseSensitive)
-        string = string.toLowerCase();
+      if (!query.caseSensitive) string = string.toLowerCase();
       this.string = string;
     }
     findNext(state2, from2, to) {
@@ -76681,17 +76712,26 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         let off2 = Math.max(from2, start2);
         let content = textContent(node).slice(off2 - start2, Math.min(node.content.size, to - start2));
         let index2 = (this.query.caseSensitive ? content : content.toLowerCase()).indexOf(this.string);
-        return index2 < 0 ? null : { from: off2 + index2, to: off2 + index2 + this.string.length, match: null, matchStart: start2 };
+        if (index2 < 0) return null;
+        const startOffset = off2 - start2;
+        const absoluteIndex = startOffset + index2;
+        const fromPos = mapIndexToDocPos(node, start2, absoluteIndex);
+        const toPos = mapIndexToDocPos(node, start2, absoluteIndex + this.string.length);
+        return { from: fromPos, to: toPos, match: null, matchStart: start2 };
       });
     }
     findPrev(state2, from2, to) {
       return scanTextblocks(state2.doc, from2, to, (node, start2) => {
         let off2 = Math.max(start2, to);
         let content = textContent(node).slice(off2 - start2, Math.min(node.content.size, from2 - start2));
-        if (!this.query.caseSensitive)
-          content = content.toLowerCase();
+        if (!this.query.caseSensitive) content = content.toLowerCase();
         let index2 = content.lastIndexOf(this.string);
-        return index2 < 0 ? null : { from: off2 + index2, to: off2 + index2 + this.string.length, match: null, matchStart: start2 };
+        if (index2 < 0) return null;
+        const startOffset = off2 - start2;
+        const absoluteIndex = startOffset + index2;
+        const fromPos = mapIndexToDocPos(node, start2, absoluteIndex);
+        const toPos = mapIndexToDocPos(node, start2, absoluteIndex + this.string.length);
+        return { from: fromPos, to: toPos, match: null, matchStart: start2 };
       });
     }
   }
@@ -76706,7 +76746,11 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         let content = textContent(node).slice(0, Math.min(node.content.size, to - start2));
         this.regexp.lastIndex = from2 - start2;
         let match = this.regexp.exec(content);
-        return match ? { from: start2 + match.index, to: start2 + match.index + match[0].length, match, matchStart: start2 } : null;
+        if (!match) return null;
+        const absoluteIndex = match.index;
+        const fromPos = mapIndexToDocPos(node, start2, absoluteIndex);
+        const toPos = mapIndexToDocPos(node, start2, absoluteIndex + match[0].length);
+        return { from: fromPos, to: toPos, match, matchStart: start2 };
       });
     }
     findPrev(state2, from2, to) {
@@ -76716,18 +76760,20 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         for (let off2 = 0; ; ) {
           this.regexp.lastIndex = off2;
           let next = this.regexp.exec(content);
-          if (!next)
-            break;
+          if (!next) break;
           match = next;
           off2 = next.index + 1;
         }
-        return match ? { from: start2 + match.index, to: start2 + match.index + match[0].length, match, matchStart: start2 } : null;
+        if (!match) return null;
+        const absoluteIndex = match.index;
+        const fromPos = mapIndexToDocPos(node, start2, absoluteIndex);
+        const toPos = mapIndexToDocPos(node, start2, absoluteIndex + match[0].length);
+        return { from: fromPos, to: toPos, match, matchStart: start2 };
       });
     }
   }
   function getGroupIndices(match) {
-    if (match.indices)
-      return match.indices;
+    if (match.indices) return match.indices;
     let result = [[0, match[0].length]];
     for (let i2 = 1, pos = 0; i2 < match.length; i2++) {
       let found2 = match[i2] ? match[0].indexOf(match[i2], pos) : -1;
@@ -76739,10 +76785,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     let result = [], highestSeen = -1;
     function add(text2) {
       let last = result.length - 1;
-      if (last > -1 && typeof result[last] == "string")
-        result[last] += text2;
-      else
-        result.push(text2);
+      if (last > -1 && typeof result[last] == "string") result[last] += text2;
+      else result.push(text2);
     }
     while (text.length) {
       let m2 = /\$([$&\d+])/.exec(text);
@@ -76750,8 +76794,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         add(text);
         return result;
       }
-      if (m2.index > 0)
-        add(text.slice(0, m2.index + (m2[1] == "$" ? 1 : 0)));
+      if (m2.index > 0) add(text.slice(0, m2.index + (m2[1] == "$" ? 1 : 0)));
       if (m2[1] != "$") {
         let n = m2[1] == "&" ? 0 : +m2[1];
         if (highestSeen >= n) {
@@ -76769,30 +76812,50 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     try {
       new RegExp(source, baseFlags);
       return true;
-    } catch (_a2) {
+    } catch {
       return false;
     }
   }
   const TextContentCache = /* @__PURE__ */ new WeakMap();
   function textContent(node) {
     let cached = TextContentCache.get(node);
-    if (cached)
-      return cached;
+    if (cached) return cached;
     let content = "";
     for (let i2 = 0; i2 < node.childCount; i2++) {
       let child = node.child(i2);
-      if (child.isText)
-        content += child.text;
-      else if (child.isLeaf)
-        content += "";
-      else
-        content += " " + textContent(child) + " ";
+      if (child.isText) content += child.text;
+      else if (child.isLeaf) content += "";
+      else if (child.type && child.type.name === "run") content += textContent(child);
+      else content += " " + textContent(child) + " ";
     }
     TextContentCache.set(node, content);
     return content;
   }
+  function mapIndexToDocPos(node, start2, index2) {
+    if (index2 <= 0) return start2;
+    const fullText = textContent(node);
+    if (index2 >= fullText.length) return start2 + node.content.size;
+    let target = start2;
+    let remaining = index2;
+    let found2 = false;
+    node.descendants((child, pos) => {
+      if (found2) return false;
+      if (!child.isText) return true;
+      const len2 = child.text.length;
+      if (remaining <= len2) {
+        target = start2 + pos + remaining;
+        found2 = true;
+        return false;
+      }
+      remaining -= len2;
+      return true;
+    });
+    return found2 ? target : start2 + node.content.size;
+  }
+  const transparentInlineNodes = /* @__PURE__ */ new Set(["run"]);
   function scanTextblocks(node, from2, to, f, nodeStart = 0) {
-    if (node.inlineContent) {
+    const isTransparentInline = node.inlineContent && node.type && transparentInlineNodes.has(node.type.name);
+    if (node.inlineContent && !isTransparentInline) {
       return f(node, nodeStart);
     } else if (!node.isLeaf) {
       if (from2 > to) {
@@ -76801,8 +76864,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           pos -= child.nodeSize;
           if (pos < from2) {
             let result = scanTextblocks(child, from2, to, f, pos + 1);
-            if (result != null)
-              return result;
+            if (result != null) return result;
           }
         }
       } else {
@@ -76811,8 +76873,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           pos += child.nodeSize;
           if (pos > from2) {
             let result = scanTextblocks(child, from2, to, f, start2 + 1);
-            if (result != null)
-              return result;
+            if (result != null) return result;
           }
         }
       }
@@ -76822,8 +76883,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   function checkWordBoundary(state2, pos) {
     let $pos = state2.doc.resolve(pos);
     let before = $pos.nodeBefore, after = $pos.nodeAfter;
-    if (!before || !after || !before.isText || !after.isText)
-      return true;
+    if (!before || !after || !before.isText || !after.isText) return true;
     return !/\p{L}$/u.test(before.text) || !/^\p{L}/u.test(after.text);
   }
   class SearchState {
@@ -76834,14 +76894,12 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
   }
   function buildMatchDeco(state2, query, range2) {
-    if (!query.valid)
-      return DecorationSet.empty;
+    if (!query.valid) return DecorationSet.empty;
     let deco = [];
     let sel = state2.selection;
     for (let pos = range2 ? range2.from : 0, end2 = range2 ? range2.to : state2.doc.content.size; ; ) {
       let next = query.findNext(state2, pos, end2);
-      if (!next)
-        break;
+      if (!next) break;
       let cls = next.from == sel.from && next.to == sel.to ? "ProseMirror-active-search-match" : "ProseMirror-search-match";
       deco.push(Decoration.inline(next.from, next.to, { class: cls }));
       pos = next.to;
@@ -76860,8 +76918,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         },
         apply(tr, search2, _oldState, state2) {
           let set = tr.getMeta(searchKey);
-          if (set)
-            return new SearchState(set.query, set.range, buildMatchDeco(state2, set.query, set.range));
+          if (set) return new SearchState(set.query, set.range, buildMatchDeco(state2, set.query, set.range));
           if (tr.docChanged || tr.selectionSet) {
             let range2 = search2.range;
             if (range2) {
@@ -76886,6 +76943,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   function setSearchState(tr, query, range2 = null) {
     return tr.setMeta(searchKey, { query, range: range2 });
   }
+  const isRegExp = (value) => Object.prototype.toString.call(value) === "[object RegExp]";
   const Search = Extension.create({
     addStorage() {
       return {
@@ -76955,10 +77013,14 @@ Please report this to https://github.com/markedjs/marked.`, e) {
             let caseSensitive = false;
             let regexp = false;
             const wholeWord = false;
-            if (patternInput instanceof RegExp) {
+            if (isRegExp(patternInput)) {
+              const regexPattern = (
+                /** @type {RegExp} */
+                patternInput
+              );
               regexp = true;
-              pattern = patternInput.source;
-              caseSensitive = !patternInput.flags.includes("i");
+              pattern = regexPattern.source;
+              caseSensitive = !regexPattern.flags.includes("i");
             } else if (typeof patternInput === "string" && /^\/(.+)\/([gimsuy]*)$/.test(patternInput)) {
               const [, body, flags] = patternInput.match(/^\/(.+)\/([gimsuy]*)$/);
               regexp = true;