@superdoc-dev/cli 0.2.0-next.130 → 0.2.0-next.131

package/dist/index.js

@@ -38443,7 +38443,7 @@ var init_remark_gfm_z_sDF4ss_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-Cw5CEerM.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-C9IFvZwR.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -57998,24 +57998,34 @@ function translateDocumentPartObj(params) {
     }]
   };
 }
+function sanitizeId(id) {
+  if (typeof id === "string" && id.trim() !== "")
+    return id.trim();
+}
 function generateSdtPrForDocPartObj(attrs) {
   const existingDocPartObj = attrs.sdtPr?.elements?.find((el) => el.name === "w:docPartObj");
   const existingDocPartGallery = existingDocPartObj?.elements?.find((el) => el.name === "w:docPartGallery")?.attributes?.["w:val"];
   const docPartGallery = attrs.docPartGallery ?? existingDocPartGallery ?? null;
-  const id = attrs.id ?? attrs.sdtPr?.elements?.find((el) => el.name === "w:id")?.attributes?.["w:val"] ?? "";
+  const id = sanitizeId(attrs.id ?? attrs.sdtPr?.elements?.find((el) => el.name === "w:id")?.attributes?.["w:val"]);
   const docPartUnique = attrs.docPartUnique ?? existingDocPartObj?.elements?.some((el) => el.name === "w:docPartUnique") ?? false;
   if (docPartGallery === null) {
     if (attrs.sdtPr)
-      return attrs.sdtPr;
-    return {
-      name: "w:sdtPr",
-      elements: [{
+      return {
+        ...attrs.sdtPr,
+        elements: Array.isArray(attrs.sdtPr.elements) ? attrs.sdtPr.elements.filter((el) => !(el.name === "w:id" && el.attributes?.["w:val"]?.trim() === "")) : attrs.sdtPr.elements
+      };
+    const elements = [{
+      name: "w:docPartObj",
+      elements: []
+    }];
+    if (id != null)
+      elements.unshift({
         name: "w:id",
         attributes: { "w:val": id }
-      }, {
-        name: "w:docPartObj",
-        elements: []
-      }]
+      });
+    return {
+      name: "w:sdtPr",
+      elements
     };
   }
   const docPartObjElements = [{
@@ -58025,12 +58035,14 @@ function generateSdtPrForDocPartObj(attrs) {
   if (docPartUnique)
     docPartObjElements.push({ name: "w:docPartUnique" });
   const sdtPrElements = [{
-    name: "w:id",
-    attributes: { "w:val": id }
-  }, {
     name: "w:docPartObj",
     elements: docPartObjElements
   }];
+  if (id != null)
+    sdtPrElements.unshift({
+      name: "w:id",
+      attributes: { "w:val": id }
+    });
   if (attrs.sdtPr?.elements && Array.isArray(attrs.sdtPr.elements)) {
     const elementsToExclude = ["w:id", "w:docPartObj"];
     const passthroughElements = attrs.sdtPr.elements.filter((el) => el && el.name && !elementsToExclude.includes(el.name));
@@ -64076,11 +64088,7 @@ var isRegExp = (value) => {
   };
 }, tableOfContentsHandler = (params) => {
   const node3 = params.nodes[0];
-  const normalizedContent = normalizeDocPartContent(params.nodeListHandler.handler({
-    ...params,
-    nodes: node3.elements,
-    path: [...params.path || [], node3]
-  }));
+  const normalizedContent = normalizeDocPartContent(translateTocSdtContent(node3, params));
   const sdtPr = params.extraParams.sdtPr;
   return {
     type: "documentPartObject",
@@ -64113,10 +64121,35 @@ var isRegExp = (value) => {
       sdtPr
     }
   };
-}, validGalleryTypeMap, inlineNodeTypes, wrapInlineNode = (node3) => ({
+}, validGalleryTypeMap, inlineNodeTypes, SD_TOC_XML_NAME = "sd:tableOfContents", PARAGRAPH_XML_NAME = "w:p", PARAGRAPH_PROPERTIES_XML_NAME = "w:pPr", wrapInlineNode = (node3) => ({
   type: "paragraph",
   content: [node3]
-}), normalizeDocPartContent = (nodes = []) => {
+}), hasMeaningfulParagraphContent = (elements = []) => elements.some((element) => element?.name && element.name !== PARAGRAPH_PROPERTIES_XML_NAME), translateNodes = (params, nodes, pathTail = []) => params.nodeListHandler.handler({
+  ...params,
+  nodes,
+  path: [...params.path || [], ...pathTail]
+}), translateTocSdtContent = (sdtContent, params) => {
+  const translatedContent = [];
+  const parentPath = [sdtContent];
+  (sdtContent?.elements || []).forEach((child) => {
+    const childElements = Array.isArray(child?.elements) ? child.elements : [];
+    const tocElements = child?.name === PARAGRAPH_XML_NAME ? childElements.filter((el) => el?.name === SD_TOC_XML_NAME) : [];
+    if (tocElements.length === 0) {
+      translatedContent.push(...translateNodes(params, [child], parentPath));
+      return;
+    }
+    const remainingElements = childElements.filter((el) => el?.name !== SD_TOC_XML_NAME);
+    if (hasMeaningfulParagraphContent(remainingElements))
+      translatedContent.push(...translateNodes(params, [{
+        ...child,
+        elements: remainingElements
+      }], parentPath));
+    tocElements.forEach((tocElement) => {
+      translatedContent.push(...translateNodes(params, [tocElement], [...parentPath, child]));
+    });
+  });
+  return translatedContent;
+}, normalizeDocPartContent = (nodes = []) => {
   const normalized = [];
   nodes.forEach((node3) => {
     if (inlineNodeTypes.has(node3?.type))
@@ -68546,6 +68579,7 @@ var isRegExp = (value) => {
   let currentFieldStack = [];
   let unpairedEnd = null;
   let collecting = false;
+  const rawNodeSourceTokens = /* @__PURE__ */ new WeakMap;
   const finalizeField = () => {
     if (collecting) {
       const collectedNodes = collectedNodesStack.pop().filter((n) => n !== null);
@@ -68562,16 +68596,30 @@ var isRegExp = (value) => {
     } else
       unpairedEnd = true;
   };
-  for (const node3 of nodes) {
-    const rawNode = carbonCopy(node3);
+  const captureRawNodeForCurrentField = (rawNode, capturedRawNodes, rawSourceToken) => {
+    if (rawCollectedNodesStack.length === 0)
+      return;
+    if (capturedRawNodes.has(rawNode))
+      return;
+    const currentRawStack = rawCollectedNodesStack[rawCollectedNodesStack.length - 1];
+    const lastRawNode = currentRawStack[currentRawStack.length - 1];
+    if (lastRawNode?.name === "w:r" && rawNode?.name === "w:r" && rawNodeSourceTokens.get(lastRawNode) === rawSourceToken && Array.isArray(lastRawNode.elements) && Array.isArray(rawNode.elements))
+      lastRawNode.elements.push(...carbonCopy(rawNode.elements));
+    else {
+      currentRawStack.push(rawNode);
+      rawNodeSourceTokens.set(rawNode, rawSourceToken);
+    }
+    capturedRawNodes.add(rawNode);
+  };
+  const processNode = (node3, rawNode, capturedRawNodes, rawSourceToken) => {
     collecting = collectedNodesStack.length > 0;
     if (shouldSkipFieldProcessing$1(node3)) {
       if (collecting) {
         collectedNodesStack[collectedNodesStack.length - 1].push(node3);
-        rawCollectedNodesStack[collectedNodesStack.length - 1].push(rawNode);
+        captureRawNodeForCurrentField(rawNode, capturedRawNodes, rawSourceToken);
       } else
         processedNodes.push(node3);
-      continue;
+      return;
     }
     const fldType = node3.elements?.find((el) => el.name === "w:fldChar")?.attributes?.["w:fldCharType"];
     const instrTextEl = node3.elements?.find((el) => el.name === "w:instrText");
@@ -68587,49 +68635,52 @@ var isRegExp = (value) => {
             rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(...processed);
           } else
             processedNodes.push(...processed);
-          continue;
+          return;
         }
       }
     }
     if (fldType === "begin") {
       collectedNodesStack.push([]);
-      rawCollectedNodesStack.push([rawNode]);
+      const rawStack = [rawNode];
+      rawCollectedNodesStack.push(rawStack);
+      rawNodeSourceTokens.set(rawNode, rawSourceToken);
+      capturedRawNodes.add(rawNode);
       currentFieldStack.push({
         instrText: "",
         instructionTokens: [],
         afterSeparate: false
       });
-      continue;
+      return;
     }
     if (collecting && currentFieldStack.length > 0) {
       const currentField = currentFieldStack[currentFieldStack.length - 1];
       if (!currentField.afterSeparate) {
         const instructionTokens = extractInstructionTokensFromNode(node3);
         if (instructionTokens.length > 0) {
-          rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
+          captureRawNodeForCurrentField(rawNode, capturedRawNodes, rawSourceToken);
           currentField.instructionTokens.push(...instructionTokens);
           const instrTextValue = instrTextEl?.elements?.[0]?.text;
           if (instrTextValue != null)
             currentField.instrText += `${instrTextValue} `;
           if (instructionTokens.some((token) => token.type === "tab"))
             currentField.instrText += "\t";
-          continue;
+          return;
         }
       }
     }
     if (fldType === "end") {
       if (collecting)
-        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
+        captureRawNodeForCurrentField(rawNode, capturedRawNodes, rawSourceToken);
       finalizeField();
-      continue;
+      return;
     } else if (fldType === "separate") {
       if (collecting) {
-        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
+        captureRawNodeForCurrentField(rawNode, capturedRawNodes, rawSourceToken);
         const currentField = currentFieldStack[currentFieldStack.length - 1];
         if (currentField)
           currentField.afterSeparate = true;
       }
-      continue;
+      return;
     }
     if (Array.isArray(node3.elements)) {
       const childResult = preProcessNodesForFldChar(node3.elements, docx);
@@ -68638,22 +68689,35 @@ var isRegExp = (value) => {
         childResult.unpairedBegin.forEach((pendingField) => {
           currentFieldStack.push(pendingField.fieldInfo);
           collectedNodesStack.push([node3]);
-          rawCollectedNodesStack.push([rawNode]);
+          const rawStack = [rawNode];
+          rawCollectedNodesStack.push(rawStack);
+          rawNodeSourceTokens.set(rawNode, rawSourceToken);
+          capturedRawNodes.add(rawNode);
         });
       else if (childResult.unpairedEnd) {
         collectedNodesStack[collectedNodesStack.length - 1].push(node3);
-        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
+        captureRawNodeForCurrentField(rawNode, capturedRawNodes, rawSourceToken);
         finalizeField();
       } else if (collecting) {
         collectedNodesStack[collectedNodesStack.length - 1].push(node3);
-        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
+        captureRawNodeForCurrentField(rawNode, capturedRawNodes, rawSourceToken);
       } else
         processedNodes.push(node3);
     } else if (collecting) {
       collectedNodesStack[collectedNodesStack.length - 1].push(node3);
-      rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
+      captureRawNodeForCurrentField(rawNode, capturedRawNodes, rawSourceToken);
     } else
       processedNodes.push(node3);
+  };
+  for (const node3 of nodes) {
+    const rawNode = carbonCopy(node3);
+    const logicalNodes = expandNodeForFieldProcessing(node3);
+    const rawLogicalNodes = expandNodeForFieldProcessing(rawNode);
+    const capturedRawNodes = /* @__PURE__ */ new Set;
+    const rawSourceToken = {};
+    logicalNodes.forEach((logicalNode, index2) => {
+      processNode(logicalNode, rawLogicalNodes[index2] ?? rawNode, capturedRawNodes, rawSourceToken);
+    });
   }
   let unpairedBegin = null;
   if (collectedNodesStack.length > 0) {
@@ -68698,6 +68762,55 @@ var isRegExp = (value) => {
       tokens.push({ type: "tab" });
   });
   return tokens;
+}, FIELD_CONTROL_ELEMENT_NAMES, INSTRUCTION_ELEMENT_NAMES, cloneNodeWithElements = (node3, elements) => ({
+  ...node3,
+  elements: carbonCopy(elements)
+}), expandNodeForFieldProcessing = (node3) => {
+  const elements = Array.isArray(node3?.elements) ? node3.elements : null;
+  if (node3?.name !== "w:r" || !elements || elements.length === 0)
+    return [node3];
+  const runProperties = elements.filter((el) => el?.name === "w:rPr");
+  const contentElements = elements.filter((el) => el?.name !== "w:rPr");
+  const logicalNodes = [];
+  let currentKind = null;
+  let currentElements = [];
+  const flushCurrentGroup = () => {
+    if (currentElements.length === 0)
+      return;
+    logicalNodes.push(cloneNodeWithElements(node3, [...runProperties, ...currentElements]));
+    currentElements = [];
+    currentKind = null;
+  };
+  contentElements.forEach((element) => {
+    if (!element?.name) {
+      if (currentKind !== "content") {
+        flushCurrentGroup();
+        currentKind = "content";
+      }
+      currentElements.push(element);
+      return;
+    }
+    if (FIELD_CONTROL_ELEMENT_NAMES.has(element.name)) {
+      flushCurrentGroup();
+      logicalNodes.push(cloneNodeWithElements(node3, [...runProperties, element]));
+      return;
+    }
+    if (INSTRUCTION_ELEMENT_NAMES.has(element.name)) {
+      if (currentKind !== "instruction") {
+        flushCurrentGroup();
+        currentKind = "instruction";
+      }
+      currentElements.push(element);
+      return;
+    }
+    if (currentKind !== "content") {
+      flushCurrentGroup();
+      currentKind = "content";
+    }
+    currentElements.push(element);
+  });
+  flushCurrentGroup();
+  return logicalNodes.length > 1 ? logicalNodes : [node3];
 }, SKIP_FIELD_PROCESSING_NODE_NAMES, shouldSkipFieldProcessing = (node3) => SKIP_FIELD_PROCESSING_NODE_NAMES.has(node3?.name), preProcessPageFieldsOnly = (nodes = [], depth = 0) => {
   const processedNodes = [];
   let i2 = 0;
@@ -74860,7 +74973,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_Cw5CEerM_es = __esm(() => {
+var init_SuperConverter_C9IFvZwR_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();
@@ -100489,6 +100602,8 @@ var init_SuperConverter_Cw5CEerM_es = __esm(() => {
     })();
   }))(), 1);
   SKIP_FIELD_PROCESSING_NODE_NAMES$1 = new Set(["w:drawing", "w:pict"]);
+  FIELD_CONTROL_ELEMENT_NAMES = new Set(["w:fldChar"]);
+  INSTRUCTION_ELEMENT_NAMES = new Set(["w:instrText", "w:tab"]);
   SKIP_FIELD_PROCESSING_NODE_NAMES = new Set(["w:drawing", "w:pict"]);
   HEADER_FOOTER_FILENAME_PATTERN = /^(header|footer)\d*\.xml$/i;
   CHART_TYPE_MAP = {
@@ -135072,7 +135187,7 @@ var init_remark_gfm_CjV8kaUy_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-BNoEv7Gv.es.js
+// ../../packages/superdoc/dist/chunks/src-BTrBP-Dc.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -217807,9 +217922,9 @@ var Node$13 = class Node$14 {
     return false;
   return Boolean(checker(attrs));
 }, SuperToolbar, ICONS, TEXTS, tableActionsOptions;
-var init_src_BNoEv7Gv_es = __esm(() => {
+var init_src_BTrBP_Dc_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
-  init_SuperConverter_Cw5CEerM_es();
+  init_SuperConverter_C9IFvZwR_es();
   init_jszip_ChlR43oI_es();
   init_uuid_qzgm05fK_es();
   init_constants_CMPtQbp7_es();
@@ -244930,7 +245045,7 @@ function print() { __p += __j.call(arguments, '') }
   TableOfContents = Node$13.create({
     name: "tableOfContents",
     group: "block",
-    content: "paragraph+",
+    content: "paragraph*",
     inline: false,
     addStorage() {
       return { pageMap: null };
@@ -251418,8 +251533,8 @@ var init_zipper_DqXT7uTa_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_BNoEv7Gv_es();
-  init_SuperConverter_Cw5CEerM_es();
+  init_src_BTrBP_Dc_es();
+  init_SuperConverter_C9IFvZwR_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();
   init_constants_CMPtQbp7_es();
@@ -284518,11 +284633,7 @@ function handleDocPartObj2(params3) {
 }
 var tableOfContentsHandler2 = (params3) => {
   const node4 = params3.nodes[0];
-  const translatedContent = params3.nodeListHandler.handler({
-    ...params3,
-    nodes: node4.elements,
-    path: [...params3.path || [], node4]
-  });
+  const translatedContent = translateTocSdtContent2(node4, params3);
   const normalizedContent = normalizeDocPartContent2(translatedContent);
   const sdtPr = params3.extraParams.sdtPr;
   const id2 = sdtPr.elements?.find((el) => el.name === "w:id")?.attributes["w:val"] || "";
@@ -284563,10 +284674,38 @@ var tableOfContentsHandler2 = (params3) => {
     }
   };
   return result;
-}, validGalleryTypeMap2, inlineNodeTypes2, wrapInlineNode2 = (node4) => ({
+}, validGalleryTypeMap2, inlineNodeTypes2, SD_TOC_XML_NAME2 = "sd:tableOfContents", PARAGRAPH_XML_NAME2 = "w:p", PARAGRAPH_PROPERTIES_XML_NAME2 = "w:pPr", wrapInlineNode2 = (node4) => ({
   type: "paragraph",
   content: [node4]
-}), normalizeDocPartContent2 = (nodes = []) => {
+}), hasMeaningfulParagraphContent2 = (elements = []) => elements.some((element3) => element3?.name && element3.name !== PARAGRAPH_PROPERTIES_XML_NAME2), translateNodes2 = (params3, nodes, pathTail = []) => params3.nodeListHandler.handler({
+  ...params3,
+  nodes,
+  path: [...params3.path || [], ...pathTail]
+}), translateTocSdtContent2 = (sdtContent, params3) => {
+  const translatedContent = [];
+  const parentPath = [sdtContent];
+  (sdtContent?.elements || []).forEach((child) => {
+    const childElements = Array.isArray(child?.elements) ? child.elements : [];
+    const tocElements = child?.name === PARAGRAPH_XML_NAME2 ? childElements.filter((el) => el?.name === SD_TOC_XML_NAME2) : [];
+    if (tocElements.length === 0) {
+      translatedContent.push(...translateNodes2(params3, [child], parentPath));
+      return;
+    }
+    const remainingElements = childElements.filter((el) => el?.name !== SD_TOC_XML_NAME2);
+    if (hasMeaningfulParagraphContent2(remainingElements)) {
+      translatedContent.push(...translateNodes2(params3, [
+        {
+          ...child,
+          elements: remainingElements
+        }
+      ], parentPath));
+    }
+    tocElements.forEach((tocElement) => {
+      translatedContent.push(...translateNodes2(params3, [tocElement], [...parentPath, child]));
+    });
+  });
+  return translatedContent;
+}, normalizeDocPartContent2 = (nodes = []) => {
   const normalized = [];
   nodes.forEach((node4) => {
     if (inlineNodeTypes2.has(node4?.type)) {
@@ -299235,6 +299374,7 @@ var SKIP_FIELD_PROCESSING_NODE_NAMES2, shouldSkipFieldProcessing2 = (node4) => S
   let currentFieldStack = [];
   let unpairedEnd = null;
   let collecting = false;
+  const rawNodeSourceTokens = new WeakMap;
   const finalizeField = () => {
     if (collecting) {
       const collectedNodes = collectedNodesStack.pop().filter((n) => n !== null);
@@ -299252,17 +299392,32 @@ var SKIP_FIELD_PROCESSING_NODE_NAMES2, shouldSkipFieldProcessing2 = (node4) => S
       unpairedEnd = true;
     }
   };
-  for (const node4 of nodes) {
-    const rawNode = carbonCopy2(node4);
+  const captureRawNodeForCurrentField = (rawNode, capturedRawNodes, rawSourceToken) => {
+    if (rawCollectedNodesStack.length === 0)
+      return;
+    if (capturedRawNodes.has(rawNode))
+      return;
+    const currentRawStack = rawCollectedNodesStack[rawCollectedNodesStack.length - 1];
+    const lastRawNode = currentRawStack[currentRawStack.length - 1];
+    const canMergeIntoLastNode = lastRawNode?.name === "w:r" && rawNode?.name === "w:r" && rawNodeSourceTokens.get(lastRawNode) === rawSourceToken && Array.isArray(lastRawNode.elements) && Array.isArray(rawNode.elements);
+    if (canMergeIntoLastNode) {
+      lastRawNode.elements.push(...carbonCopy2(rawNode.elements));
+    } else {
+      currentRawStack.push(rawNode);
+      rawNodeSourceTokens.set(rawNode, rawSourceToken);
+    }
+    capturedRawNodes.add(rawNode);
+  };
+  const processNode = (node4, rawNode, capturedRawNodes, rawSourceToken) => {
     collecting = collectedNodesStack.length > 0;
     if (shouldSkipFieldProcessing2(node4)) {
       if (collecting) {
         collectedNodesStack[collectedNodesStack.length - 1].push(node4);
-        rawCollectedNodesStack[collectedNodesStack.length - 1].push(rawNode);
+        captureRawNodeForCurrentField(rawNode, capturedRawNodes, rawSourceToken);
       } else {
         processedNodes.push(node4);
       }
-      continue;
+      return;
     }
     const fldCharEl = node4.elements?.find((el) => el.name === "w:fldChar");
     const fldType = fldCharEl?.attributes?.["w:fldCharType"];
@@ -299280,22 +299435,25 @@ var SKIP_FIELD_PROCESSING_NODE_NAMES2, shouldSkipFieldProcessing2 = (node4) => S
           } else {
             processedNodes.push(...processed);
           }
-          continue;
+          return;
         }
       }
     }
     if (fldType === "begin") {
       collectedNodesStack.push([]);
-      rawCollectedNodesStack.push([rawNode]);
+      const rawStack = [rawNode];
+      rawCollectedNodesStack.push(rawStack);
+      rawNodeSourceTokens.set(rawNode, rawSourceToken);
+      capturedRawNodes.add(rawNode);
       currentFieldStack.push({ instrText: "", instructionTokens: [], afterSeparate: false });
-      continue;
+      return;
     }
     if (collecting && currentFieldStack.length > 0) {
       const currentField = currentFieldStack[currentFieldStack.length - 1];
       if (!currentField.afterSeparate) {
         const instructionTokens = extractInstructionTokensFromNode2(node4);
         if (instructionTokens.length > 0) {
-          rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
+          captureRawNodeForCurrentField(rawNode, capturedRawNodes, rawSourceToken);
           currentField.instructionTokens.push(...instructionTokens);
           const instrTextValue = instrTextEl?.elements?.[0]?.text;
           if (instrTextValue != null) {
@@ -299304,25 +299462,25 @@ var SKIP_FIELD_PROCESSING_NODE_NAMES2, shouldSkipFieldProcessing2 = (node4) => S
           if (instructionTokens.some((token) => token.type === "tab")) {
             currentField.instrText += "\t";
           }
-          continue;
+          return;
         }
       }
     }
     if (fldType === "end") {
       if (collecting) {
-        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
+        captureRawNodeForCurrentField(rawNode, capturedRawNodes, rawSourceToken);
       }
       finalizeField();
-      continue;
+      return;
     } else if (fldType === "separate") {
       if (collecting) {
-        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
+        captureRawNodeForCurrentField(rawNode, capturedRawNodes, rawSourceToken);
         const currentField = currentFieldStack[currentFieldStack.length - 1];
         if (currentField) {
           currentField.afterSeparate = true;
         }
       }
-      continue;
+      return;
     }
     if (Array.isArray(node4.elements)) {
       const childResult = preProcessNodesForFldChar2(node4.elements, docx);
@@ -299331,24 +299489,37 @@ var SKIP_FIELD_PROCESSING_NODE_NAMES2, shouldSkipFieldProcessing2 = (node4) => S
         childResult.unpairedBegin.forEach((pendingField) => {
           currentFieldStack.push(pendingField.fieldInfo);
           collectedNodesStack.push([node4]);
-          rawCollectedNodesStack.push([rawNode]);
+          const rawStack = [rawNode];
+          rawCollectedNodesStack.push(rawStack);
+          rawNodeSourceTokens.set(rawNode, rawSourceToken);
+          capturedRawNodes.add(rawNode);
         });
       } else if (childResult.unpairedEnd) {
         collectedNodesStack[collectedNodesStack.length - 1].push(node4);
-        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
+        captureRawNodeForCurrentField(rawNode, capturedRawNodes, rawSourceToken);
         finalizeField();
       } else if (collecting) {
         collectedNodesStack[collectedNodesStack.length - 1].push(node4);
-        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
+        captureRawNodeForCurrentField(rawNode, capturedRawNodes, rawSourceToken);
       } else {
         processedNodes.push(node4);
       }
     } else if (collecting) {
       collectedNodesStack[collectedNodesStack.length - 1].push(node4);
-      rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
+      captureRawNodeForCurrentField(rawNode, capturedRawNodes, rawSourceToken);
     } else {
       processedNodes.push(node4);
     }
+  };
+  for (const node4 of nodes) {
+    const rawNode = carbonCopy2(node4);
+    const logicalNodes = expandNodeForFieldProcessing2(node4);
+    const rawLogicalNodes = expandNodeForFieldProcessing2(rawNode);
+    const capturedRawNodes = new Set;
+    const rawSourceToken = {};
+    logicalNodes.forEach((logicalNode, index3) => {
+      processNode(logicalNode, rawLogicalNodes[index3] ?? rawNode, capturedRawNodes, rawSourceToken);
+    });
   }
   let unpairedBegin = null;
   if (collectedNodesStack.length > 0) {
@@ -299382,10 +299553,62 @@ var SKIP_FIELD_PROCESSING_NODE_NAMES2, shouldSkipFieldProcessing2 = (node4) => S
     }
   });
   return tokens;
+}, FIELD_CONTROL_ELEMENT_NAMES2, INSTRUCTION_ELEMENT_NAMES2, cloneNodeWithElements2 = (node4, elements) => ({
+  ...node4,
+  elements: carbonCopy2(elements)
+}), expandNodeForFieldProcessing2 = (node4) => {
+  const elements = Array.isArray(node4?.elements) ? node4.elements : null;
+  if (node4?.name !== "w:r" || !elements || elements.length === 0) {
+    return [node4];
+  }
+  const runProperties = elements.filter((el) => el?.name === "w:rPr");
+  const contentElements = elements.filter((el) => el?.name !== "w:rPr");
+  const logicalNodes = [];
+  let currentKind = null;
+  let currentElements = [];
+  const flushCurrentGroup = () => {
+    if (currentElements.length === 0)
+      return;
+    logicalNodes.push(cloneNodeWithElements2(node4, [...runProperties, ...currentElements]));
+    currentElements = [];
+    currentKind = null;
+  };
+  contentElements.forEach((element3) => {
+    if (!element3?.name) {
+      if (currentKind !== "content") {
+        flushCurrentGroup();
+        currentKind = "content";
+      }
+      currentElements.push(element3);
+      return;
+    }
+    if (FIELD_CONTROL_ELEMENT_NAMES2.has(element3.name)) {
+      flushCurrentGroup();
+      logicalNodes.push(cloneNodeWithElements2(node4, [...runProperties, element3]));
+      return;
+    }
+    if (INSTRUCTION_ELEMENT_NAMES2.has(element3.name)) {
+      if (currentKind !== "instruction") {
+        flushCurrentGroup();
+        currentKind = "instruction";
+      }
+      currentElements.push(element3);
+      return;
+    }
+    if (currentKind !== "content") {
+      flushCurrentGroup();
+      currentKind = "content";
+    }
+    currentElements.push(element3);
+  });
+  flushCurrentGroup();
+  return logicalNodes.length > 1 ? logicalNodes : [node4];
 };
 var init_preProcessNodesForFldChar = __esm(() => {
   init_fld_preprocessors();
   SKIP_FIELD_PROCESSING_NODE_NAMES2 = new Set(["w:drawing", "w:pict"]);
+  FIELD_CONTROL_ELEMENT_NAMES2 = new Set(["w:fldChar"]);
+  INSTRUCTION_ELEMENT_NAMES2 = new Set(["w:instrText", "w:tab"]);
 });
 
 // ../../packages/super-editor/src/core/super-converter/field-references/preProcessPageFieldsOnly.js
@@ -303014,30 +303237,43 @@ function translateDocumentPartObj2(params3) {
   };
   return result;
 }
+function sanitizeId2(id2) {
+  if (typeof id2 === "string" && id2.trim() !== "") {
+    return id2.trim();
+  }
+  return;
+}
 function generateSdtPrForDocPartObj2(attrs) {
   const existingDocPartObj = attrs.sdtPr?.elements?.find((el) => el.name === "w:docPartObj");
   const existingDocPartGallery = existingDocPartObj?.elements?.find((el) => el.name === "w:docPartGallery")?.attributes?.["w:val"];
   const docPartGallery = attrs.docPartGallery ?? existingDocPartGallery ?? null;
-  const id2 = attrs.id ?? attrs.sdtPr?.elements?.find((el) => el.name === "w:id")?.attributes?.["w:val"] ?? "";
+  const id2 = sanitizeId2(attrs.id ?? attrs.sdtPr?.elements?.find((el) => el.name === "w:id")?.attributes?.["w:val"]);
   const docPartUnique = attrs.docPartUnique ?? existingDocPartObj?.elements?.some((el) => el.name === "w:docPartUnique") ?? false;
   if (docPartGallery === null) {
     if (attrs.sdtPr) {
-      return attrs.sdtPr;
+      const filteredSdtPr = {
+        ...attrs.sdtPr,
+        elements: Array.isArray(attrs.sdtPr.elements) ? attrs.sdtPr.elements.filter((el) => !(el.name === "w:id" && el.attributes?.["w:val"]?.trim() === "")) : attrs.sdtPr.elements
+      };
+      return filteredSdtPr;
+    }
+    const elements = [
+      {
+        name: "w:docPartObj",
+        elements: []
+      }
+    ];
+    if (id2 != null) {
+      elements.unshift({
+        name: "w:id",
+        attributes: {
+          "w:val": id2
+        }
+      });
     }
     return {
       name: "w:sdtPr",
-      elements: [
-        {
-          name: "w:id",
-          attributes: {
-            "w:val": id2
-          }
-        },
-        {
-          name: "w:docPartObj",
-          elements: []
-        }
-      ]
+      elements
     };
   }
   const docPartObjElements = [
@@ -303052,17 +303288,19 @@ function generateSdtPrForDocPartObj2(attrs) {
     docPartObjElements.push({ name: "w:docPartUnique" });
   }
   const sdtPrElements = [
-    {
-      name: "w:id",
-      attributes: {
-        "w:val": id2
-      }
-    },
     {
       name: "w:docPartObj",
       elements: docPartObjElements
     }
   ];
+  if (id2 != null) {
+    sdtPrElements.unshift({
+      name: "w:id",
+      attributes: {
+        "w:val": id2
+      }
+    });
+  }
   if (attrs.sdtPr?.elements && Array.isArray(attrs.sdtPr.elements)) {
     const elementsToExclude = ["w:id", "w:docPartObj"];
     const passthroughElements = attrs.sdtPr.elements.filter((el) => el && el.name && !elementsToExclude.includes(el.name));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.2.0-next.130",
+  "version": "0.2.0-next.131",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -22,19 +22,19 @@
     "typescript": "^5.9.2",
     "@superdoc/pm-adapter": "0.0.0",
     "@superdoc/super-editor": "0.0.1",
-    "superdoc": "1.18.0",
-    "@superdoc/document-api": "0.0.1"
+    "@superdoc/document-api": "0.0.1",
+    "superdoc": "1.18.0"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.130",
-    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.130",
-    "@superdoc-dev/cli-linux-x64": "0.2.0-next.130",
-    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.130",
-    "@superdoc-dev/cli-windows-x64": "0.2.0-next.130"
+    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.131",
+    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.131",
+    "@superdoc-dev/cli-linux-x64": "0.2.0-next.131",
+    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.131",
+    "@superdoc-dev/cli-windows-x64": "0.2.0-next.131"
   },
   "scripts": {
     "dev": "bun run src/index.ts",