@clazic/kordoc 2.1.4 → 2.1.6

package/dist/{chunk-NNYD6QUN.js → chunk-TFYOEQE2.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/utils.ts
-var VERSION = true ? "2.1.4" : "0.0.0-dev";
+var VERSION = true ? "2.1.6" : "0.0.0-dev";
 function toArrayBuffer(buf) {
   if (buf.byteOffset === 0 && buf.byteLength === buf.buffer.byteLength) {
     return buf.buffer;
@@ -90,4 +90,4 @@ export {
   sanitizeHref,
   classifyError
 };
-//# sourceMappingURL=chunk-NNYD6QUN.js.map
+//# sourceMappingURL=chunk-TFYOEQE2.js.map

package/dist/cli.js

@@ -2,11 +2,11 @@
 import {
   detectFormat,
   parse
-} from "./chunk-N2UPMKGJ.js";
+} from "./chunk-H7HMKSLX.js";
 import {
   VERSION,
   toArrayBuffer
-} from "./chunk-NNYD6QUN.js";
+} from "./chunk-TFYOEQE2.js";
 import "./chunk-MOL7MDBG.js";
 
 // src/cli.ts
@@ -92,7 +92,7 @@ program.name("kordoc").description("\uBAA8\uB450 \uD30C\uC2F1\uD574\uBC84\uB9AC\
         process.stdout.write(output + "\n");
       }
     } catch (err) {
-      const { sanitizeError } = await import("./utils-7VR5ORIC.js");
+      const { sanitizeError } = await import("./utils-7JE5SKSL.js");
       process.stderr.write(`
 [kordoc] ERROR: ${fileName} \u2014 ${sanitizeError(err)}
 `);
@@ -101,7 +101,7 @@ program.name("kordoc").description("\uBAA8\uB450 \uD30C\uC2F1\uD574\uBC84\uB9AC\
   }
 });
 program.command("watch <dir>").description("\uB514\uB809\uD1A0\uB9AC \uAC10\uC2DC \u2014 \uC0C8 \uBB38\uC11C \uC790\uB3D9 \uBCC0\uD658").option("--webhook <url>", "\uACB0\uACFC \uC804\uC1A1 \uC6F9\uD6C5 URL").option("-d, --out-dir <dir>", "\uBCC0\uD658 \uACB0\uACFC \uCD9C\uB825 \uB514\uB809\uD1A0\uB9AC").option("-p, --pages <range>", "\uD398\uC774\uC9C0/\uC139\uC158 \uBC94\uC704").option("--format <type>", "\uCD9C\uB825 \uD615\uC2DD: markdown \uB610\uB294 json", "markdown").option("--silent", "\uC9C4\uD589 \uBA54\uC2DC\uC9C0 \uC228\uAE30\uAE30").action(async (dir, opts) => {
-  const { watchDirectory } = await import("./watch-5RZ4YQPC.js");
+  const { watchDirectory } = await import("./watch-XALC6VOR.js");
   await watchDirectory({
     dir,
     outDir: opts.outDir,

package/dist/index.cjs

@@ -181,7 +181,7 @@ var import_jszip2 = __toESM(require("jszip"), 1);
 var import_xmldom = require("@xmldom/xmldom");
 
 // src/utils.ts
-var VERSION = true ? "2.1.4" : "0.0.0-dev";
+var VERSION = true ? "2.1.6" : "0.0.0-dev";
 function toArrayBuffer(buf) {
   if (buf.byteOffset === 0 && buf.byteLength === buf.buffer.byteLength) {
     return buf.buffer;
@@ -5644,7 +5644,7 @@ var HEADER_XML = `<?xml version='1.0' encoding='UTF-8'?>
         <hh:diagonal type="SOLID" width="0.1 mm" color="#000000"/>
       </hh:borderFill>
     </hh:borderFills>
-    <hh:charProperties itemCnt="13">
+    <hh:charProperties itemCnt="15">
       <hh:charPr id="0" height="1000" textColor="#000000" shadeColor="none" useFontSpace="0" useKerning="0" symMark="NONE" borderFillIDRef="2">
         <hh:fontRef hangul="1" latin="1" hanja="1" japanese="1" other="1" symbol="1" user="1"/>
         <hh:ratio hangul="100" latin="100" hanja="100" japanese="100" other="100" symbol="100" user="100"/>
@@ -5795,6 +5795,30 @@ var HEADER_XML = `<?xml version='1.0' encoding='UTF-8'?>
         <hh:outline type="NONE"/>
         <hh:shadow type="NONE" color="#C0C0C0" offsetX="10" offsetY="10"/>
       </hh:charPr>
+      <hh:charPr id="13" height="1000" textColor="#000000" shadeColor="none" useFontSpace="0" useKerning="0" symMark="NONE" borderFillIDRef="2">
+        <hh:fontRef hangul="1" latin="1" hanja="1" japanese="1" other="1" symbol="1" user="1"/>
+        <hh:ratio hangul="100" latin="100" hanja="100" japanese="100" other="100" symbol="100" user="100"/>
+        <hh:spacing hangul="0" latin="0" hanja="0" japanese="0" other="0" symbol="0" user="0"/>
+        <hh:relSz hangul="100" latin="100" hanja="100" japanese="100" other="100" symbol="100" user="100"/>
+        <hh:offset hangul="0" latin="0" hanja="0" japanese="0" other="0" symbol="0" user="0"/>
+        <hh:bold/>
+        <hh:italic/>
+        <hh:underline type="NONE" shape="SOLID" color="#000000"/>
+        <hh:strikeout shape="NONE" color="#000000"/>
+        <hh:outline type="NONE"/>
+        <hh:shadow type="NONE" color="#C0C0C0" offsetX="10" offsetY="10"/>
+      </hh:charPr>
+      <hh:charPr id="14" height="900" textColor="#333333" shadeColor="#F0F0F0" useFontSpace="0" useKerning="0" symMark="NONE" borderFillIDRef="2">
+        <hh:fontRef hangul="1" latin="1" hanja="1" japanese="1" other="1" symbol="1" user="1"/>
+        <hh:ratio hangul="100" latin="100" hanja="100" japanese="100" other="100" symbol="100" user="100"/>
+        <hh:spacing hangul="0" latin="0" hanja="0" japanese="0" other="0" symbol="0" user="0"/>
+        <hh:relSz hangul="100" latin="100" hanja="100" japanese="100" other="100" symbol="100" user="100"/>
+        <hh:offset hangul="0" latin="0" hanja="0" japanese="0" other="0" symbol="0" user="0"/>
+        <hh:underline type="NONE" shape="SOLID" color="#000000"/>
+        <hh:strikeout shape="NONE" color="#000000"/>
+        <hh:outline type="NONE"/>
+        <hh:shadow type="NONE" color="#C0C0C0" offsetX="10" offsetY="10"/>
+      </hh:charPr>
     </hh:charProperties>
     <hh:tabProperties itemCnt="3">
       <hh:tabPr id="0" autoTabLeft="0" autoTabRight="0"/>
@@ -6717,6 +6741,8 @@ var CHAR_H3 = "9";
 var CHAR_H456 = "10";
 var CHAR_BOLD = "11";
 var CHAR_ITALIC = "12";
+var CHAR_BOLD_ITALIC = "13";
+var CHAR_CODE = "14";
 var PARA_NORMAL = "0";
 var SEC_NS = [
   `xmlns:ha="http://www.hancom.co.kr/hwpml/2011/app"`,
@@ -6744,7 +6770,7 @@ function escapeXml(text) {
 }
 function parseInlineRuns(text) {
   const runs = [];
-  const re = /\*\*\*(.+?)\*\*\*|\*\*(.+?)\*\*|\*(.+?)\*|_(.+?)_|`(.+?)`/g;
+  const re = /\*\*\*(.+?)\*\*\*|\*\*(.+?)\*\*|\*(.+?)\*|_(.+?)_|`(.+?)`|\[([^\]]+)\]\(([^)]+)\)/g;
   let last = 0;
   let m;
   while ((m = re.exec(text)) !== null) {
@@ -6753,13 +6779,16 @@ function parseInlineRuns(text) {
     else if (m[2]) runs.push({ text: m[2], bold: true });
     else if (m[3]) runs.push({ text: m[3], italic: true });
     else if (m[4]) runs.push({ text: m[4], italic: true });
-    else if (m[5]) runs.push({ text: m[5] });
+    else if (m[5]) runs.push({ text: m[5], code: true });
+    else if (m[6]) runs.push({ text: m[6], url: m[7] });
     last = m.index + m[0].length;
   }
   if (last < text.length) runs.push({ text: text.slice(last) });
   return runs.filter((r) => r.text.length > 0);
 }
 function charPrForRun(run) {
+  if (run.code) return CHAR_CODE;
+  if (run.bold && run.italic) return CHAR_BOLD_ITALIC;
   if (run.bold) return CHAR_BOLD;
   if (run.italic) return CHAR_ITALIC;
   return CHAR_NORMAL;
@@ -6767,19 +6796,41 @@ function charPrForRun(run) {
 function makeRun(text, charPrId) {
   return `<hp:run charPrIDRef="${charPrId}"><hp:t${text ? `>${escapeXml(text)}</hp:t` : "/"}></hp:run>`;
 }
-function makeRunsFromText(text, defaultCharPr) {
+function makeHyperlinkRun(text, url, charPrId, nextId) {
+  const subId = nextId();
+  const paraId = nextId();
+  return [
+    `<hp:run charPrIDRef="${charPrId}">`,
+    `  <hp:ctrl>`,
+    `    <hp:hyperLink url="${escapeXml(url)}" macro="" visitedStyle="UNKNOWN" visitedStyleIDRef="4294967295">`,
+    `      <hp:subList id="${subId}" textDirection="HORIZONTAL" lineWrap="BREAK" vertAlign="TOP"`,
+    `                 linkListIDRef="0" linkListNextIDRef="0" textWidth="0" textHeight="0"`,
+    `                 hasTextRef="0" hasNumRef="0">`,
+    `        <hp:p id="${paraId}" paraPrIDRef="0" styleIDRef="0" pageBreak="0" columnBreak="0" merged="0">`,
+    `          <hp:run charPrIDRef="${charPrId}"><hp:t>${escapeXml(text)}</hp:t></hp:run>`,
+    `        </hp:p>`,
+    `      </hp:subList>`,
+    `    </hp:hyperLink>`,
+    `  </hp:ctrl>`,
+    `</hp:run>`
+  ].join("\n");
+}
+function makeRunsFromText(text, defaultCharPr, nextId) {
   const runs = parseInlineRuns(text);
   if (runs.length === 0) return makeRun("", defaultCharPr);
-  if (runs.length === 1 && !runs[0].bold && !runs[0].italic)
-    return makeRun(runs[0].text, defaultCharPr);
-  return runs.map((r) => makeRun(r.text, charPrForRun(r))).join("");
+  const isPlain = runs.length === 1 && !runs[0].bold && !runs[0].italic && !runs[0].code && !runs[0].url;
+  if (isPlain) return makeRun(runs[0].text, defaultCharPr);
+  return runs.map((r) => {
+    if (r.url && nextId) return makeHyperlinkRun(r.text, r.url, CHAR_NORMAL, nextId);
+    return makeRun(r.text, charPrForRun(r));
+  }).join("");
 }
 var LINESEG = `  <hp:linesegarray>
     <hp:lineseg textpos="0" vertpos="0" vertsize="1000" textheight="1000" baseline="850" spacing="600" horzpos="0" horzsize="42520" flags="393216"/>
   </hp:linesegarray>`;
 function makeParagraph(text, charPrId, paraPrId, nextId) {
   const id = nextId();
-  const runs = makeRunsFromText(text, charPrId);
+  const runs = makeRunsFromText(text, charPrId, nextId);
   return [
     `<hp:p id="${id}" paraPrIDRef="${paraPrId}" styleIDRef="0" pageBreak="0" columnBreak="0" merged="0">`,
     `  ${runs}`,
@@ -6865,6 +6916,15 @@ ${row.map((cell, colIdx) => makeTableCell(cell, colIdx, rowIdx, colWidth, rowIdx
     `</hp:p>`
   ].join("\n");
 }
+function getIndent(line) {
+  let spaces = 0;
+  for (const ch of line) {
+    if (ch === " ") spaces++;
+    else if (ch === "	") spaces += 2;
+    else break;
+  }
+  return Math.floor(spaces / 2);
+}
 function parseMarkdownToBlocks(md) {
   const lines = md.split("\n");
   const blocks = [];
@@ -6883,6 +6943,12 @@ function parseMarkdownToBlocks(md) {
       i++;
       continue;
     }
+    const imgm = trimmed.match(/^!\[([^\]]*)\]\(([^)]+)\)$/);
+    if (imgm) {
+      blocks.push({ type: "image", alt: imgm[1], src: imgm[2] });
+      i++;
+      continue;
+    }
     if (trimmed.startsWith("|")) {
       const tableRows = [];
       while (i < lines.length && lines[i].trim().startsWith("|")) {
@@ -6898,35 +6964,84 @@ function parseMarkdownToBlocks(md) {
       if (tableRows.length > 0) blocks.push({ type: "table", rows: tableRows });
       continue;
     }
-    if (/^[-*+]\s/.test(trimmed)) {
+    if (/^\s*[-*+]\s/.test(line)) {
       const items = [];
-      while (i < lines.length && /^\s*[-*+]\s/.test(lines[i]))
-        items.push(lines[i++].trim().replace(/^[-*+]\s+/, ""));
+      while (i < lines.length && /^\s*[-*+]\s/.test(lines[i])) {
+        const indent = getIndent(lines[i]);
+        const text = lines[i].trim().replace(/^[-*+]\s+/, "");
+        items.push({ text, indent });
+        i++;
+      }
       blocks.push({ type: "list", listType: "unordered", items });
       continue;
     }
-    if (/^\d+\.\s/.test(trimmed)) {
+    if (/^\s*\d+\.\s/.test(line)) {
       const items = [];
-      while (i < lines.length && /^\s*\d+\.\s/.test(lines[i]))
-        items.push(lines[i++].trim().replace(/^\d+\.\s+/, ""));
+      while (i < lines.length && /^\s*\d+\.\s/.test(lines[i])) {
+        const indent = getIndent(lines[i]);
+        const text = lines[i].trim().replace(/^\d+\.\s+/, "");
+        items.push({ text, indent });
+        i++;
+      }
       blocks.push({ type: "list", listType: "ordered", items });
       continue;
     }
     if (trimmed.startsWith("```")) {
+      const lang = trimmed.slice(3).trim();
       i++;
       const codeLines = [];
       while (i < lines.length && !lines[i].trim().startsWith("```")) codeLines.push(lines[i++]);
       if (i < lines.length) i++;
-      if (codeLines.length > 0) blocks.push({ type: "paragraph", text: codeLines.join("\n") });
+      if (codeLines.length > 0) blocks.push({ type: "code", text: codeLines.join("\n"), lang });
       continue;
     }
     const paraLines = [];
-    while (i < lines.length && lines[i].trim() && !lines[i].trim().startsWith("#") && !lines[i].trim().startsWith("|") && !/^\s*[-*+]\s/.test(lines[i]) && !/^\s*\d+\.\s/.test(lines[i]) && !lines[i].trim().startsWith("```")) paraLines.push(lines[i++].trim());
+    while (i < lines.length && lines[i].trim() && !lines[i].trim().startsWith("#") && !lines[i].trim().startsWith("|") && !/^\s*[-*+]\s/.test(lines[i]) && !/^\s*\d+\.\s/.test(lines[i]) && !lines[i].trim().startsWith("```") && !lines[i].trim().match(/^!\[[^\]]*\]\([^)]+\)$/)) paraLines.push(lines[i++].trim());
     if (paraLines.length > 0) blocks.push({ type: "paragraph", text: paraLines.join(" ") });
   }
   return blocks;
 }
-function generateSectionXml(blocks, styleMap) {
+function mimeToFormat(mimeType) {
+  if (mimeType.includes("jpeg") || mimeType.includes("jpg")) return "JPG";
+  if (mimeType.includes("gif")) return "GIF";
+  if (mimeType.includes("bmp")) return "BMP";
+  return "PNG";
+}
+function makeImageParagraph(binDataId, nextId, widthHwp = 28346, heightHwp = 19843) {
+  const paraId = nextId();
+  return [
+    `<hp:p id="${paraId}" paraPrIDRef="0" styleIDRef="0" pageBreak="0" columnBreak="0" merged="0">`,
+    `  <hp:run charPrIDRef="0">`,
+    `    <hp:pic name="" zOrder="0" numberingType="NONE" textWrap="TOP_AND_BOTTOM" textFlow="BOTH_SIDES"`,
+    `            lock="0" dropcapstyle="None" pageBreak="CELL">`,
+    `      <hp:instSz width="${widthHwp}" height="${heightHwp}" widthRelTo="ABSOLUTE" heightRelTo="ABSOLUTE" protect="0"/>`,
+    `      <hp:pos treatAsChar="1" affectLSpacing="0" flowWithText="1" allowOverlap="0"`,
+    `             holdAnchorAndSO="0" vertRelTo="PARA" horzRelTo="COLUMN"`,
+    `             vertAlign="TOP" horzAlign="LEFT" vertOffset="0" horzOffset="0"/>`,
+    `      <hp:outMargin left="0" right="0" top="0" bottom="0"/>`,
+    `      <hp:content binaryItemIDRef="${binDataId}"/>`,
+    `      <hp:imgRect left="0" top="0" right="${widthHwp}" bottom="${heightHwp}"/>`,
+    `      <hp:imgClip left="0" top="0" right="${widthHwp}" bottom="${heightHwp}"/>`,
+    `    </hp:pic>`,
+    `  </hp:run>`,
+    LINESEG,
+    `</hp:p>`
+  ].join("\n");
+}
+function makeCodeParagraphs(code, nextId) {
+  const lines = code.split("\n");
+  return lines.map((line) => {
+    const id = nextId();
+    const safe = escapeXml(line || " ");
+    return [
+      `<hp:p id="${id}" paraPrIDRef="0" styleIDRef="0" pageBreak="0" columnBreak="0" merged="0">`,
+      `  <hp:run charPrIDRef="${CHAR_CODE}"><hp:t>${safe}</hp:t></hp:run>`,
+      LINESEG,
+      `</hp:p>`
+    ].join("\n");
+  }).join("\n");
+}
+function generateSectionXml(blocks, styleMap, imageMap) {
   const nextId = makeIdGen();
   const firstId = nextId();
   const defaultCharPr = styleMap ? styleMap.body.charPr : CHAR_NORMAL;
@@ -6975,11 +7090,12 @@ function generateSectionXml(blocks, styleMap) {
     `</hp:p>`
   ].join("\n");
   const bodyParts = [];
+  const orderedCounters = /* @__PURE__ */ new Map();
   for (const block of blocks) {
+    if (block.type !== "list") orderedCounters.clear();
     switch (block.type) {
       case "heading": {
         const level = block.level || 1;
-        const headingKey = `h${level}`;
         let charPrId;
         let paraPrId;
         if (styleMap) {
@@ -7004,21 +7120,51 @@ function generateSectionXml(blocks, styleMap) {
         }
         break;
       }
+      case "code": {
+        bodyParts.push(makeCodeParagraphs(block.text || "", nextId));
+        break;
+      }
       case "empty":
         bodyParts.push(makeEmptyParagraph(nextId));
         break;
       case "list": {
         const charPrId = styleMap ? styleMap.body.charPr : CHAR_NORMAL;
         const paraPrId = styleMap ? styleMap.body.paraPr : PARA_NORMAL;
-        for (let idx = 0; idx < (block.items || []).length; idx++) {
-          const prefix = block.listType === "ordered" ? `${idx + 1}. ` : "\u2022 ";
-          bodyParts.push(makeParagraph(prefix + (block.items || [])[idx], charPrId, paraPrId, nextId));
+        const items = block.items || [];
+        if (block.listType === "ordered") {
+          for (const item of items) {
+            const cnt = (orderedCounters.get(item.indent) || 0) + 1;
+            orderedCounters.set(item.indent, cnt);
+            for (const [k] of orderedCounters) {
+              if (k > item.indent) orderedCounters.set(k, 0);
+            }
+            const indent = "    ".repeat(item.indent);
+            bodyParts.push(makeParagraph(`${indent}${cnt}. ${item.text}`, charPrId, paraPrId, nextId));
+          }
+        } else {
+          for (const item of items) {
+            const bullets = ["\u2022", "\u25E6", "\u25AA"];
+            const bullet = bullets[Math.min(item.indent, bullets.length - 1)];
+            const indent = "    ".repeat(item.indent);
+            bodyParts.push(makeParagraph(`${indent}${bullet} ${item.text}`, charPrId, paraPrId, nextId));
+          }
         }
         break;
       }
       case "table":
         if (block.rows?.length) bodyParts.push(makeTable(block.rows, nextId, styleMap));
         break;
+      case "image": {
+        const src = block.src || "";
+        const binId = imageMap?.get(src);
+        if (binId !== void 0) {
+          bodyParts.push(makeImageParagraph(binId, nextId));
+        } else {
+          const alt = block.alt || src || "(\uC774\uBBF8\uC9C0)";
+          bodyParts.push(makeParagraph(`[\uC774\uBBF8\uC9C0: ${alt}]`, CHAR_NORMAL, PARA_NORMAL, nextId));
+        }
+        break;
+      }
     }
   }
   return [
@@ -7055,9 +7201,28 @@ async function markdownToHwpx(markdown, options) {
       warnings.push(`[warn] \uD15C\uD50C\uB9BF \uCC98\uB9AC \uC2E4\uD328: ${msg}. \uAE30\uBCF8 \uC2A4\uD0C0\uC77C \uC0AC\uC6A9`);
     }
   }
+  const imageMap = /* @__PURE__ */ new Map();
+  const binDataEntries = [];
+  if (opts.images && opts.images.length > 0) {
+    for (let idx = 0; idx < opts.images.length; idx++) {
+      const img = opts.images[idx];
+      const binId = idx + 1;
+      const format = mimeToFormat(img.mimeType);
+      const nameWithoutExt = img.filename.replace(/\.[^.]+$/, "");
+      const binFilename = `BinData/${nameWithoutExt}`;
+      imageMap.set(img.filename, binId);
+      binDataEntries.push({ id: binId, format, filename: binFilename });
+    }
+  }
+  if (binDataEntries.length > 0) {
+    const binXml = binDataEntries.map((e) => `    <hh:binData id="${e.id}" type="LINK" format="${e.format}" compress="NO" access="PUBLIC"><hh:sourceFile href="${e.filename}"/></hh:binData>`).join("\n");
+    headerXml = headerXml.replace("</hh:refList>", `${binXml}
+  </hh:refList>`);
+  }
   const sectionXml = generateSectionXml(
     parseMarkdownToBlocks(markdown),
-    styleMap || void 0
+    styleMap || void 0,
+    imageMap.size > 0 ? imageMap : void 0
   );
   const zip = new import_jszip6.default();
   zip.file("mimetype", "application/hwp+zip", { compression: "STORE" });
@@ -7073,8 +7238,7 @@ async function markdownToHwpx(markdown, options) {
   if (opts.images && opts.images.length > 0) {
     for (const img of opts.images) {
       const nameWithoutExt = img.filename.replace(/\.[^.]+$/, "");
-      const binDataPath = `BinData/${nameWithoutExt}`;
-      zip.file(binDataPath, img.data);
+      zip.file(`BinData/${nameWithoutExt}`, img.data);
     }
   }
   return await zip.generateAsync({ type: "arraybuffer" });