@superdoc-dev/cli 0.11.0-next.1 → 0.11.0-next.2

package/dist/index.js

@@ -209584,7 +209584,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-Jjjx6UC7.es.js
+// ../../packages/superdoc/dist/chunks/src-DTrWuNvy.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -269017,6 +269017,7 @@ function lineHeightBeforeIndex(lines, fromLine, targetIndex) {
 function computeCaretLayoutRectGeometry({ layout, blocks: blocks2, measures, painterHost, viewportHost, visibleHost, zoom }, pos, includeDomFallback = true) {
   if (!layout)
     return null;
+  const originalPos = pos;
   let effectivePos = pos;
   let hit = getFragmentAtPosition(layout, blocks2, measures, pos);
   if (!hit) {
@@ -269088,28 +269089,105 @@ function computeCaretLayoutRectGeometry({ layout, blocks: blocks2, measures, pai
   };
   const pageEl = getPageElementByIndex(painterHost ?? null, hit.pageIndex);
   const pageRect = pageEl?.getBoundingClientRect();
+  if (includeDomFallback && pageRect) {
+    const selection = pageEl?.ownerDocument?.getSelection();
+    if (selection?.rangeCount && selection.isCollapsed) {
+      const nativeRange = selection.getRangeAt(0);
+      if (typeof nativeRange.getBoundingClientRect === "function") {
+        const nativeRect = nativeRange.getBoundingClientRect();
+        const inPageBounds = Number.isFinite(nativeRect.left) && Number.isFinite(nativeRect.top) && Number.isFinite(nativeRect.height) && nativeRect.height > 0 && nativeRect.left >= pageRect.left - 2 && nativeRect.left <= pageRect.right + 2 && nativeRect.top >= pageRect.top - 2 && nativeRect.top <= pageRect.bottom + 2;
+        const nativeX = (nativeRect.left - pageRect.left) / zoom;
+        const nativeY = (nativeRect.top - pageRect.top) / zoom;
+        const withinGeometrySanity = Math.abs(nativeX - result.x) <= 80;
+        if (inPageBounds && withinGeometrySanity)
+          return {
+            pageIndex: hit.pageIndex,
+            x: nativeX,
+            y: nativeY,
+            height: line.lineHeight
+          };
+      }
+    }
+  }
   let domCaretX = null;
   let domCaretY = null;
-  const spanEls = pageEl?.querySelectorAll("span[data-pm-start][data-pm-end]");
-  for (const spanEl of Array.from(spanEls ?? [])) {
-    const pmStart = Number(spanEl.dataset.pmStart);
-    const pmEnd = Number(spanEl.dataset.pmEnd);
-    if (effectivePos >= pmStart && effectivePos <= pmEnd && spanEl.firstChild?.nodeType === Node.TEXT_NODE) {
-      const textNode = spanEl.firstChild;
-      const charIndex = Math.min(effectivePos - pmStart, textNode.length);
-      const rangeObj = document.createRange();
-      rangeObj.setStart(textNode, charIndex);
-      rangeObj.setEnd(textNode, charIndex);
-      if (typeof rangeObj.getBoundingClientRect !== "function")
-        break;
-      const rangeRect = rangeObj.getBoundingClientRect();
-      if (pageRect) {
-        domCaretX = (rangeRect.left - pageRect.left) / zoom;
-        domCaretY = (rangeRect.top - pageRect.top) / zoom;
-      }
+  const spanCandidates = [];
+  const pushUnique = (el) => {
+    if (!spanCandidates.includes(el))
+      spanCandidates.push(el);
+  };
+  const collectSpans = (root3) => {
+    if (!root3)
+      return;
+    const spans = root3.querySelectorAll("span[data-pm-start][data-pm-end]");
+    for (const span of Array.from(spans))
+      if (span instanceof HTMLElement)
+        pushUnique(span);
+  };
+  const lineEls = pageEl?.querySelectorAll(".superdoc-line[data-pm-start][data-pm-end]");
+  let localLineEl = null;
+  for (const lineEl of Array.from(lineEls ?? [])) {
+    if (!(lineEl instanceof HTMLElement))
+      continue;
+    const lineStart = Number(lineEl.dataset.pmStart);
+    const lineEnd = Number(lineEl.dataset.pmEnd);
+    if (!Number.isFinite(lineStart) || !Number.isFinite(lineEnd))
+      continue;
+    if (effectivePos >= lineStart && effectivePos <= lineEnd) {
+      localLineEl = lineEl;
       break;
     }
   }
+  collectSpans(localLineEl);
+  if (spanCandidates.length === 0) {
+    const MAX_PM_DISTANCE = 8;
+    const pageSpans = pageEl?.querySelectorAll("span[data-pm-start][data-pm-end]");
+    for (const span of Array.from(pageSpans ?? [])) {
+      if (!(span instanceof HTMLElement))
+        continue;
+      const pmStart = Number(span.dataset.pmStart);
+      const pmEnd = Number(span.dataset.pmEnd);
+      if (!Number.isFinite(pmStart) || !Number.isFinite(pmEnd))
+        continue;
+      if (effectivePos >= pmStart && effectivePos <= pmEnd) {
+        pushUnique(span);
+        continue;
+      }
+      if (Math.abs(pmStart - effectivePos) <= MAX_PM_DISTANCE || Math.abs(pmEnd - effectivePos) <= MAX_PM_DISTANCE)
+        pushUnique(span);
+    }
+  }
+  const domProbePositions = Array.from(new Set([
+    originalPos,
+    effectivePos,
+    originalPos - 1,
+    originalPos + 1
+  ])).filter((candidate) => candidate >= 0);
+  let resolved = false;
+  for (const probePos of domProbePositions) {
+    for (const spanEl of spanCandidates) {
+      const pmStart = Number(spanEl.dataset.pmStart);
+      const pmEnd = Number(spanEl.dataset.pmEnd);
+      if (probePos >= pmStart && probePos <= pmEnd && spanEl.firstChild?.nodeType === Node.TEXT_NODE) {
+        const textNode = spanEl.firstChild;
+        const charIndex = Math.min(probePos - pmStart, textNode.length);
+        const rangeObj = document.createRange();
+        rangeObj.setStart(textNode, charIndex);
+        rangeObj.setEnd(textNode, charIndex);
+        if (typeof rangeObj.getBoundingClientRect !== "function")
+          continue;
+        const rangeRect = rangeObj.getBoundingClientRect();
+        if (pageRect) {
+          domCaretX = (rangeRect.left - pageRect.left) / zoom;
+          domCaretY = (rangeRect.top - pageRect.top) / zoom;
+          resolved = true;
+          break;
+        }
+      }
+    }
+    if (resolved)
+      break;
+  }
   if (includeDomFallback && domCaretX != null && domCaretY != null)
     return {
       pageIndex: hit.pageIndex,
@@ -284668,7 +284746,148 @@ var Node$13 = class Node$14 {
   if (!allowedRanges?.length)
     return false;
   return allowedRanges.some((allowed) => range.from >= allowed.from && range.to <= allowed.to);
-}, PermissionRanges, Protection, DOM_CLASS_NAMES, DATA_ATTRS, DATASET_KEYS, DRAGGABLE_SELECTOR, VerticalNavigationPluginKey, createDefaultState = () => ({ goalX: null }), VerticalNavigation, createPermissionBlockMarkerNode = ({ name, attributes }) => Node$13.create({
+}, PermissionRanges, Protection, DOM_CLASS_NAMES, DATA_ATTRS, DATASET_KEYS, DRAGGABLE_SELECTOR, VerticalNavigationPluginKey, createDefaultState = () => ({ goalX: null }), VerticalNavigation, STRONG_RTL_CHAR_RE$1, STRONG_LTR_CHAR_RE, isStrongRtl = (char) => STRONG_RTL_CHAR_RE$1.test(char), isStrongLtr = (char) => STRONG_LTR_CHAR_RE.test(char), hasMixedDirectionBoundary = (leftChar, rightChar) => isStrongRtl(leftChar) && isStrongLtr(rightChar) || isStrongLtr(leftChar) && isStrongRtl(rightChar), resolveCaretPoint = (doc$12, range) => {
+  const rect = range.getBoundingClientRect();
+  if (rect && Number.isFinite(rect.left) && Number.isFinite(rect.top)) {
+    if (rect.width === 0 && rect.height === 0)
+      return null;
+    const midY = rect.height > 0 ? rect.top + rect.height / 2 : rect.top;
+    return {
+      x: rect.left,
+      y: midY
+    };
+  }
+  const node3 = range.startContainer?.nodeType === Node.TEXT_NODE ? range.startContainer.parentElement : range.startContainer;
+  if (!node3 || !(node3 instanceof HTMLElement))
+    return null;
+  const fallbackRect = node3.getBoundingClientRect();
+  if (!fallbackRect)
+    return null;
+  return {
+    x: fallbackRect.left,
+    y: fallbackRect.top + fallbackRect.height / 2
+  };
+}, resolveLineElement = (doc$12, point5) => {
+  return doc$12.elementsFromPoint(point5.x, point5.y).find((el) => el instanceof HTMLElement ? el.classList.contains("superdoc-line") : false);
+}, collectVisualChars = (lineEl, view, targetX = null) => {
+  const doc$12 = lineEl.ownerDocument;
+  const nodeFilter = doc$12.defaultView?.NodeFilter;
+  if (!nodeFilter)
+    return [];
+  const chars = [];
+  const walker = doc$12.createTreeWalker(lineEl, nodeFilter.SHOW_TEXT);
+  const RANGE_WINDOW_PX = 96;
+  const hasTargetX = Number.isFinite(targetX);
+  let node3 = walker.nextNode();
+  while (node3) {
+    const textNode = node3;
+    const text5 = textNode.textContent ?? "";
+    for (let i4 = 0;i4 < text5.length; i4 += 1) {
+      const char = text5[i4];
+      if (!char || /\s/.test(char))
+        continue;
+      let pmStart;
+      let pmEnd;
+      try {
+        pmStart = view.posAtDOM(textNode, i4);
+        pmEnd = view.posAtDOM(textNode, i4 + 1);
+      } catch {
+        continue;
+      }
+      if (!Number.isFinite(pmStart) || !Number.isFinite(pmEnd) || pmEnd <= pmStart)
+        continue;
+      const range = doc$12.createRange();
+      range.setStart(textNode, i4);
+      range.setEnd(textNode, i4 + 1);
+      const rect = range.getBoundingClientRect();
+      if (rect.width <= 0 || rect.height <= 0)
+        continue;
+      if (hasTargetX && rect.right < targetX - RANGE_WINDOW_PX)
+        continue;
+      if (hasTargetX && rect.left > targetX + RANGE_WINDOW_PX)
+        continue;
+      chars.push({
+        char,
+        pmStart,
+        pmEnd,
+        centerX: rect.left + rect.width / 2,
+        centerY: rect.top + rect.height / 2
+      });
+    }
+    node3 = walker.nextNode();
+  }
+  return chars;
+}, resolveBoundaryChars = (chars, caretPoint) => {
+  if (chars.length === 0)
+    return null;
+  const sameBand = chars.filter((c) => Math.abs(c.centerY - caretPoint.y) <= 8);
+  const band = sameBand.length > 0 ? sameBand : chars;
+  band.sort((a2, b$1) => a2.centerX - b$1.centerX);
+  let left$1 = null;
+  let right$1 = null;
+  for (const c of band) {
+    if (c.centerX < caretPoint.x) {
+      left$1 = c;
+      continue;
+    }
+    right$1 = c;
+    break;
+  }
+  if (!left$1 || !right$1)
+    return null;
+  return {
+    left: left$1,
+    right: right$1
+  };
+}, resolveMixedBidiBackspaceRange = ({ state, view }) => {
+  const { selection } = state;
+  if (!selection?.empty)
+    return null;
+  const doc$12 = view?.dom?.ownerDocument;
+  const nativeSelection = doc$12?.getSelection?.();
+  if (!nativeSelection || nativeSelection.rangeCount === 0)
+    return null;
+  const range = nativeSelection.getRangeAt(0);
+  if (!range.collapsed)
+    return null;
+  const caretPoint = resolveCaretPoint(doc$12, range);
+  if (!caretPoint)
+    return null;
+  const lineEl = resolveLineElement(doc$12, caretPoint);
+  if (!lineEl)
+    return null;
+  const lineText = lineEl.textContent ?? "";
+  const hasRtl = STRONG_RTL_CHAR_RE$1.test(lineText);
+  const hasLtr = STRONG_LTR_CHAR_RE.test(lineText);
+  if (!hasRtl || !hasLtr)
+    return null;
+  let chars = collectVisualChars(lineEl, view, caretPoint.x);
+  if (chars.length < 2)
+    chars = collectVisualChars(lineEl, view, null);
+  const boundary = resolveBoundaryChars(chars, caretPoint);
+  if (!boundary)
+    return null;
+  if (!hasMixedDirectionBoundary(boundary.left.char, boundary.right.char))
+    return null;
+  if (selection.from !== boundary.right.pmStart && selection.from !== boundary.left.pmEnd)
+    return null;
+  return {
+    from: boundary.left.pmStart,
+    to: boundary.left.pmEnd
+  };
+}, mixedBidiBackspace = () => ({ state, view, tr, dispatch }) => {
+  const range = resolveMixedBidiBackspaceRange({
+    state,
+    view
+  });
+  if (!range)
+    return false;
+  if (dispatch) {
+    tr.delete(range.from, range.to);
+    tr.scrollIntoView();
+  }
+  return true;
+}, MixedBidiBackspace, createPermissionBlockMarkerNode = ({ name, attributes }) => Node$13.create({
   name,
   group: "block",
   inline: false,
@@ -284864,6 +285083,7 @@ var Node$13 = class Node$14 {
     Image,
     NodeResizer,
     CustomSelection,
+    MixedBidiBackspace,
     MathInline,
     MathBlock,
     PassthroughInline,
@@ -284963,6 +285183,7 @@ var Node$13 = class Node$14 {
     PermissionRanges,
     Protection,
     VerticalNavigation,
+    MixedBidiBackspace,
     MathInline,
     MathBlock,
     PassthroughInline,
@@ -286489,6 +286710,7 @@ var Node$13 = class Node$14 {
     () => commands$1.backspaceAtomBefore(),
     () => commands$1.backspaceNextToRun(),
     () => commands$1.backspaceAcrossRuns(),
+    () => commands$1.mixedBidiBackspace?.() ?? false,
     () => commands$1.deleteSelection(),
     () => commands$1.removeNumberingProperties(),
     () => commands$1.joinBackward(),
@@ -291957,7 +292179,27 @@ menclose::after {
   }
   element3.style.textAlign = resolveTextAlign(attrs?.alignment, rtl);
   return rtl;
-}, shouldUseSegmentPositioning = (hasExplicitPositioning, hasSegments, isRtl) => hasExplicitPositioning && hasSegments && !isRtl, MATHML_NS$19 = "http://www.w3.org/1998/Math/MathML", OPERATOR_CHARS, STY_TO_VARIANT, SCR_TO_VARIANT, convertMathRun = (node3, doc$12) => {
+}, shouldUseSegmentPositioning = (hasExplicitPositioning, hasSegments, isRtl) => hasExplicitPositioning && hasSegments && !isRtl, RTL_DATE_LIKE_TOKEN_RE, STRONG_RTL_CHAR_RE, LATIN_DIGIT_NEUTRAL_ONLY_RE, RLM = "‏", normalizeRtlDateTokenForWordParity = (text5) => {
+  if (!RTL_DATE_LIKE_TOKEN_RE.test(text5))
+    return text5;
+  return text5.replace(/[./-]/g, (separator) => `${RLM}${separator}${RLM}`);
+}, resolveRunDirectionAttribute = (opts) => {
+  if (opts.isRtlTagged) {
+    const sample = (opts.runText ?? opts.effectiveText).trim();
+    if (!sample)
+      return "rtl";
+    if (RTL_DATE_LIKE_TOKEN_RE.test(sample))
+      return "rtl";
+    if (STRONG_RTL_CHAR_RE.test(sample))
+      return "rtl";
+    if (LATIN_DIGIT_NEUTRAL_ONLY_RE.test(sample))
+      return null;
+    return "rtl";
+  }
+  if (typeof opts.runText === "string" && RTL_DATE_LIKE_TOKEN_RE.test(opts.runText))
+    return "ltr";
+  return null;
+}, MATHML_NS$19 = "http://www.w3.org/1998/Math/MathML", OPERATOR_CHARS, STY_TO_VARIANT, SCR_TO_VARIANT, convertMathRun = (node3, doc$12) => {
   const text5 = extractText(node3);
   if (!text5)
     return null;
@@ -292747,10 +292989,6 @@ menclose::after {
   if (runToken === "totalPageCount")
     return context.totalPages ? String(context.totalPages) : run2.text ?? "";
   return run2.text ?? "";
-}, RTL_DATE_LIKE_TOKEN_RE, RLM = "‏", normalizeRtlDateTokenForWordParity = (text5) => {
-  if (!RTL_DATE_LIKE_TOKEN_RE.test(text5))
-    return text5;
-  return text5.replace(/[./-]/g, (separator) => `${RLM}${separator}${RLM}`);
 }, createDomPainter = (options) => {
   const painter = new DomPainter(options);
   return {
@@ -301569,7 +301807,13 @@ menclose::after {
   #isCompositionKeyboardEvent(event) {
     return event.isComposing || event.keyCode === 229 || event.key === "Dead" || event.key === "Compose";
   }
-}, isObject2 = (value) => typeof value === "object" && value !== null, INTERNAL_OBJECT_MIME_TYPE = "application/x-superdoc-internal-object", INTERNAL_MIME_TYPE = "application/x-field-annotation", FIELD_ANNOTATION_DATA_TYPE = "fieldAnnotation", IMAGE_EXTENSIONS, DragDropManager = class {
+}, isObject2 = (value) => typeof value === "object" && value !== null, shouldUseNativeCaretFallback = (selection, pos) => {
+  if (!selection)
+    return false;
+  if (!selection.empty)
+    return false;
+  return selection.head === pos;
+}, INTERNAL_OBJECT_MIME_TYPE = "application/x-superdoc-internal-object", INTERNAL_MIME_TYPE = "application/x-field-annotation", FIELD_ANNOTATION_DATA_TYPE = "fieldAnnotation", IMAGE_EXTENSIONS, DragDropManager = class {
   #deps = null;
   #dragOverRaf = null;
   #pendingDragOver = null;
@@ -304109,7 +304353,7 @@ menclose::after {
     return;
   console.log(...args$1);
 }, HEADER_FOOTER_INIT_BUDGET_MS = 200, MAX_ZOOM_WARNING_THRESHOLD = 10, MAX_SELECTION_RECTS_PER_USER = 100, SEMANTIC_RESIZE_DEBOUNCE_MS = 120, MIN_SEMANTIC_CONTENT_WIDTH_PX = 1, GLOBAL_PERFORMANCE, PresentationEditor, ICONS, TEXTS, tableActionsOptions;
-var init_src_Jjjx6UC7_es = __esm(() => {
+var init_src_DTrWuNvy_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_SuperConverter_CnwfJPj6_es();
   init_jszip_C49i9kUs_es();
@@ -322675,6 +322919,14 @@ function print() { __p += __j.call(arguments, '') }
       })];
     }
   });
+  STRONG_RTL_CHAR_RE$1 = /[\u0590-\u08FF]/;
+  STRONG_LTR_CHAR_RE = /[A-Za-z\u00C0-\u024F]/;
+  MixedBidiBackspace = Extension.create({
+    name: "mixedBidiBackspace",
+    addCommands() {
+      return { mixedBidiBackspace };
+    }
+  });
   PermStart = Node$13.create({
     name: "permStart",
     group: "inline",
@@ -330779,6 +331031,9 @@ function print() { __p += __j.call(arguments, '') }
     "wave",
     "doubleWave"
   ]);
+  RTL_DATE_LIKE_TOKEN_RE = /^-?\d+(?:[./-]\d+)+$/;
+  STRONG_RTL_CHAR_RE = /[\u0590-\u08FF]/;
+  LATIN_DIGIT_NEUTRAL_ONLY_RE = /^[\s0-9A-Za-z./\-_:,+()]+$/;
   OPERATOR_CHARS = new Set([
     "+",
     "-",
@@ -333797,10 +334052,13 @@ function print() { __p += __j.call(arguments, '') }
           this.pendingTooltips.set(elem, linkData.tooltip);
       }
       applyRunStyles(elem, run2, isActiveLink);
-      if (textRun.bidi?.rtl === true)
-        elem.setAttribute("dir", "rtl");
-      else if (typeof textRun.text === "string" && RTL_DATE_LIKE_TOKEN_RE.test(textRun.text))
-        elem.setAttribute("dir", "ltr");
+      const dirAttr = resolveRunDirectionAttribute({
+        runText: textRun.text,
+        effectiveText,
+        isRtlTagged: textRun.bidi?.rtl === true
+      });
+      if (dirAttr)
+        elem.setAttribute("dir", dirAttr);
       const commentAnnotations = textRun.comments;
       if (!!commentAnnotations?.length) {
         elem.dataset.commentIds = commentAnnotations.map((c) => c.commentId).join(",");
@@ -334916,7 +335174,6 @@ function print() { __p += __j.call(arguments, '') }
     "path(",
     "rect("
   ];
-  RTL_DATE_LIKE_TOKEN_RE = /^-?\d+(?:[./-]\d+)+$/;
   CLIP_PATH_PREFIXES = [
     "inset(",
     "polygon(",
@@ -341842,7 +342099,8 @@ function print() { __p += __j.call(arguments, '') }
       }, pos, includeDomFallback);
     }
     #computeCaretLayoutRect(pos) {
-      const geometry = this.#computeCaretLayoutRectGeometry(pos, true);
+      const useNativeFallback = shouldUseNativeCaretFallback(this.editor?.state?.selection, pos);
+      const geometry = this.#computeCaretLayoutRectGeometry(pos, useNativeFallback);
       let dom = null;
       try {
         dom = this.#computeDomCaretPageLocal(pos);
@@ -342314,7 +342572,7 @@ var init_zipper_BxRAi0_5_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_Jjjx6UC7_es();
+  init_src_DTrWuNvy_es();
   init_SuperConverter_CnwfJPj6_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.11.0-next.1",
+  "version": "0.11.0-next.2",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -25,20 +25,20 @@
     "@types/ws": "^8.5.13",
     "typescript": "^5.9.2",
     "@superdoc/document-api": "0.0.1",
+    "@superdoc/pm-adapter": "0.0.0",
     "superdoc": "1.33.1",
-    "@superdoc/super-editor": "0.0.1",
-    "@superdoc/pm-adapter": "0.0.0"
+    "@superdoc/super-editor": "0.0.1"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.11.0-next.1",
-    "@superdoc-dev/cli-darwin-x64": "0.11.0-next.1",
-    "@superdoc-dev/cli-linux-x64": "0.11.0-next.1",
-    "@superdoc-dev/cli-linux-arm64": "0.11.0-next.1",
-    "@superdoc-dev/cli-windows-x64": "0.11.0-next.1"
+    "@superdoc-dev/cli-darwin-arm64": "0.11.0-next.2",
+    "@superdoc-dev/cli-darwin-x64": "0.11.0-next.2",
+    "@superdoc-dev/cli-linux-arm64": "0.11.0-next.2",
+    "@superdoc-dev/cli-windows-x64": "0.11.0-next.2",
+    "@superdoc-dev/cli-linux-x64": "0.11.0-next.2"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",