@wenyan-md/core 1.0.16 → 2.0.0

package/dist/publish.js

@@ -1,68 +1,10 @@
 import { JSDOM } from "jsdom";
 import { fileFromPath } from "formdata-node/file-from-path";
-import { FormData, Blob } from "formdata-node";
-import path$1 from "node:path";
+import path from "node:path";
 import { stat } from "node:fs/promises";
 import { FormDataEncoder } from "form-data-encoder";
+import { FormData } from "formdata-node";
 import { Readable } from "node:stream";
-import path from "path";
-const tokenUrl = "https://api.weixin.qq.com/cgi-bin/token";
-const publishUrl = "https://api.weixin.qq.com/cgi-bin/draft/add";
-const uploadUrl = `https://api.weixin.qq.com/cgi-bin/material/add_material`;
-const appIdEnv = process.env.WECHAT_APP_ID || "";
-const appSecretEnv = process.env.WECHAT_APP_SECRET || "";
-async function fetchAccessToken(appId, appSecret) {
-  appId = appId ?? appIdEnv;
-  appSecret = appSecret ?? appSecretEnv;
-  const response = await fetch(`${tokenUrl}?grant_type=client_credential&appid=${appId}&secret=${appSecret}`);
-  if (!response.ok) {
-    const errorText = await response.text();
-    throw new Error(`获取AccessToken失败: ${response.status} ${errorText}`);
-  }
-  return await response.json();
-}
-async function uploadMaterial(type, fileData, fileName, accessToken) {
-  const form = new FormData();
-  form.append("media", fileData, fileName);
-  const encoder = new FormDataEncoder(form);
-  const response = await fetch(`${uploadUrl}?access_token=${accessToken}&type=${type}`, {
-    method: "POST",
-    headers: encoder.headers,
-    body: Readable.from(encoder),
-    duplex: "half"
-  });
-  if (!response.ok) {
-    const errorText = await response.text();
-    throw new Error(`上传素材失败: ${response.status} ${errorText}`);
-  }
-  const data = await response.json();
-  if (data.errcode && data.errcode !== 0) {
-    throw new Error(`上传素材失败: ${data.errcode} ${data.errmsg}`);
-  }
-  if (data.url && data.url.startsWith("http://")) {
-    data.url = data.url.replace(/^http:\/\//i, "https://");
-  }
-  return data;
-}
-async function publishArticle(title, content, thumbMediaId, accessToken) {
-  const response = await fetch(`${publishUrl}?access_token=${accessToken}`, {
-    method: "POST",
-    body: JSON.stringify({
-      articles: [
-        {
-          title,
-          content,
-          thumb_media_id: thumbMediaId
-        }
-      ]
-    })
-  });
-  if (!response.ok) {
-    const errorText = await response.text();
-    throw new Error(`发布失败: ${response.status} ${errorText}`);
-  }
-  return await response.json();
-}
 function normalizePath(p) {
   return p.replace(/\\/g, "/").replace(/\/+$/, "");
 }
@@ -115,6 +57,59 @@ const RuntimeEnv = {
     return normalizedInput;
   }
 };
+const tokenUrl = "https://api.weixin.qq.com/cgi-bin/token";
+const publishUrl = "https://api.weixin.qq.com/cgi-bin/draft/add";
+const uploadUrl = "https://api.weixin.qq.com/cgi-bin/material/add_material";
+function createWechatClient(adapter) {
+  return {
+    async fetchAccessToken(appId, appSecret) {
+      const res = await adapter.fetch(
+        `${tokenUrl}?grant_type=client_credential&appid=${appId}&secret=${appSecret}`
+      );
+      if (!res.ok) throw new Error(await res.text());
+      return res.json();
+    },
+    async uploadMaterial(type, file, filename, accessToken) {
+      const multipart = adapter.createMultipart("media", file, filename);
+      const res = await adapter.fetch(`${uploadUrl}?access_token=${accessToken}&type=${type}`, {
+        ...multipart,
+        method: "POST"
+      });
+      const data = await res.json();
+      if (data.errcode && data.errcode !== 0) {
+        throw new Error(`${data.errcode}: ${data.errmsg}`);
+      }
+      if (data.url?.startsWith("http://")) {
+        data.url = data.url.replace(/^http:\/\//i, "https://");
+      }
+      return data;
+    },
+    async publishArticle(title, content, thumbMediaId, accessToken) {
+      const res = await adapter.fetch(`${publishUrl}?access_token=${accessToken}`, {
+        method: "POST",
+        body: JSON.stringify({
+          articles: [{ title, content, thumb_media_id: thumbMediaId }]
+        })
+      });
+      if (!res.ok) throw new Error(await res.text());
+      return res.json();
+    }
+  };
+}
+const nodeHttpAdapter = {
+  fetch,
+  createMultipart(field, file, filename) {
+    const form = new FormData();
+    form.append(field, file, filename);
+    const encoder = new FormDataEncoder(form);
+    return {
+      body: Readable.from(encoder),
+      headers: encoder.headers,
+      duplex: "half"
+    };
+  }
+};
+const { uploadMaterial, publishArticle, fetchAccessToken } = createWechatClient(nodeHttpAdapter);
 async function uploadImage(imageUrl, accessToken, fileName, relativePath) {
   let fileData;
   let finalName;
@@ -123,8 +118,8 @@ async function uploadImage(imageUrl, accessToken, fileName, relativePath) {
     if (!response.ok || !response.body) {
       throw new Error(`Failed to download image from URL: ${imageUrl}`);
     }
-    const fileNameFromUrl = path$1.basename(imageUrl.split("?")[0]);
-    const ext = path$1.extname(fileNameFromUrl);
+    const fileNameFromUrl = path.basename(imageUrl.split("?")[0]);
+    const ext = path.extname(fileNameFromUrl);
     finalName = fileName ?? (ext === "" ? `${fileNameFromUrl}.jpg` : fileNameFromUrl);
     const buffer = await response.arrayBuffer();
     if (buffer.byteLength === 0) {
@@ -138,10 +133,11 @@ async function uploadImage(imageUrl, accessToken, fileName, relativePath) {
     if (stats.size === 0) {
       throw new Error(`本地图片大小为0，无法上传: ${resolvedPath}`);
     }
-    const fileNameFromLocal = path$1.basename(resolvedPath);
-    const ext = path$1.extname(fileNameFromLocal);
+    const fileNameFromLocal = path.basename(resolvedPath);
+    const ext = path.extname(fileNameFromLocal);
     finalName = fileName ?? (ext === "" ? `${fileNameFromLocal}.jpg` : fileNameFromLocal);
-    fileData = await fileFromPath(resolvedPath);
+    const fileFromPathResult = await fileFromPath(resolvedPath);
+    fileData = new Blob([await fileFromPathResult.arrayBuffer()], { type: fileFromPathResult.type });
   }
   const data = await uploadMaterial("image", fileData, finalName, accessToken);
   if (data.errcode) {
@@ -174,8 +170,11 @@ async function uploadImages(content, accessToken, relativePath) {
   const updatedHtml = dom.serialize();
   return { html: updatedHtml, firstImageId };
 }
-async function publishToDraft(title, content, cover, appId, appSecret, relativePath) {
-  const accessToken = await fetchAccessToken(appId, appSecret);
+async function publishToDraft(title, content, cover = "", options = {}) {
+  const { appId, appSecret, relativePath } = options;
+  const appIdEnv = process.env.WECHAT_APP_ID || "";
+  const appSecretEnv = process.env.WECHAT_APP_SECRET || "";
+  const accessToken = await fetchAccessToken(appId ?? appIdEnv, appSecret ?? appSecretEnv);
   if (!accessToken.access_token) {
     if (accessToken.errcode) {
       throw new Error(`获取 Access Token 失败，错误码：${accessToken.errcode}，${accessToken.errmsg}`);

package/dist/types/core/hlThemeRegistry.d.ts

@@ -0,0 +1,8 @@
+export interface HlTheme {
+    id: string;
+    getCss(): Promise<string>;
+}
+export declare function registerHlTheme(theme: HlTheme): void;
+export declare function getHlTheme(id: string): HlTheme | undefined;
+export declare function getAllHlThemes(): HlTheme[];
+export declare function registerBuiltInHlThemes(): void;

package/dist/types/core/index.d.ts

@@ -0,0 +1,29 @@
+import { FrontMatterResult } from "./parser/frontMatterParser.js";
+export interface WenyanOptions {
+    isConvertMathJax?: boolean;
+    isWechat?: boolean;
+}
+export interface ApplyStylesOptions {
+    themeId?: string;
+    hlThemeId?: string;
+    themeCss?: string;
+    hlThemeCss?: string;
+    isMacStyle?: boolean;
+    isAddFootnote?: boolean;
+}
+export declare function createWenyanCore(options?: WenyanOptions): Promise<{
+    handleFrontMatter(markdown: string): Promise<FrontMatterResult>;
+    renderMarkdown(markdown: string): Promise<string>;
+    applyStylesWithTheme(wenyanElement: HTMLElement, options?: ApplyStylesOptions): Promise<string>;
+    applyStylesWithResolvedCss(wenyanElement: HTMLElement, options: {
+        themeCss: string;
+        hlThemeCss: string;
+        isMacStyle: boolean;
+        isAddFootnote: boolean;
+    }): Promise<string>;
+}>;
+export * from "./themeRegistry.js";
+export * from "./hlThemeRegistry.js";
+export { serif, sansSerif, monospace } from "./utils.js";
+export { createCssModifier } from "./parser/cssParser.js";
+export { macStyleCss } from "./renderer/macStyleRender.js";

package/dist/types/core/parser/cssParser.d.ts

@@ -0,0 +1,11 @@
+import * as csstree from "css-tree";
+type CssUpdate = {
+    property: string;
+    value?: string;
+    append?: boolean;
+};
+type CssUpdateMap = Record<string, CssUpdate[]>;
+export declare const parseOptions: csstree.ParseOptions;
+export declare function createCssModifier(updates: CssUpdateMap): (customCss: string) => string;
+export declare function createCssApplier(css: string): (element: HTMLElement) => void;
+export {};

package/dist/types/core/parser/frontMatterParser.d.ts

@@ -0,0 +1,7 @@
+export interface FrontMatterResult {
+    body: string;
+    title?: string;
+    description?: string;
+    cover?: string;
+}
+export declare function handleFrontMatter(markdown: string): Promise<FrontMatterResult>;

package/dist/types/core/parser/markedParser.d.ts

@@ -0,0 +1,6 @@
+export declare function createMarkedClient(): {
+    /**
+     * 解析 Markdown 为 HTML
+     */
+    parse(markdown: string): Promise<string>;
+};

package/dist/types/core/parser/mathjaxParser.d.ts

@@ -0,0 +1,8 @@
+export interface MathJaxParserOptions {
+    inlineMath?: [string, string][];
+    displayMath?: [string, string][];
+    fontCache?: "none" | "local" | "global";
+}
+export declare function createMathJaxParser(options?: MathJaxParserOptions): {
+    parser(htmlString: string): string;
+};

package/dist/types/core/renderer/footnotesRender.d.ts

@@ -0,0 +1 @@
+export declare function addFootnotes(element: HTMLElement, listStyle?: boolean): void;

package/dist/types/core/renderer/highlightApplyRender.d.ts

@@ -0,0 +1 @@
+export declare function renderHighlightTheme(wenyanElement: HTMLElement, highlightCss: string): void;

package/dist/types/core/renderer/macStyleRender.d.ts

@@ -0,0 +1,3 @@
+import macStyleCss from "../../assets/mac_style.css?raw";
+export declare function renderMacStyle(wenyanElement: HTMLElement): void;
+export { macStyleCss };

package/dist/types/core/renderer/pseudoApplyRender.d.ts

@@ -0,0 +1 @@
+export declare function applyPseudoElements(element: HTMLElement, themeCss: string): void;

package/dist/types/core/renderer/themeApplyRender.d.ts

@@ -0,0 +1 @@
+export declare function renderTheme(wenyanElement: HTMLElement, themeCss: string): void;

package/dist/types/core/renderer/wechatPostRender.d.ts

@@ -0,0 +1 @@
+export declare function wechatPostRender(element: HTMLElement): void;

package/dist/types/core/themeRegistry.d.ts

@@ -0,0 +1,16 @@
+export interface ThemeMeta {
+    id: string;
+    name: string;
+    description: string;
+    appName: string;
+    author: string;
+}
+export interface Theme {
+    meta: ThemeMeta;
+    getCss(): Promise<string>;
+}
+export declare function registerTheme(theme: Theme): void;
+export declare function getTheme(id: string): Theme | undefined;
+export declare function getAllThemes(): Theme[];
+export declare function registerAllBuiltInThemes(): void;
+export declare function getAllGzhThemes(): Theme[];

package/dist/types/core/types.d.ts

@@ -0,0 +1,10 @@
+export type CssSource = {
+    type: "inline";
+    css: string;
+} | {
+    type: "asset";
+    loader: () => Promise<string>;
+} | {
+    type: "url";
+    url: string;
+};

package/dist/types/core/utils.d.ts

@@ -0,0 +1,6 @@
+export declare const serif = "Georgia, Cambria, 'Noto Serif', 'Times New Roman', serif";
+export declare const sansSerif = "system-ui, 'Apple Color Emoji', 'Segoe UI', 'Segoe UI Symbol', 'Noto Sans', 'Roboto', sans-serif";
+export declare const monospace = "Menlo, Monaco, Consolas, 'Liberation Mono', 'Roboto Mono', 'Courier New', 'Microsoft YaHei', monospace";
+export declare function normalizeCssLoader(loaderOrContent: any): () => Promise<string>;
+export declare function stringToMap(str: string): Map<string, string>;
+export declare function replaceCSSVariables(css: string): string;

package/dist/types/node/wrapper.d.ts

@@ -0,0 +1,9 @@
+import { ApplyStylesOptions } from "../core/index.js";
+export interface StyledContent {
+    content: string;
+    title?: string;
+    cover?: string;
+    description?: string;
+}
+export declare function renderStyledContent(content: string, options?: ApplyStylesOptions): Promise<StyledContent>;
+export declare function getGzhContent(content: string, themeId: string, hlThemeId: string, isMacStyle?: boolean, isAddFootnote?: boolean): Promise<StyledContent>;

package/dist/types/wechat/adapters/browser.d.ts

@@ -0,0 +1,2 @@
+import { HttpAdapter } from "../http.js";
+export declare const browserHttpAdapter: HttpAdapter;

package/dist/types/wechat/adapters/node.d.ts

@@ -0,0 +1,2 @@
+import { HttpAdapter } from "../http.js";
+export declare const nodeHttpAdapter: HttpAdapter;

package/dist/types/wechat/core.d.ts

@@ -0,0 +1,6 @@
+import type { HttpAdapter } from "./http.js";
+export declare function createWechatClient(adapter: HttpAdapter): {
+    fetchAccessToken(appId: string, appSecret: string): Promise<any>;
+    uploadMaterial(type: string, file: Blob, filename: string, accessToken: string): Promise<any>;
+    publishArticle(title: string, content: string, thumbMediaId: string, accessToken: string): Promise<any>;
+};

package/dist/types/wechat/http.d.ts

@@ -0,0 +1,12 @@
+export interface MultipartBody {
+    body: BodyInit;
+    headers?: Record<string, string>;
+}
+export interface HttpAdapter {
+    fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
+    createMultipart(field: string, file: Blob, filename: string): MultipartBody;
+}
+export interface UploadResponse {
+    media_id: string;
+    url: string;
+}

package/dist/types/wechat/publish.d.ts

@@ -0,0 +1,6 @@
+export interface PublishOptions {
+    appId?: string;
+    appSecret?: string;
+    relativePath?: string;
+}
+export declare function publishToDraft(title: string, content: string, cover?: string, options?: PublishOptions): Promise<any>;

package/dist/wrapper.js

@@ -1,20 +1,29 @@
 import { JSDOM } from "jsdom";
-import { configureMarked, handleFrontMatter, renderMarkdown, getContentForGzhBuiltinTheme } from "./core.js";
-async function getGzhContent(content, themeId, hlThemeId, isMacStyle = true, isAddFootnote = true) {
-  await configureMarked();
-  const preHandlerContent = await handleFrontMatter(content);
-  const html = await renderMarkdown(preHandlerContent.body);
+import { createWenyanCore } from "./core.js";
+const wenyanCoreInstance = await createWenyanCore();
+async function renderStyledContent(content, options = {}) {
+  const preHandlerContent = await wenyanCoreInstance.handleFrontMatter(content);
+  const html = await wenyanCoreInstance.renderMarkdown(preHandlerContent.body);
   const dom = new JSDOM(`<body><section id="wenyan">${html}</section></body>`);
   const document = dom.window.document;
   const wenyan = document.getElementById("wenyan");
-  const result = await getContentForGzhBuiltinTheme(wenyan, themeId, hlThemeId, isMacStyle, isAddFootnote);
+  const result = await wenyanCoreInstance.applyStylesWithTheme(wenyan, options);
   return {
+    content: result,
     title: preHandlerContent.title,
     cover: preHandlerContent.cover,
-    content: result,
     description: preHandlerContent.description
   };
 }
+async function getGzhContent(content, themeId, hlThemeId, isMacStyle = true, isAddFootnote = true) {
+  return await renderStyledContent(content, {
+    themeId,
+    hlThemeId,
+    isMacStyle,
+    isAddFootnote
+  });
+}
 export {
-  getGzhContent
+  getGzhContent,
+  renderStyledContent
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wenyan-md/core",
-  "version": "1.0.16",
+  "version": "2.0.0",
   "description": "Core library for Wenyan markdown rendering & publishing",
   "author": "Lei <caol64@gmail.com> (https://github.com/caol64)",
   "license": "Apache-2.0",
@@ -28,28 +28,21 @@
   "exports": {
     ".": {
       "import": "./dist/core.js",
-      "types": "./dist/types/core.d.ts",
+      "types": "./dist/types/core/index.d.ts",
       "browser": "./dist/browser/wenyan-core.js"
     },
     "./publish": {
       "import": "./dist/publish.js",
-      "types": "./dist/types/publish.d.ts"
+      "types": "./dist/types/wechat/publish.d.ts"
     },
     "./wrapper": {
       "import": "./dist/wrapper.js",
-      "types": "./dist/types/wrapper.d.ts"
-    },
-    "./theme": {
-      "import": "./dist/theme.js",
-      "types": "./dist/types/theme.d.ts"
-    },
-    "./hltheme": {
-      "import": "./dist/hltheme.js",
-      "types": "./dist/types/hltheme.d.ts"
+      "types": "./dist/types/node/wrapper.d.ts"
     }
   },
   "devDependencies": {
-    "@types/jsdom": "^21.1.7",
+    "@types/css-tree": "^2.3.11",
+    "@types/jsdom": "^27.0.0",
     "@types/node": "^24.3.0",
     "ts-lib": "^0.0.5",
     "typescript": "^5.9.2",
@@ -57,27 +50,41 @@
     "vitest": "^3.2.4"
   },
   "dependencies": {
-    "css-tree": "3.0.1",
-    "form-data-encoder": "^4.1.0",
-    "formdata-node": "^6.0.3",
+    "css-tree": "^3.1.0",
     "front-matter": "^4.0.2",
     "highlight.js": "11.10.0",
-    "jsdom": "^26.1.0",
     "marked": "^15.0.12",
     "marked-highlight": "^2.2.1",
     "mathjax-full": "3.2.2"
   },
+  "peerDependencies": {
+    "jsdom": "^27.4.0",
+    "form-data-encoder": "^4.1.0",
+    "formdata-node": "^6.0.3"
+  },
+  "peerDependenciesMeta": {
+    "jsdom": {
+      "optional": true
+    },
+    "form-data-encoder": {
+      "optional": true
+    },
+    "formdata-node": {
+      "optional": true
+    }
+  },
   "scripts": {
     "dev": "vite build --watch",
-    "build": "vite build && tsc && node -e \"const fs = require('fs'); fs.copyFileSync('src/main.d.ts', 'dist/types/core.d.ts');\"",
+    "check": "tsc --noEmit",
+    "build": "vite build && tsc",
     "build:browser": "vite build --config vite.config.browser.ts",
     "build:styles": "vite build --config vite.config.styles.ts",
     "build:math": "vite build --config vite.config.math.ts",
     "build:all": "pnpm build && pnpm build:styles && pnpm build:math && pnpm build:browser",
-    "test:main": "vitest run main.test.js",
-    "test:wrapper": "pnpm build && vitest run wrapper.test.js",
-    "test:publish": "vitest run test/publish.test.js",
-    "test:realPublish": "vitest run test/realPublish.test.js",
-    "test:runtimeEnv": "vitest run test/runtimeEnv.test.js"
+    "test": "pnpm build && vitest",
+    "test:wrapper": "pnpm build && vitest run test/wrapper.test.ts",
+    "test:publish": "vitest run test/publish.test.ts",
+    "test:realPublish": "vitest run test/realPublish.test.ts",
+    "test:runtimeEnv": "vitest run test/runtimeEnv.test.ts"
   }
 }