@lyhue1991/wxgzh 0.1.2 → 0.1.3

package/README.md

@@ -1,6 +1,15 @@
 # wxgzh
 
-一个面向微信公众号的 Node.js CLI 工具：把 Markdown 文章处理成适合公众号发布的 HTML，修复图片，并提交到公众号草稿箱。
+一个面向微信公众号的 SKILL，基于 NodeJS CLI.
+
+把 Markdown 文章处理成适合公众号发布的 HTML，上传图片，生成封面，并提交到公众号草稿箱。
+
+<mark>安装此SKILL</mark>
+
+```
+npx skills add lyhue1991/wxgzh
+```
+
 
 ## 一、功能概述
 
@@ -12,7 +21,7 @@
 - 支持主题样式、自定义 CSS、自动摘要、封面图生成。
 - 也支持分步执行，便于你单独检查 HTML、封面或发布结果。
 
-**操作方法**
+**手动操作方法**
 
 * step1: 一键安装（要求：Node.js >= 18）
 

package/dist/core/converter.js

@@ -371,6 +371,9 @@ function escapeHtmlAttribute(value) {
 function isTextNodeEmpty(node) {
     return node.type === 'text' && !node.data.trim();
 }
+function isTagNode(node, tagName) {
+    return node.type === 'tag' && node.tagName.toLowerCase() === tagName;
+}
 function isStandaloneImageParagraph($paragraph) {
     const nodes = $paragraph.contents().toArray().filter((node) => !isTextNodeEmpty(node));
     return nodes.every((node) => node.type === 'tag' && ['img', 'br'].includes(node.tagName.toLowerCase()));
@@ -410,10 +413,33 @@ async function loadCustomCss() {
 function normalizeListItems($) {
     $('li').each((_, element) => {
         const $item = $(element);
-        const childElements = $item
-            .contents()
-            .toArray()
-            .filter((node) => !isTextNodeEmpty(node));
+        const initialChildren = $item.contents().toArray();
+        const hasParagraphChild = initialChildren.some((node) => isTagNode(node, 'p'));
+        if (hasParagraphChild) {
+            const fragments = [];
+            let previousWasParagraph = false;
+            for (const node of initialChildren) {
+                if (isTextNodeEmpty(node)) {
+                    continue;
+                }
+                if (isTagNode(node, 'p')) {
+                    const paragraphHtml = renderSoftBreakFriendlyHtml(node.children ?? []);
+                    if (!paragraphHtml.trim()) {
+                        continue;
+                    }
+                    if (previousWasParagraph) {
+                        fragments.push('<br>');
+                    }
+                    fragments.push(paragraphHtml);
+                    previousWasParagraph = true;
+                    continue;
+                }
+                fragments.push(renderSoftBreakFriendlyNode(node, true));
+                previousWasParagraph = false;
+            }
+            $item.html(fragments.join(''));
+        }
+        const childElements = $item.contents().toArray().filter((node) => !isTextNodeEmpty(node));
         if (childElements.length === 0) {
             return;
         }
@@ -425,7 +451,7 @@ function normalizeListItems($) {
             return ['p', 'ul', 'ol', 'section', 'blockquote', 'pre', 'table'].includes(tagName);
         });
         const firstChild = childElements[0];
-        if (!hasBlockChild && firstChild?.type === 'tag' && firstChild.tagName.toLowerCase() === 'span' && childElements.length === 1) {
+        if (!hasBlockChild && isTagNode(firstChild, 'span') && childElements.length === 1) {
             return;
         }
         if (hasBlockChild) {
@@ -585,12 +611,80 @@ function setInlineStyleProperty(existingStyle, property, value) {
         .map(([name, declarationValue]) => `${name}: ${declarationValue}`)
         .join('; ');
 }
+function removeInlineStyleProperties(existingStyle, properties) {
+    if (!existingStyle) {
+        return undefined;
+    }
+    const propertiesToRemove = new Set(properties.map((property) => property.trim().toLowerCase()).filter(Boolean));
+    const declarations = existingStyle
+        .split(';')
+        .map((declaration) => declaration.trim())
+        .filter(Boolean)
+        .filter((declaration) => {
+        const separatorIndex = declaration.indexOf(':');
+        if (separatorIndex === -1) {
+            return true;
+        }
+        const name = declaration.slice(0, separatorIndex).trim().toLowerCase();
+        return !propertiesToRemove.has(name);
+    });
+    if (declarations.length === 0) {
+        return undefined;
+    }
+    return declarations.join('; ');
+}
+function normalizeInlinedListStyles($) {
+    $('ol').each((_, element) => {
+        const $list = $(element);
+        const depth = $list.parents('ol').length;
+        const cleanedStyle = removeInlineStyleProperties($list.attr('style'), ['list-style', 'list-style-type', 'list-style-position']);
+        const listType = depth === 0 ? '1' : depth === 1 ? 'a' : 'i';
+        if (cleanedStyle) {
+            $list.attr('style', cleanedStyle);
+        }
+        else {
+            $list.removeAttr('style');
+        }
+        $list.attr('type', listType);
+    });
+    $('ul').each((_, element) => {
+        const $list = $(element);
+        const cleanedStyle = removeInlineStyleProperties($list.attr('style'), ['list-style', 'list-style-type', 'list-style-position']);
+        if (cleanedStyle) {
+            $list.attr('style', cleanedStyle);
+            return;
+        }
+        $list.removeAttr('style');
+    });
+    $('ol > li, ul > li').each((_, element) => {
+        const $item = $(element);
+        const cleanedStyle = removeInlineStyleProperties($item.attr('style'), ['list-style', 'list-style-type', 'list-style-position']);
+        if (cleanedStyle) {
+            $item.attr('style', cleanedStyle);
+            return;
+        }
+        $item.removeAttr('style');
+    });
+}
+function removeWechatUnsafeListWhitespace($) {
+    $('ol, ul').each((_, element) => {
+        $(element)
+            .contents()
+            .toArray()
+            .filter((node) => isTextNodeEmpty(node))
+            .forEach((node) => {
+            $(node).remove();
+        });
+    });
+}
 function cleanInlinedHtml(html) {
     const $ = cheerio.load(html);
     $('pre > code').each((_, element) => {
         const $element = $(element);
         $element.html(renderWechatFriendlyCodeHtml($element.contents().toArray()));
     });
+    normalizeInlinedListStyles($);
+    removeWechatUnsafeListWhitespace($);
     const $article = $('body > #write > article').first();
     const $firstChild = $article.children().first();
     if ($firstChild.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lyhue1991/wxgzh",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Markdown to WeChat Official Account draft CLI",
   "license": "MIT",
   "main": "dist/cli/index.js",