superdoc 1.0.0-beta.14 → 1.0.0-beta.16

package/dist/super-editor/chunks/{converter-CfmIU--8.js → converter-C_R_BK8X.js}

@@ -18972,7 +18972,6 @@ const encode$B = (params, encodedAttrs = {}) => {
       }
     }
   });
-  console.log("subs:", subs);
   return subs;
 };
 function decode$D(params) {
@@ -20131,6 +20130,51 @@ function getStrikeValue(attributes) {
   if (value === "0" || value === "false" || value === "off") return "0";
   return "1";
 }
+function parseProperties(node) {
+  const marks = [];
+  const unknownMarks = [];
+  const { attributes = {}, elements = [] } = node;
+  const { nodes, paragraphProperties = {}, runProperties = {} } = splitElementsAndProperties(elements);
+  const hasRun = elements.find((element) => element.name === "w:r");
+  if (hasRun) paragraphProperties.elements = paragraphProperties?.elements?.filter((el) => el.name !== "w:rPr");
+  if (runProperties && runProperties?.elements?.length) {
+    marks.push(...parseMarks(runProperties, unknownMarks));
+  }
+  if (paragraphProperties && paragraphProperties.elements?.length) {
+    const disallowedParagraphProperties = ["w:u"];
+    const filteredParagraphProperties = {
+      ...paragraphProperties,
+      elements: paragraphProperties.elements?.filter((el) => !disallowedParagraphProperties.includes(el.name))
+    };
+    marks.push(...parseMarks(filteredParagraphProperties, unknownMarks));
+  }
+  marks.push(...handleStyleChangeMarks(runProperties, marks));
+  if (paragraphProperties && paragraphProperties.elements?.length) {
+    attributes["paragraphProperties"] = paragraphProperties;
+  }
+  if (marks && node.name === "w:p") {
+    marks.forEach((mark) => {
+      const attrValue = Object.keys(mark.attrs ?? {})[0];
+      if (attrValue) {
+        const value = mark.attrs[attrValue];
+        attributes[attrValue] = value;
+      }
+    });
+  }
+  return { elements: nodes, attributes, marks, unknownMarks };
+}
+function splitElementsAndProperties(elements) {
+  const pPr = elements.find((el) => el.name === "w:pPr");
+  const rPr = elements.find((el) => el.name === "w:rPr");
+  const sectPr = elements.find((el) => el.name === "w:sectPr");
+  const els = elements.filter((el) => el.name !== "w:pPr" && el.name !== "w:rPr" && el.name !== "w:sectPr");
+  return {
+    nodes: els,
+    paragraphProperties: pPr,
+    runProperties: rPr,
+    sectionProperties: sectPr
+  };
+}
 function getTableStyleId(path) {
   const tbl = path.find((ancestor) => ancestor.name === "w:tbl");
   if (!tbl) {
@@ -20155,13 +20199,6 @@ const handleParagraphNode$1 = (params) => {
   if (pPr) {
     inlineParagraphProperties = translator$12.encode({ ...params, nodes: [pPr] }) || {};
   }
-  const handleStandardNode2 = nodeListHandler.handlerEntities.find(
-    (e) => e.handlerName === "standardNodeHandler"
-  )?.handler;
-  if (!handleStandardNode2) {
-    console.error("Standard node handler not found");
-    return null;
-  }
   const insideTable = (params.path || []).some((ancestor) => ancestor.name === "w:tc");
   const tableStyleId = getTableStyleId(params.path || []);
   const resolvedParagraphProperties = resolveParagraphProperties(
@@ -20170,15 +20207,29 @@ const handleParagraphNode$1 = (params) => {
     insideTable,
     tableStyleId
   );
-  const updatedParams = {
-    ...params,
-    nodes: [node],
-    extraParams: { ...params.extraParams, paragraphProperties: resolvedParagraphProperties }
-  };
-  const result = handleStandardNode2(updatedParams);
-  if (result.nodes.length === 1) {
-    schemaNode = result.nodes[0];
+  const { elements = [], attributes = {}, marks = [] } = parseProperties(node, params.docx);
+  const childContent = [];
+  if (elements.length) {
+    const updatedElements = elements.map((el) => {
+      if (!el.marks) el.marks = [];
+      el.marks.push(...marks);
+      return el;
+    });
+    const childParams = {
+      ...params,
+      nodes: updatedElements,
+      extraParams: { ...params.extraParams, paragraphProperties: resolvedParagraphProperties },
+      path: [...params.path || [], node]
+    };
+    const translatedChildren = nodeListHandler.handler(childParams);
+    childContent.push(...translatedChildren);
   }
+  schemaNode = {
+    type: "paragraph",
+    content: childContent,
+    attrs: { ...attributes },
+    marks: []
+  };
   schemaNode.type = "paragraph";
   schemaNode.attrs.paragraphProperties = inlineParagraphProperties;
   schemaNode.attrs.rsidRDefault = node.attributes?.["w:rsidRDefault"];
@@ -21826,13 +21877,14 @@ const tableOfContentsHandler = (params) => {
     nodes: node.elements,
     path: [...params.path || [], node]
   });
+  const normalizedContent = normalizeDocPartContent(translatedContent);
   const sdtPr = params.extraParams.sdtPr;
   const id = sdtPr.elements?.find((el) => el.name === "w:id")?.attributes["w:val"] || "";
   const docPartObj = sdtPr?.elements.find((el) => el.name === "w:docPartObj");
   const docPartUnique = docPartObj?.elements.some((el) => el.name === "w:docPartUnique") ?? false;
   const result = {
     type: "documentPartObject",
-    content: translatedContent,
+    content: normalizedContent,
     attrs: {
       id,
       docPartGallery: "Table of Contents",
@@ -21872,6 +21924,22 @@ const genericDocPartHandler = (params) => {
 const validGalleryTypeMap = {
   "Table of Contents": tableOfContentsHandler
 };
+const inlineNodeTypes = /* @__PURE__ */ new Set(["bookmarkStart", "bookmarkEnd"]);
+const wrapInlineNode = (node) => ({
+  type: "paragraph",
+  content: [node]
+});
+const normalizeDocPartContent = (nodes = []) => {
+  const normalized = [];
+  nodes.forEach((node) => {
+    if (inlineNodeTypes.has(node?.type)) {
+      normalized.push(wrapInlineNode(node));
+    } else {
+      normalized.push(node);
+    }
+  });
+  return normalized;
+};
 function handleDocumentSectionNode(params) {
   const { nodes, nodeListHandler } = params;
   if (nodes.length === 0 || nodes[0].name !== "w:sdt") {
@@ -24950,7 +25018,8 @@ function handleImageNode(node, params, isAnchor) {
     horizontal: positionHValue,
     top: positionVValue
   };
-  const simplePos = node.elements.find((el) => el.name === "wp:simplePos");
+  const useSimplePos = attributes["simplePos"] === "1" || attributes["simplePos"] === 1;
+  const simplePos = useSimplePos ? node.elements.find((el) => el.name === "wp:simplePos") : null;
   const wrapNode = isAnchor ? node.elements.find(
     (el) => ["wp:wrapNone", "wp:wrapSquare", "wp:wrapThrough", "wp:wrapTight", "wp:wrapTopAndBottom"].includes(el.name)
   ) : null;
@@ -32718,15 +32787,26 @@ const getCommentSchema = (type2, commentIndex) => {
     }
   };
 };
-const getConfig = (type2) => ({
-  xmlName: `${XML_NODE_NAME$7}${type2}`,
-  sdNodeOrKeyName: `${SD_NODE_NAME$6}${type2}`,
-  type: NodeTranslator.translatorTypes.NODE,
-  encode: () => {
-  },
-  decode: decode$7,
-  attributes: [attrConfig]
-});
+const getConfig = (type2) => {
+  const sdName = `${SD_NODE_NAME$6}${type2}`;
+  const isStart = type2 === "Start";
+  return {
+    xmlName: `${XML_NODE_NAME$7}${type2}`,
+    sdNodeOrKeyName: sdName,
+    type: NodeTranslator.translatorTypes.NODE,
+    encode: ({ nodes }) => {
+      const node = nodes?.[0];
+      if (!node) return void 0;
+      const attrs = node.attributes ? { ...node.attributes } : {};
+      return {
+        type: isStart ? "commentRangeStart" : "commentRangeEnd",
+        attrs
+      };
+    },
+    decode: decode$7,
+    attributes: [attrConfig]
+  };
+};
 const commentRangeStartTranslator = NodeTranslator.from(getConfig("Start"));
 const commentRangeEndTranslator = NodeTranslator.from(getConfig("End"));
 const XML_NODE_NAME$6 = "sd:pageReference";
@@ -33450,127 +33530,224 @@ const sdtNodeHandlerEntity = {
   handlerName: "sdtNodeHandler",
   handler: handleSdtNode
 };
-function parseProperties(node) {
-  const marks = [];
-  const unknownMarks = [];
-  const { attributes = {}, elements = [] } = node;
-  const { nodes, paragraphProperties = {}, runProperties = {} } = splitElementsAndProperties(elements);
-  const hasRun = elements.find((element) => element.name === "w:r");
-  if (hasRun) paragraphProperties.elements = paragraphProperties?.elements?.filter((el) => el.name !== "w:rPr");
-  if (runProperties && runProperties?.elements?.length) {
-    marks.push(...parseMarks(runProperties, unknownMarks));
-  }
-  if (paragraphProperties && paragraphProperties.elements?.length) {
-    const disallowedParagraphProperties = ["w:u"];
-    const filteredParagraphProperties = {
-      ...paragraphProperties,
-      elements: paragraphProperties.elements?.filter((el) => !disallowedParagraphProperties.includes(el.name))
-    };
-    marks.push(...parseMarks(filteredParagraphProperties, unknownMarks));
-  }
-  marks.push(...handleStyleChangeMarks(runProperties, marks));
-  if (paragraphProperties && paragraphProperties.elements?.length) {
-    attributes["paragraphProperties"] = paragraphProperties;
+const translatorList = Array.from(
+  /* @__PURE__ */ new Set([
+    translator$1M,
+    translator$6,
+    translator$5,
+    translator$4,
+    translator$3,
+    translator$1L,
+    translator$1K,
+    translator$1J,
+    translator$20,
+    translator$1r,
+    translator$1$,
+    translator$q,
+    translator$7,
+    translator$8,
+    translator$1p,
+    translator$23,
+    translator$F,
+    translator$1R,
+    translator$1H,
+    translator$1W,
+    translator$1G,
+    translator$2,
+    translator$1F,
+    translator$s,
+    translator$1X,
+    translator$X,
+    translator$1E,
+    translator$E,
+    translator$D,
+    translator$b,
+    translator$Z,
+    translator$J,
+    translator$I,
+    translator$C,
+    translator$K,
+    translator$22,
+    translator$10,
+    translator$1_,
+    translator$1x,
+    translator$1D,
+    translator$1w,
+    translator$V,
+    translator$U,
+    translator$1C,
+    translator$1B,
+    translator$1A,
+    translator$1z,
+    translator$1P,
+    translator$1n,
+    translator$1y,
+    translator$O,
+    translator$1v,
+    translator$1u,
+    translator$1t,
+    translator$1s,
+    translator$11,
+    translator$1f,
+    translator$1h,
+    translator$12,
+    translator$1g,
+    translator$$,
+    translator$1V,
+    translator$1N,
+    translator$1U,
+    translator$1l,
+    translator$r,
+    translator$1Q,
+    translator$1e,
+    translator$1d,
+    translator$1c,
+    translator$1b,
+    translator$1a,
+    translator$T,
+    translator$1Y,
+    translator$1T,
+    translator$1S,
+    translator$1,
+    translator$21,
+    translator$19,
+    translator$9,
+    translator$e,
+    translator$p,
+    translator$d,
+    translator$B,
+    translator$o,
+    translator$a,
+    translator$A,
+    translator$n,
+    translator$m,
+    translator$l,
+    translator$k,
+    translator$c,
+    translator$j,
+    translator$i,
+    translator$h,
+    translator$g,
+    translator$f,
+    translator$G,
+    translator$P,
+    translator$M,
+    translator$N,
+    translator$H,
+    translator$_,
+    translator$17,
+    translator$R,
+    translator$v,
+    translator$Q,
+    translator$z,
+    translator$w,
+    translator$18,
+    translator$16,
+    translator$15,
+    translator$1j,
+    translator$1Z,
+    translator$L,
+    translator$Y,
+    translator$y,
+    translator$x,
+    translator$14,
+    translator$13,
+    translator$u,
+    translator$t,
+    commentRangeStartTranslator,
+    commentRangeEndTranslator
+  ])
+);
+const additionalHandlers = Object.freeze(
+  translatorList.reduce((acc, translator2) => {
+    const key = translator2?.xmlName;
+    if (!key) return acc;
+    acc[key] = translator2;
+    return acc;
+  }, {})
+);
+const baseHandlers = {
+  ...additionalHandlers
+};
+const registeredHandlers = Object.freeze(baseHandlers);
+const INLINE_PARENT_NAMES = /* @__PURE__ */ new Set([
+  "w:r",
+  "w:hyperlink",
+  "w:smartTag",
+  "w:fldSimple",
+  "w:proofErr",
+  "w:del",
+  "w:ins"
+]);
+const INLINE_NODE_NAMES = /* @__PURE__ */ new Set([
+  "m:oMathPara",
+  "m:oMath",
+  "m:t",
+  "m:r",
+  "m:ctrlPr",
+  "m:sSupPr",
+  "m:e",
+  "m:sup",
+  "m:sSup"
+]);
+const BLOCK_BOUNDARY_NAMES = /* @__PURE__ */ new Set(["w:p", "w:body", "w:tbl", "w:tc", "w:tr"]);
+const isInlineContext = (path = [], currentNodeName) => {
+  if (currentNodeName && INLINE_NODE_NAMES.has(currentNodeName)) {
+    return true;
   }
-  if (marks && node.name === "w:p") {
-    marks.forEach((mark) => {
-      const attrValue = Object.keys(mark.attrs ?? {})[0];
-      if (attrValue) {
-        const value = mark.attrs[attrValue];
-        attributes[attrValue] = value;
-      }
-    });
+  if (!Array.isArray(path) || path.length === 0) return false;
+  for (let i = path.length - 1; i >= 0; i--) {
+    const ancestorName = path[i]?.name;
+    if (!ancestorName) continue;
+    if (INLINE_NODE_NAMES.has(ancestorName) || INLINE_PARENT_NAMES.has(ancestorName)) {
+      return true;
+    }
+    if (BLOCK_BOUNDARY_NAMES.has(ancestorName)) {
+      return false;
+    }
   }
-  return { elements: nodes, attributes, marks, unknownMarks };
-}
-function splitElementsAndProperties(elements) {
-  const pPr = elements.find((el) => el.name === "w:pPr");
-  const rPr = elements.find((el) => el.name === "w:rPr");
-  const sectPr = elements.find((el) => el.name === "w:sectPr");
-  const els = elements.filter((el) => el.name !== "w:pPr" && el.name !== "w:rPr" && el.name !== "w:sectPr");
-  return {
-    nodes: els,
-    paragraphProperties: pPr,
-    runProperties: rPr,
-    sectionProperties: sectPr
-  };
-}
-function getElementName(element) {
-  return SuperConverter.allowedElements[element.name || element.type];
-}
-const isPropertiesElement = (element) => {
-  return !!SuperConverter.propertyTypes[element.name || element.type];
+  return false;
 };
-const handleStandardNode = (params) => {
-  const { nodes, docx, nodeListHandler } = params;
-  if (!nodes || nodes.length === 0) {
-    return { nodes: [], consumed: 0 };
-  }
+const handlePassthroughNode = (params) => {
+  const { nodes = [] } = params;
   const node = nodes[0];
-  const { name } = node;
-  const { attributes, elements, marks = [] } = parseProperties(node);
-  if (name === "w:sdt") {
+  if (!node) return { nodes: [], consumed: 0 };
+  if (registeredHandlers[node.name]) {
     return { nodes: [], consumed: 0 };
   }
-  if (isPropertiesElement(node)) {
-    return {
-      nodes: [
-        {
-          type: getElementName(node),
-          attrs: { ...attributes },
-          marks: []
-        }
-      ],
-      consumed: 0
-    };
-  }
-  if (!getElementName(node)) {
-    return {
-      nodes: [
-        {
-          type: name,
-          content: elements,
-          attrs: { ...attributes },
-          marks
-        }
-      ],
-      consumed: 0,
-      unhandled: true
-    };
-  }
-  const content = [];
-  const parentStyleId = getParentStyleId(node);
-  if (elements && elements.length) {
-    const updatedElements = elements.map((el) => {
-      if (!el.marks) el.marks = [];
-      el.marks.push(...marks);
-      return el;
-    });
+  const originalXml = carbonCopy(node) || {};
+  const originalElementsSource = originalXml.elements;
+  const originalElements = originalElementsSource ? carbonCopy(originalElementsSource) : [];
+  const childElements = Array.isArray(node.elements) ? node.elements : [];
+  let childContent = [];
+  if (childElements.length && params.nodeListHandler?.handler) {
     const childParams = {
       ...params,
-      nodes: updatedElements,
-      parentStyleId,
+      nodes: childElements,
       path: [...params.path || [], node]
     };
-    const childContent = nodeListHandler.handler(childParams);
-    content.push(...childContent);
+    childContent = params.nodeListHandler.handler(childParams) || [];
   }
-  const resultNode = {
-    type: getElementName(node),
-    content,
-    attrs: { ...attributes },
-    marks: []
+  if (originalElements?.length) {
+    originalXml.elements = originalElements;
+  }
+  const passthroughNode = {
+    type: isInlineContext(params.path, node.name) ? "passthroughInline" : "passthroughBlock",
+    attrs: {
+      originalName: node.name,
+      originalXml
+    },
+    marks: [],
+    content: childContent
+  };
+  return {
+    nodes: [passthroughNode],
+    consumed: 1
   };
-  return { nodes: [resultNode], consumed: 1 };
-};
-const getParentStyleId = (node) => {
-  const pPr = node.elements?.find((el) => el.name === "w:pPr");
-  const styleTag = pPr?.elements?.find((el) => el.name === "w:pStyle");
-  return styleTag ? styleTag.attributes["w:val"] : null;
 };
-const standardNodeHandlerEntity = {
-  handlerName: "standardNodeHandler",
-  handler: handleStandardNode
+const passthroughNodeHandlerEntity = {
+  handlerName: "passthroughNodeHandler",
+  handler: handlePassthroughNode
 };
 const handler = (params) => {
   const { nodes } = params;
@@ -33594,13 +33771,6 @@ const handleBookmarkNode = (params) => {
     return { nodes: [], consumed: 0 };
   }
   const node = nodes[0];
-  const handleStandardNode2 = nodeListHandler.handlerEntities.find(
-    (e) => e.handlerName === "standardNodeHandler"
-  )?.handler;
-  if (!handleStandardNode2) {
-    console.error("Standard node handler not found");
-    return { nodes: [], consumed: 0 };
-  }
   const customMarks = editor?.extensionService?.extensions?.filter((e) => e.isExternal === true) || [];
   const bookmarkName = node.attributes["w:name"]?.split(";")[0];
   const customMark = customMarks.find((mark) => mark.name === bookmarkName);
@@ -33609,7 +33779,6 @@ const handleBookmarkNode = (params) => {
       (n) => n.name === "w:bookmarkEnd" && n.attributes["w:id"] === node.attributes["w:id"]
     );
     const textNodes = nodes.slice(1, bookmarkEndIndex);
-    const nodeListHandler2 = params.nodeListHandler;
     const attrs = {};
     node.attributes["w:name"].split(";").forEach((name) => {
       const [key, value] = name.split("=");
@@ -33617,7 +33786,7 @@ const handleBookmarkNode = (params) => {
         attrs[key] = value;
       }
     });
-    const translatedText = nodeListHandler2.handler({
+    const translatedText = nodeListHandler.handler({
       ...params,
       nodes: textNodes,
       path: [...params.path || [], node]
@@ -33633,13 +33802,11 @@ const handleBookmarkNode = (params) => {
       consumed: translatedText.length + 2
     };
   }
-  const updatedParams = { ...params, nodes: [node] };
-  const result = handleStandardNode2(updatedParams);
-  if (result.nodes.length === 1) {
-    result.nodes[0].attrs.name = node.attributes["w:name"];
-    result.nodes[0].attrs.id = node.attributes["w:id"];
+  const encoded = translator$8.encode({ ...params, nodes: [node] });
+  if (!encoded) {
+    return { nodes: [], consumed: 0 };
   }
-  return result;
+  return { nodes: [encoded], consumed: 1 };
 };
 const handleBookmarkStartNode = (params) => {
   const { nodes } = params;
@@ -34561,18 +34728,22 @@ const getInstructionPreProcessor = (instruction) => {
 const preProcessNodesForFldChar = (nodes = [], docx) => {
   const processedNodes = [];
   let collectedNodesStack = [];
+  let rawCollectedNodesStack = [];
   let currentFieldStack = [];
   let unpairedEnd = null;
   let collecting = false;
   const finalizeField = () => {
     if (collecting) {
       const collectedNodes = collectedNodesStack.pop().filter((n) => n !== null);
+      const rawCollectedNodes = rawCollectedNodesStack.pop().filter((n) => n !== null);
       const currentField = currentFieldStack.pop();
-      const combined = _processCombinedNodesForFldChar(collectedNodes, currentField.instrText.trim(), docx);
+      const combinedResult = _processCombinedNodesForFldChar(collectedNodes, currentField.instrText.trim(), docx);
+      const outputNodes = combinedResult.handled ? combinedResult.nodes : rawCollectedNodes;
       if (collectedNodesStack.length === 0) {
-        processedNodes.push(...combined);
+        processedNodes.push(...outputNodes);
       } else {
-        collectedNodesStack[collectedNodesStack.length - 1].push(...combined);
+        collectedNodesStack[collectedNodesStack.length - 1].push(...outputNodes);
+        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(...outputNodes);
       }
     } else {
       unpairedEnd = true;
@@ -34584,18 +34755,26 @@ const preProcessNodesForFldChar = (nodes = [], docx) => {
     const instrTextEl = node.elements?.find((el) => el.name === "w:instrText");
     collecting = collectedNodesStack.length > 0;
     if (fldType === "begin") {
-      collectedNodesStack.push([null]);
+      collectedNodesStack.push([]);
+      rawCollectedNodesStack.push([node]);
       currentFieldStack.push({ instrText: "" });
       continue;
     }
     if (instrTextEl && collecting && currentFieldStack.length > 0) {
+      rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node);
       currentFieldStack[currentFieldStack.length - 1].instrText += (instrTextEl.elements?.[0]?.text || "") + " ";
       continue;
     }
     if (fldType === "end") {
+      if (collecting) {
+        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node);
+      }
       finalizeField();
       continue;
     } else if (fldType === "separate") {
+      if (collecting) {
+        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node);
+      }
       continue;
     }
     if (Array.isArray(node.elements)) {
@@ -34605,17 +34784,21 @@ const preProcessNodesForFldChar = (nodes = [], docx) => {
         childResult.unpairedBegin.forEach((pendingField) => {
           currentFieldStack.push(pendingField.fieldInfo);
           collectedNodesStack.push([node]);
+          rawCollectedNodesStack.push([node]);
         });
       } else if (childResult.unpairedEnd) {
         collectedNodesStack[collectedNodesStack.length - 1].push(node);
+        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node);
         finalizeField();
       } else if (collecting) {
         collectedNodesStack[collectedNodesStack.length - 1].push(node);
+        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node);
       } else {
         processedNodes.push(node);
       }
     } else if (collecting) {
       collectedNodesStack[collectedNodesStack.length - 1].push(node);
+      rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node);
     } else {
       processedNodes.push(node);
     }
@@ -34637,10 +34820,9 @@ const _processCombinedNodesForFldChar = (nodesToCombine = [], instrText, docx) =
   const instructionType = instrText.trim().split(" ")[0];
   const instructionPreProcessor = getInstructionPreProcessor(instructionType);
   if (instructionPreProcessor) {
-    return instructionPreProcessor(nodesToCombine, instrText, docx);
-  } else {
-    return nodesToCombine;
+    return { nodes: instructionPreProcessor(nodesToCombine, instrText, docx), handled: true };
   }
+  return { nodes: nodesToCombine, handled: false };
 };
 const preProcessPageFieldsOnly = (nodes = []) => {
   const processedNodes = [];
@@ -34715,6 +34897,14 @@ function scanFieldSequence(nodes, beginIndex) {
     endIndex
   };
 }
+const commentRangeStartHandlerEntity = generateV2HandlerEntity(
+  "commentRangeStartHandler",
+  commentRangeStartTranslator
+);
+const commentRangeEndHandlerEntity = generateV2HandlerEntity(
+  "commentRangeEndHandler",
+  commentRangeEndTranslator
+);
 const createDocumentJson = (docx, converter, editor) => {
   const json = carbonCopy(getInitialJSON(docx));
   if (!json) return null;
@@ -34776,6 +34966,7 @@ const createDocumentJson = (docx, converter, editor) => {
       path: []
     });
     parsedContent = filterOutRootInlineNodes(parsedContent);
+    collapseWhitespaceNextToInlinePassthrough(parsedContent);
     const result = {
       type: "doc",
       content: parsedContent,
@@ -34816,6 +35007,8 @@ const defaultNodeListHandler = () => {
     bookmarkStartNodeHandlerEntity,
     bookmarkEndNodeHandlerEntity,
     hyperlinkNodeHandlerEntity,
+    commentRangeStartHandlerEntity,
+    commentRangeEndHandlerEntity,
     drawingNodeHandlerEntity,
     trackChangeNodeHandlerEntity,
     tableNodeHandlerEntity,
@@ -34824,7 +35017,7 @@ const defaultNodeListHandler = () => {
     autoPageHandlerEntity,
     autoTotalPageCountEntity,
     pageReferenceEntity,
-    standardNodeHandlerEntity
+    passthroughNodeHandlerEntity
   ];
   const handler2 = createNodeListHandler(entities);
   return {
@@ -35111,8 +35304,8 @@ const importHeadersFooters = (docx, converter, mainEditor) => {
   editor.options.annotations = true;
   headers.forEach((header) => {
     const { rId, referenceFile, currentFileName } = getHeaderFooterSectionData(header, docx);
-    const { processedNodes: headerProcessedNodes } = preProcessPageFieldsOnly(referenceFile.elements[0].elements ?? []);
-    referenceFile.elements[0].elements = headerProcessedNodes;
+    const headerNodes = carbonCopy(referenceFile.elements[0].elements ?? []);
+    const { processedNodes: headerProcessedNodes } = preProcessPageFieldsOnly(headerNodes);
     const sectPrHeader = allSectPrElements.find(
       (el) => el.name === "w:headerReference" && el.attributes["r:id"] === rId
     );
@@ -35120,7 +35313,7 @@ const importHeadersFooters = (docx, converter, mainEditor) => {
     if (converter.headerIds[sectionType]) sectionType = null;
     const nodeListHandler = defaultNodeListHandler();
     let schema = nodeListHandler.handler({
-      nodes: referenceFile.elements[0].elements,
+      nodes: headerProcessedNodes,
       nodeListHandler,
       docx,
       converter,
@@ -35141,15 +35334,15 @@ const importHeadersFooters = (docx, converter, mainEditor) => {
   if (titlePg) converter.headerIds.titlePg = true;
   footers.forEach((footer) => {
     const { rId, referenceFile, currentFileName } = getHeaderFooterSectionData(footer, docx);
-    const { processedNodes: footerProcessedNodes } = preProcessPageFieldsOnly(referenceFile.elements[0].elements ?? []);
-    referenceFile.elements[0].elements = footerProcessedNodes;
+    const footerNodes = carbonCopy(referenceFile.elements[0].elements ?? []);
+    const { processedNodes: footerProcessedNodes } = preProcessPageFieldsOnly(footerNodes);
     const sectPrFooter = allSectPrElements.find(
       (el) => el.name === "w:footerReference" && el.attributes["r:id"] === rId
     );
     const sectionType = sectPrFooter?.attributes["w:type"];
     const nodeListHandler = defaultNodeListHandler();
     let schema = nodeListHandler.handler({
-      nodes: referenceFile.elements[0].elements,
+      nodes: footerProcessedNodes,
       nodeListHandler,
       docx,
       converter,
@@ -35212,6 +35405,51 @@ function filterOutRootInlineNodes(content = []) {
   ]);
   return content.filter((node) => node && typeof node.type === "string" && !INLINE_TYPES.has(node.type));
 }
+function collapseWhitespaceNextToInlinePassthrough(content = []) {
+  if (!Array.isArray(content) || content.length === 0) return;
+  const sequence = collectInlineSequence(content);
+  sequence.forEach((entry, index2) => {
+    if (entry.kind !== "passthrough") return;
+    const prev = findNeighborText(sequence, index2, -1);
+    const next = findNeighborText(sequence, index2, 1);
+    if (!prev || !next) return;
+    if (!prev.node.text.endsWith(" ") || !next.node.text.startsWith(" ")) return;
+    prev.node.text = prev.node.text.replace(/ +$/, " ");
+    next.node.text = next.node.text.replace(/^ +/, "");
+    if (next.node.text.length === 0) {
+      next.parent.splice(next.index, 1);
+    }
+  });
+}
+function collectInlineSequence(nodes, result = [], insidePassthrough = false) {
+  if (!Array.isArray(nodes) || nodes.length === 0) return result;
+  nodes.forEach((node, index2) => {
+    if (!node) return;
+    const isPassthrough = node.type === "passthroughInline";
+    if (isPassthrough && !insidePassthrough) {
+      result.push({ kind: "passthrough", parent: nodes, index: index2 });
+    }
+    if (node.type === "text" && typeof node.text === "string" && !insidePassthrough) {
+      result.push({ kind: "text", node, parent: nodes, index: index2 });
+    }
+    if (Array.isArray(node.content) && node.content.length) {
+      const nextInside = insidePassthrough || isPassthrough;
+      collectInlineSequence(node.content, result, nextInside);
+    }
+  });
+  return result;
+}
+function findNeighborText(sequence, startIndex, direction) {
+  let cursor = startIndex + direction;
+  while (cursor >= 0 && cursor < sequence.length) {
+    const entry = sequence[cursor];
+    if (entry.kind === "text") {
+      return entry;
+    }
+    cursor += direction;
+  }
+  return null;
+}
 function getThemeColorPalette(docx) {
   const themePart = docx?.["word/theme/theme1.xml"];
   if (!themePart || !Array.isArray(themePart.elements)) return void 0;
@@ -35574,7 +35812,9 @@ function exportSchemaToJson(params) {
     "page-number": translator$4,
     "total-page-number": translator$3,
     pageReference: translator$6,
-    tableOfContents: translator$5
+    tableOfContents: translator$5,
+    passthroughBlock: translatePassthroughNode,
+    passthroughInline: translatePassthroughNode
   };
   let handler2 = router[type2];
   if (handler2 && "decode" in handler2 && typeof handler2.decode === "function") {
@@ -35586,6 +35826,11 @@ function exportSchemaToJson(params) {
   }
   return handler2(params);
 }
+function translatePassthroughNode(params) {
+  const original = params?.node?.attrs?.originalXml;
+  if (!original) return null;
+  return carbonCopy(original);
+}
 function translateBodyNode(params) {
   let sectPr = params.bodyNode?.elements?.find((n) => n.name === "w:sectPr");
   if (!sectPr) {
@@ -36285,7 +36530,7 @@ const _SuperConverter = class _SuperConverter {
   static getStoredSuperdocVersion(docx) {
     return _SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
   }
-  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.0.0-beta.14") {
+  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.0.0-beta.16") {
     return _SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version, false);
   }
   /**
@@ -36899,7 +37144,6 @@ export {
   inputRulesPlugin as Z,
   TrackDeleteMarkName as _,
   Plugin as a,
-  translator$L as a$,
   v4 as a0,
   TrackFormatMarkName as a1,
   comments_module_events as a2,
@@ -36925,18 +37169,7 @@ export {
   vClickOutside as aM,
   getActiveFormatting as aN,
   getFileObject as aO,
-  translator$H as aP,
-  translator$N as aQ,
-  translator$P as aR,
-  translator$I as aS,
-  translator$J as aT,
-  translator$Q as aU,
-  translator$R as aV,
-  translator$17 as aW,
-  translator$K as aX,
-  translator$_ as aY,
-  translator$M as aZ,
-  translator$O as a_,
+  registeredHandlers as aP,
   posToDOMRect as aa,
   CommandService as ab,
   SuperConverter as ac,
@@ -36964,80 +37197,7 @@ export {
   convertSizeToCSS as ay,
   SelectionRange as az,
   Slice as b,
-  translator$23 as b$,
-  translator$Z as b0,
-  translator$Y as b1,
-  commentRangeEndTranslator as b2,
-  commentRangeStartTranslator as b3,
-  translator$t as b4,
-  translator$u as b5,
-  translator$x as b6,
-  translator$y as b7,
-  translator$1Z as b8,
-  translator$w as b9,
-  translator$T as bA,
-  translator$1Q as bB,
-  translator$r as bC,
-  translator$1l as bD,
-  translator$1U as bE,
-  translator$1N as bF,
-  translator$1V as bG,
-  translator$$ as bH,
-  translator$11 as bI,
-  translator$1n as bJ,
-  translator$1C as bK,
-  translator$U as bL,
-  translator$V as bM,
-  translator$1_ as bN,
-  translator$10 as bO,
-  translator$22 as bP,
-  translator$C as bQ,
-  translator$b as bR,
-  translator$D as bS,
-  translator$E as bT,
-  translator$X as bU,
-  translator$s as bV,
-  translator$1F as bW,
-  translator$1W as bX,
-  translator$1H as bY,
-  translator$1R as bZ,
-  translator$F as b_,
-  translator$z as ba,
-  translator$v as bb,
-  translator$1j as bc,
-  translator$G as bd,
-  translator$f as be,
-  translator$g as bf,
-  translator$h as bg,
-  translator$i as bh,
-  translator$j as bi,
-  translator$c as bj,
-  translator$k as bk,
-  translator$l as bl,
-  translator$m as bm,
-  translator$n as bn,
-  translator$A as bo,
-  translator$a as bp,
-  translator$o as bq,
-  translator$B as br,
-  translator$d as bs,
-  translator$p as bt,
-  translator$e as bu,
-  translator$9 as bv,
-  translator$21 as bw,
-  translator$1S as bx,
-  translator$1T as by,
-  translator$1Y as bz,
   DOMParser$1 as c,
-  translator$1p as c0,
-  translator$8 as c1,
-  translator$7 as c2,
-  translator$q as c3,
-  translator$1$ as c4,
-  translator$20 as c5,
-  translator$5 as c6,
-  translator$6 as c7,
-  translator$1M as c8,
   Mark as d,
   dropPoint as e,
   callOrGet as f,