kordoc 3.5.0 → 3.5.1

package/dist/index.js

@@ -9,18 +9,20 @@ import {
   blocksToMarkdown,
   buildTable,
   classifyError,
+  compareSectionPaths,
   convertTableToText,
   flattenLayoutTables,
   isPathTraversal,
   mapPuaText,
+  normalizeSectionHref,
   precheckZipSize,
   sanitizeHref,
   stripDtd,
   toArrayBuffer
-} from "./chunk-AHDNELBR.js";
+} from "./chunk-OXOPDVNV.js";
 import {
   parsePageRange
-} from "./chunk-AIQ3ISQU.js";
+} from "./chunk-GE43BE46.js";
 
 // src/index.ts
 import { readFile } from "fs/promises";
@@ -657,14 +659,27 @@ function findBrackets(eqString, startIdx, direction) {
   const [s, e] = findBrackets(flipped, newStartIdx, 1);
   return [flipped.length - e, flipped.length - s];
 }
-function findOutterBrackets(eqString, startIdx) {
-  let idx = startIdx;
-  while (true) {
-    idx -= 1;
-    if (idx < 0) throw new Error("cannot find bracket");
-    if (eqString[idx] === "{") break;
+function findEnclosingBrackets(eqString, startIdx) {
+  let depth = 0;
+  for (let idx = startIdx - 1; idx >= 0; idx--) {
+    const ch = eqString[idx];
+    if (ch === "}") {
+      depth += 1;
+    } else if (ch === "{") {
+      if (depth > 0) {
+        depth -= 1;
+        continue;
+      }
+      try {
+        const [start, end] = findBrackets(eqString, idx, 1);
+        if (start === idx && end > startIdx) return [start, end];
+      } catch {
+        return null;
+      }
+      return null;
+    }
   }
-  return findBrackets(eqString, idx, 1);
+  return null;
 }
 function replaceFrac(eqString) {
   const hmlFrac = "over";
@@ -717,8 +732,9 @@ function replaceAllMatrix(eqString) {
         const elem = replaceElements(input.slice(eStart, eEnd));
         let beforeMat;
         let afterMat;
-        if (matElem.removeOutterBrackets) {
-          const [bStart, bEnd] = findOutterBrackets(input, cursor);
+        const outer = matElem.removeOutterBrackets ? findEnclosingBrackets(input, cursor) : null;
+        if (outer && outer[1] >= eEnd) {
+          const [bStart, bEnd] = outer;
           beforeMat = input.slice(0, bStart);
           afterMat = input.slice(bEnd);
         } else {
@@ -744,10 +760,11 @@ function replaceAllBar(eqString) {
       if (cursor === -1) break;
       try {
         const [eStart, eEnd] = findBrackets(input, cursor, 1);
-        const [bStart, bEnd] = findOutterBrackets(input, cursor);
         const elem = input.slice(eStart, eEnd);
-        const beforeBar = input.slice(0, bStart);
-        const afterBar = input.slice(bEnd);
+        const outer = findEnclosingBrackets(input, cursor);
+        const [replaceStart, replaceEnd] = outer && outer[1] >= eEnd ? outer : [cursor, eEnd];
+        const beforeBar = input.slice(0, replaceStart);
+        const afterBar = input.slice(replaceEnd);
         input = beforeBar + barElem + elem + afterBar;
       } catch {
         return input;
@@ -1369,24 +1386,19 @@ async function resolveSectionPaths(zip) {
     if (paths.length > 0) return paths;
   }
   const sectionFiles = zip.file(/[Ss]ection\d+\.xml$/);
-  return sectionFiles.map((f) => f.name).sort();
+  return sectionFiles.map((f) => f.name).sort(compareSectionPaths);
 }
 function parseSectionPathsFromManifest(xml) {
   const parser = createXmlParser();
   const doc = parser.parseFromString(stripDtd(xml), "text/xml");
   const items = doc.getElementsByTagName("opf:item");
   const spine = doc.getElementsByTagName("opf:itemref");
-  const isSectionId = (id) => /^s/i.test(id) || id.toLowerCase().includes("section");
   const idToHref = /* @__PURE__ */ new Map();
   for (let i = 0; i < items.length; i++) {
     const item = items[i];
     const id = item.getAttribute("id") || "";
-    let href = item.getAttribute("href") || "";
-    const mediaType = item.getAttribute("media-type") || "";
-    if (!isSectionId(id) && !mediaType.includes("xml")) continue;
-    if (!href.startsWith("/") && !href.startsWith("Contents/") && isSectionId(id))
-      href = "Contents/" + href;
-    idToHref.set(id, href);
+    const href = normalizeSectionHref(item.getAttribute("href") || "");
+    if (id && href) idToHref.set(id, href);
   }
   if (spine.length > 0) {
     const ordered = [];
@@ -1396,7 +1408,7 @@ function parseSectionPathsFromManifest(xml) {
     }
     if (ordered.length > 0) return ordered;
   }
-  return Array.from(idToHref.entries()).filter(([id]) => isSectionId(id)).sort((a, b) => a[0].localeCompare(b[0])).map(([, href]) => href);
+  return Array.from(idToHref.values()).sort(compareSectionPaths);
 }
 function detectHwpxHeadings(blocks, styleMap) {
   if (blocks.some((b) => b.type === "heading")) return;
@@ -16907,7 +16919,7 @@ async function parseXlsxDocument(buffer, options) {
   }
   let pageFilter = null;
   if (options?.pages) {
-    const { parsePageRange: parsePageRange2 } = await import("./page-range-CIRRJPXJ.js");
+    const { parsePageRange: parsePageRange2 } = await import("./page-range-LNMXJU6W.js");
     pageFilter = parsePageRange2(options.pages, sheets.length);
   }
   const blocks = [];
@@ -17545,7 +17557,7 @@ async function parseXlsDocument(buffer, options) {
   const totalSheets = Math.min(globals.sheets.length, MAX_SHEETS2);
   let pageFilter = null;
   if (options?.pages) {
-    const { parsePageRange: parsePageRange2 } = await import("./page-range-CIRRJPXJ.js");
+    const { parsePageRange: parsePageRange2 } = await import("./page-range-LNMXJU6W.js");
     pageFilter = parsePageRange2(options.pages, totalSheets);
   }
   const allBlocks = [];
@@ -21473,10 +21485,9 @@ async function resolveSectionEntryNames(zip) {
     const paths = sectionPathsFromManifest(xml).filter((p) => zip.file(p) !== null);
     if (paths.length > 0) return paths;
   }
-  return Object.keys(zip.files).filter((n) => /[Ss]ection\d+\.xml$/.test(n)).sort();
+  return Object.keys(zip.files).filter((n) => /[Ss]ection\d+\.xml$/.test(n)).sort(compareSectionPaths);
 }
 function sectionPathsFromManifest(xml) {
-  const isSectionId = (id) => /^s/i.test(id) || id.toLowerCase().includes("section");
   const attr = (tag, name) => {
     const m = tag.match(new RegExp(`(?:^|\\s)${name}\\s*=\\s*(?:"([^"]*)"|'([^']*)')`));
     return m ? m[1] ?? m[2] : "";
@@ -21484,11 +21495,8 @@ function sectionPathsFromManifest(xml) {
   const idToHref = /* @__PURE__ */ new Map();
   for (const m of xml.matchAll(/<opf:item(\s(?:"[^"]*"|'[^']*'|[^>"'])*?)\/?>/g)) {
     const id = attr(m[1], "id");
-    let href = attr(m[1], "href");
-    const mediaType = attr(m[1], "media-type");
-    if (!isSectionId(id) && !mediaType.includes("xml")) continue;
-    if (!href.startsWith("/") && !href.startsWith("Contents/") && isSectionId(id)) href = "Contents/" + href;
-    if (id) idToHref.set(id, href);
+    const href = normalizeSectionHref(attr(m[1], "href"));
+    if (id && href) idToHref.set(id, href);
   }
   const ordered = [];
   for (const m of xml.matchAll(/<opf:itemref(\s(?:"[^"]*"|'[^']*'|[^>"'])*?)\/?>/g)) {
@@ -21496,7 +21504,7 @@ function sectionPathsFromManifest(xml) {
     if (href) ordered.push(href);
   }
   if (ordered.length > 0) return ordered;
-  return Array.from(idToHref.entries()).filter(([id]) => isSectionId(id)).sort((a, b) => a[0].localeCompare(b[0])).map(([, href]) => href);
+  return Array.from(idToHref.values()).sort(compareSectionPaths);
 }
 
 // src/roundtrip/patcher.ts
@@ -23505,7 +23513,7 @@ async function parseHwp(buffer, options) {
 async function parsePdf(buffer, options) {
   let parsePdfDocument;
   try {
-    const mod = await import("./parser-LBLPN3KY.js");
+    const mod = await import("./parser-GHZMDUGG.js");
     parsePdfDocument = mod.parsePdfDocument;
   } catch {
     return {