@wenyan-md/core 3.0.10 → 3.0.11

package/dist/core.js

@@ -202,7 +202,19 @@ async function handleFrontMatter(markdown) {
   const { attributes, body } = fm(markdown);
   const result = { content: body || "" };
   let head = "";
-  const { title, description, cover, author, source_url, need_open_comment, only_fans_can_comment, image_list, type } = attributes;
+  const {
+    title,
+    description,
+    cover,
+    author,
+    source_url,
+    pic_crop_235_1,
+    pic_crop_1_1,
+    need_open_comment,
+    only_fans_can_comment,
+    image_list,
+    type
+  } = attributes;
   if (title) {
     result.title = title;
   }
@@ -219,6 +231,12 @@ async function handleFrontMatter(markdown) {
   if (source_url) {
     result.source_url = source_url;
   }
+  if (pic_crop_235_1) {
+    result.pic_crop_235_1 = String(pic_crop_235_1);
+  }
+  if (pic_crop_1_1) {
+    result.pic_crop_1_1 = String(pic_crop_1_1);
+  }
   if (need_open_comment !== void 0) {
     result.need_open_comment = need_open_comment;
   }
@@ -996,15 +1014,34 @@ function wechatPostRender(element) {
     }
     li.appendChild(section);
   });
-  const nestedLists = element.querySelectorAll(
-    "li > section > ul, li > section > ol"
-  );
-  nestedLists.forEach((nestedList) => {
-    const li = nestedList.closest("li");
-    if (li) {
-      li.insertAdjacentElement("afterend", nestedList);
+  const flattenNestedLists = () => {
+    let nestedLists = element.querySelectorAll(
+      "li > section > ul, li > section > ol"
+    );
+    while (nestedLists.length > 0) {
+      Array.from(nestedLists).reverse().forEach((nestedList) => {
+        const isOrdered = nestedList.tagName === "OL";
+        const doc = element.ownerDocument;
+        const items = Array.from(nestedList.children).filter(
+          (child) => child.tagName === "LI"
+        );
+        const wrapper = doc.createElement("section");
+        wrapper.style.marginLeft = "1em";
+        items.forEach((item, index) => {
+          const content = item.querySelector("section");
+          const sectionEl = doc.createElement("section");
+          const marker = isOrdered ? `${index + 1}. ` : "• ";
+          sectionEl.innerHTML = marker + (content?.innerHTML ?? item.innerHTML);
+          wrapper.appendChild(sectionEl);
+        });
+        nestedList.replaceWith(wrapper);
+      });
+      nestedLists = element.querySelectorAll(
+        "li > section > ul, li > section > ol"
+      );
     }
-  });
+  };
+  flattenNestedLists();
   element.style.color = "rgb(0, 0, 0)";
   element.style.caretColor = "rgb(0, 0, 0)";
 }

package/dist/publish.js

@@ -196,12 +196,18 @@ class WechatPublisher {
   uploadCacheStore;
   uploadMaterial;
   publishArticle;
+  _listDraftsFn;
+  _getDraftFn;
+  _updateDraftFn;
   fetchAccessToken;
   constructor(httpAdapter, tokenStoreAdapter, uploadCacheStoreAdapter) {
-    const { uploadMaterial, publishArticle, fetchAccessToken } = createWechatClient(httpAdapter);
+    const { uploadMaterial, publishArticle, fetchAccessToken, listDrafts, getDraft, updateDraft } = createWechatClient(httpAdapter);
     this.uploadMaterial = uploadMaterial;
     this.publishArticle = publishArticle;
     this.fetchAccessToken = fetchAccessToken;
+    this._listDraftsFn = listDrafts;
+    this._getDraftFn = getDraft;
+    this._updateDraftFn = updateDraft;
     this.tokenStore = tokenStoreAdapter ? new TokenStore(tokenStoreAdapter) : void 0;
     this.uploadCacheStore = uploadCacheStoreAdapter ? new UploadCacheStore(uploadCacheStoreAdapter) : void 0;
   }
@@ -242,6 +248,15 @@ class WechatPublisher {
   async publishToDraft(accessToken, options) {
     return await this.publishArticle(accessToken, options);
   }
+  async listDrafts(accessToken, offset = 0, count = 20, noContent = 0) {
+    return await this._listDraftsFn(accessToken, offset, count, noContent);
+  }
+  async getDraft(accessToken, mediaId) {
+    return await this._getDraftFn(accessToken, mediaId);
+  }
+  async updateDraft(accessToken, mediaId, articleIndex, options) {
+    await this._updateDraftFn(accessToken, mediaId, articleIndex, options);
+  }
   async clearCache() {
     if (this.tokenStore) {
       await this.tokenStore.clear();

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

@@ -5,6 +5,8 @@ export interface FrontMatterResult {
     cover?: string;
     author?: string;
     source_url?: string;
+    pic_crop_235_1?: string;
+    pic_crop_1_1?: string;
     need_open_comment?: boolean;
     only_fans_can_comment?: boolean;
     image_list?: string[];

package/dist/types/publish.d.ts

@@ -1,13 +1,15 @@
 import { HttpAdapter } from "./http.js";
 import { TokenStorageAdapter } from "./tokenStore.js";
 import { UploadCacheStorageAdapter } from "./uploadCacheStore.js";
-import { WechatPublishOptions, WechatPublishResponse, WechatUploadResponse } from "./wechat.js";
+import { WechatPublishOptions, WechatPublishResponse, WechatUploadResponse, WechatDraftListResponse, WechatDraftGetResponse } from "./wechat.js";
 export interface ArticleOptions {
     title: string;
     content: string;
     cover?: string;
     author?: string;
     source_url?: string;
+    pic_crop_235_1?: string;
+    pic_crop_1_1?: string;
     need_open_comment?: boolean;
     only_fans_can_comment?: boolean;
 }
@@ -19,11 +21,17 @@ export declare class WechatPublisher {
     private uploadCacheStore;
     private uploadMaterial;
     private publishArticle;
+    private _listDraftsFn;
+    private _getDraftFn;
+    private _updateDraftFn;
     private fetchAccessToken;
     constructor(httpAdapter: HttpAdapter, tokenStoreAdapter?: TokenStorageAdapter, uploadCacheStoreAdapter?: UploadCacheStorageAdapter);
     getAccessTokenWithCache(appId: string, appSecret: string): Promise<string>;
     uploadImage(file: Blob, filename: string, accessToken: string, appId?: string): Promise<WechatUploadResponse>;
     publishToDraft(accessToken: string, options: WechatPublishOptions): Promise<WechatPublishResponse>;
+    listDrafts(accessToken: string, offset?: number, count?: number, noContent?: number): Promise<WechatDraftListResponse>;
+    getDraft(accessToken: string, mediaId: string): Promise<WechatDraftGetResponse>;
+    updateDraft(accessToken: string, mediaId: string, articleIndex: number, options: Partial<WechatPublishOptions>): Promise<void>;
     clearCache(): Promise<void>;
     setExternalToken(appid: string, accessToken: string): Promise<void>;
 }

package/dist/types/wechat.d.ts

@@ -19,6 +19,8 @@ export interface WechatPublishOptions {
     content: string;
     thumb_media_id: string;
     content_source_url?: string;
+    pic_crop_235_1?: string;
+    pic_crop_1_1?: string;
     article_type?: "news" | "newspic";
     image_info?: ImageInfo;
     need_open_comment?: 0 | 1;
@@ -39,9 +41,31 @@ export interface WechatTokenResponse {
 export interface WechatPublishResponse {
     media_id: string;
 }
+export interface WechatDraftListItem {
+    media_id: string;
+    content: {
+        news_item: WechatPublishOptions[];
+    };
+    update_time: number;
+}
+export interface WechatDraftListResponse {
+    total_count: number;
+    item_count: number;
+    item: WechatDraftListItem[];
+}
+export interface WechatDraftGetResponse {
+    news_item: WechatPublishOptions[];
+}
+export interface WechatDraftUpdateResponse {
+    errcode: number;
+    errmsg: string;
+}
 export declare function createWechatClient(httpAdapter: HttpAdapter): {
     fetchAccessToken(appId: string, appSecret: string): Promise<WechatTokenResponse>;
     uploadMaterial(type: string, file: Blob, filename: string, accessToken: string): Promise<WechatUploadResponse>;
     publishArticle(accessToken: string, options: WechatPublishOptions): Promise<WechatPublishResponse>;
+    listDrafts(accessToken: string, offset?: number, count?: number, noContent?: number): Promise<WechatDraftListResponse>;
+    getDraft(accessToken: string, mediaId: string): Promise<WechatDraftGetResponse>;
+    updateDraft(accessToken: string, mediaId: string, articleIndex: number, options: Partial<WechatPublishOptions>): Promise<void>;
 };
 export type WechatClient = ReturnType<typeof createWechatClient>;

package/dist/wechat.js

@@ -1,6 +1,9 @@
 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 draftListUrl = "https://api.weixin.qq.com/cgi-bin/draft/batchget";
+const draftGetUrl = "https://api.weixin.qq.com/cgi-bin/draft/get";
+const draftUpdateUrl = "https://api.weixin.qq.com/cgi-bin/draft/update";
 function createWechatClient(httpAdapter) {
   return {
     async fetchAccessToken(appId, appSecret) {
@@ -37,6 +40,39 @@ function createWechatClient(httpAdapter) {
       const data = await res.json();
       assertWechatSuccess(data);
       return data;
+    },
+    async listDrafts(accessToken, offset = 0, count = 20, noContent = 0) {
+      const res = await httpAdapter.fetch(`${draftListUrl}?access_token=${accessToken}`, {
+        method: "POST",
+        body: JSON.stringify({ offset, count, no_content: noContent })
+      });
+      if (!res.ok) throw new Error(await res.text());
+      const data = await res.json();
+      assertWechatSuccess(data);
+      return data;
+    },
+    async getDraft(accessToken, mediaId) {
+      const res = await httpAdapter.fetch(`${draftGetUrl}?access_token=${accessToken}`, {
+        method: "POST",
+        body: JSON.stringify({ media_id: mediaId })
+      });
+      if (!res.ok) throw new Error(await res.text());
+      const data = await res.json();
+      assertWechatSuccess(data);
+      return data;
+    },
+    async updateDraft(accessToken, mediaId, articleIndex, options) {
+      const res = await httpAdapter.fetch(`${draftUpdateUrl}?access_token=${accessToken}`, {
+        method: "POST",
+        body: JSON.stringify({
+          media_id: mediaId,
+          index: articleIndex,
+          articles: options
+        })
+      });
+      if (!res.ok) throw new Error(await res.text());
+      const data = await res.json();
+      assertWechatSuccess(data);
     }
   };
 }
@@ -44,7 +80,7 @@ const WECHAT_ERROR_HINTS = {
   45166: "内容超长。小绿书模式有内容长度限制，请精简正文后重试。"
 };
 function assertWechatSuccess(data) {
-  if ("errcode" in data) {
+  if ("errcode" in data && data.errcode !== 0) {
     const hint = WECHAT_ERROR_HINTS[data.errcode];
     throw new Error(hint ? `${data.errcode}: ${hint} (${data.errmsg})` : `${data.errcode}: ${data.errmsg}`);
   }

package/dist/wrapper.js

@@ -478,7 +478,17 @@ async function uploadImages(content, accessToken, relativePath, appId) {
   return { html: updatedHtml, firstImageId };
 }
 async function publishToWechatDraft(articleOptions, publishOptions = {}) {
-  const { title, content, cover, author, source_url, need_open_comment, only_fans_can_comment } = articleOptions;
+  const {
+    title,
+    content,
+    cover,
+    author,
+    source_url,
+    pic_crop_235_1,
+    pic_crop_1_1,
+    need_open_comment,
+    only_fans_can_comment
+  } = articleOptions;
   const { appId, appSecret, relativePath } = publishOptions;
   const { appId: appIdFinal, appSecret: appSecretFinal } = await getAppIdAndSecret(appId, appSecret);
   const accessToken = await wechatPublisher.getAccessTokenWithCache(appIdFinal, appSecretFinal);
@@ -514,6 +524,8 @@ async function publishToWechatDraft(articleOptions, publishOptions = {}) {
     thumb_media_id: thumbMediaId,
     author,
     content_source_url: source_url,
+    pic_crop_235_1,
+    pic_crop_1_1,
     need_open_comment: need_open_comment ? 1 : 0,
     only_fans_can_comment: only_fans_can_comment ? 1 : 0
   });
@@ -571,11 +583,30 @@ async function publishImageTextToWechatDraft(articleOptions, publishOptions = {}
   if (!thumbMediaId) {
     throw new Error("未能获取封面图的 media_id");
   }
+  let plainContent = content || "";
+  if (plainContent) {
+    if (plainContent.includes("<br") || plainContent.includes("<p")) {
+      plainContent = plainContent.replace(/<br\s*\/?>\n/g, "\n");
+      const dom = new JSDOM(`<body>${plainContent}</body>`);
+      const document = dom.window.document;
+      const brs = document.querySelectorAll("br");
+      for (const br of brs) {
+        br.replaceWith(document.createTextNode("\n"));
+      }
+      const paragraphs = document.querySelectorAll("p");
+      for (const p of paragraphs) {
+        const text = document.createTextNode("\n" + p.textContent + "\n");
+        p.replaceWith(text);
+      }
+      plainContent = document.body.textContent?.trim() || "";
+    }
+    plainContent = plainContent.replace(/^#{1,6}\s+/gm, "").replace(/\*\*(.*?)\*\*/g, "$1").replace(/\*(.*?)\*/g, "$1").replace(/__(.*?)__/g, "$1").replace(/_(.*?)_/g, "$1").replace(/`{1,3}[^`]*`{1,3}/g, "").replace(/\[([^\]]+)\]\([^)]+\)/g, "$1").replace(/!\[([^\]]*)\]\([^)]+\)/g, "").replace(/^\s*[-*+]\s+/gm, "").replace(/^\s*\d+\.\s+/gm, "").replace(/^\s*>\s+/gm, "").replace(/\n{3,}/g, "\n\n").trim();
+  }
   const data = await wechatPublisher.publishToDraft(
     accessToken,
     {
       title,
-      content,
+      content: plainContent,
       thumb_media_id: thumbMediaId,
       author,
       article_type: "newspic",
@@ -864,7 +895,21 @@ async function extractAndCleanImages(body) {
       parent.remove();
     }
   }
-  return { imagePaths, cleanedHtml: wenyan.outerHTML };
+  for (const child of Array.from(wenyan.children)) {
+    if (!child.textContent?.trim()) {
+      child.remove();
+    }
+  }
+  const paragraphs = Array.from(wenyan.querySelectorAll("p"));
+  for (const p of paragraphs) {
+    const frag = document.createDocumentFragment();
+    while (p.firstChild) {
+      frag.appendChild(p.firstChild);
+    }
+    frag.appendChild(document.createElement("br"));
+    p.parentNode?.replaceChild(frag, p);
+  }
+  return { imagePaths, cleanedHtml: wenyan.innerHTML.trim() };
 }
 const nodeMermaidRenderer = createNodeMermaidRenderer();
 const wenyanCoreInstance = await createWenyanCore({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wenyan-md/core",
-  "version": "3.0.10",
+  "version": "3.0.11",
   "description": "Core library for Wenyan markdown rendering & publishing",
   "author": "Lei <caol64@gmail.com> (https://github.com/caol64)",
   "license": "Apache-2.0",