@qcplay/cli 1.0.9 → 1.0.10

package/bin/qcplay.js

@@ -9,7 +9,7 @@ import path from "path";
 import readline from "readline";
 import { fileURLToPath, pathToFileURL } from "url";
 
-import { buildOfficialArticleMarkdown, importWechatArticle } from "../lib/wechat-article.js";
+import { buildOfficialArticleMarkdown, importWechatArticle, normalizeArticleColor } from "../lib/wechat-article.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -1150,6 +1150,15 @@ function applyInlineMarkdown(text) {
     return storeToken(`<code>${escapeHtml(code)}</code>`);
   });
 
+  output = output.replace(/\{\{qc-color:([^}]+)\}\}([\s\S]*?)\{\{\/qc-color\}\}/g, (_, rawColor, content) => {
+    const color = normalizeArticleColor(rawColor);
+    if (!color) {
+      return content;
+    }
+    const plainText = content.replace(/\\([\\`*_\[\]])/g, "$1");
+    return storeToken(`<span style="color:${escapeHtml(color)};">${escapeHtml(plainText)}</span>`);
+  });
+
   output = output.replace(/!\[([^\]]*)\]\(([^)]+)\)/g, (_, alt, url) => {
     return storeToken(
       `<img src="${escapeHtml(url.trim())}" alt="${escapeHtml(alt.trim())}" ` +
@@ -1171,7 +1180,7 @@ function applyInlineMarkdown(text) {
   output = output.replace(/(?<!\*)\*([^*]+)\*(?!\*)/g, "<em>$1</em>");
   output = output.replace(/(?<!_)_([^_]+)_(?!_)/g, "<em>$1</em>");
 
-  for (let index = 0; index < tokens.length; index += 1) {
+  for (let index = tokens.length - 1; index >= 0; index -= 1) {
     output = output.replace(`@@MDTOKEN${index}@@`, tokens[index]);
   }
 
@@ -1478,6 +1487,7 @@ async function importWechatArticleCommand(sourceUrl, file = "article.md") {
   console.log(targetFile);
   console.log(chalk.gray(`标题: ${article.title}`));
   console.log(chalk.gray(`已转存图片: ${article.imageCount} 张`));
+  console.log(chalk.gray(`已保留文字颜色: ${article.colorCount} 处`));
   console.log("");
   console.log("请补充 cate_id 等业务字段，确认内容后执行:");
   console.log("");

package/lib/wechat-article.js

@@ -234,9 +234,68 @@ function escapeMarkdownText(value) {
   return normalizeTextContent(value).replace(/([\\`*_\[\]])/g, "\\$1");
 }
 
-function markdownForNode($, node, listDepth = 0) {
+const NAMED_TEXT_COLORS = new Set([
+  "aqua",
+  "black",
+  "blue",
+  "cyan",
+  "fuchsia",
+  "gray",
+  "green",
+  "grey",
+  "lime",
+  "magenta",
+  "maroon",
+  "navy",
+  "olive",
+  "orange",
+  "pink",
+  "purple",
+  "red",
+  "silver",
+  "teal",
+  "transparent",
+  "white",
+  "yellow"
+]);
+
+export function normalizeArticleColor(value) {
+  const color = String(value || "")
+    .trim()
+    .replace(/\s*!important\s*$/i, "")
+    .trim()
+    .toLowerCase();
+  if (/^#[0-9a-f]{3,4}(?:[0-9a-f]{3,4})?$/.test(color)) {
+    return color;
+  }
+  if (/^rgba?\(\s*(?:\d{1,3}%?\s*,\s*){2}\d{1,3}%?(?:\s*,\s*(?:0|1|0?\.\d+|\d{1,3}%))?\s*\)$/.test(color)) {
+    return color.replace(/\s+/g, " ");
+  }
+  return NAMED_TEXT_COLORS.has(color) ? color : "";
+}
+
+function elementTextColor(element) {
+  const style = [element.attr("style"), element.attr("data-style")].filter(Boolean).join(";");
+  let color = "";
+  for (const match of style.matchAll(/(?:^|;)\s*(?:color|-webkit-text-fill-color)\s*:\s*([^;]+)/gi)) {
+    color = normalizeArticleColor(match[1]) || color;
+  }
+  return (
+    color ||
+    normalizeArticleColor(element.attr("color")) ||
+    normalizeArticleColor(element.attr("data-color"))
+  );
+}
+
+function markdownForNode($, node, listDepth = 0, inheritedColor = "", context = { colorCount: 0, colors: new Set() }) {
   if (node.type === "text") {
-    return escapeMarkdownText(node.data);
+    const value = escapeMarkdownText(node.data);
+    if (!inheritedColor || !value.trim()) {
+      return value;
+    }
+    context.colorCount += 1;
+    context.colors.add(inheritedColor);
+    return `{{qc-color:${inheritedColor}}}${value}{{/qc-color}}`;
   }
   if (node.type !== "tag") {
     return "";
@@ -244,7 +303,13 @@ function markdownForNode($, node, listDepth = 0) {
 
   const element = $(node);
   const tag = String(node.tagName || node.name || "").toLowerCase();
-  const children = () => element.contents().toArray().map(child => markdownForNode($, child, listDepth)).join("");
+  const textColor = elementTextColor(element) || inheritedColor;
+  const children = () =>
+    element
+      .contents()
+      .toArray()
+      .map(child => markdownForNode($, child, listDepth, textColor, context))
+      .join("");
 
   if (["script", "style", "noscript", "iframe", "video", "audio", "canvas", "svg", "form", "button", "input"].includes(tag)) {
     return "";
@@ -297,12 +362,7 @@ function markdownForNode($, node, listDepth = 0) {
   if (tag === "ul" || tag === "ol") {
     const ordered = tag === "ol";
     const items = element.children("li").toArray().map((item, index) => {
-      const value = $(item)
-        .contents()
-        .toArray()
-        .map(child => markdownForNode($, child, listDepth + 1))
-        .join("")
-        .trim();
+      const value = markdownForNode($, item, listDepth + 1, textColor, context).trim();
       const prefix = ordered ? `${index + 1}.` : "-";
       return `${"  ".repeat(listDepth)}${prefix} ${value}`;
     });
@@ -411,8 +471,13 @@ export async function convertWechatHtml(html, pageUrl, options = {}) {
     $(element).attr("data-qcplay-src", uploaded.get(key));
   });
 
+  const colorContext = { colorCount: 0, colors: new Set() };
   const markdown = normalizeMarkdown(
-    content.contents().toArray().map(node => markdownForNode($, node)).join("")
+    content
+      .contents()
+      .toArray()
+      .map(node => markdownForNode($, node, 0, "", colorContext))
+      .join("")
   );
   if (!markdown) {
     throw new Error("微信文章正文转换后为空");
@@ -426,6 +491,8 @@ export async function convertWechatHtml(html, pageUrl, options = {}) {
     thumbnail: coverSource ? uploaded.get(assertWechatImageUrl(coverSource, sourceUrl).toString()) || "" : uploaded.values().next().value || "",
     markdown,
     imageCount: uploaded.size,
+    colorCount: colorContext.colorCount,
+    colors: [...colorContext.colors],
     sourceUrl: sourceUrl.toString()
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qcplay/cli",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "QCPlay CLI",
   "type": "module",
   "bin": {