@harbour-enterprises/superdoc 0.13.0-RC3 → 0.13.0-next.2

package/dist/super-editor/chunks/{converter-BbSSdo_p.js → converter-DW8-tb6t.js}

@@ -12438,7 +12438,7 @@ const OPT_PRESERVE_WS = 1, OPT_PRESERVE_WS_FULL = 2, OPT_OPEN_LEFT = 4;
 function wsOptionsFor(type2, preserveWhitespace, base) {
   if (preserveWhitespace != null)
     return (preserveWhitespace ? OPT_PRESERVE_WS : 0) | (preserveWhitespace === "full" ? OPT_PRESERVE_WS_FULL : 0);
-  return type2 && type2.whitespace == "pre" ? OPT_PRESERVE_WS | OPT_PRESERVE_WS_FULL : base & -5;
+  return type2 && type2.whitespace == "pre" ? OPT_PRESERVE_WS | OPT_PRESERVE_WS_FULL : base & ~OPT_OPEN_LEFT;
 }
 class NodeContext {
   constructor(type2, attrs, marks, solid, match, options2) {
@@ -15409,7 +15409,7 @@ class Transaction extends Transform {
       throw new RangeError("Selection passed to setSelection must point at the current document");
     this.curSelection = selection;
     this.curSelectionFor = this.steps.length;
-    this.updated = (this.updated | UPDATED_SEL) & -3;
+    this.updated = (this.updated | UPDATED_SEL) & ~UPDATED_MARKS;
     this.storedMarks = null;
     return this;
   }
@@ -15460,7 +15460,7 @@ class Transaction extends Transform {
   */
   addStep(step, doc2) {
     super.addStep(step, doc2);
-    this.updated = this.updated & -3;
+    this.updated = this.updated & ~UPDATED_MARKS;
     this.storedMarks = null;
   }
   /**
@@ -16076,7 +16076,6 @@ const getLineHeightValueString = (lineHeight, defaultUnit, lineRule = "", isObje
   if (Number.isNaN(value) || value === 0) return {};
   if (lineRule === "atLeast" && value < 1) return {};
   unit = unit ? unit : defaultUnit;
-  value += unit ? 4 : 0.2;
   return isObject ? { ["line-height"]: `${value}${unit}` } : `line-height: ${value}${unit}`;
 };
 const deobfuscateFont = (arrayBuffer, guidHex) => {
@@ -17341,6 +17340,16 @@ const carbonCopy = (obj) => {
     return void 0;
   }
 };
+const baseOrderedListDef = {
+  "attributes": {
+    "w:abstractNumId": "1"
+  }
+};
+const baseBulletList = {
+  "attributes": {
+    "w:abstractNumId": "0"
+  }
+};
 const baseNumbering = {
   "declaration": {
     "attributes": {
@@ -18855,7 +18864,9 @@ function exportSchemaToJson(params) {
     shapeContainer: translateShapeContainer,
     shapeTextbox: translateShapeTextbox,
     contentBlock: translateContentBlock,
-    structuredContent: translateStructuredContent
+    structuredContent: translateStructuredContent,
+    "page-number": translatePageNumberNode,
+    "total-page-number": translateTotalPageNumberNode
   };
   if (!router[type2]) {
     console.error("No translation function found for node type:", type2);
@@ -18959,7 +18970,7 @@ function generateParagraphProperties(node2) {
     };
     pPrElements.push(spacingElement);
   }
-  if (indent && Object.values(indent).some((v) => v !== 0)) {
+  if (indent) {
     const { left, right, firstLine, hanging } = indent;
     const attributes = {};
     if (left || left === 0) attributes["w:left"] = pixelsToTwips(left);
@@ -18974,7 +18985,7 @@ function generateParagraphProperties(node2) {
       attributes
     };
     pPrElements.push(indentElement);
-  } else if (textIndent && textIndent !== "0in") {
+  } else if (textIndent) {
     const indentElement = {
       name: "w:ind",
       attributes: {
@@ -19023,9 +19034,6 @@ function generateParagraphProperties(node2) {
   if (sectPr) {
     pPrElements.push(sectPr);
   }
-  const numPr = node2.attrs?.paragraphProperties?.elements?.find((n) => n.name === "w:numPr");
-  const hasNumPr = pPrElements.some((n) => n.name === "w:numPr");
-  if (numPr && !hasNumPr) pPrElements.push(numPr);
   if (!pPrElements.length) return null;
   return {
     name: "w:pPr",
@@ -19274,68 +19282,160 @@ function addNewImageRelationship(params, imagePath) {
   return newId;
 }
 function translateList(params) {
-  const { node: node2 } = params;
-  const { attrs = {} } = node2;
-  if (node2.content.length > 1) {
-    flattenContent(params);
-    throw new Error("Multi list not supported yet");
-  }
-  const listItem = node2.content[0];
-  const { numId, level } = listItem.attrs;
-  let numPrTag;
-  if (numId) {
-    numPrTag = generateNumPrTag(numId, level);
-  }
-  const paragraphNode = node2.content[0]?.content[0];
-  const outputNode = exportSchemaToJson({ ...params, node: paragraphNode });
-  const pPr = outputNode.elements.find((n) => n.name === "w:pPr");
-  if (pPr && pPr.elements) pPr.elements.unshift(numPrTag);
-  const indentTag = restoreIndent(listItem.attrs.indent);
-  indentTag && pPr?.elements?.push(indentTag);
-  const runNode = outputNode.elements?.find((n) => n.name === "w:r");
-  const rPr = runNode?.elements?.find((n) => n.name === "w:rPr");
-  if (rPr) pPr.elements.push(rPr);
-  if (listItem.attrs.numPrType !== "inline") {
-    const numPrIndex = pPr?.elements?.findIndex((e) => e.name === "w:numPr");
-    if (numPrIndex !== -1) {
-      pPr?.elements?.splice(numPrIndex, 1);
-    }
-  }
-  return [outputNode];
-}
-const restoreIndent = (indent) => {
-  const attributes = {};
-  if (!indent) indent = {};
-  if (indent.left || indent.left === 0) attributes["w:left"] = pixelsToTwips(indent.left);
-  if (indent.right || indent.right === 0) attributes["w:right"] = pixelsToTwips(indent.right);
-  if (indent.firstLine || indent.firstLine === 0) attributes["w:firstLine"] = pixelsToTwips(indent.firstLine);
-  if (indent.hanging || indent.hanging === 0) attributes["w:hanging"] = pixelsToTwips(indent.hanging);
-  if (indent.leftChars || indent.leftChars === 0) attributes["w:leftChars"] = pixelsToTwips(indent.leftChars);
-  if (!Object.keys(attributes).length) return;
-  return {
-    name: "w:ind",
+  const { type: type2 } = params.node;
+  const flatContent = flattenContent(params);
+  const listNodes = [];
+  flatContent.forEach((listNode) => {
+    const { level, listType, pPrs: additionalPprs, content, attrs = {} } = listNode;
+    const attrsNumId = listNode.attrs.numId;
+    const actualNumId = attrsNumId || listNode.listId;
+    const listId = actualNumId ?? generateNewListDefinition(params, listType);
+    const pPr = getListParagraphProperties(level, listId, additionalPprs);
+    content.forEach((contentNode, index) => {
+      const paragraphNode = Object.assign({}, contentNode);
+      paragraphNode.attrs = {
+        ...paragraphNode.attrs,
+        ...listNode.attrs
+      };
+      const outputNode = exportSchemaToJson({ ...params, node: paragraphNode });
+      if (!outputNode.elements) {
+        outputNode.elements = [];
+      }
+      if (Array.isArray(outputNode)) {
+        const mapped = [];
+        outputNode.forEach((el, index2) => {
+          el.elements.forEach((element) => {
+            if (element.name === "w:pPr") return;
+            mapped.push(element);
+          });
+          if (index2 < outputNode.length - 1) mapped.push({ name: "w:br", type: "element" });
+        });
+        mapped.unshift(carbonCopy(pPr));
+        return listNodes.push({ name: "w:p", elements: mapped });
+      }
+      const propsElementIndex = outputNode.elements.findIndex((e) => e.name === "w:pPr");
+      const content2 = outputNode.elements.filter((e) => e.name !== "w:pPr");
+      if (!content2.length && !Array.isArray(outputNode)) {
+        const elements = contentNode.attrs.paragraphProperties ? [contentNode.attrs.paragraphProperties] : [];
+        const spacer = {
+          name: "w:p",
+          type: "element",
+          elements
+        };
+        return listNodes.push(spacer);
+      }
+      outputNode.elements = outputNode.elements.map((el, index2) => {
+        if (el.name === "w:sdt") {
+          const contentIndex = el.elements.findIndex((e) => e.name === "w:sdtContent");
+          const content3 = el.elements[contentIndex];
+          const innerContent = content3.elements[0];
+          if (innerContent.name === "w:p") {
+            content3.elements = innerContent.elements;
+          }
+          return {
+            name: "w:r",
+            type: "element",
+            elements: [el]
+          };
+        } else {
+          return el;
+        }
+      });
+      const { attributes: generalAttributes } = attrs;
+      const { originalInlineRunProps } = generalAttributes || {};
+      if (originalInlineRunProps) pPr.elements.push(originalInlineRunProps);
+      if (propsElementIndex === -1) {
+        outputNode.elements.unshift(carbonCopy(pPr));
+      } else {
+        const resultProps = carbonCopy(pPr).elements.map((item) => {
+          const isChanged = outputNode.elements[propsElementIndex].elements.find((e) => e.name === item.name);
+          return isChanged ? isChanged : item;
+        });
+        outputNode.elements[propsElementIndex].elements = resultProps;
+      }
+      let importedFontSize;
+      if (listNode.attrs?.importedFontSize) {
+        const fontNoUnit = parseInt(listNode.attrs.importedFontSize.split("pt")[0]);
+        importedFontSize = {
+          name: "w:sz",
+          attributes: { "w:val": fontNoUnit * 2 }
+        };
+      }
+      let importedFontFamily;
+      if (listNode.attrs?.importedFontFamily) {
+        importedFontFamily = {
+          name: "w:rFonts",
+          attributes: { "w:ascii": listNode.attrs?.importedFontFamily, "w:hAnsi": listNode.attrs?.importedFontFamily }
+        };
+      }
+      const rPrElement = outputNode.elements.find((e) => e.name === "w:rPr");
+      if (rPrElement) {
+        rPrElement.elements.push(fontSize);
+      } else if (importedFontSize || importedFontFamily) {
+        const elements = [];
+        if (importedFontSize) elements.push(importedFontSize);
+        if (importedFontFamily) elements.push(importedFontFamily);
+        outputNode.elements.unshift({ name: "w:rPr", elements });
+      }
+      if (index !== 0) {
+        const currentpPr = outputNode.elements.find((e) => e.name === "w:pPr");
+        const numPrIndex = currentpPr.elements.findIndex((e) => e.name === "w:numPr");
+        if (numPrIndex !== -1) currentpPr.elements.splice(numPrIndex, 1);
+      }
+      listNodes.push(outputNode);
+    });
+  });
+  return listNodes;
+}
+function generateNewListDefinition(params, listType) {
+  const nextNumbering = getLargestListDefinitionIndex(params.converter?.numbering?.definitions);
+  const definition = listType === "bullet" ? baseBulletList : baseOrderedListDef;
+  const listId = nextNumbering;
+  const abstractId = definition.attributes["w:abstractNumId"];
+  const newNumDef = {
     type: "element",
-    attributes
+    name: "w:num",
+    attributes: {
+      "w:numId": String(listId),
+      "w16cid:durableId": "485517411"
+    },
+    elements: [
+      { name: "w:abstractNumId", attributes: { "w:val": String(abstractId) } }
+    ]
   };
+  params.converter.numbering.definitions[listId] = newNumDef;
+  return listId;
+}
+const getLargestListDefinitionIndex = (definitions) => {
+  if (!definitions || !Object.keys(definitions).length) return 0;
+  const maxKey = Math.max(...Object.keys(definitions).map((key) => parseInt(key, 10)));
+  return maxKey + 1;
 };
-const generateNumPrTag = (numId, level) => {
+function getListParagraphProperties(level, numId, additionalPprs = []) {
   return {
-    name: "w:numPr",
+    name: "w:pPr",
     type: "element",
     elements: [
       {
-        name: "w:numId",
+        name: "w:numPr",
         type: "element",
-        attributes: { "w:val": numId }
+        elements: [
+          {
+            name: "w:ilvl",
+            type: "element",
+            attributes: { "w:val": level }
+          },
+          {
+            name: "w:numId",
+            type: "element",
+            attributes: { "w:val": numId }
+          }
+        ]
       },
-      {
-        name: "w:ilvl",
-        type: "element",
-        attributes: { "w:val": level }
-      }
+      ...additionalPprs
     ]
   };
-};
+}
 function flattenContent({ node: node2 }) {
   const { content, attrs = {} } = node2;
   const { listId, syncId } = node2.attrs || {};
@@ -19406,7 +19506,10 @@ function preProcessVerticalMergeCells(table, { editorSchema }) {
     if (!row.content) continue;
     for (let cellIndex = 0; cellIndex < row.content?.length; cellIndex++) {
       const cell = row.content[cellIndex];
-      if (!cell) continue;
+      if (!cell) {
+        console.log("no cell");
+        continue;
+      }
       const { attrs } = cell;
       if (attrs.rowspan > 1) {
         const rowsToChange = content.slice(rowIndex + 1, rowIndex + attrs.rowspan);
@@ -20141,7 +20244,7 @@ function getTranslationByAnnotationType(annotationType) {
 const translateFieldAttrsToMarks = (attrs = {}) => {
   const {
     fontFamily,
-    fontSize,
+    fontSize: fontSize2,
     bold,
     underline,
     italic,
@@ -20150,7 +20253,7 @@ const translateFieldAttrsToMarks = (attrs = {}) => {
   } = attrs;
   const marks = [];
   if (fontFamily) marks.push({ type: "fontFamily", attrs: { fontFamily } });
-  if (fontSize) marks.push({ type: "fontSize", attrs: { fontSize } });
+  if (fontSize2) marks.push({ type: "fontSize", attrs: { fontSize: fontSize2 } });
   if (bold) marks.push({ type: "bold", attrs: {} });
   if (underline) marks.push({ type: "underline", attrs: {} });
   if (italic) marks.push({ type: "italic", attrs: {} });
@@ -20371,24 +20474,26 @@ generateXml_fn = function(node2, debug = false) {
   if (!name && node2.type === "text") {
     return node2.text;
   }
-  if (name === "w:instrText") {
-    tags.push(elements[0].text);
-  } else if (name === "w:t" || name === "w:delText" || name === "wp:posOffset") {
-    const text = __privateMethod(this, _DocxExporter_instances, replaceSpecialCharacters_fn).call(this, elements[0].text);
-    tags.push(text);
-  } else {
-    if (elements) {
-      for (let child of elements) {
-        const newElements = __privateMethod(this, _DocxExporter_instances, generateXml_fn).call(this, child);
-        if (!newElements) continue;
-        if (typeof newElements === "string") {
-          tags.push(newElements);
-          continue;
+  if (elements) {
+    if (name === "w:instrText") {
+      tags.push(elements[0].text);
+    } else if (name === "w:t" || name === "w:delText" || name === "wp:posOffset") {
+      const text = __privateMethod(this, _DocxExporter_instances, replaceSpecialCharacters_fn).call(this, elements[0].text);
+      tags.push(text);
+    } else {
+      if (elements) {
+        for (let child of elements) {
+          const newElements = __privateMethod(this, _DocxExporter_instances, generateXml_fn).call(this, child);
+          if (!newElements) continue;
+          if (typeof newElements === "string") {
+            tags.push(newElements);
+            continue;
+          }
+          const removeUndefined = newElements.filter((el) => {
+            return el !== "<undefined>" && el !== "</undefined>";
+          });
+          tags.push(...removeUndefined);
         }
-        const removeUndefined = newElements.filter((el) => {
-          return el !== "<undefined>" && el !== "</undefined>";
-        });
-        tags.push(...removeUndefined);
       }
     }
   }
@@ -20410,7 +20515,7 @@ function applyMarksToHtmlAnnotation(state2, marks) {
     return state2;
   }
   const fontFamily = marks.find((m) => m.type === "fontFamily");
-  const fontSize = marks.find((m) => m.type === "fontSize");
+  const fontSize2 = marks.find((m) => m.type === "fontSize");
   const highlight = marks.find((m) => m.type === "highlight");
   const textStyleType = schema.marks.textStyle;
   const highlightType = schema.marks.highlight;
@@ -20421,17 +20526,17 @@ function applyMarksToHtmlAnnotation(state2, marks) {
     if (!foundTextStyle) {
       tr.addMark(pos, pos + node2.nodeSize, textStyleType.create({
         ...fontFamily?.attrs,
-        ...fontSize?.attrs
+        ...fontSize2?.attrs
       }));
     } else if (!foundTextStyle?.attrs.fontFamily && fontFamily) {
       tr.addMark(pos, pos + node2.nodeSize, textStyleType.create({
         ...foundTextStyle?.attrs,
         ...fontFamily.attrs
       }));
-    } else if (!foundTextStyle?.attrs.fontSize && fontSize) {
+    } else if (!foundTextStyle?.attrs.fontSize && fontSize2) {
       tr.addMark(pos, pos + node2.nodeSize, textStyleType.create({
         ...foundTextStyle?.attrs,
-        ...fontSize.attrs
+        ...fontSize2.attrs
       }));
     }
     if (!foundHighlight) {
@@ -20458,6 +20563,81 @@ function translateStructuredContent(params) {
     elements: nodeElements
   };
 }
+const translatePageNumberNode = (params) => {
+  const outputMarks = processOutputMarks(params.node.attrs?.marksAsAttrs || []);
+  return getAutoPageJson("PAGE", outputMarks);
+};
+const translateTotalPageNumberNode = (params) => {
+  const outputMarks = processOutputMarks(params.node.attrs?.marksAsAttrs || []);
+  return getAutoPageJson("NUMPAGES", outputMarks);
+};
+const getAutoPageJson = (type2, outputMarks = []) => {
+  return [
+    {
+      "name": "w:r",
+      "elements": [
+        {
+          "name": "w:rPr",
+          "elements": outputMarks
+        },
+        {
+          "name": "w:fldChar",
+          "attributes": {
+            "w:fldCharType": "begin"
+          }
+        }
+      ]
+    },
+    {
+      "name": "w:r",
+      "elements": [
+        {
+          "name": "w:rPr",
+          "elements": outputMarks
+        },
+        {
+          "name": "w:instrText",
+          "elements": [
+            {
+              "type": "text",
+              "text": ` ${type2}`
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "w:r",
+      "elements": [
+        {
+          "name": "w:rPr",
+          "elements": outputMarks
+        },
+        {
+          "name": "w:fldChar",
+          "attributes": {
+            "w:fldCharType": "separate"
+          }
+        }
+      ]
+    },
+    {
+      "name": "w:r",
+      "elements": [
+        {
+          "name": "w:rPr",
+          "elements": outputMarks
+        },
+        {
+          "name": "w:fldChar",
+          "attributes": {
+            "w:fldCharType": "end"
+          }
+        }
+      ]
+    }
+  ];
+};
 const defaultInitialXml = `<w:document xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:cx="http://schemas.microsoft.com/office/drawing/2014/chartex" xmlns:cx1="http://schemas.microsoft.com/office/drawing/2015/9/8/chartex" xmlns:cx2="http://schemas.microsoft.com/office/drawing/2015/10/21/chartex" xmlns:cx3="http://schemas.microsoft.com/office/drawing/2016/5/9/chartex" xmlns:cx4="http://schemas.microsoft.com/office/drawing/2016/5/10/chartex" xmlns:cx5="http://schemas.microsoft.com/office/drawing/2016/5/11/chartex" xmlns:cx6="http://schemas.microsoft.com/office/drawing/2016/5/12/chartex" xmlns:cx7="http://schemas.microsoft.com/office/drawing/2016/5/13/chartex" xmlns:cx8="http://schemas.microsoft.com/office/drawing/2016/5/14/chartex" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:aink="http://schemas.microsoft.com/office/drawing/2016/ink" xmlns:am3d="http://schemas.microsoft.com/office/drawing/2017/model3d" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:oel="http://schemas.microsoft.com/office/2019/extlst" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:w16cex="http://schemas.microsoft.com/office/word/2018/wordml/cex" xmlns:w16cid="http://schemas.microsoft.com/office/word/2016/wordml/cid" xmlns:w16="http://schemas.microsoft.com/office/word/2018/wordml" xmlns:w16sdtdh="http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash" xmlns:w16se="http://schemas.microsoft.com/office/word/2015/wordml/symex" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" mc:Ignorable="w14 w15 w16se w16cid w16 w16cex w16sdtdh wp14"><w:body></w:body></w:document>`;
 const parseXmlToJson = (xml) => {
   return JSON.parse(xmljs.xml2json(xml, null, 2));
@@ -20555,7 +20735,7 @@ function handleTableCellNode(node2, row, table, rowBorders, columnWidth = null,
   const attributes = {};
   const referencedStyles = getReferencedTableStyles(styleTag, docx) || {};
   attributes.cellMargins = getTableCellMargins(marginTag, referencedStyles);
-  const { fontSize, fonts = {} } = referencedStyles;
+  const { fontSize: fontSize2, fonts = {} } = referencedStyles;
   const fontFamily = fonts["ascii"];
   if (width) {
     attributes["colwidth"] = [width];
@@ -20583,7 +20763,7 @@ function handleTableCellNode(node2, row, table, rowBorders, columnWidth = null,
   if (colspan) attributes["colspan"] = parseInt(colspan, 10);
   if (background) attributes["background"] = background;
   attributes["verticalAlign"] = verticalAlign;
-  if (fontSize) attributes["fontSize"] = fontSize;
+  if (fontSize2) attributes["fontSize"] = fontSize2;
   if (fontFamily) attributes["fontFamily"] = fontFamily["ascii"];
   if (rowBorders) attributes["borders"] = { ...rowBorders };
   if (inlineBorders) attributes["borders"] = Object.assign(attributes["borders"] || {}, inlineBorders);
@@ -20681,8 +20861,8 @@ function getReferencedTableStyles(tblStyleTag, docx, nodeListHandler2) {
       const { "w:ascii": ascii, "w:hAnsi": hAnsi, "w:cs": cs } = fonts.attributes;
       stylesToReturn.fonts = { ascii, hAnsi, cs };
     }
-    const fontSize = rPr.elements.find((el) => el.name === "w:sz");
-    if (fontSize?.attributes) stylesToReturn.fontSize = halfPointToPoints(fontSize.attributes["w:val"]) + "pt";
+    const fontSize2 = rPr.elements.find((el) => el.name === "w:sz");
+    if (fontSize2?.attributes) stylesToReturn.fontSize = halfPointToPoints(fontSize2.attributes["w:val"]) + "pt";
   }
   const tblPr = styleTag.elements.find((el) => el.name === "w:tblPr");
   if (tblPr && tblPr.elements) {
@@ -21135,6 +21315,11 @@ function getElementName(element) {
 const isPropertiesElement = (element) => {
   return !!SuperConverter.propertyTypes[element.name || element.type];
 };
+function hasTextNode(elements) {
+  const runs = elements.filter((el) => el.name === "w:r");
+  const runsHaveText = runs.some((run) => run.elements.some((el) => el.name === "w:t"));
+  return runsHaveText;
+}
 const handleTrackChangeNode = (params) => {
   const { nodes, nodeListHandler: nodeListHandler2 } = params;
   if (nodes.length === 0 || !(nodes[0].name === "w:del" || nodes[0].name === "w:ins" || nodes[0].name === "w:sdt")) {
@@ -21336,118 +21521,221 @@ const areAttrsEqual = (attrsA = {}, attrsB = {}) => {
 };
 const handleListNode = (params) => {
   const { nodes, lists, docx } = params;
-  if (nodes.length === 0 || nodes[0].name !== "w:p" || nodes[0].isList) {
+  if (nodes.length === 0 || nodes[0].name !== "w:p") {
     return { nodes: [], consumed: 0 };
   }
   const node2 = carbonCopy(nodes[0]);
-  const isList = testForList(node2, docx);
-  if (isList) {
-    node2.isList = true;
-    const result = handleListNodes(params, node2);
+  const processedElements = preProcessNodesForFldChar(node2.elements);
+  node2.elements = processedElements;
+  const originalPpr = node2.elements.find((el) => el.name === "w:pPr");
+  if (testForList(node2, docx)) {
+    const siblings = carbonCopy(nodes);
+    const listItems = [];
+    let possibleList = siblings.shift();
+    while (possibleList && testForList(possibleList, docx)) {
+      listItems.push(possibleList);
+      possibleList = siblings.shift();
+      if (possibleList?.elements && !hasTextNode(possibleList.elements)) {
+        const { name } = possibleList;
+        if (name === "w:tbl") continue;
+        listItems.push(possibleList);
+        possibleList = siblings.shift();
+      }
+    }
+    const listNodes = handleListNodes({ listItems, params, originalPpr });
     return {
-      nodes: [result],
-      consumed: 1
+      nodes: [listNodes],
+      consumed: listItems.filter((i) => i.seen).length,
+      lists
     };
   } else {
-    return { nodes: [], consumed: 0 };
+    return { nodes: [], consumed: 0, lists };
   }
 };
 const listHandlerEntity = {
   handlerName: "listHandler",
   handler: handleListNode
 };
-function handleListNodes(params, node2) {
+function handleListNodes({
+  listItems,
+  originalPpr,
+  params,
+  listLevel = 0,
+  actualListLevel = 0,
+  currentListNumId = null,
+  path = "",
+  isNested = false
+}) {
   const { docx, nodeListHandler: nodeListHandler2, lists } = params;
-  const initialpPr = node2.elements.find((el) => el.name === "w:pPr");
+  const parsedListItems = [];
+  let overallListType;
+  let listStyleType;
+  const handleStandardNode2 = nodeListHandler2.handlerEntities.find(
+    (e) => e.handlerName === "standardNodeHandler"
+  )?.handler;
+  if (!handleStandardNode2) {
+    console.error("Standard node handler not found");
+    return { nodes: [], consumed: 0 };
+  }
+  const initialpPr = listItems[0].elements.find((el) => el.name === "w:pPr");
   const styleTag = initialpPr?.elements?.find((el) => el.name === "w:pStyle");
   const styleId = styleTag?.attributes["w:val"];
-  const { numPr: numPrTag, type: numPrType } = getNumPrRecursive({ node: node2, styleId, docx });
-  const currentListNumId = getNumIdFromTag(numPrTag);
-  const iLvlTag = numPrTag?.elements?.find((el) => el.name === "w:ilvl");
-  let iLvl = Number(iLvlTag?.attributes["w:val"]);
-  if (!iLvl && iLvl !== 0) iLvl = getOutlineLevelFromStyleTag(styleId, docx);
-  const {
-    listType,
-    listOrderingType,
-    listrPrs,
-    listpPrs,
-    start,
-    lvlText,
-    lvlJc
-  } = getNodeNumberingDefinition(node2, iLvl, docx);
-  if (!listType) {
-    const pPrIndex = node2.elements.findIndex((el) => el.name === "w:pPr");
-    const pPr = node2.elements[pPrIndex];
-    const numPrIndex2 = pPr?.elements?.findIndex((el) => el.name === "w:numPr");
-    if (numPrIndex2 >= 0) {
-      pPr?.elements?.splice(numPrIndex2, 1);
-      node2.elements[pPrIndex] = pPr;
-    }
-    const styleIdIndex = pPr?.elements?.findIndex((el) => el.name === "w:pStyle");
-    if (styleIdIndex >= 0) pPr?.elements?.splice(styleIdIndex, 1);
-    const fallBack = nodeListHandler2.handler({ ...params, nodes: [node2] })?.filter((n) => n);
-    return fallBack[0];
-  }
-  if (!lists[currentListNumId]) lists[currentListNumId] = { levels: {} };
-  const currentListByNumId = lists[currentListNumId];
-  if (!currentListByNumId.levels[iLvl]) currentListByNumId.levels[iLvl] = Number(start) || 1;
-  else currentListByNumId.levels[iLvl]++;
-  Object.keys(currentListByNumId.levels).forEach((key) => {
-    const level = Number(key);
-    if (level > iLvl) {
-      delete currentListByNumId.levels[level];
-    }
-  });
-  const path = [];
-  if (iLvl > 0) {
-    for (let i = iLvl; i >= 0; i--) {
-      const { start: lvlStart } = getNodeNumberingDefinition(node2, i, docx);
-      if (!currentListByNumId.levels[i]) {
-        currentListByNumId.levels[i] = Number(lvlStart);
+  const numPrTag = getNumPrRecursive({ node: listItems[0], styleId, docx });
+  currentListNumId = getNumIdFromTag(numPrTag);
+  actualListLevel = parseInt(numPrTag?.elements?.find((el) => el.name === "w:ilvl")?.attributes["w:val"]) || 0;
+  if (actualListLevel === void 0) actualListLevel = getOutlineLevelFromStyleTag(styleId, docx);
+  let lastNestedListLevel = 0;
+  for (let [index, item] of listItems.entries()) {
+    if (item.seen) continue;
+    const { attributes, elements, marks = [] } = parseProperties(item);
+    const matchedStyle = getStyleTagFromStyleId(styleId, docx) || {};
+    const { marks: styleIdMarks } = parseProperties(matchedStyle);
+    const textStyle = marks.find((mark) => mark.type === "textStyle");
+    const textStyleFromStyles = styleIdMarks?.find((mark) => mark.type === "textStyle");
+    const {
+      listType,
+      listOrderingType,
+      ilvl,
+      listrPrs,
+      listpPrs,
+      start,
+      lvlText,
+      lvlJc,
+      numId
+    } = getNodeNumberingDefinition(item, listLevel, docx);
+    listStyleType = listOrderingType;
+    const intLevel = parseInt(ilvl);
+    const isRoot = actualListLevel === intLevel && numId === currentListNumId;
+    const isSameListLevelDef = isSameListLevelDefsExceptStart({
+      firstListId: numId,
+      secondListId: currentListNumId,
+      level: intLevel,
+      pStyleId: null,
+      docx
+    });
+    const isDifferentList = numId !== currentListNumId && !isSameListLevelDef;
+    const isNested2 = listLevel < intLevel || listLevel === intLevel && isDifferentList && lastNestedListLevel === listLevel;
+    if (!lists[currentListNumId]) lists[currentListNumId] = {};
+    if (!lists[currentListNumId][listLevel]) {
+      lists[currentListNumId][listLevel] = Number(start);
+    }
+    const nodeAttributes = {};
+    if (isRoot && !isNested2) {
+      overallListType = listType;
+      item.seen = true;
+      const schemaElements = [];
+      const nodeContents = nodeListHandler2.handler({ ...params, nodes: [attributes.paragraphProperties, ...elements] })?.filter((n) => n) || [];
+      let parNode = {
+        type: "paragraph",
+        content: nodeContents
+      };
+      if (parNode.content) {
+        parNode = {
+          ...parNode,
+          attrs: {
+            textAlign: textStyle?.attrs.textAlign || textStyleFromStyles?.attrs.textAlign || null,
+            rsidRDefault: attributes?.["w:rsidRDefault"] || null,
+            styleId
+          },
+          content: mergeTextNodes(parNode.content)
+        };
+      }
+      schemaElements.push(parNode);
+      lastNestedListLevel = listLevel;
+      let thisItemPath = [];
+      if (listStyleType !== "bullet") {
+        thisItemPath = [...path, lists[currentListNumId][listLevel]];
+        lists[currentListNumId][actualListLevel]++;
+      }
+      if (!path.length && actualListLevel > 0) {
+        const currentDef = lists[currentListNumId];
+        if (currentDef) {
+          const newPath = [];
+          Object.keys(currentDef).forEach((key) => {
+            newPath.push(currentDef[key]);
+          });
+          thisItemPath = newPath;
+        }
+      }
+      const pPr = item.elements.find((el) => el.name === "w:pPr");
+      let indent = pPr?.elements.find((el) => el.name === "w:ind");
+      const pPrFromStyles = matchedStyle?.elements?.find((style) => style.name === "w:pPr");
+      const stylesIndent = pPrFromStyles?.elements?.find((el) => el.name === "w:ind");
+      if (!indent) indent = stylesIndent;
+      if (indent) {
+        const indentAttrs = {};
+        if (!indent.attributes) indent.attributes = {};
+        if (indent.attributes["w:left"] !== void 0) indentAttrs.left = twipsToPixels(indent.attributes["w:left"]);
+        if (indent.attributes["w:right"] !== void 0) indentAttrs.right = twipsToPixels(indent.attributes["w:right"]);
+        if (indent.attributes["w:firstLine"] !== void 0) indentAttrs.firstLine = twipsToPixels(indent.attributes["w:firstLine"]);
+        if (indent.attributes["w:hanging"] !== void 0) indentAttrs.hanging = twipsToPixels(indent.attributes["w:hanging"]);
+        nodeAttributes["indent"] = indentAttrs;
+      }
+      if (listpPrs) nodeAttributes["listParagraphProperties"] = listpPrs;
+      if (listrPrs) nodeAttributes["listRunProperties"] = listrPrs;
+      nodeAttributes["textStyle"] = textStyle;
+      nodeAttributes["order"] = start;
+      nodeAttributes["lvlText"] = lvlText;
+      nodeAttributes["lvlJc"] = textStyle?.attrs.textAlign;
+      nodeAttributes["listLevel"] = thisItemPath;
+      nodeAttributes["listNumberingType"] = listOrderingType;
+      nodeAttributes["attributes"] = {
+        parentAttributes: item?.attributes || null
+      };
+      const originalRunProps = originalPpr?.elements?.find((el) => el.name === "w:rPr");
+      if (originalRunProps) {
+        nodeAttributes.attributes["originalInlineRunProps"] = originalRunProps;
+      }
+      nodeAttributes["numId"] = numId;
+      if (docx) {
+        nodeAttributes["spacing"] = getParagraphSpacing(item, docx, styleId);
+      }
+      const newListItem = createListItem(schemaElements, nodeAttributes, []);
+      parsedListItems.push(newListItem);
+    } else if (isNested2) {
+      const newPath = [...path, lists[currentListNumId][listLevel]];
+      const sublist = handleListNodes({
+        listItems: listItems.slice(index),
+        originalPpr,
+        params,
+        listLevel: listLevel + 1,
+        actualListLevel: listLevel,
+        currentListNumId: numId,
+        path: newPath,
+        isNested: true
+      });
+      lastNestedListLevel = sublist.lastNestedListLevel;
+      delete sublist.lastNestedListLevel;
+      const lastItem = parsedListItems[parsedListItems.length - 1];
+      if (!lastItem) {
+        parsedListItems.push(createListItem([sublist], nodeAttributes, []));
+      } else {
+        lastItem.content.push(sublist);
       }
-      path.unshift(currentListByNumId.levels[i]);
+    } else if (!numId) {
+      item.seen = true;
+      const n = handleStandardNode2({ ...params, nodes: [item] }).nodes[0];
+      parsedListItems[parsedListItems.length - 1]?.content.push(n);
+    } else {
+      lastNestedListLevel = listLevel;
+      if (listLevel > 0 && item.elements[0].elements.find((el) => el.name === "w:numPr")) {
+        lists[currentListNumId][listLevel] = 0;
+      }
+      break;
     }
   }
-  if (!path.length) path.push(currentListByNumId.levels[iLvl]);
-  const attrs = {};
-  attrs.lvlText = lvlText;
-  attrs.listLevel = path;
-  attrs.listNumberingType = listOrderingType;
-  attrs.numId = currentListNumId;
-  attrs.level = iLvl;
-  attrs.numPrType = numPrType;
-  attrs.styleId = styleId;
-  node2.isList = true;
-  const nodePpr = node2.attrs?.paragraphProperties?.elements?.find((el) => el.name === "w:pPr");
-  const numPrIndex = node2.attrs?.paragraphProperties?.elements?.findIndex((el) => el.name === "w:numPr");
-  nodePpr?.elements?.splice(numPrIndex, 1);
-  const listContents = nodeListHandler2.handler({ ...params, nodes: [node2] });
-  const innerParagraph = listContents.find((el) => el.type === "paragraph");
-  const firstElement = innerParagraph.content[0];
-  firstElement?.marks?.find((mark) => mark.type === "textStyle");
-  attrs.indent = listpPrs?.indent;
-  const processedContents = listContents.map((el, index) => {
-    const { attrs: elementAttrs } = el;
-    const { indent, textIndent, paragraphProperties, ...rest } = elementAttrs;
-    if (index === 0 && !attrs.indent) attrs.indent = indent;
-    return {
-      ...el,
-      attrs: rest
-    };
-  });
-  const listItem = {
-    type: "listItem",
-    content: processedContents || [],
-    attrs
-  };
   const resultingList = {
-    type: listType,
-    content: [listItem],
+    type: overallListType || "bulletList",
+    content: parsedListItems,
     attrs: {
-      "list-style-type": listOrderingType,
-      listId: currentListNumId
+      "list-style-type": listStyleType,
+      listId: currentListNumId,
+      attributes: {
+        parentAttributes: listItems[0]?.attributes || null
+      }
     }
   };
+  if (isNested) resultingList.lastNestedListLevel = lastNestedListLevel;
   return resultingList;
 }
 const getOutlineLevelFromStyleTag = (styleTag, docx) => {
@@ -21466,27 +21754,11 @@ function testForList(node2, docx) {
   const paragraphStyle = pPr.elements?.find((el) => el.name === "w:pStyle");
   let numPr = pPr.elements?.find((el) => el.name === "w:numPr");
   let numId = getNumIdFromTag(numPr);
-  const ilvlTag = numPr?.elements?.find((el) => el.name === "w:ilvl");
-  let ilvl = ilvlTag?.attributes["w:val"];
-  let outlinelvl;
   const styleId = paragraphStyle?.attributes["w:val"];
-  const styleTag = getStyleTagFromStyleId(styleId, docx);
-  if (styleTag && !numId) {
-    const { numPr: numPrRecursve, type: type2 } = getNumPrRecursive({ node: node2, styleId, docx });
-    numPr = numPrRecursve;
+  if (styleId && !numId) {
+    numPr = getNumPrRecursive({ node: node2, styleId, docx });
     numId = getNumIdFromTag(numPr);
-    const stylePpr = styleTag?.elements?.find((el) => el.name === "w:pPr");
-    stylePpr?.elements?.find((el) => el.name === "w:numPr");
-    ilvl = stylePpr?.elements?.find((el) => el.name === "w:ilvl")?.attributes["w:val"];
-    outlinelvl = stylePpr?.elements?.find((el) => el.name === "w:outlineLvl")?.attributes["w:val"];
-    ilvl = outlinelvl || ilvl;
-  }
-  const numbering = docx["word/numbering.xml"] || {};
-  const numDefinition = numbering?.elements?.[0].elements?.find((el) => el.attributes?.["w:numId"] == numId);
-  const abstractNumId = numDefinition?.elements?.find((el) => el.name === "w:abstractNumId")?.attributes["w:val"];
-  const abstractNumDefinition = numbering?.elements?.[0].elements?.find((el) => el.attributes?.["w:abstractNumId"] == abstractNumId);
-  const levelDefinition = abstractNumDefinition?.elements?.find((el) => el.name === "w:lvl" && el.attributes?.["w:ilvl"] == ilvl);
-  if (!levelDefinition) return false;
+  }
   return !!numId;
 }
 const getNumIdFromTag = (tag) => {
@@ -21494,19 +21766,20 @@ const getNumIdFromTag = (tag) => {
 };
 function getStyleTagFromStyleId(styleId, docx) {
   const styles = docx["word/styles.xml"];
-  if (!styles) return {};
+  if (!styles) {
+    return {};
+  }
   const styleEls = styles.elements;
   const wStyles = styleEls.find((el) => el.name === "w:styles");
   const styleTags = wStyles.elements.filter((style) => style.name === "w:style");
-  const styleDef = styleTags.find((tag) => tag.attributes["w:styleId"] === styleId);
-  return styleDef;
+  return styleTags.find((tag) => tag.attributes["w:styleId"] === styleId);
 }
 function getNumPrRecursive({ node: node2, styleId, docx, seenStyleIds = /* @__PURE__ */ new Set() }) {
   const initialPpr = node2?.elements?.find((el) => el.name === "w:pPr");
   const initialNumPr = initialPpr?.elements?.find((el) => el.name === "w:numPr");
   let numPr = initialNumPr;
   let numId = getNumIdFromTag(numPr);
-  if (numId) return { numPr, type: "inline" };
+  if (numId) return numPr;
   const matchedStyle = getStyleTagFromStyleId(styleId, docx);
   const pPr = matchedStyle?.elements?.find((style) => style.name === "w:pPr");
   numPr = pPr?.elements?.find((style) => style.name === "w:numPr");
@@ -21515,10 +21788,18 @@ function getNumPrRecursive({ node: node2, styleId, docx, seenStyleIds = /* @__PU
   if (!numId && !seenStyleIds.has(styleId)) {
     const basedOnStyleId = basedOn?.attributes["w:val"];
     seenStyleIds.add(styleId);
-    if (!basedOnStyleId) return {};
+    if (!basedOnStyleId) return null;
     return getNumPrRecursive({ styleId: basedOnStyleId, docx, seenStyleIds });
   }
-  return { numPr, type: "numbering" };
+  return numPr;
+}
+function createListItem(content, attrs, marks) {
+  return {
+    type: "listItem",
+    content,
+    attrs,
+    marks
+  };
 }
 const orderedListTypes = [
   "decimal",
@@ -21556,6 +21837,18 @@ const unorderedListTypes = [
   "disc"
   // Disc bullets (●)
 ];
+const isSameListLevelDefsExceptStart = ({ firstListId, secondListId, level, pStyleId, docx }) => {
+  const { numFmt, lvlText, lvlJc } = getListLevelDefinitionTag(firstListId, level, pStyleId, docx);
+  const {
+    numFmt: numFmt2,
+    lvlText: lvlText2,
+    lvlJc: lvlJc2
+  } = getListLevelDefinitionTag(secondListId, level, pStyleId, docx);
+  const sameNumFmt = numFmt === numFmt2;
+  const sameLvlText = lvlText === lvlText2;
+  const sameLvlJc = lvlJc === lvlJc2;
+  return sameNumFmt && sameLvlText && sameLvlJc;
+};
 const getListNumIdFromStyleRef = (styleId, docx) => {
   const styles = docx["word/styles.xml"];
   if (!styles) return null;
@@ -21587,28 +21880,24 @@ const getListNumIdFromStyleRef = (styleId, docx) => {
   }
   return { numId, ilvl };
 };
-const getAbstractDefinition = (numId, docx) => {
+const getListLevelDefinitionTag = (numId, level, pStyleId, docx) => {
   const def = docx["word/numbering.xml"];
   if (!def) return {};
   const { elements } = def;
   const listData = elements[0];
+  if (pStyleId) {
+    const { numId: numIdFromStyles, ilvl: iLvlFromStyles } = getListNumIdFromStyleRef(pStyleId, docx) || {};
+    if (!numId && numIdFromStyles) numId = numIdFromStyles;
+    if (!level && iLvlFromStyles) level = iLvlFromStyles ? parseInt(iLvlFromStyles) : null;
+  }
   const numberingElements = listData.elements;
   const abstractDefinitions = numberingElements.filter((style) => style.name === "w:abstractNum");
   const numDefinitions = numberingElements.filter((style) => style.name === "w:num");
-  const numDefinition = numDefinitions.find((style) => style.attributes["w:numId"] == numId);
+  const numDefinition = numDefinitions.find((style) => style.attributes["w:numId"] === numId);
   const abstractNumId = numDefinition?.elements[0].attributes["w:val"];
   const listDefinitionForThisNumId = abstractDefinitions?.find(
     (style) => style.attributes["w:abstractNumId"] === abstractNumId
   );
-  return listDefinitionForThisNumId;
-};
-const getListLevelDefinitionTag = (numId, level, pStyleId, docx) => {
-  if (pStyleId) {
-    const { numId: numIdFromStyles, ilvl: iLvlFromStyles } = getListNumIdFromStyleRef(pStyleId, docx) || {};
-    if (!numId && numIdFromStyles) numId = numIdFromStyles;
-    if (!level && iLvlFromStyles) level = iLvlFromStyles ? parseInt(iLvlFromStyles) : null;
-  }
-  const listDefinitionForThisNumId = getAbstractDefinition(numId, docx);
   const currentLevel = getDefinitionForLevel(listDefinitionForThisNumId, level);
   const numStyleLink = listDefinitionForThisNumId?.elements?.find((style) => style.name === "w:numStyleLink");
   const numStyleLinkId = numStyleLink?.attributes["w:val"];
@@ -21617,15 +21906,7 @@ const getListLevelDefinitionTag = (numId, level, pStyleId, docx) => {
     return getListLevelDefinitionTag(current.numId, level, null, docx);
   }
   const start = currentLevel?.elements?.find((style) => style.name === "w:start")?.attributes["w:val"];
-  let numFmt = currentLevel?.elements?.find((style) => style.name === "w:numFmt")?.attributes["w:val"];
-  if (!numFmt) {
-    const altChoice = currentLevel?.elements.find((style) => style.name === "mc:AlternateContent");
-    const choice = altChoice?.elements.find((style) => style.name === "mc:Choice");
-    const choiceNumFmt = choice?.elements.find((style) => style.name === "w:numFmt")?.attributes["w:val"];
-    if (choiceNumFmt) {
-      numFmt = choiceNumFmt;
-    }
-  }
+  const numFmt = currentLevel?.elements?.find((style) => style.name === "w:numFmt")?.attributes["w:val"];
   const lvlText = currentLevel?.elements?.find((style) => style.name === "w:lvlText").attributes["w:val"];
   const lvlJc = currentLevel?.elements?.find((style) => style.name === "w:lvlJc").attributes["w:val"];
   const pPr = currentLevel?.elements?.find((style) => style.name === "w:pPr");
@@ -21640,10 +21921,12 @@ function getNodeNumberingDefinition(item, level, docx) {
   const initialPpr = item.elements.find((el) => el.name === "w:pPr");
   const styleTag = initialPpr?.elements?.find((el) => el.name === "w:pStyle");
   const styleId = styleTag?.attributes["w:val"];
-  const { numPr: numPrTag, type: type2 } = getNumPrRecursive({ node: item, styleId, docx });
+  const numPrTag = getNumPrRecursive({ node: item, styleId, docx });
   if (!numPrTag) return {};
   const numIdTag = numPrTag?.elements.find((style) => style.name === "w:numId");
   const numId = numIdTag?.attributes["w:val"];
+  const ilvlTag = numPrTag?.elements.find((style) => style.name === "w:ilvl");
+  const ilvl = ilvlTag?.attributes["w:val"] || getOutlineLevelFromStyleTag(styleId, docx);
   const pStyle = listStyles.find((style) => style.name === "w:pStyle");
   const pStyleId = pStyle?.attributes["w:val"];
   const {
@@ -21655,84 +21938,29 @@ function getNodeNumberingDefinition(item, level, docx) {
     rPr
   } = getListLevelDefinitionTag(numId, level, pStyleId, docx);
   let listpPrs, listrPrs;
-  if (pPr) listpPrs = _processListParagraphProperties(pPr, initialPpr);
+  if (pPr) listpPrs = _processListParagraphProperties(pPr);
   if (rPr) listrPrs = _processListRunProperties(rPr);
   let listType;
   if (unorderedListTypes.includes(listTypeDef?.toLowerCase())) listType = "bulletList";
   else if (orderedListTypes.includes(listTypeDef)) listType = "orderedList";
-  else if (listTypeDef === "custom") {
-    listType = "orderedList";
-  } else {
-    return {};
-  }
-  return { listType, listOrderingType: listTypeDef, listrPrs, listpPrs, start, lvlText, lvlJc };
+  else return {};
+  return { listType, listOrderingType: listTypeDef, ilvl, numId, listrPrs, listpPrs, start, lvlText, lvlJc };
 }
 function getDefinitionForLevel(data, level) {
   return data?.elements?.find((item) => Number(item.attributes["w:ilvl"]) === level);
 }
-function parseIndentElement(indElem) {
-  if (!indElem || !indElem.attributes) return {};
-  const out = {};
-  if (indElem.attributes["w:left"] != null) out.left = twipsToPixels(indElem.attributes["w:left"]);
-  if (indElem.attributes["w:right"] != null) out.right = twipsToPixels(indElem.attributes["w:right"]);
-  if (indElem.attributes["w:firstLine"] != null) out.firstLine = twipsToPixels(indElem.attributes["w:firstLine"]);
-  if (indElem.attributes["w:hanging"] != null) out.hanging = twipsToPixels(indElem.attributes["w:hanging"]);
-  if (indElem.attributes["w:leftChars"] != null) out.leftChars = twipsToPixels(indElem.attributes["w:leftChars"]);
-  return out;
-}
-function combineIndents(ind1, ind2) {
-  ind1 = ind1 && typeof ind1 === "object" ? ind1 : {};
-  ind2 = ind2 && typeof ind2 === "object" ? ind2 : {};
-  const indent = {};
-  ["left", "right", "firstLine", "hanging"].forEach((prop) => {
-    const v1 = ind1[prop] !== void 0 ? Number(ind1[prop]) : null;
-    const v2 = ind2[prop] !== void 0 ? Number(ind2[prop]) : null;
-    if (v1 != null && v2 != null) {
-      indent[prop] = prop === "left" || prop === "hanging" ? Math.max(v1, v2) : v1;
-    } else if (v1 != null) {
-      indent[prop] = v1;
-    } else if (v2 != null) {
-      indent[prop] = v2;
-    }
-  });
-  return indent;
-}
-function _processListParagraphProperties(data, inlinePpr) {
+function _processListParagraphProperties(data) {
   const { elements } = data;
   const expectedTypes = ["w:ind", "w:jc", "w:tabs"];
   const paragraphProperties = {};
   if (!elements) return paragraphProperties;
   elements.forEach((item) => {
-    if (!expectedTypes.includes(item.name)) {
-      console.warn(`[numbering.xml] Unexpected list paragraph prop found: ${item.name}`);
-    }
-  });
-  const inlineIndent = inlinePpr?.elements?.find((item) => item.name === "w:ind");
-  const parsedInlineIndent = parseIndentElement(inlineIndent);
-  const styleIndent = elements.find((item) => item.name === "w:ind");
-  parseIndentElement(styleIndent);
-  paragraphProperties.indent = parsedInlineIndent;
-  const justify = elements.find((item) => item.name === "w:jc");
-  if (justify) {
-    const justifyAttrs = {};
-    if (!justify.attributes) justify.attributes = {};
-    if (justify.attributes["w:val"] !== void 0) justifyAttrs.val = justify.attributes["w:val"];
-    paragraphProperties.justify = justifyAttrs;
-  }
-  const tabs = elements.find((item) => item.name === "w:tabs");
-  if (tabs) {
-    const tabElements = tabs.elements.filter((item) => item.name === "w:tab");
-    const tabStops = [];
-    tabElements.forEach((tab) => {
-      const tabStop = {};
-      if (!tab.attributes) tab.attributes = {};
-      if (tab.attributes["w:val"] !== void 0) tabStop.val = tab.attributes["w:val"];
-      if (tab.attributes["w:leader"] !== void 0) tabStop.leader = tab.attributes["w:leader"];
-      if (tab.attributes["w:pos"] !== void 0) tabStop.pos = twipsToPixels(tab.attributes["w:pos"]);
-      tabStops.push(tabStop);
+    if (!expectedTypes.includes(item.name)) ;
+    const { attributes = {} } = item;
+    Object.keys(attributes).forEach((key) => {
+      paragraphProperties[key] = attributes[key];
     });
-    paragraphProperties.tabStops = tabStops;
-  }
+  });
   return paragraphProperties;
 }
 function _processListRunProperties(data) {
@@ -21779,6 +22007,9 @@ const handleParagraphNode = (params) => {
   let schemaNode;
   let processedElements = preProcessNodesForFldChar(node2.elements);
   node2.elements = processedElements;
+  if (testForList(node2, docx)) {
+    return { nodes: [], consumed: 0 };
+  }
   const handleStandardNode2 = nodeListHandler2.handlerEntities.find(
     (e) => e.handlerName === "standardNodeHandler"
   )?.handler;
@@ -21848,14 +22079,6 @@ const handleParagraphNode = (params) => {
     schemaNode.attrs["spacing"] = getParagraphSpacing(node2, docx, styleId, schemaNode.attrs.marksAttrs);
     schemaNode.attrs["rsidRDefault"] = defaultStyleId;
   }
-  if (docx) {
-    const { justify: justify2 } = getDefaultParagraphStyle(docx, styleId);
-    if (justify2) {
-      schemaNode.attrs.justify = {
-        val: justify2["w:val"]
-      };
-    }
-  }
   if (framePr && framePr.attributes["w:dropCap"]) {
     schemaNode.attrs.dropcap = {
       type: framePr.attributes["w:dropCap"],
@@ -21878,7 +22101,6 @@ const handleParagraphNode = (params) => {
     schemaNode.attrs.paragraphProperties.sectPr = sectPr;
     schemaNode.attrs.pageBreakSource = "sectPr";
   }
-  console.debug("paragraphNodeHandler", schemaNode);
   return { nodes: schemaNode ? [schemaNode] : [], consumed: 1 };
 };
 const getParagraphIndent = (node2, docx, styleId = "") => {
@@ -21916,14 +22138,19 @@ const getParagraphIndent = (node2, docx, styleId = "") => {
   return indent;
 };
 const getParagraphSpacing = (node2, docx, styleId = "", marks = []) => {
-  const spacing = {};
+  const spacing = {
+    lineSpaceAfter: 0,
+    lineSpaceBefore: 0,
+    line: 0,
+    lineRule: null
+  };
   const { spacing: pDefaultSpacing = {} } = getDefaultParagraphStyle(docx, styleId);
   let lineSpaceAfter, lineSpaceBefore, line, lineRuleStyle;
   const pPr = node2.elements?.find((el) => el.name === "w:pPr");
   const inLineSpacingTag = pPr?.elements?.find((el) => el.name === "w:spacing");
   const inLineSpacing = inLineSpacingTag?.attributes || {};
   const textStyleMark = marks.find((el) => el.type === "textStyle");
-  const fontSize = textStyleMark?.attrs?.fontSize;
+  const fontSize2 = textStyleMark?.attrs?.fontSize;
   const lineSpacing = inLineSpacing?.["w:line"] || line || pDefaultSpacing?.["w:line"];
   if (lineSpacing) spacing.line = twipsToLines(lineSpacing);
   const lineRule = inLineSpacing?.["w:lineRule"] || lineRuleStyle || pDefaultSpacing?.["w:lineRule"];
@@ -21934,14 +22161,14 @@ const getParagraphSpacing = (node2, docx, styleId = "", marks = []) => {
   const beforeSpacing = inLineSpacing?.["w:before"] || lineSpaceBefore || pDefaultSpacing?.["w:before"];
   if (beforeSpacing) spacing.lineSpaceBefore = twipsToPixels(beforeSpacing);
   const beforeAutospacing = inLineSpacing?.["w:beforeAutospacing"];
-  if (beforeAutospacing === "1" && fontSize) {
-    spacing.lineSpaceBefore += Math.round(parseInt(fontSize) * 0.5 * 96 / 72);
+  if (beforeAutospacing === "1" && fontSize2) {
+    spacing.lineSpaceBefore += Math.round(parseInt(fontSize2) * 0.5 * 96 / 72);
   }
   const afterSpacing = inLineSpacing?.["w:after"] || lineSpaceAfter || pDefaultSpacing?.["w:after"];
   if (afterSpacing) spacing.lineSpaceAfter = twipsToPixels(afterSpacing);
   const afterAutospacing = inLineSpacing?.["w:afterAutospacing"];
-  if (afterAutospacing === "1" && fontSize) {
-    spacing.lineSpaceAfter += Math.round(parseInt(fontSize) * 0.5 * 96 / 72);
+  if (afterAutospacing === "1" && fontSize2) {
+    spacing.lineSpaceAfter += Math.round(parseInt(fontSize2) * 0.5 * 96 / 72);
   }
   return spacing;
 };
@@ -22121,15 +22348,25 @@ const processCombinedNodesForFldChar = (nodesToCombine = []) => {
   if (!isNumPages) isNumPages = instrText?.trim().startsWith("NUMPAGES");
   const urlMatch = instrText?.match(/HYPERLINK\s+"([^"]+)"/);
   if (hasPageMarker) {
-    processedNodes.push({
+    const pageNumNode = {
       name: "sd:autoPageNumber",
       type: "element"
+    };
+    nodesToCombine.forEach((n) => {
+      const rPrNode = n.elements.find((el) => el.name === "w:rPr");
+      if (rPrNode) pageNumNode.elements = [rPrNode];
     });
+    processedNodes.push(pageNumNode);
   } else if (isNumPages) {
-    processedNodes.push({
+    const totalPageNumNode = {
       name: "sd:totalPageNumber",
       type: "element"
+    };
+    nodesToCombine.forEach((n) => {
+      const rPrNode = n.elements.find((el) => el.name === "w:rPr");
+      if (rPrNode) totalPageNumNode.elements = [rPrNode];
     });
+    processedNodes.push(totalPageNumNode);
   } else if (urlMatch && urlMatch?.length >= 2) {
     const url = urlMatch[1];
     const textMarks = [];
@@ -22201,7 +22438,7 @@ const handleAnnotationNode = (params) => {
   const fieldColor = sdtPr?.elements.find((el) => el.name === "w:fieldColor")?.attributes["w:val"];
   const isMultipleImage = sdtPr?.elements.find((el) => el.name === "w:fieldMultipleImage")?.attributes["w:val"];
   const fontFamily = sdtPr?.elements.find((el) => el.name === "w:fieldFontFamily")?.attributes["w:val"];
-  const fontSize = sdtPr?.elements.find((el) => el.name === "w:fieldFontSize")?.attributes["w:val"];
+  const fontSize2 = sdtPr?.elements.find((el) => el.name === "w:fieldFontSize")?.attributes["w:val"];
   const textColor = sdtPr?.elements.find((el) => el.name === "w:fieldTextColor")?.attributes["w:val"];
   const textHighlight = sdtPr?.elements.find((el) => el.name === "w:fieldTextHighlight")?.attributes["w:val"];
   const attrs = {
@@ -22212,7 +22449,7 @@ const handleAnnotationNode = (params) => {
     fieldColor,
     multipleImage: isMultipleImage === "true",
     fontFamily: fontFamily !== "null" ? fontFamily : null,
-    fontSize: fontSize !== "null" ? fontSize : null,
+    fontSize: fontSize2 !== "null" ? fontSize2 : null,
     textColor: textColor !== "null" ? textColor : null,
     textHighlight: textHighlight !== "null" ? textHighlight : null
   };
@@ -22465,8 +22702,13 @@ const handleAutoPageNumber = (params) => {
   if (nodes.length === 0 || nodes[0].name !== "sd:autoPageNumber") {
     return { nodes: [], consumed: 0 };
   }
+  const rPr = nodes[0].elements?.find((el) => el.name === "w:rPr");
+  const marks = parseMarks(rPr || { elements: [] });
   const processedNode = {
-    type: "page-number"
+    type: "page-number",
+    attrs: {
+      marksAsAttrs: marks
+    }
   };
   return { nodes: [processedNode], consumed: 1 };
 };
@@ -22479,8 +22721,13 @@ const handleAutoTotalPageNumber = (params) => {
   if (nodes.length === 0 || nodes[0].name !== "sd:totalPageNumber") {
     return { nodes: [], consumed: 0 };
   }
+  const rPr = nodes[0].elements?.find((el) => el.name === "w:rPr");
+  const marks = parseMarks(rPr || { elements: [] });
   const processedNode = {
-    type: "total-page-number"
+    type: "total-page-number",
+    attrs: {
+      marksAsAttrs: marks
+    }
   };
   return { nodes: [processedNode], consumed: 1 };
 };
@@ -22778,8 +23025,8 @@ const defaultNodeListHandler = () => {
     alternateChoiceHandler,
     runNodeHandlerEntity,
     pictNodeHandlerEntity,
-    listHandlerEntity,
     paragraphNodeHandlerEntity,
+    listHandlerEntity,
     textNodeHandlerEntity,
     lineBreakNodeHandlerEntity,
     annotationNodeHandlerEntity,
@@ -22793,7 +23040,7 @@ const defaultNodeListHandler = () => {
     autoPageHandlerEntity,
     autoTotalPageCountEntity,
     standardNodeHandlerEntity
-    // This is the last one as it can handle everything
+    //this should be the last one, bcs this parses everything!!!
   ];
   const handler = createNodeListHandler(entities);
   return {
@@ -23025,8 +23272,6 @@ const importHeadersFooters = (docx, converter, editor) => {
     converter.headers[rId] = { type: "doc", content: [...schema] };
     sectionType && (converter.headerIds[sectionType] = rId);
   });
-  const titlePg = allSectPrElements?.find((el) => el.name === "w:titlePg");
-  if (titlePg) converter.headerIds.titlePg = true;
   footers.forEach((footer) => {
     const { rId, referenceFile, currentFileName } = getHeaderFooterSectionData(footer, docx);
     const sectPrFooter = allSectPrElements.find((el) => el.name === "w:footerReference" && el.attributes["r:id"] === rId);
@@ -23167,7 +23412,7 @@ const _SuperConverter = class _SuperConverter {
       return;
     }
   }
-  static updateDocumentVersion(docx = this.convertedXml, version = "0.13.0-RC3") {
+  static updateDocumentVersion(docx = this.convertedXml, version = "0.13.0-next.2") {
     const customLocation = "docProps/custom.xml";
     if (!docx[customLocation]) {
       docx[customLocation] = generateCustomXml();
@@ -23294,6 +23539,7 @@ const _SuperConverter = class _SuperConverter {
   getThemeInfo(themeName) {
     themeName = themeName.toLowerCase();
     const theme1 = this.convertedXml["word/theme/theme1.xml"];
+    if (!theme1) return {};
     const themeData = theme1.elements.find((el) => el.name === "a:theme");
     const themeElements = themeData.elements.find((el) => el.name === "a:themeElements");
     const fontScheme = themeElements.elements.find((el) => el.name === "a:fontScheme");
@@ -23324,7 +23570,7 @@ const _SuperConverter = class _SuperConverter {
     const exporter = new DocxExporter(this);
     return exporter.schemaToXml(data, debug);
   }
-  async exportToDocx(jsonData, editorSchema, documentMedia, isFinalDoc = false, commentsExportType, comments = [], editor, exportJsonOnly = false) {
+  async exportToDocx(jsonData, editorSchema, documentMedia, isFinalDoc = false, commentsExportType, comments = [], editor) {
     const commentsWithParaIds = comments.map((c) => prepareCommentParaIds(c));
     const commentDefinitions = commentsWithParaIds.map((c, index) => getCommentDefinition(c, index, commentsWithParaIds, editor));
     const { result, params } = this.exportToXmlJson({
@@ -23336,7 +23582,6 @@ const _SuperConverter = class _SuperConverter {
       isFinalDoc,
       editor
     });
-    if (exportJsonOnly) return result;
     const exporter = new DocxExporter(this);
     const xml = exporter.schemaToXml(result);
     await __privateMethod(this, _SuperConverter_instances, exportProcessMediaFiles_fn).call(this, {
@@ -23637,7 +23882,7 @@ function storeSuperdocVersion(docx) {
 function generateCustomXml() {
   return DEFAULT_CUSTOM_XML;
 }
-function generateSuperdocVersion(pid = 2, version = "0.13.0-RC3") {
+function generateSuperdocVersion(pid = 2, version = "0.13.0-next.2") {
   return {
     type: "element",
     name: "property",
@@ -23661,7 +23906,7 @@ function generateSuperdocVersion(pid = 2, version = "0.13.0-RC3") {
   };
 }
 export {
-  getDefinitionForLevel as $,
+  Transform as $,
   AllSelection as A,
   Buffer2 as B,
   TrackInsertMarkName as C,
@@ -23687,20 +23932,15 @@ export {
   getLineHeightValueString as W,
   toKebabCase as X,
   kebabCase as Y,
-  getStyleTagFromStyleId as Z,
-  getAbstractDefinition as _,
+  getColStyleDeclaration as Z,
+  SelectionRange as _,
   Plugin as a,
-  parseIndentElement as a0,
-  combineIndents as a1,
-  getColStyleDeclaration as a2,
-  SelectionRange as a3,
-  Transform as a4,
-  createColGroup as a5,
-  commonjsGlobal as a6,
-  getDefaultExportFromCjs$1 as a7,
-  getContentTypesFromXml as a8,
-  xmljs as a9,
-  vClickOutside as aa,
+  createColGroup as a0,
+  commonjsGlobal as a1,
+  getDefaultExportFromCjs$1 as a2,
+  getContentTypesFromXml as a3,
+  xmljs as a4,
+  vClickOutside as a5,
   canSplit as b,
   callOrGet as c,
   canJoin as d,
@@ -23713,13 +23953,13 @@ export {
   NodeRange as k,
   liftTarget as l,
   findWrapping as m,
-  generateDocxRandomId as n,
+  isMacOS as n,
   objectIncludes as o,
-  minMax as p,
-  generateRandom32BitHex as q,
+  isIOS as p,
+  generateDocxRandomId as q,
   replaceStep as r,
-  isMacOS as s,
-  isIOS as t,
+  minMax as s,
+  generateRandom32BitHex as t,
   DOMSerializer as u,
   Mark as v,
   dropPoint as w,