@harbour-enterprises/superdoc 0.15.7-next.1 → 0.15.7-next.3

package/dist/chunks/{super-editor.es-wYUD2FbG.cjs → super-editor.es-BZl0f40H.cjs}

@@ -22960,20 +22960,62 @@ const helpers = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   isTextSelection,
   posToDOMRect
 }, Symbol.toStringTag, { value: "Module" }));
-const generateNewListDefinition = ({ numId, listType, editor }) => {
+const generateNewListDefinition = ({ numId, listType, level, start: start2, text, fmt, editor }) => {
   if (typeof listType === "string") listType = editor.schema.nodes[listType];
   const definition = listType.name === "orderedList" ? baseOrderedListDef : baseBulletList;
   const numbering = editor.converter.numbering;
   const newNumbering = { ...numbering };
-  const newAbstractId = getNewListId(editor, "abstracts");
-  const newAbstractDef = {
-    ...definition,
-    attributes: {
-      ...definition.attributes,
-      "w:abstractNumId": String(newAbstractId)
-    }
-  };
-  newNumbering.abstracts[newAbstractId] = newAbstractDef;
+  let skipAddingNewAbstract = false;
+  let newAbstractId = getNewListId(editor, "abstracts");
+  let newAbstractDef = JSON.parse(
+    JSON.stringify({
+      ...definition,
+      attributes: {
+        ...definition.attributes,
+        "w:abstractNumId": String(newAbstractId)
+      }
+    })
+  );
+  if (level && start2 && text && fmt) {
+    if (newNumbering.definitions[numId]) {
+      const abstractId = newNumbering.definitions[numId]?.elements[0]?.attributes["w:val"];
+      newAbstractId = abstractId;
+      const abstract = editor.converter.numbering.abstracts[abstractId];
+      newAbstractDef = { ...abstract };
+      skipAddingNewAbstract = true;
+    }
+    const levelDefIndex = newAbstractDef.elements.findIndex(
+      (el) => el.name === "w:lvl" && el.attributes["w:ilvl"] === level
+    );
+    const levelProps = newAbstractDef.elements[levelDefIndex];
+    const elToFilter = ["w:numFmt", "w:lvlText", "w:start"];
+    const oldElements = levelProps.elements.filter((el) => !elToFilter.includes(el.name));
+    levelProps.elements = [
+      ...oldElements,
+      {
+        type: "element",
+        name: "w:start",
+        attributes: {
+          "w:val": start2
+        }
+      },
+      {
+        type: "element",
+        name: "w:numFmt",
+        attributes: {
+          "w:val": fmt
+        }
+      },
+      {
+        type: "element",
+        name: "w:lvlText",
+        attributes: {
+          "w:val": text
+        }
+      }
+    ];
+  }
+  if (!skipAddingNewAbstract) newNumbering.abstracts[newAbstractId] = newAbstractDef;
   const newNumDef = getBasicNumIdTag(numId, newAbstractId);
   newNumbering.definitions[numId] = newNumDef;
   editor.converter.numbering = newNumbering;
@@ -23205,7 +23247,7 @@ const ListHelpers = {
   baseOrderedListDef,
   baseBulletList
 };
-function extractListLevelStyles(cssText, listId, level) {
+const extractListLevelStyles = (cssText, listId, level) => {
   const pattern = new RegExp(`@list\\s+l${listId}:level${level}\\s*\\{([^}]+)\\}`, "i");
   const match = cssText.match(pattern);
   if (!match) return null;
@@ -23216,14 +23258,58 @@ function extractListLevelStyles(cssText, listId, level) {
     styleMap[key] = value;
   }
   return styleMap;
-}
+};
 const numDefMap = /* @__PURE__ */ new Map([
-  ["decimal", { def: "decimal", abstractNum: 1 }],
-  ["alpha-lower", { def: "lowerLetter", abstractNum: 1 }],
-  ["alpha-upper", { def: "upperLetter", abstractNum: 1 }],
-  ["roman-lower", { def: "lowerRoman", abstractNum: 1 }],
-  ["roman-upper", { def: "upperRoman", abstractNum: 1 }],
-  ["bullet", { def: "bullet", abstractNum: 0 }]
+  ["decimal", "decimal"],
+  ["alpha-lower", "lowerLetter"],
+  ["alpha-upper", "upperLetter"],
+  ["roman-lower", "lowerRoman"],
+  ["roman-upper", "upperRoman"],
+  ["bullet", "bullet"]
+]);
+const numDefByTypeMap = /* @__PURE__ */ new Map([
+  ["1", "decimal"],
+  ["a", "lowerLetter"],
+  ["A", "upperLetter"],
+  ["I", "upperRoman"],
+  ["i", "lowerRoman"]
+]);
+function getStartNumber(lvlText) {
+  const match = lvlText.match(/^(\d+)/);
+  if (match) return parseInt(match[1], 10);
+  return null;
+}
+function letterToNumber(letter) {
+  return letter.toLowerCase().charCodeAt(0) - "a".charCodeAt(0) + 1;
+}
+function getStartNumberFromAlpha(lvlText) {
+  const match = lvlText.match(/^([a-zA-Z])/);
+  if (match) return letterToNumber(match[1]);
+  return null;
+}
+function romanToNumber(roman) {
+  const map3 = { I: 1, V: 5, X: 10, L: 50, C: 100, D: 500, M: 1e3 };
+  let num = 0, prev = 0;
+  for (let i = roman.length - 1; i >= 0; i--) {
+    const curr = map3[roman[i].toUpperCase()] || 0;
+    if (curr < prev) num -= curr;
+    else num += curr;
+    prev = curr;
+  }
+  return num;
+}
+function getStartNumberFromRoman(lvlText) {
+  const match = lvlText.match(/^([ivxlcdmIVXLCDM]+)/);
+  if (match) return romanToNumber(match[1]);
+  return null;
+}
+const startHelperMap = /* @__PURE__ */ new Map([
+  ["decimal", getStartNumber],
+  ["lowerLetter", getStartNumberFromAlpha],
+  ["upperLetter", getStartNumberFromAlpha],
+  ["lowerRoman", getStartNumberFromRoman],
+  ["upperRoman", getStartNumberFromRoman],
+  ["bullet", () => 1]
 ]);
 const handleDocxPaste = (html, editor, view, plugin2) => {
   const { converter } = editor;
@@ -23232,35 +23318,50 @@ const handleDocxPaste = (html, editor, view, plugin2) => {
   cleanedHtml = cleanHtmlUnnecessaryTags(cleanedHtml);
   const tempDiv = document.createElement("div");
   tempDiv.innerHTML = cleanedHtml;
-  const paragraphs = tempDiv.querySelectorAll("p");
-  paragraphs.forEach((p) => {
-    const innerHTML3 = p.innerHTML;
-    if (!innerHTML3.includes("<!--[if !supportLists]")) return;
-    const styleAttr = p.getAttribute("style") || "";
+  const data = tempDiv.querySelectorAll("p, li");
+  const startMap = {};
+  data.forEach((item) => {
+    let type2;
+    if (item.localName === "li") {
+      type2 = "listItem";
+    } else {
+      const html2 = item.innerHTML;
+      type2 = "p";
+      if (!html2.includes("<!--[if !supportLists]")) return;
+    }
+    const styleAttr = item.getAttribute("style") || "";
     const msoListMatch = styleAttr.match(/mso-list:\s*l(\d+)\s+level(\d+)\s+lfo(\d+)/);
     const css = tempDiv.querySelector("style").innerHTML;
     if (msoListMatch) {
       const [, abstractId, level, numId] = msoListMatch;
       const styles = extractListLevelStyles(css, abstractId, level);
-      const msoNumFormat = styles["mso-level-number-format"] || "decimal";
-      const abstractOverride = numDefMap.get(msoNumFormat);
-      if (!numId) return;
-      const abstractDefinition = getListAbstractDefinition(
-        abstractOverride ? abstractOverride.abstractNum : numId,
-        editor
-      );
-      let { lvlText, start: start2, numFmt } = getLevelDefinition(abstractDefinition, level);
-      if (abstractOverride.abstractNum === 1) lvlText = `%${level}.`;
-      p.setAttribute("data-num-id", numId);
-      p.setAttribute("data-list-level", level - 1);
-      p.setAttribute("data-start", start2);
-      p.setAttribute("data-lvl-text", styles["mso-level-text"] || lvlText);
-      p.setAttribute("data-num-fmt", abstractOverride.def || numFmt);
+      let start2, numFmt, lvlText;
+      if (type2 === "listItem") {
+        const listType = item.parentNode.getAttribute("type");
+        const startAttr = item.parentNode.getAttribute("start");
+        if (!startMap[numId]) startMap[numId] = startAttr;
+        start2 = startMap[numId];
+        numFmt = numDefByTypeMap.get(listType);
+        lvlText = `%${level}.`;
+      } else {
+        const msoNumFormat = styles["mso-level-number-format"] || "decimal";
+        numFmt = numDefMap.get(msoNumFormat);
+        const punc = item.children[0]?.innerText?.slice(-1) || ".";
+        lvlText = numFmt === "bullet" ? normalizeLvlTextChar(styles["mso-level-text"]) : `%${level}${punc}`;
+        const startGetter = startHelperMap.get(numFmt);
+        if (!startMap[numId]) startMap[numId] = startGetter(item.children[0]?.innerText || "1");
+        start2 = startMap[numId];
+      }
+      item.setAttribute("data-num-id", numId);
+      item.setAttribute("data-list-level", parseInt(level) - 1);
+      item.setAttribute("data-start", start2);
+      item.setAttribute("data-lvl-text", lvlText);
+      item.setAttribute("data-num-fmt", numFmt);
       const ptToPxRatio = 1.333;
       const indent = parseInt(styles["margin-left"]) * ptToPxRatio || 0;
-      if (indent > 0) p.setAttribute("data-left-indent", indent);
+      if (indent > 0) item.setAttribute("data-left-indent", indent);
     }
-    extractAndRemoveConditionalPrefix(p);
+    extractAndRemoveConditionalPrefix(item);
   });
   transformWordLists(tempDiv, editor);
   const doc2 = DOMParser$1.fromSchema(editor.schema).parse(tempDiv);
@@ -23270,37 +23371,29 @@ const handleDocxPaste = (html, editor, view, plugin2) => {
   dispatch(view.state.tr.replaceSelectionWith(doc2, true));
   return true;
 };
-const getLevelDefinition = (abstractDefinition, level) => {
-  if (!abstractDefinition || !abstractDefinition.elements) return null;
-  const levelElement = abstractDefinition.elements.find((el) => {
-    return el.name === "w:lvl" && el.attributes?.["w:ilvl"] == level;
-  });
-  if (!levelElement) return null;
-  const { elements } = levelElement;
-  const lvlText = elements.find((el) => el.name === "w:lvlText")?.attributes?.["w:val"];
-  const start2 = elements.find((el) => el.name === "w:start")?.attributes?.["w:val"];
-  const numFmt = elements.find((el) => el.name === "w:numFmt")?.attributes?.["w:val"];
-  return { lvlText, start: start2, numFmt, elements };
-};
-const getListAbstractDefinition = (abstractId, editor) => {
-  const { abstracts = {} } = editor?.converter?.numbering;
-  return abstracts[abstractId] || null;
-};
 const transformWordLists = (container, editor) => {
-  const paragraphs = Array.from(container.querySelectorAll("p[data-num-id]"));
+  const listItems = Array.from(container.querySelectorAll("[data-num-id]"));
   const lists = {};
   const mappedLists = {};
-  for (const p of paragraphs) {
-    const level = parseInt(p.getAttribute("data-list-level"));
-    const numFmt = p.getAttribute("data-num-fmt");
-    const start2 = p.getAttribute("data-start");
-    const lvlText = p.getAttribute("data-lvl-text");
-    const indent = p.getAttribute("data-left-indent");
-    const importedId = p.getAttribute("data-num-id");
+  for (const item of listItems) {
+    const level = parseInt(item.getAttribute("data-list-level"));
+    const numFmt = item.getAttribute("data-num-fmt");
+    const start2 = item.getAttribute("data-start");
+    const lvlText = item.getAttribute("data-lvl-text");
+    const indent = item.getAttribute("data-left-indent");
+    const importedId = item.getAttribute("data-num-id");
     if (!mappedLists[importedId]) mappedLists[importedId] = ListHelpers.getNewListId(editor);
     const id = mappedLists[importedId];
     const listType = numFmt === "bullet" ? "bulletList" : "orderedList";
-    ListHelpers.generateNewListDefinition({ numId: id, listType, editor });
+    ListHelpers.generateNewListDefinition({
+      numId: id,
+      listType,
+      level: level.toString(),
+      start: start2,
+      fmt: numFmt,
+      text: lvlText,
+      editor
+    });
     if (!lists[id]) lists[id] = { levels: {} };
     const currentListByNumId = lists[id];
     if (!currentListByNumId.levels[level]) currentListByNumId.levels[level] = Number(start2) || 1;
@@ -23314,28 +23407,28 @@ const transformWordLists = (container, editor) => {
     const path = generateListPath(level, currentListByNumId.levels, start2);
     if (!path.length) path.push(currentListByNumId.levels[level]);
     const li = document.createElement("li");
-    li.innerHTML = p.innerHTML;
+    li.innerHTML = item.innerHTML;
     li.setAttribute("data-num-id", id);
     li.setAttribute("data-list-level", JSON.stringify(path));
     li.setAttribute("data-level", level);
     li.setAttribute("data-lvl-text", lvlText);
     li.setAttribute("data-num-fmt", numFmt);
     if (indent) li.setAttribute("data-indent", JSON.stringify({ left: indent }));
-    if (p.hasAttribute("data-font-family")) {
-      li.setAttribute("data-font-family", p.getAttribute("data-font-family"));
+    if (item.hasAttribute("data-font-family")) {
+      li.setAttribute("data-font-family", item.getAttribute("data-font-family"));
     }
-    if (p.hasAttribute("data-font-size")) {
-      li.setAttribute("data-font-size", p.getAttribute("data-font-size"));
+    if (item.hasAttribute("data-font-size")) {
+      li.setAttribute("data-font-size", item.getAttribute("data-font-size"));
     }
-    const parentNode2 = p.parentNode;
+    const parentNode2 = item.parentNode;
     let listForLevel;
     const newList = numFmt === "bullet" ? document.createElement("ul") : document.createElement("ol");
     newList.setAttribute("data-list-id", id);
     newList.level = level;
-    parentNode2.insertBefore(newList, p);
+    parentNode2.insertBefore(newList, item);
     listForLevel = newList;
     listForLevel.appendChild(li);
-    p.remove();
+    item.remove();
   }
 };
 const generateListPath = (level, levels, start2) => {
@@ -23349,8 +23442,8 @@ const generateListPath = (level, levels, start2) => {
   }
   return path;
 };
-function extractAndRemoveConditionalPrefix(p) {
-  const nodes = Array.from(p.childNodes);
+function extractAndRemoveConditionalPrefix(item) {
+  const nodes = Array.from(item.childNodes);
   let fontFamily2 = null;
   let fontSize2 = null;
   let start2 = -1, end2 = -1;
@@ -23371,10 +23464,10 @@ function extractAndRemoveConditionalPrefix(p) {
       }
     }
     for (let i = end2; i >= start2; i--) {
-      p.removeChild(p.childNodes[i]);
+      item.removeChild(item.childNodes[i]);
     }
-    if (fontFamily2) p.setAttribute("data-font-family", fontFamily2);
-    if (fontSize2) p.setAttribute("data-font-size", fontSize2);
+    if (fontFamily2) item.setAttribute("data-font-family", fontFamily2);
+    if (fontSize2) item.setAttribute("data-font-size", fontSize2);
   }
 }
 const generateOrderedListIndex = ({ listLevel, lvlText, listNumberingType, customFormat }) => {
@@ -26100,7 +26193,7 @@ function generateTableCellProperties(node2) {
     const cellBordersElement = {
       name: "w:tcBorders",
       elements: Object.entries(borders).map(([key, value]) => {
-        if (!value.size) {
+        if (!value.size || value.val === "none") {
           return {
             name: `w:${key}`,
             attributes: {
@@ -28920,7 +29013,7 @@ const _SuperConverter = class _SuperConverter2 {
       return;
     }
   }
-  static updateDocumentVersion(docx = this.convertedXml, version2 = "0.15.7-next.1") {
+  static updateDocumentVersion(docx = this.convertedXml, version2 = "0.15.7-next.3") {
     const customLocation = "docProps/custom.xml";
     if (!docx[customLocation]) {
       docx[customLocation] = generateCustomXml();
@@ -29399,7 +29492,7 @@ function storeSuperdocVersion(docx) {
 function generateCustomXml() {
   return DEFAULT_CUSTOM_XML;
 }
-function generateSuperdocVersion(pid = 2, version2 = "0.15.7-next.1") {
+function generateSuperdocVersion(pid = 2, version2 = "0.15.7-next.3") {
   return {
     type: "element",
     name: "property",
@@ -45726,7 +45819,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
    * @returns {Object | void} Migration results
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "0.15.7-next.1");
+    console.debug("[checkVersionMigrations] Current editor version", "0.15.7-next.3");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");