@v1hz/md2docx 1.0.4 → 1.1.0

package/config/config.json

@@ -8,7 +8,7 @@
   "tableCaption": {
     "enabled": true,
     "format": "表 {n}",
-    "separator": ""
+    "separator": " "
   },
   "normalizeHeadings": {
     "enabled": true

package/config/config.schema.json

@@ -47,7 +47,7 @@
         "separator": {
           "description": "编号与表格标题之间的分隔符",
           "type": "string",
-          "default": ""
+          "default": " "
         }
       },
       "required": ["enabled", "format", "separator"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@v1hz/md2docx",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "description": "基于 pandoc 的 Markdown 转 Word (docx) 工具，自动处理标题、编号、Mermaid 图表等",
   "keywords": [
     "converter",

package/src/cli.ts

@@ -132,6 +132,7 @@ export function formatHelp(configOptions: ConfigOption[]): string {
   const lines = [
     "用法:",
     "  md2docx <md-path> [选项]",
+    "  md2docx clean",
     "",
     "选项:",
     "  -o <path>                         输出 docx 路径",
@@ -140,6 +141,9 @@ export function formatHelp(configOptions: ConfigOption[]): string {
     "  -v, --version                     显示版本号",
     "  -h, --help                        显示帮助",
     "",
+    "子命令:",
+    "  clean                             清除 tmp/ 缓存",
+    "",
     "配置覆盖:",
   ];
 

package/src/index.ts

@@ -1,17 +1,41 @@
 #!/usr/bin/env bun
 
-import { mkdirSync, writeFileSync } from "fs";
+import { existsSync, mkdirSync, rmSync, writeFileSync } from "fs";
 import { dirname, parse, resolve } from "path";
 import { $ } from "bun";
 
 import { applyConfigOverrides, formatHelp, getConfigOptions, parseCliArgs } from "./cli";
 import { loadConfig } from "./config";
-import { CONFIG_PATH, CONFIG_SCHEMA_PATH, PKG_DIR, formattedMdPath, preprocessDir } from "./paths";
+import {
+  CONFIG_PATH,
+  CONFIG_SCHEMA_PATH,
+  PKG_DIR,
+  TMP_DIR,
+  formattedMdPath,
+  preprocessDir,
+} from "./paths";
 import { preprocess } from "./preprocess/index";
 import { startWebEditor } from "./web";
+import { ensureTemplateDocx } from "./style/generate";
+
+async function cleanCache(): Promise<number> {
+  const resolved = resolve(TMP_DIR);
+  if (existsSync(resolved)) {
+    rmSync(resolved, { recursive: true, force: true });
+    console.log(`已清除缓存：${resolved}`);
+  } else {
+    console.log("缓存目录不存在，无需清理。");
+  }
+  return 0;
+}
 
 export async function run(args: string[]): Promise<number> {
   try {
+    // 检查子命令
+    const subcommand = args[0];
+    if (subcommand === "clean") {
+      return await cleanCache();
+    }
     const schema = JSON.parse(await Bun.file(CONFIG_SCHEMA_PATH).text());
     const configOptions = getConfigOptions(schema);
     const cli = parseCliArgs(args, configOptions);
@@ -33,7 +57,7 @@ export async function run(args: string[]): Promise<number> {
     }
 
     const mdPath = resolve(cli.mdPath!);
-    if (!(await Bun.file(mdPath).exists())) throw new Error(`找不到 Markdown 文件：${mdPath}`);
+    if (!existsSync(mdPath)) throw new Error(`找不到 Markdown 文件：${mdPath}`);
 
     const config = await loadConfig(cli.configPath ?? CONFIG_PATH);
     const cfg = applyConfigOverrides(config, cli.overrides);
@@ -46,10 +70,12 @@ export async function run(args: string[]): Promise<number> {
     writeFileSync(mdOutput, formattedMd, "utf-8");
 
     if (cfg.pandoc.enabled) {
+      const templatePath = await ensureTemplateDocx();
       const configuredName = cfg.pandoc.outputName.replaceAll("{file_name}", baseName);
       const docxOutput = resolve(cli.outputPath ?? configuredName);
       mkdirSync(dirname(docxOutput), { recursive: true });
-      const result = await $`pandoc ${mdOutput} -o ${docxOutput}`.nothrow();
+      const result =
+        await $`pandoc ${mdOutput} -o ${docxOutput} --reference-doc=${templatePath}`.nothrow();
       if (result.exitCode !== 0) {
         console.error(`pandoc 转换失败 (exit code ${result.exitCode}):`, result.stderr.toString());
         return 1;

package/src/paths.ts

@@ -27,11 +27,8 @@ export function formattedMdPath(baseName: string): string {
 /** 样式模块目录 */
 export const STYLE_DIR = `${TMP_DIR}/style`;
 
-/** 参考 docx 文件路径（样式提取的输入） */
-export const STYLE_REF_DOCX = `${STYLE_DIR}/ref.docx`;
-
-/** 样式 JSON 文件路径（提取结果的输出 / 模板生成的输入） */
-export const STYLE_JSON = `${STYLE_DIR}/style.json`;
+/** 样式配置文件（相对于包安装目录），用户维护的样式定义 */
+export const STYLE_CONFIG = resolve(PKG_DIR, "config/style.json");
 
 /** 生成的模板 docx 文件路径 */
-export const STYLE_TEMPLATE_DOCX = `${STYLE_DIR}/template.docx`;
+export const STYLE_TEMPLATE_DOCX = `${STYLE_DIR}/style.docx`;

package/src/style/extract.ts

@@ -1,4 +1,4 @@
-import { readFileSync, writeFileSync } from "node:fs";
+import { readFileSync } from "node:fs";
 import { DOMParser } from "@xmldom/xmldom";
 import { useNamespaces } from "xpath";
 import PizZip from "pizzip";
@@ -372,10 +372,3 @@ export function extractStylesFromDocx(docxPath: string): ExtractedStyles {
 
   return result;
 }
-
-if (import.meta.main) {
-  const { STYLE_REF_DOCX, STYLE_JSON } = await import("../paths");
-  const styles = extractStylesFromDocx(STYLE_REF_DOCX);
-  writeFileSync(STYLE_JSON, JSON.stringify(styles, null, 2), "utf-8");
-  console.log(`Styles extracted from ${STYLE_REF_DOCX} to ${STYLE_JSON}`);
-}

package/src/style/generate.ts

@@ -0,0 +1,31 @@
+import { readFileSync, mkdirSync } from "fs";
+import { Document, Packer } from "docx";
+import { dirname } from "path";
+import { STYLE_CONFIG, STYLE_TEMPLATE_DOCX } from "../paths";
+
+export async function generateTemplateDocx(): Promise<void> {
+  const styles = JSON.parse(readFileSync(STYLE_CONFIG, "utf-8"));
+  const doc = new Document({
+    styles: styles,
+    sections: [],
+  });
+  const buf = await Packer.toBuffer(doc);
+  mkdirSync(dirname(STYLE_TEMPLATE_DOCX), { recursive: true });
+  await Bun.write(STYLE_TEMPLATE_DOCX, buf);
+}
+
+let _generatePromise: Promise<void> | null = null;
+
+export async function ensureTemplateDocx(): Promise<string> {
+  const exists = await Bun.file(STYLE_TEMPLATE_DOCX).exists();
+  if (!exists) {
+    if (_generatePromise === null) {
+      _generatePromise = generateTemplateDocx().catch((e) => {
+        _generatePromise = null; // 重置，允许下次重试
+        throw e;
+      });
+    }
+    await _generatePromise;
+  }
+  return STYLE_TEMPLATE_DOCX;
+}