kordoc 4.18.13 → 4.19.1

package/dist/{model-bundle-53CHDYCG.js → model-bundle-FEUM7XXS.js}

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 import {
   ALL_OCR_MODELS
-} from "./chunk-LKA7Z2NH.js";
+} from "./chunk-XFZMRCGJ.js";
 import {
   ALL_FORMULA_MODELS,
   getModelStatusIn,
   getModelsDir
-} from "./chunk-JWTZ3OVZ.js";
-import "./chunk-ISC2TH24.js";
-import "./chunk-PN5WWW56.js";
+} from "./chunk-BDTWXJNM.js";
+import "./chunk-4WTJS6ES.js";
+import "./chunk-7L5GY54Q.js";
 
 // src/shared/model-bundle.ts
 import { copyFile, mkdir } from "fs/promises";
@@ -101,4 +101,4 @@ export {
   importModels,
   modelCacheStatus
 };
-//# sourceMappingURL=model-bundle-53CHDYCG.js.map
+//# sourceMappingURL=model-bundle-FEUM7XXS.js.map

package/dist/{models-UVLAKK3M.js → models-6QCNX5YR.js}

@@ -10,10 +10,10 @@ import {
   ocrModelPath,
   ocrModelsCached,
   parseCharacterDict
-} from "./chunk-LKA7Z2NH.js";
-import "./chunk-JWTZ3OVZ.js";
-import "./chunk-ISC2TH24.js";
-import "./chunk-PN5WWW56.js";
+} from "./chunk-XFZMRCGJ.js";
+import "./chunk-BDTWXJNM.js";
+import "./chunk-4WTJS6ES.js";
+import "./chunk-7L5GY54Q.js";
 export {
   ALL_OCR_MODELS,
   OCR_DET_MODEL,
@@ -26,4 +26,4 @@ export {
   ocrModelsCached,
   parseCharacterDict
 };
-//# sourceMappingURL=models-UVLAKK3M.js.map
+//# sourceMappingURL=models-6QCNX5YR.js.map

package/dist/{parser-I4D3TRGU.js → parser-6EIBURDE.js}

@@ -50,38 +50,40 @@ import {
   startsNewItem,
   trimTrailingEmptyTableCols,
   wrapJoiner
-} from "./chunk-INESPVEV.js";
+} from "./chunk-CL3CJ7X5.js";
 import {
   ocrModelsCached
-} from "./chunk-LKA7Z2NH.js";
-import "./chunk-JWTZ3OVZ.js";
-import "./chunk-ISC2TH24.js";
+} from "./chunk-XFZMRCGJ.js";
+import "./chunk-BDTWXJNM.js";
+import "./chunk-4WTJS6ES.js";
 import {
   blocksToPages
-} from "./chunk-V7LKQNC4.js";
+} from "./chunk-X6ME7YYS.js";
 import {
   encodePng
 } from "./chunk-7FCNOKOR.js";
 import {
   CELL_EDGES,
+  CELL_PAGES,
   CONTENT_CELLS,
   escapeLiteralTags,
   stripScriptTags,
   unframeLayoutTables
-} from "./chunk-XVB3PUPJ.js";
+} from "./chunk-L5N5UQBP.js";
 import {
   hasRequestedPagesAfter,
   parsePageRange
 } from "./chunk-VQFA55IC.js";
 import {
   WINGDINGS,
+  assignTableIds,
   blocksToMarkdown,
   escapeLiteralDollar
-} from "./chunk-JKHU7HID.js";
+} from "./chunk-TRUR4RUJ.js";
 import {
   KordocError,
   sanitizeHref
-} from "./chunk-PN5WWW56.js";
+} from "./chunk-7L5GY54Q.js";
 
 // src/pdf/ocr-region-merge.ts
 function mergeOcrImageRegions(blocks, page, regions, ocrBlocks) {
@@ -762,6 +764,167 @@ function splitContactTables(blocks) {
   }
 }
 
+// src/pdf/table-pages.ts
+var CELL_SPLITS = /* @__PURE__ */ new WeakMap();
+function relocate(src, dst, from = 0) {
+  const out = [];
+  for (const s of CELL_SPLITS.get(src) ?? []) {
+    const at = dst.text.indexOf(src.text.slice(s.at, s.at + 20).trimEnd(), Math.max(from, out.at(-1)?.at ?? 0));
+    if (at >= 0) out.push({ at, page: s.page });
+  }
+  return out;
+}
+var setSplits = (cell, splits) => {
+  if (splits.length) CELL_SPLITS.set(cell, splits.sort((a, b) => a.at - b.at));
+};
+function markContinuedText(cell, add, page) {
+  if (!add.text.trim()) return;
+  const base = cell.text.trim() ? cell.text.length + 1 : 0;
+  setSplits(cell, [
+    ...CELL_SPLITS.get(cell) ?? [],
+    { at: base, page },
+    ...(CELL_SPLITS.get(add) ?? []).map((s) => ({ at: base + s.at, page: s.page }))
+  ]);
+}
+function rowStarts(t) {
+  const covered = /* @__PURE__ */ new Set();
+  const rows = [];
+  for (let r = 0; r < t.rows; r++) {
+    const starts = [];
+    for (let c = 0; c < t.cols; c++) {
+      if (covered.has(r * 1e5 + c)) continue;
+      const cell = t.cells[r]?.[c];
+      if (!cell) continue;
+      for (let dr = 0; dr < cell.rowSpan; dr++) for (let dc = 0; dc < cell.colSpan; dc++) if (dr || dc) covered.add((r + dr) * 1e5 + c + dc);
+      starts.push({ cell, c });
+    }
+    rows.push(starts);
+  }
+  return rows;
+}
+var covering = (t, r) => rowStarts(t).slice(0, r + 1).flatMap((starts, rr) => starts.filter((s) => rr + s.cell.rowSpan > r).map((s) => s.cell));
+function cellPage(cell) {
+  const p = CELL_PAGES.get(cell);
+  if (p !== void 0 || !cell.blocks?.length || cell.blocks.some((b) => b.pageNumber === void 0)) return p;
+  return Math.min(...cell.blocks.map((b) => b.pageNumber));
+}
+function tableRowPages(t, pageNumber) {
+  const pages = [];
+  let prev = pageNumber;
+  for (const starts of rowStarts(t)) {
+    let mark, text = false;
+    for (const { cell } of starts) {
+      const p = cellPage(cell);
+      if (p !== void 0) mark = Math.max(mark ?? p, p);
+      else if (cell.text.trim() || cell.blocks?.length) text = true;
+    }
+    const page = mark ?? (text ? pageNumber : prev);
+    prev = page !== void 0 && prev !== void 0 ? Math.max(prev, page) : page ?? prev;
+    pages.push(prev);
+  }
+  return pages;
+}
+function markJoinedPages(table, prev, curr) {
+  const pt = prev.table, ct = curr.table;
+  if (!curr.pageNumber || table.rows < pt.rows) return;
+  const pp = tableRowPages(pt, prev.pageNumber), cp = tableRowPages(ct, curr.pageNumber);
+  const off = table.rows - ct.rows;
+  const rows = rowStarts(table), ptRows = rowStarts(pt), ctRows = rowStarts(ct);
+  rows.forEach((starts, r) => {
+    const page2 = r < pt.rows ? pp[r] : cp[r - off];
+    for (const { cell } of starts) {
+      if (page2 !== void 0 && page2 !== prev.pageNumber) CELL_PAGES.set(cell, page2);
+      const src = (r < pt.rows ? ptRows[r] : ctRows[r - off])?.find((s) => s.cell !== cell && s.cell.text === cell.text && CELL_SPLITS.has(s.cell));
+      if (src) setSplits(cell, relocate(src.cell, cell));
+    }
+  });
+  const cr = pt.rows - 1 - off, page = cp[cr];
+  if (cr < 0 || page === void 0 || page === prev.pageNumber) return;
+  const tails = ctRows[cr].filter((s) => s.cell.text.trim());
+  for (const { cell } of ctRows[cr]) for (const b of cell.blocks ?? []) b.pageNumber ??= page;
+  const heads = covering(pt, pt.rows - 1);
+  for (const cell of covering(table, pt.rows - 1)) {
+    if (cell.blocks?.length) continue;
+    const head = heads.filter((h) => h.text.trim() && cell.text.startsWith(h.text.trimEnd()) && cell.text.trim().length > h.text.trim().length).sort((a, b) => b.text.length - a.text.length)[0];
+    if (!head) continue;
+    const from = head.text.trimEnd().length;
+    const hit = tails.map((t) => ({ t: t.cell, at: cell.text.indexOf(t.cell.text.trim().slice(0, 20), from) })).filter((h) => h.at >= from).sort((a, b) => a.at - b.at)[0];
+    if (!hit) continue;
+    setSplits(cell, [...relocate(head, cell), { at: hit.at, page }, ...relocate(hit.t, cell, hit.at)]);
+  }
+}
+function splitCell(cell, page) {
+  if (page === void 0) return null;
+  if (cell.blocks?.length) {
+    const k2 = cell.blocks.findIndex((b) => (b.pageNumber ?? page) > page);
+    if (k2 <= 0) return null;
+    const head = cell.blocks.slice(0, k2), tail = cell.blocks.slice(k2);
+    const text = (bs) => bs.map((b) => b.text ?? "").filter(Boolean).join("\n");
+    return { head: { text: text(head), blocks: head }, tail: { text: text(tail), blocks: tail }, page: tail[0].pageNumber, rest: [] };
+  }
+  const splits = CELL_SPLITS.get(cell) ?? [];
+  const k = splits.findIndex((s2) => s2.page > page && s2.at < cell.text.length);
+  if (k < 0) return null;
+  const s = splits[k];
+  const rest = cell.text.slice(s.at), lead = rest.length - rest.trimStart().length;
+  return {
+    head: { text: cell.text.slice(0, s.at).trimEnd() },
+    tail: { text: rest.trim() },
+    page: s.page,
+    rest: splits.slice(k + 1).map((x) => ({ at: x.at - s.at - lead, page: x.page })).filter((x) => x.at > 0)
+  };
+}
+function splitCrossPageRows(t, pageNumber) {
+  const pages = tableRowPages(t, pageNumber);
+  const rows = rowStarts(t);
+  for (let r = 0; r < t.rows; r++) {
+    const splits = rows[r].map((s) => ({ ...s, split: splitCell(s.cell, pages[r]) })).filter((s) => s.split);
+    if (!splits.length) continue;
+    const clone = (cell, patch) => {
+      const out = { ...cell, ...patch };
+      const p = CELL_PAGES.get(cell);
+      if (p !== void 0) CELL_PAGES.set(out, p);
+      if (!("text" in patch) && CELL_SPLITS.has(cell)) CELL_SPLITS.set(out, CELL_SPLITS.get(cell));
+      return out;
+    };
+    const e = Math.max(...splits.map((s) => r + s.cell.rowSpan - 1));
+    const cells = t.cells.map((row2) => row2.slice());
+    const row = Array.from({ length: t.cols }, () => ({ text: "", colSpan: 1, rowSpan: 1 }));
+    for (const { cell, c, split } of splits) {
+      cells[r][c] = clone(cell, split.head);
+      const tail = { ...cell, ...split.tail, rowSpan: 1 };
+      CELL_PAGES.set(tail, split.page);
+      setSplits(tail, split.rest);
+      row[c] = tail;
+    }
+    rows.forEach((starts, rr) => {
+      for (const { cell, c } of starts) {
+        if (splits.some((s) => s.cell === cell) || rr > e || rr + cell.rowSpan - 1 <= e) continue;
+        cells[rr][c] = clone(cells[rr][c], { rowSpan: cell.rowSpan + 1 });
+      }
+    });
+    cells.splice(e + 1, 0, row);
+    return splitCrossPageRows({ ...t, rows: t.rows + 1, cells }, pageNumber);
+  }
+  return t;
+}
+function splitPageTables(blocks) {
+  return blocks.flatMap((b) => {
+    if (b.type !== "table" || !b.table) return [b];
+    const t = splitCrossPageRows(b.table, b.pageNumber);
+    const pages = tableRowPages(t, b.pageNumber);
+    const cuts = [0];
+    for (let r = 1; r < t.rows; r++) if (pages[r] !== pages[r - 1]) cuts.push(r);
+    if (cuts.length === 1) return t === b.table ? [b] : [{ ...b, table: t }];
+    return cuts.map((from, k) => {
+      const end = cuts[k + 1] ?? t.rows;
+      const cells = t.cells.slice(from, end).map((row, dr) => row.map((cell) => cell && from + dr + cell.rowSpan > end ? { ...cell, rowSpan: end - from - dr } : cell));
+      const table = { ...t, rows: end - from, cells, ...k ? { caption: void 0, captionBlocks: void 0 } : {} };
+      return { ...b, table, pageNumber: pages[from] };
+    });
+  });
+}
+
 // src/pdf/table-parts.ts
 var flowText = (text) => text.replace(/<\/?u>|~~/g, "");
 var PART_COL_TOL = 1;
@@ -1181,6 +1344,7 @@ function leftColumnOf(b, t) {
 }
 function placeJoined(blocks, i, j, table) {
   const prev = blocks[i];
+  markJoinedPages(table, prev, blocks[j]);
   blocks[i] = { ...prev, table };
   blocks.splice(j, 1);
   let k = j - 1;
@@ -1534,6 +1698,7 @@ function mergeContinuedCells(blocks, pageHeights) {
     if (!cell || !add) continue;
     const at = cell.blocks || add.blocks ? cellBlocks(cell, prev.pageNumber).length : -1;
     if (cell.blocks || add.blocks) cell.blocks = [...cellBlocks(cell, prev.pageNumber), ...cellBlocks(add, part.pageNumber)];
+    else if (part.pageNumber) markContinuedText(cell, add, part.pageNumber);
     cell.text = [cell.text, add.text].filter((s) => s.trim()).join("\n");
     joinCellEdges(cell, add);
     const lines = CELL_LINES.get(add);
@@ -2882,7 +3047,7 @@ function mergeLinkRuns(markdown) {
 
 // src/pdf/formula-ocr.ts
 async function applyFormulaOcr(buffer, blocks, pageFilter, effectivePageCount, warnings, _onProgress) {
-  const formulaMod = await import("./formula-YCAO5IVW.js");
+  const formulaMod = await import("./formula-QSZRYZ44.js");
   const { FormulaPipeline, ensureFormulaModels } = formulaMod;
   await ensureFormulaModels((p) => {
     if (p.phase === "download" && p.total) {
@@ -3303,7 +3468,7 @@ async function parsePdfDocument(buffer, options) {
       }
       if (targets.size > 0) {
         try {
-          const { runPdfOcr } = await import("./pdf-ocr-F4ICXO7W.js");
+          const { runPdfOcr } = await import("./pdf-ocr-MESGGING.js");
           const mode = typeof options?.ocr === "function" ? options.ocr : "builtin";
           const regionPages = new Map([...ocrRegions].filter(([p]) => options?.ocr !== "force" && !isImageBased && !pageQuality.find((q) => q.page === p)?.needsOcr));
           const ocrPageBlocks = await runPdfOcr(ocrBuffer, targets, mode, warnings, options?.onProgress, options?.tables !== false, vectorPageOps, regionPages);
@@ -3456,11 +3621,12 @@ async function parsePdfDocument(buffer, options) {
       blocks.length = 0;
       for (const b of kept) blocks.push(b);
     }
-    const finishMarkdown = (bs) => mergeLinkRuns(cleanPdfText(blocksToMarkdown(bs), { keepLoneNumbers: true }));
+    const finishMarkdown = (bs) => mergeLinkRuns(cleanPdfText(blocksToMarkdown(bs, { tableFormat: options?.tableFormat }), { keepLoneNumbers: true }));
+    if (options?.tableFormat === "gfm") assignTableIds(blocks);
     let markdown = finishMarkdown(outBlocks);
     return {
       markdown,
-      pages: blocksToPages(splitPageBreakWraps(outBlocks), finishMarkdown),
+      pages: blocksToPages(splitPageTables(splitPageBreakWraps(outBlocks)), finishMarkdown),
       blocks,
       metadata,
       outline: outline.length > 0 ? outline : void 0,
@@ -3540,4 +3706,4 @@ export {
   parsePdfDocument,
   removeHeaderFooterBlocks
 };
-//# sourceMappingURL=parser-I4D3TRGU.js.map
+//# sourceMappingURL=parser-6EIBURDE.js.map