@harbour-enterprises/superdoc 0.12.36 → 0.12.37-next.2

package/dist/super-editor/chunks/{converter-BSl_E2ED.js → converter-RpLHCUPf.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;
   }
   /**
@@ -18864,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);
@@ -20561,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));
@@ -21459,6 +21536,8 @@ const handleListNode = (params) => {
       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();
       }
@@ -22269,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 = [];
@@ -22613,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 };
 };
@@ -22627,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 };
 };
@@ -23313,7 +23412,7 @@ const _SuperConverter = class _SuperConverter {
       return;
     }
   }
-  static updateDocumentVersion(docx = this.convertedXml, version = "0.12.36") {
+  static updateDocumentVersion(docx = this.convertedXml, version = "0.12.37-next.2") {
     const customLocation = "docProps/custom.xml";
     if (!docx[customLocation]) {
       docx[customLocation] = generateCustomXml();
@@ -23783,7 +23882,7 @@ function storeSuperdocVersion(docx) {
 function generateCustomXml() {
   return DEFAULT_CUSTOM_XML;
 }
-function generateSuperdocVersion(pid = 2, version = "0.12.36") {
+function generateSuperdocVersion(pid = 2, version = "0.12.37-next.2") {
   return {
     type: "element",
     name: "property",

package/dist/super-editor/chunks/{docx-zipper-USmuqzmo.js → docx-zipper-V5sLSr7T.js}

@@ -1,4 +1,4 @@
-import { x as process$1, a1 as commonjsGlobal, B as Buffer, a2 as getDefaultExportFromCjs, a3 as getContentTypesFromXml, a4 as xmljs } from "./converter-BSl_E2ED.js";
+import { x as process$1, a1 as commonjsGlobal, B as Buffer, a2 as getDefaultExportFromCjs, a3 as getContentTypesFromXml, a4 as xmljs } from "./converter-RpLHCUPf.js";
 function commonjsRequire(path) {
   throw new Error('Could not dynamically require "' + path + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');
 }