formatferry 1.0.34 → 1.0.36

package/dist/index.js

@@ -58205,6 +58205,7 @@ var InputSanitizer = class {
       ALLOWED_TAGS: [
         "p",
         "br",
+        "hr",
         "div",
         "span",
         "h1",
@@ -58255,6 +58256,7 @@ var InputSanitizer = class {
           ALLOWED_TAGS: [
             "p",
             "br",
+            "hr",
             "div",
             "span",
             "h1",
@@ -58513,6 +58515,49 @@ function normalizeAtlassianHTML(html, domParser) {
 
 // ../../src/shared/confluence-slack-services.ts
 var import_turndown = __toESM(require_turndown_cjs(), 1);
+
+// ../../src/shared/text-decoration.ts
+var DECLARATION = /(?:^|;)\s*text-decoration(?:-line)?\s*:([^;]*)/gi;
+function styleDecorations(style) {
+  const result = { underline: false, strike: false };
+  if (!style) return result;
+  DECLARATION.lastIndex = 0;
+  let match;
+  while ((match = DECLARATION.exec(style)) !== null) {
+    const value = match[1].toLowerCase();
+    result.underline = /\bunderline\b/.test(value);
+    result.strike = /\bline-through\b/.test(value);
+  }
+  return result;
+}
+function nodeStyle(node) {
+  const el = node;
+  return typeof el.getAttribute === "function" ? el.getAttribute("style") || "" : "";
+}
+function nodeDecorations(node) {
+  const fromStyle = styleDecorations(nodeStyle(node));
+  const name = node.nodeName;
+  return {
+    underline: fromStyle.underline || name === "U" || name === "INS",
+    strike: fromStyle.strike || name === "DEL" || name === "S" || name === "STRIKE"
+  };
+}
+function isUnderlineSpan(node) {
+  return node.nodeName === "SPAN" && styleDecorations(nodeStyle(node)).underline;
+}
+function isStrikeSpan(node) {
+  return node.nodeName === "SPAN" && styleDecorations(nodeStyle(node)).strike;
+}
+function decorate(content, node, syntax) {
+  if (!content.trim()) return content;
+  const d = nodeDecorations(node);
+  let out = content;
+  if (d.underline && syntax.underline) out = syntax.underline[0] + out + syntax.underline[1];
+  if (d.strike && syntax.strike) out = syntax.strike[0] + out + syntax.strike[1];
+  return out;
+}
+
+// ../../src/shared/confluence-slack-services.ts
 function escapeSlackEntities(text) {
   return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
@@ -58575,13 +58620,9 @@ function createSlackService(deps) {
   service.addRule("slackStrikethrough", {
     filter: (node) => {
       if (["DEL", "S", "STRIKE"].includes(node.nodeName)) return true;
-      if (node.nodeName === "SPAN") {
-        const style = node.getAttribute("style") || "";
-        return style.includes("text-decoration: line-through") || style.includes("text-decoration:line-through") || style.includes("text-decoration-line: line-through") || style.includes("text-decoration-line:line-through");
-      }
-      return false;
+      return isStrikeSpan(node);
     },
-    replacement: (content) => content.trim() ? `~${content}~` : content
+    replacement: (content, node) => decorate(content, node, { underline: null, strike: ["~", "~"] })
   });
   service.addRule("slackMonospaceCode", {
     filter: (node) => {
@@ -58642,13 +58683,10 @@ ${escapeSlackEntities(code)}
   service.addRule("slackUnderline", {
     filter: (node) => {
       if (node.nodeName === "U" || node.nodeName === "INS") return true;
-      if (node.nodeName === "SPAN") {
-        const style = node.getAttribute("style") || "";
-        return style.includes("text-decoration: underline") || style.includes("text-decoration:underline");
-      }
-      return false;
+      return isUnderlineSpan(node);
     },
-    replacement: (content) => content
+    // Slack has no underline; keep a strikethrough set on the same span
+    replacement: (content, node) => decorate(content, node, { underline: null, strike: ["~", "~"] })
   });
   service.addRule("slackLink", {
     filter: (node) => node.nodeName === "A" && !!node.getAttribute("href"),
@@ -58680,34 +58718,38 @@ ${plainText}
   });
   return service;
 }
-function processConfluenceList(list, service, depth) {
-  const isOrdered = list.nodeName === "OL";
-  const marker = (isOrdered ? "#" : "*").repeat(depth);
+function processConfluenceList(list, service, parentPrefix) {
+  const prefix = parentPrefix + (list.nodeName === "OL" ? "#" : "*");
   const items = Array.from(list.children).filter((c) => c.nodeName === "LI");
-  let result = depth === 1 ? "\n" : "";
+  const isTop = parentPrefix === "";
+  let result = isTop ? "\n" : "";
   items.forEach((item) => {
-    const itemContent = processConfluenceListItem(item, service, depth);
-    result += `${marker} ${itemContent}
+    const itemContent = processConfluenceListItem(item, service, prefix);
+    result += `${prefix} ${itemContent}
 `;
   });
-  return depth === 1 ? result + "\n" : result;
+  return isTop ? result + "\n" : result;
 }
-function processConfluenceListItem(item, service, depth) {
-  let content = "";
-  const TEXT_NODE = 3;
+function processConfluenceListItem(item, service, prefix) {
   const ELEMENT_NODE2 = 1;
+  const doc = item.ownerDocument;
+  let content = "";
+  let buffer = doc.createElement("div");
+  const flush = () => {
+    if (buffer.childNodes.length > 0) {
+      content += service.turndown(buffer).replace(/[ \t]*\n(?:[ \t]*\n)+[ \t]*/g, " \\\\ ");
+    }
+    buffer = doc.createElement("div");
+  };
   Array.from(item.childNodes).forEach((child) => {
-    if (child.nodeType === TEXT_NODE) {
-      content += child.textContent || "";
-    } else if (child.nodeType === ELEMENT_NODE2) {
-      const el = child;
-      if (el.nodeName === "UL" || el.nodeName === "OL") {
-        content += "\n" + processConfluenceList(el, service, depth + 1);
-      } else {
-        content += service.turndown(el.outerHTML);
-      }
+    if (child.nodeType === ELEMENT_NODE2 && (child.nodeName === "UL" || child.nodeName === "OL")) {
+      flush();
+      content = content.trimEnd() + "\n" + processConfluenceList(child, service, prefix);
+    } else {
+      buffer.appendChild(child.cloneNode(true));
     }
   });
+  flush();
   return content.trim();
 }
 function createConfluenceService(deps) {
@@ -58783,24 +58825,16 @@ ${codeContent}
   service.addRule("confluenceUnderline", {
     filter: (node) => {
       if (node.nodeName === "U" || node.nodeName === "INS") return true;
-      if (node.nodeName === "SPAN") {
-        const style = node.getAttribute("style") || "";
-        return style.includes("text-decoration: underline") || style.includes("text-decoration:underline");
-      }
-      return false;
+      return isUnderlineSpan(node);
     },
-    replacement: (content) => content.trim() ? `+${content}+` : content
+    replacement: (content, node) => decorate(content, node, { underline: ["+", "+"], strike: ["-", "-"] })
   });
   service.addRule("confluenceStrikethrough", {
     filter: (node) => {
       if (["DEL", "S", "STRIKE"].includes(node.nodeName)) return true;
-      if (node.nodeName === "SPAN") {
-        const style = node.getAttribute("style") || "";
-        return style.includes("text-decoration: line-through") || style.includes("text-decoration:line-through") || style.includes("text-decoration-line: line-through") || style.includes("text-decoration-line:line-through");
-      }
-      return false;
+      return isStrikeSpan(node);
     },
-    replacement: (content) => content.trim() ? `-${content}-` : content
+    replacement: (content, node) => decorate(content, node, { underline: ["+", "+"], strike: ["-", "-"] })
   });
   service.addRule("confluenceMonospaceCode", {
     filter: (node) => {
@@ -58884,7 +58918,7 @@ h${level}. ${trimmed}
   service.addRule("confluenceList", {
     filter: ["ul", "ol"],
     replacement: (_content, node) => {
-      return processConfluenceList(node, service, 1);
+      return processConfluenceList(node, service, "");
     }
   });
   service.addRule("confluenceTable", {
@@ -58898,7 +58932,7 @@ h${level}. ${trimmed}
         const cells = Array.from(row.querySelectorAll("th, td"));
         const isHeaderRow = cells.some((c) => c.nodeName === "TH");
         const delim = isHeaderRow ? "||" : "|";
-        const cellTexts = cells.map((c) => (c.textContent || "").trim());
+        const cellTexts = cells.map((c) => (c.textContent || "").trim().replace(/\|/g, "\\|"));
         result += delim + cellTexts.join(delim) + delim + "\n";
       });
       return result + "\n";
@@ -58981,7 +59015,7 @@ var ConversionEngine = class {
       emDelimiter: "_"
     });
     this.addGoogleDocsRules(this.githubService);
-    this.addGoogleDocsRules(this.commonmarkService);
+    this.addGoogleDocsRules(this.commonmarkService, ["<del>", "</del>"]);
     this.addGoogleDocsRules(this.customService);
     this.addTableRules(this.githubService);
     this.addTableRules(this.commonmarkService);
@@ -58995,6 +59029,13 @@ var ConversionEngine = class {
     this.addSupSubMathRules(this.githubService);
     this.addSupSubMathRules(this.commonmarkService);
     this.addSupSubMathRules(this.customService);
+    this.commonmarkService.addRule("commonmarkStrikethrough", {
+      filter: (node) => {
+        if (["DEL", "S", "STRIKE"].includes(node.nodeName)) return true;
+        return isStrikeSpan(node);
+      },
+      replacement: (content, node) => decorate(content, node, { underline: ["<u>", "</u>"], strike: ["<del>", "</del>"] })
+    });
     this.addPdfPageMarkerRules(this.githubService);
     this.addPdfPageMarkerRules(this.commonmarkService);
     this.addPdfPageMarkerRules(this.customService);
@@ -59013,6 +59054,37 @@ var ConversionEngine = class {
     this.confluenceService = createConfluenceService(deps);
     this.addSlideMarkerRules(this.slackService);
     this.addSlideMarkerRules(this.confluenceService);
+    [
+      this.githubService,
+      this.commonmarkService,
+      this.customService,
+      this.discordService,
+      this.redditService,
+      this.rmarkdownService,
+      this.slackService,
+      this.confluenceService
+    ].forEach((service) => this.addGoogleDocsWrapperRule(service));
+  }
+  /**
+   * Google Docs wraps every copied selection in
+   * <b style="font-weight:normal" id="docs-internal-guid-...">. Treating that
+   * as bold puts a stray pair of bold markers around the whole document, so a
+   * <b>/<strong> whose inline style explicitly sets a non-bold weight is
+   * rendered as its plain content.
+   */
+  addGoogleDocsWrapperRule(service) {
+    service.addRule("googleDocsNonBoldWrapper", {
+      filter: (node) => {
+        if (node.nodeName !== "B" && node.nodeName !== "STRONG") return false;
+        const style = (node.getAttribute("style") || "").toLowerCase();
+        const matches = [...style.matchAll(/font-weight\s*:\s*([a-z0-9]+)/g)];
+        if (matches.length === 0) return false;
+        const weight = matches[matches.length - 1][1];
+        if (weight === "normal" || weight === "lighter") return true;
+        return /^\d+$/.test(weight) && parseInt(weight, 10) < 600;
+      },
+      replacement: (content) => content
+    });
   }
   /**
    * Create Discord-optimized Turndown service
@@ -59034,8 +59106,10 @@ var ConversionEngine = class {
     this.addPdfPageMarkerRules(service);
     this.addSlideMarkerRules(service);
     service.addRule("discordUnderline", {
-      filter: ["u", "ins"],
-      replacement: (content) => content.trim() ? `__${content}__` : content
+      // Includes Google Docs CSS underline, which the shared rules would
+      // otherwise emit as <u>…</u> (shown literally in Discord)
+      filter: (node) => node.nodeName === "U" || node.nodeName === "INS" || isUnderlineSpan(node),
+      replacement: (content, node) => decorate(content, node, { underline: ["__", "__"], strike: ["~~", "~~"] })
     });
     service.addRule("discordHeadingLimit", {
       filter: ["h4", "h5", "h6"],
@@ -59069,7 +59143,7 @@ ${plainText}
       },
       replacement: (_content, node) => {
         const checked = node.checked || node.hasAttribute("checked");
-        return checked ? "\u2611 " : "\u2610 ";
+        return (checked ? "\u2611" : "\u2610") + this.checkboxSpacer(node);
       }
     });
     return service;
@@ -59097,9 +59171,9 @@ ${plainText}
    * Converts Unicode checkboxes to [x] and [ ]
    */
   normalizeGitHubCheckboxes(markdown) {
-    let result = markdown;
-    result = result.replace(/^([-*]\s+)[☑✓✔■⬛]/gm, "$1[x]");
-    result = result.replace(/^([-*]\s+)[☐✗✘□⬜]/gm, "$1[ ]");
+    let result = markdown.replace(/^([ \t]*(?:[-*+]|\d+[.)])[ \t]+)\\\[([ xX])\\\]/gm, "$1[$2]");
+    result = result.replace(/^([ \t]*(?:[-*+]|\d+[.)])[ \t]+)[☑✓✔■⬛]/gm, "$1[x]");
+    result = result.replace(/^([ \t]*(?:[-*+]|\d+[.)])[ \t]+)[☐✗✘□⬜]/gm, "$1[ ]");
     return result;
   }
   /**
@@ -59107,10 +59181,10 @@ ${plainText}
    * Converts [x], [ ], and other checkbox patterns to emoji
    */
   normalizeDiscordCheckboxes(markdown) {
-    let result = markdown.replace(/^([-*]\s+)\[x\]/gmi, "$1\u2611");
-    result = result.replace(/^([-*]\s+)[✓✔■⬛]/gm, "$1\u2611");
-    result = result.replace(/^([-*]\s+)\[\s?\]/gm, "$1\u2610");
-    result = result.replace(/^([-*]\s+)[✗✘□⬜]/gm, "$1\u2610");
+    let result = markdown.replace(/^([ \t]*(?:[-*+]|\d+[.)])[ \t]+)\\?\[x\\?\]/gmi, "$1\u2611");
+    result = result.replace(/^([ \t]*(?:[-*+]|\d+[.)])[ \t]+)[✓✔■⬛]/gm, "$1\u2611");
+    result = result.replace(/^([ \t]*(?:[-*+]|\d+[.)])[ \t]+)\\?\[\s?\\?\]/gm, "$1\u2610");
+    result = result.replace(/^([ \t]*(?:[-*+]|\d+[.)])[ \t]+)[✗✘□⬜]/gm, "$1\u2610");
     return result;
   }
   /**
@@ -59118,7 +59192,6 @@ ${plainText}
    * Converts Unicode superscript to ^text syntax
    */
   normalizeRedditUnicode(markdown) {
-    let result = markdown;
     const superscriptMap = {
       "\u2070": "0",
       "\xB9": "1",
@@ -59133,9 +59206,6 @@ ${plainText}
       "\u207F": "n",
       "\u2071": "i"
     };
-    for (const [unicode, digit] of Object.entries(superscriptMap)) {
-      result = result.replace(new RegExp(unicode, "g"), `^${digit}`);
-    }
     const subscriptMap = {
       "\u2080": "0",
       "\u2081": "1",
@@ -59148,17 +59218,13 @@ ${plainText}
       "\u2088": "8",
       "\u2089": "9"
     };
-    for (const [unicode, digit] of Object.entries(subscriptMap)) {
-      result = result.replace(new RegExp(unicode, "g"), `[${digit}]`);
-    }
-    return result;
+    return this.replaceOutsideCode(markdown, (text) => text.replace(/[⁰¹²³⁴⁵⁶⁷⁸⁹ⁿⁱ]+/g, (run) => `^(${Array.from(run).map((c) => superscriptMap[c]).join("")})`).replace(/[₀₁₂₃₄₅₆₇₈₉]+/g, (run) => `[${Array.from(run).map((c) => subscriptMap[c]).join("")}]`));
   }
   /**
    * Normalize Unicode for R Markdown format
    * Converts Unicode superscript/subscript to Pandoc syntax
    */
   normalizeRMarkdownUnicode(markdown) {
-    let result = markdown;
     const superscriptMap = {
       "\u2070": "0",
       "\xB9": "1",
@@ -59173,9 +59239,6 @@ ${plainText}
       "\u207F": "n",
       "\u2071": "i"
     };
-    for (const [unicode, digit] of Object.entries(superscriptMap)) {
-      result = result.replace(new RegExp(unicode, "g"), `^${digit}^`);
-    }
     const subscriptMap = {
       "\u2080": "0",
       "\u2081": "1",
@@ -59188,10 +59251,7 @@ ${plainText}
       "\u2088": "8",
       "\u2089": "9"
     };
-    for (const [unicode, digit] of Object.entries(subscriptMap)) {
-      result = result.replace(new RegExp(unicode, "g"), `~${digit}~`);
-    }
-    return result;
+    return this.replaceOutsideCode(markdown, (text) => text.replace(/[⁰¹²³⁴⁵⁶⁷⁸⁹ⁿⁱ]+/g, (run) => `^${Array.from(run).map((c) => superscriptMap[c]).join("")}^`).replace(/[₀₁₂₃₄₅₆₇₈₉]+/g, (run) => `~${Array.from(run).map((c) => subscriptMap[c]).join("")}~`));
   }
   /**
    * Create Reddit-optimized Turndown service
@@ -59199,6 +59259,104 @@ ${plainText}
    * - Subscript to bracketed text
    * - Fenced code blocks (new Reddit)
    */
+  /**
+   * Reddit's bare ^word superscript runs to the next space, so "x^2y" would
+   * superscript "2y". The parenthesised form ^(…) always ends where it should.
+   */
+  redditSuperscript(content) {
+    const trimmed = content.trim();
+    return trimmed ? `^(${trimmed.replace(/\)/g, "\\)")})` : "";
+  }
+  /**
+   * Pandoc ^x^ / ~x~ cannot contain bare spaces (they must be backslash-escaped),
+   * and a bare delimiter inside the content would close the span early.
+   */
+  pandocScript(content, delimiter) {
+    const trimmed = content.trim();
+    if (!trimmed) return "";
+    const escaped = trimmed.replace(delimiter === "^" ? /(?<!\\)\^/g : /(?<!\\)~/g, `\\${delimiter}`).replace(/ /g, "\\ ");
+    return `${delimiter}${escaped}${delimiter}`;
+  }
+  /**
+   * Apply a text transform everywhere except fenced code blocks and inline code spans.
+   *
+   * Fences may use ``` or ~~~ of any length (3+) and may sit behind list
+   * indentation or blockquote markers; a fence closes only on a run of the same
+   * character at least as long as the opener. Inline code spans close on a
+   * backtick run of exactly the opening length (CommonMark), so `` a`b `` is
+   * protected whole.
+   */
+  replaceOutsideCode(markdown, transform) {
+    const fenceOpen = /^((?:[ \t]*>)*[ \t]*(?:(?:[-*+]|\d+[.)])[ \t]+)?[ \t]*)(`{3,}|~{3,})/;
+    const lines = markdown.split(/(?<=\n)/);
+    const segments = [];
+    const push = (text, code) => {
+      const last = segments[segments.length - 1];
+      if (last && last.code === code) last.text += text;
+      else segments.push({ text, code });
+    };
+    let fence = null;
+    for (const line of lines) {
+      if (fence) {
+        push(line, true);
+        const body = line.replace(/^(?:[ \t]*>)*[ \t]*/, "");
+        const close = body.match(/^(`{3,}|~{3,})[ \t]*\r?\n?$/);
+        if (close && close[1][0] === fence.char && close[1].length >= fence.len) fence = null;
+        continue;
+      }
+      const open = line.match(fenceOpen);
+      if (open && !(open[2][0] === "`" && line.slice(open[0].length).includes("`"))) {
+        fence = { char: open[2][0], len: open[2].length };
+        push(line, true);
+        continue;
+      }
+      push(line, false);
+    }
+    const out = [];
+    for (const seg of segments) {
+      if (seg.code) {
+        out.push(seg.text);
+        continue;
+      }
+      const text = seg.text;
+      let plainStart = 0;
+      let i = 0;
+      while (i < text.length) {
+        if (text[i] !== "`") {
+          i++;
+          continue;
+        }
+        let j = i;
+        while (j < text.length && text[j] === "`") j++;
+        const runLen = j - i;
+        let k = j;
+        let closeAt = -1;
+        while (k < text.length) {
+          if (text[k] !== "`") {
+            k++;
+            continue;
+          }
+          let m = k;
+          while (m < text.length && text[m] === "`") m++;
+          if (m - k === runLen) {
+            closeAt = m;
+            break;
+          }
+          k = m;
+        }
+        if (closeAt === -1) {
+          i = j;
+          continue;
+        }
+        out.push(transform(text.slice(plainStart, i)));
+        out.push(text.slice(i, closeAt));
+        plainStart = closeAt;
+        i = closeAt;
+      }
+      out.push(transform(text.slice(plainStart)));
+    }
+    return out.join("");
+  }
   createRedditService() {
     const service = new import_turndown2.default({
       headingStyle: "atx",
@@ -59212,13 +59370,15 @@ ${plainText}
     this.addListRules(service);
     this.addPdfPageMarkerRules(service);
     this.addSlideMarkerRules(service);
+    service.addRule("redditUnderline", {
+      filter: (node) => node.nodeName === "U" || node.nodeName === "INS" || isUnderlineSpan(node),
+      // Keep a strikethrough set on the same span
+      replacement: (content, node) => decorate(content, node, { underline: null, strike: ["~~", "~~"] })
+    });
+    this.addTaskListRules(service);
     service.addRule("redditSuperscript", {
       filter: (node) => node.nodeName === "SUP",
-      replacement: (content) => {
-        const trimmed = content.trim();
-        if (!trimmed) return "";
-        return trimmed.includes(" ") ? `^(${trimmed})` : `^${trimmed}`;
-      }
+      replacement: (content) => this.redditSuperscript(content)
     });
     service.addRule("redditSuperscriptStyle", {
       filter: (node) => {
@@ -59226,11 +59386,7 @@ ${plainText}
         const style = node.getAttribute("style") || "";
         return style.includes("vertical-align: super") || style.includes("vertical-align:super");
       },
-      replacement: (content) => {
-        const trimmed = content.trim();
-        if (!trimmed) return "";
-        return trimmed.includes(" ") ? `^(${trimmed})` : `^${trimmed}`;
-      }
+      replacement: (content) => this.redditSuperscript(content)
     });
     service.addRule("redditSubscript", {
       filter: (node) => node.nodeName === "SUB",
@@ -59271,12 +59427,10 @@ ${plainText}
     this.addListRules(service);
     this.addPdfPageMarkerRules(service);
     this.addSlideMarkerRules(service);
+    this.addTaskListRules(service);
     service.addRule("rmdSuperscript", {
       filter: (node) => node.nodeName === "SUP",
-      replacement: (content) => {
-        const trimmed = content.trim();
-        return trimmed ? `^${trimmed}^` : "";
-      }
+      replacement: (content) => this.pandocScript(content, "^")
     });
     service.addRule("rmdSuperscriptStyle", {
       filter: (node) => {
@@ -59284,17 +59438,11 @@ ${plainText}
         const style = node.getAttribute("style") || "";
         return style.includes("vertical-align: super") || style.includes("vertical-align:super");
       },
-      replacement: (content) => {
-        const trimmed = content.trim();
-        return trimmed ? `^${trimmed}^` : "";
-      }
+      replacement: (content) => this.pandocScript(content, "^")
     });
     service.addRule("rmdSubscript", {
       filter: (node) => node.nodeName === "SUB",
-      replacement: (content) => {
-        const trimmed = content.trim();
-        return trimmed ? `~${trimmed}~` : "";
-      }
+      replacement: (content) => this.pandocScript(content, "~")
     });
     service.addRule("rmdSubscriptStyle", {
       filter: (node) => {
@@ -59302,10 +59450,7 @@ ${plainText}
         const style = node.getAttribute("style") || "";
         return style.includes("vertical-align: sub") || style.includes("vertical-align:sub");
       },
-      replacement: (content) => {
-        const trimmed = content.trim();
-        return trimmed ? `~${trimmed}~` : "";
-      }
+      replacement: (content) => this.pandocScript(content, "~")
     });
     service.addRule("rmdMath", {
       filter: (node) => {
@@ -59365,7 +59510,7 @@ ${plainText}
     });
     return doc.body.firstElementChild?.innerHTML ?? html;
   }
-  addGoogleDocsRules(service) {
+  addGoogleDocsRules(service, strike = ["~~", "~~"]) {
     service.addRule("googleDocsBold", {
       filter: (node) => {
         if (node.nodeName !== "SPAN") return false;
@@ -59435,16 +59580,9 @@ ${plainText}
       }
     });
     service.addRule("googleDocsUnderline", {
-      filter: (node) => {
-        if (node.nodeName === "SPAN") {
-          const style = node.getAttribute("style") || "";
-          return style.includes("text-decoration: underline") || style.includes("text-decoration:underline");
-        }
-        return false;
-      },
-      replacement: (content) => {
-        return content.trim() ? `<u>${content}</u>` : content;
-      }
+      filter: (node) => isUnderlineSpan(node),
+      // Also applies a line-through set on the same span
+      replacement: (content, node) => decorate(content, node, { underline: ["<u>", "</u>"], strike })
     });
     service.addRule("strikethroughTags", {
       filter: ["del", "s"],
@@ -59459,14 +59597,9 @@ ${plainText}
       }
     });
     service.addRule("strikethroughStyle", {
-      filter: (node) => {
-        if (node.nodeName !== "SPAN") return false;
-        const style = node.getAttribute("style") || "";
-        return style.includes("text-decoration: line-through") || style.includes("text-decoration:line-through") || style.includes("text-decoration-line: line-through") || style.includes("text-decoration-line:line-through");
-      },
-      replacement: (content) => {
-        return content.trim() ? `~~${content}~~` : content;
-      }
+      filter: (node) => isStrikeSpan(node),
+      // Also applies an underline set on the same span
+      replacement: (content, node) => decorate(content, node, { underline: ["<u>", "</u>"], strike })
     });
     service.addRule("monospaceCode", {
       filter: (node) => {
@@ -59580,6 +59713,11 @@ ${plainText}
   escapeTableCell(content) {
     return content.replace(/\|/g, "\\|").replace(/\s*<br>\s*/g, "<br>").trim();
   }
+  /** A space after a checkbox marker unless the label text already starts with one. */
+  checkboxSpacer(node) {
+    const next = node.nextSibling;
+    return next && /^\s/.test(next.textContent || "") ? "" : " ";
+  }
   addTaskListRules(service) {
     service.addRule("gfmTaskListCheckbox", {
       filter: (node) => {
@@ -59587,53 +59725,31 @@ ${plainText}
       },
       replacement: (_content, node) => {
         const checked = node.checked || node.hasAttribute("checked");
-        return checked ? "[x] " : "[ ] ";
+        return (checked ? "[x]" : "[ ]") + this.checkboxSpacer(node);
       }
     });
   }
   /**
-   * FF-IMP-004: Add superscript, subscript, and math span rules for
-   * github/commonmark flavours. Uses the same Pandoc-style syntax as
-   * rmarkdown (^text^ for sup, ~text~ for sub, $math$ for inline math)
-   * which GitHub renders correctly in Markdown files.
+   * FF-IMP-004: Superscript, subscript and math span rules for the
+   * github/commonmark/gdocs flavours. Neither GFM nor CommonMark has
+   * superscript/subscript syntax: Pandoc-style ^x^ shows literally, and GitHub
+   * renders ~x~ as strikethrough. Both allow inline HTML and GitHub keeps
+   * <sup>/<sub>, so those are emitted instead.
    */
   addSupSubMathRules(service) {
-    service.addRule("githubSuperscript", {
-      filter: (node) => node.nodeName === "SUP",
-      replacement: (content) => {
-        const trimmed = content.trim();
-        return trimmed ? `^${trimmed}^` : "";
-      }
-    });
-    service.addRule("githubSuperscriptStyle", {
-      filter: (node) => {
-        if (node.nodeName !== "SPAN") return false;
-        const style = node.getAttribute("style") || "";
-        return style.includes("vertical-align: super") || style.includes("vertical-align:super");
-      },
-      replacement: (content) => {
-        const trimmed = content.trim();
-        return trimmed ? `^${trimmed}^` : "";
-      }
-    });
-    service.addRule("githubSubscript", {
-      filter: (node) => node.nodeName === "SUB",
-      replacement: (content) => {
-        const trimmed = content.trim();
-        return trimmed ? `~${trimmed}~` : "";
-      }
-    });
-    service.addRule("githubSubscriptStyle", {
-      filter: (node) => {
-        if (node.nodeName !== "SPAN") return false;
-        const style = node.getAttribute("style") || "";
-        return style.includes("vertical-align: sub") || style.includes("vertical-align:sub");
-      },
-      replacement: (content) => {
-        const trimmed = content.trim();
-        return trimmed ? `~${trimmed}~` : "";
-      }
-    });
+    const isStyle = (node, value) => {
+      if (node.nodeName !== "SPAN") return false;
+      const style = node.getAttribute("style") || "";
+      return style.includes(`vertical-align: ${value}`) || style.includes(`vertical-align:${value}`);
+    };
+    const wrap = (tag) => (content) => {
+      const trimmed = content.trim();
+      return trimmed ? `<${tag}>${trimmed}</${tag}>` : "";
+    };
+    service.addRule("githubSuperscript", { filter: (node) => node.nodeName === "SUP", replacement: wrap("sup") });
+    service.addRule("githubSuperscriptStyle", { filter: (node) => isStyle(node, "super"), replacement: wrap("sup") });
+    service.addRule("githubSubscript", { filter: (node) => node.nodeName === "SUB", replacement: wrap("sub") });
+    service.addRule("githubSubscriptStyle", { filter: (node) => isStyle(node, "sub"), replacement: wrap("sub") });
     service.addRule("githubMath", {
       filter: (node) => {
         if (node.nodeName !== "SPAN") return false;
@@ -59653,60 +59769,78 @@ ${plainText}
     service.addRule("enhancedList", {
       filter: ["ul", "ol"],
       replacement: (content, node) => {
-        const listType = node?.nodeName.toLowerCase();
         const items = Array.from(node.children).filter(
           (child) => child.nodeName.toLowerCase() === "li"
         );
         if (items.length === 0) return content;
-        let markdown = "\n";
-        const isOrdered = listType === "ol";
-        const marker = isOrdered ? "1." : service.options.bulletListMarker || "-";
-        items.forEach((item, index) => {
-          const itemContent = this.processListItem(item, service);
-          const actualMarker = isOrdered ? `${index + 1}.` : marker;
-          markdown += `${actualMarker} ${itemContent}
-`;
-        });
-        return markdown + "\n";
-      }
-    });
-  }
-  processListItem(item, service, depth = 0) {
-    let content = "";
-    const TEXT_NODE = 3;
-    const ELEMENT_NODE2 = 1;
-    Array.from(item.childNodes).forEach((child) => {
-      if (child.nodeType === TEXT_NODE) {
-        content += child.textContent || "";
-      } else if (child.nodeType === ELEMENT_NODE2) {
-        const element = child;
-        if (element.nodeName.toLowerCase() === "ul" || element.nodeName.toLowerCase() === "ol") {
-          const nestedContent = this.processNestedList(element, service, depth + 1);
-          content += "\n" + nestedContent;
-        } else {
-          content += service.turndown(element.outerHTML);
-        }
+        return "\n" + this.renderList(node, service) + "\n";
       }
     });
-    return content.trim();
   }
-  processNestedList(list, service, depth) {
+  /**
+   * Render a list with markers at column 0. Continuation lines of each item
+   * (extra paragraphs, nested lists) are indented to the item's content
+   * column (marker width + 1), which is what CommonMark/GFM require for them
+   * to stay inside the item: 2 spaces under "- ", 3 under "1. ", 4 under "10. ".
+   */
+  renderList(list, service) {
     const items = Array.from(list.children).filter(
       (child) => child.nodeName.toLowerCase() === "li"
     );
-    if (items.length === 0) return "";
-    let markdown = "";
     const isOrdered = list.nodeName.toLowerCase() === "ol";
-    const indent = "  ".repeat(depth);
-    const marker = isOrdered ? "1." : service.options.bulletListMarker || "-";
+    const bullet = service.options.bulletListMarker || "-";
+    let markdown = "";
     items.forEach((item, index) => {
-      const itemContent = this.processListItem(item, service, depth);
-      const actualMarker = isOrdered ? `${index + 1}.` : marker;
-      markdown += `${indent}${actualMarker} ${itemContent}
+      const marker = isOrdered ? `${index + 1}.` : bullet;
+      const indent = " ".repeat(marker.length + 1);
+      const body = this.processListItem(item, service);
+      const lines = body.split("\n");
+      const indented = lines.map((line, i) => i === 0 || line === "" ? line : indent + line).join("\n");
+      markdown += `${marker} ${indented}
 `;
     });
     return markdown;
   }
+  /**
+   * Render one list item's content relative to its own content column.
+   * Inline runs and block children are converted together, so whitespace
+   * between sibling spans survives (Google Docs emits one span per run) and
+   * multiple paragraphs stay separated.
+   */
+  processListItem(item, service) {
+    const parts = [];
+    const ELEMENT_NODE2 = 1;
+    const doc = item.ownerDocument;
+    let buffer = doc.createElement("div");
+    const flush = () => {
+      if (buffer.childNodes.length > 0) {
+        const md = service.turndown(buffer).trim();
+        if (md) parts.push(md);
+      }
+      buffer = doc.createElement("div");
+    };
+    Array.from(item.childNodes).forEach((child) => {
+      const name = child.nodeType === ELEMENT_NODE2 ? child.nodeName.toLowerCase() : "";
+      if (name === "ul" || name === "ol") {
+        flush();
+        const nested = this.renderList(child, service).replace(/\n+$/, "");
+        if (nested) parts.push(nested);
+      } else {
+        buffer.appendChild(child.cloneNode(true));
+      }
+    });
+    flush();
+    let content = "";
+    parts.forEach((part, i) => {
+      if (i === 0) {
+        content = part;
+        return;
+      }
+      const isList = /^(?:[-*+]|\d+\.) /.test(part);
+      content += (isList ? "\n" : "\n\n") + part;
+    });
+    return content;
+  }
   addSlideMarkerRules(service) {
     service.addRule("pptxSlideMarker", {
       filter: (node) => node.nodeName === "DIV" && node.hasAttribute("data-slide-marker"),
@@ -64775,8 +64909,8 @@ import { readFileSync as readFileSync5 } from "fs";
 import { resolve, dirname as dirname3 } from "path";
 import { fileURLToPath } from "url";
 var getVersion = () => {
-  if ("1.0.34") {
-    return "1.0.34";
+  if ("1.0.36") {
+    return "1.0.36";
   }
   try {
     const __dirname2 = dirname3(fileURLToPath(import.meta.url));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "formatferry",
-  "version": "1.0.34",
+  "version": "1.0.36",
   "description": "Format Ferry CLI — Convert HTML, DOCX, PDF, XLSX, CSV, JSON, XML, PPTX to Markdown",
   "keywords": [
     "markdown",