@open-feishu-card/adapter 0.3.4 → 0.3.5

package/dist/custom-colors.d.ts

@@ -4,7 +4,7 @@
  *   textStyle.customColor / textStyle.custom_color     → inline text color
  *
  * Public DSL stores custom colors in config.style.color (cus-accent / cus-bg-N …)
- * and references them via markdown.font_color / background_style — not inline #hex.
+ * and references them via <font color> in markdown content / background_style — not inline #hex.
  */
 import type { CustomColorEntry } from './normalize-stored-colors.js';
 export type ThemeColorPair = {

package/dist/index.cjs

@@ -941,7 +941,7 @@ function normalizeStoredCardColors(dsl, preRegistered) {
       }
     }
     if (obj.tag === "markdown" && typeof obj.content === "string") {
-      normalizeMarkdownInlineHexColors(obj, ensureAlias);
+      normalizeMarkdownInlineHexColors(obj, ensureAlias, !!preRegistered);
     }
     for (const value of Object.values(obj)) walk(value);
   };
@@ -976,22 +976,24 @@ function normalizeStoredCardColors(dsl, preRegistered) {
   const existing = style.color && typeof style.color === "object" ? style.color : {};
   style.color = { ...colorEntries, ...existing };
   if (!colorEntries["cus-accent"]) return;
-  const applyDefaultFontColors = (node) => {
-    if (Array.isArray(node)) {
-      for (const child of node) applyDefaultFontColors(child);
-      return;
-    }
-    if (!node || typeof node !== "object") return;
-    const obj = node;
-    if (obj.tag === "markdown" && obj.font_color === void 0) {
-      const size = obj.text_size;
-      const content = typeof obj.content === "string" ? obj.content : "";
-      if (size === "small") obj.font_color = "cus-muted";
-      else if (size === "heading" || content.includes("**")) obj.font_color = "cus-accent";
-    }
-    for (const value of Object.values(obj)) applyDefaultFontColors(value);
-  };
-  applyDefaultFontColors(dsl.body);
+  if (!preRegistered) {
+    const applyDefaultFontColors = (node) => {
+      if (Array.isArray(node)) {
+        for (const child of node) applyDefaultFontColors(child);
+        return;
+      }
+      if (!node || typeof node !== "object") return;
+      const obj = node;
+      if (obj.tag === "markdown" && obj.font_color === void 0) {
+        const size = obj.text_size;
+        const content = typeof obj.content === "string" ? obj.content : "";
+        if (size === "small") obj.font_color = "cus-muted";
+        else if (size === "heading" || content.includes("**")) obj.font_color = "cus-accent";
+      }
+      for (const value of Object.values(obj)) applyDefaultFontColors(value);
+    };
+    applyDefaultFontColors(dsl.body);
+  }
 }
 function unifyMatchingAlias(entries, fromPrefix, to) {
   const renames = /* @__PURE__ */ new Map();
@@ -1035,7 +1037,7 @@ function remapColorReferences(node, aliasRenames) {
   };
   walk(node);
 }
-function normalizeMarkdownInlineHexColors(obj, ensureAlias) {
+function normalizeMarkdownInlineHexColors(obj, ensureAlias, keepFontTags = false) {
   const content = obj.content;
   const hexColor = (raw) => {
     const v = raw.trim();
@@ -1047,7 +1049,7 @@ function normalizeMarkdownInlineHexColors(obj, ensureAlias) {
     return void 0;
   };
   const single = content.match(/^<font color=['"]([^'"]+)['"]\s*>([\s\S]*)<\/font>$/);
-  if (single) {
+  if (single && !keepFontTags) {
     const entry = hexColor(single[1]);
     if (entry) {
       const alias = ensureAlias("cus-text", entry);
@@ -1710,9 +1712,8 @@ function resolveAtUserId(prop, ctx) {
 function rebuildMarkdown(property, ctx) {
   const out = { tag: "markdown" };
   const elements = Array.isArray(property.elements) ? property.elements : [];
-  const { content, uniformFontColor } = renderChildren(elements, ctx);
+  const { content } = renderChildren(elements, ctx);
   if (content) out.content = content;
-  if (uniformFontColor) out.font_color = uniformFontColor;
   for (const [rawKey, rawValue] of Object.entries(property)) {
     if (rawKey === "elements" || rawKey === "markdownElements" || rawKey === "originTag") continue;
     if (rawKey === "udIcon") continue;
@@ -1730,7 +1731,7 @@ function rebuildMarkdown(property, ctx) {
   }
   return out;
 }
-function wrapEmphasis(text, bold, color, colorKind, inlineCustomFont = false) {
+function wrapEmphasis(text, bold, color) {
   if (!bold && !color) return text;
   const lead = text.match(/^\s*/)[0];
   const trail = text.match(/\s*$/)[0];
@@ -1738,10 +1739,7 @@ function wrapEmphasis(text, bold, color, colorKind, inlineCustomFont = false) {
   if (core.length === 0) return text;
   let wrapped = core;
   if (bold) wrapped = `**${wrapped}**`;
-  if (color) {
-    if (colorKind === "enum") wrapped = `<font color='${color}'>${wrapped}</font>`;
-    else if (colorKind === "custom" && inlineCustomFont) wrapped = `<font color='${color}'>${wrapped}</font>`;
-  }
+  if (color) wrapped = `<font color='${color}'>${wrapped}</font>`;
   return lead + wrapped + trail;
 }
 function resolveInlineStyle(ts, ctx) {
@@ -1769,20 +1767,14 @@ function resolveInlineStyle(ts, ctx) {
 function renderChildren(children, ctx) {
   let out = "";
   let buffer = [];
-  let uniformFontColor;
   function flushBuffer() {
     if (buffer.length === 0) return;
-    const customColors = buffer.filter((s) => s.colorKind === "custom" && s.color).map((s) => s.color);
-    const hasEnumColor = buffer.some((s) => s.colorKind === "enum" && s.color);
-    const uniformCustom = customColors.length > 0 && !hasEnumColor && customColors.every((c) => c === customColors[0]) ? customColors[0] : void 0;
-    if (uniformCustom) uniformFontColor = uniformCustom;
     let group = [];
     function emitGroup() {
       if (group.length === 0) return;
       const inner = group.map((s) => s.content).join("");
-      const { bold, color, colorKind } = group[0];
-      const inlineCustomFont = colorKind === "custom" && !!color && color !== uniformCustom;
-      out += wrapEmphasis(inner, bold, color, colorKind, inlineCustomFont);
+      const { bold, color } = group[0];
+      out += wrapEmphasis(inner, bold, color);
       group = [];
     }
     for (const seg of buffer) {
@@ -1812,7 +1804,7 @@ function renderChildren(children, ctx) {
     out += childToMarkdown(child, ctx);
   }
   flushBuffer();
-  return { content: out, uniformFontColor };
+  return { content: out };
 }
 function childToInlineSegment(child, ctx) {
   const tag = child.tag;
@@ -1878,8 +1870,8 @@ function childToMarkdown(child, ctx) {
     case "plain_text": {
       const content = typeof prop.content === "string" ? prop.content : "";
       const ts = isRecord2(prop.textStyle) ? prop.textStyle : void 0;
-      const { bold, color, colorKind } = resolveInlineStyle(ts, ctx);
-      return wrapEmphasis(content, bold, color, colorKind, colorKind === "custom");
+      const { bold, color } = resolveInlineStyle(ts, ctx);
+      return wrapEmphasis(content, bold, color);
     }
     case "br":
       return "\n";

package/dist/index.js

@@ -939,7 +939,7 @@ function normalizeStoredCardColors(dsl, preRegistered) {
       }
     }
     if (obj.tag === "markdown" && typeof obj.content === "string") {
-      normalizeMarkdownInlineHexColors(obj, ensureAlias);
+      normalizeMarkdownInlineHexColors(obj, ensureAlias, !!preRegistered);
     }
     for (const value of Object.values(obj)) walk(value);
   };
@@ -974,22 +974,24 @@ function normalizeStoredCardColors(dsl, preRegistered) {
   const existing = style.color && typeof style.color === "object" ? style.color : {};
   style.color = { ...colorEntries, ...existing };
   if (!colorEntries["cus-accent"]) return;
-  const applyDefaultFontColors = (node) => {
-    if (Array.isArray(node)) {
-      for (const child of node) applyDefaultFontColors(child);
-      return;
-    }
-    if (!node || typeof node !== "object") return;
-    const obj = node;
-    if (obj.tag === "markdown" && obj.font_color === void 0) {
-      const size = obj.text_size;
-      const content = typeof obj.content === "string" ? obj.content : "";
-      if (size === "small") obj.font_color = "cus-muted";
-      else if (size === "heading" || content.includes("**")) obj.font_color = "cus-accent";
-    }
-    for (const value of Object.values(obj)) applyDefaultFontColors(value);
-  };
-  applyDefaultFontColors(dsl.body);
+  if (!preRegistered) {
+    const applyDefaultFontColors = (node) => {
+      if (Array.isArray(node)) {
+        for (const child of node) applyDefaultFontColors(child);
+        return;
+      }
+      if (!node || typeof node !== "object") return;
+      const obj = node;
+      if (obj.tag === "markdown" && obj.font_color === void 0) {
+        const size = obj.text_size;
+        const content = typeof obj.content === "string" ? obj.content : "";
+        if (size === "small") obj.font_color = "cus-muted";
+        else if (size === "heading" || content.includes("**")) obj.font_color = "cus-accent";
+      }
+      for (const value of Object.values(obj)) applyDefaultFontColors(value);
+    };
+    applyDefaultFontColors(dsl.body);
+  }
 }
 function unifyMatchingAlias(entries, fromPrefix, to) {
   const renames = /* @__PURE__ */ new Map();
@@ -1033,7 +1035,7 @@ function remapColorReferences(node, aliasRenames) {
   };
   walk(node);
 }
-function normalizeMarkdownInlineHexColors(obj, ensureAlias) {
+function normalizeMarkdownInlineHexColors(obj, ensureAlias, keepFontTags = false) {
   const content = obj.content;
   const hexColor = (raw) => {
     const v = raw.trim();
@@ -1045,7 +1047,7 @@ function normalizeMarkdownInlineHexColors(obj, ensureAlias) {
     return void 0;
   };
   const single = content.match(/^<font color=['"]([^'"]+)['"]\s*>([\s\S]*)<\/font>$/);
-  if (single) {
+  if (single && !keepFontTags) {
     const entry = hexColor(single[1]);
     if (entry) {
       const alias = ensureAlias("cus-text", entry);
@@ -1708,9 +1710,8 @@ function resolveAtUserId(prop, ctx) {
 function rebuildMarkdown(property, ctx) {
   const out = { tag: "markdown" };
   const elements = Array.isArray(property.elements) ? property.elements : [];
-  const { content, uniformFontColor } = renderChildren(elements, ctx);
+  const { content } = renderChildren(elements, ctx);
   if (content) out.content = content;
-  if (uniformFontColor) out.font_color = uniformFontColor;
   for (const [rawKey, rawValue] of Object.entries(property)) {
     if (rawKey === "elements" || rawKey === "markdownElements" || rawKey === "originTag") continue;
     if (rawKey === "udIcon") continue;
@@ -1728,7 +1729,7 @@ function rebuildMarkdown(property, ctx) {
   }
   return out;
 }
-function wrapEmphasis(text, bold, color, colorKind, inlineCustomFont = false) {
+function wrapEmphasis(text, bold, color) {
   if (!bold && !color) return text;
   const lead = text.match(/^\s*/)[0];
   const trail = text.match(/\s*$/)[0];
@@ -1736,10 +1737,7 @@ function wrapEmphasis(text, bold, color, colorKind, inlineCustomFont = false) {
   if (core.length === 0) return text;
   let wrapped = core;
   if (bold) wrapped = `**${wrapped}**`;
-  if (color) {
-    if (colorKind === "enum") wrapped = `<font color='${color}'>${wrapped}</font>`;
-    else if (colorKind === "custom" && inlineCustomFont) wrapped = `<font color='${color}'>${wrapped}</font>`;
-  }
+  if (color) wrapped = `<font color='${color}'>${wrapped}</font>`;
   return lead + wrapped + trail;
 }
 function resolveInlineStyle(ts, ctx) {
@@ -1767,20 +1765,14 @@ function resolveInlineStyle(ts, ctx) {
 function renderChildren(children, ctx) {
   let out = "";
   let buffer = [];
-  let uniformFontColor;
   function flushBuffer() {
     if (buffer.length === 0) return;
-    const customColors = buffer.filter((s) => s.colorKind === "custom" && s.color).map((s) => s.color);
-    const hasEnumColor = buffer.some((s) => s.colorKind === "enum" && s.color);
-    const uniformCustom = customColors.length > 0 && !hasEnumColor && customColors.every((c) => c === customColors[0]) ? customColors[0] : void 0;
-    if (uniformCustom) uniformFontColor = uniformCustom;
     let group = [];
     function emitGroup() {
       if (group.length === 0) return;
       const inner = group.map((s) => s.content).join("");
-      const { bold, color, colorKind } = group[0];
-      const inlineCustomFont = colorKind === "custom" && !!color && color !== uniformCustom;
-      out += wrapEmphasis(inner, bold, color, colorKind, inlineCustomFont);
+      const { bold, color } = group[0];
+      out += wrapEmphasis(inner, bold, color);
       group = [];
     }
     for (const seg of buffer) {
@@ -1810,7 +1802,7 @@ function renderChildren(children, ctx) {
     out += childToMarkdown(child, ctx);
   }
   flushBuffer();
-  return { content: out, uniformFontColor };
+  return { content: out };
 }
 function childToInlineSegment(child, ctx) {
   const tag = child.tag;
@@ -1876,8 +1868,8 @@ function childToMarkdown(child, ctx) {
     case "plain_text": {
       const content = typeof prop.content === "string" ? prop.content : "";
       const ts = isRecord2(prop.textStyle) ? prop.textStyle : void 0;
-      const { bold, color, colorKind } = resolveInlineStyle(ts, ctx);
-      return wrapEmphasis(content, bold, color, colorKind, colorKind === "custom");
+      const { bold, color } = resolveInlineStyle(ts, ctx);
+      return wrapEmphasis(content, bold, color);
     }
     case "br":
       return "\n";

package/dist/normalize-stored-colors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-stored-colors.d.ts","sourceRoot":"","sources":["../src/normalize-stored-colors.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,MAAM,gBAAgB,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzE,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC1C,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAgB,mBAAmB,IAAI,aAAa,CAEnD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,gBAAgB,GAAG,MAAM,CAE7D;AAED,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,gBAAgB,EACvB,MAAM,EAAE,QAAQ,GAAG,UAAU,GAC5B,MAAM,CAUR;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAgB9D;AAiBD;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,aAAa,CAAC,EAAE,aAAa,GAC5B,IAAI,CAiGN"}
+{"version":3,"file":"normalize-stored-colors.d.ts","sourceRoot":"","sources":["../src/normalize-stored-colors.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,MAAM,gBAAgB,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzE,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC1C,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAgB,mBAAmB,IAAI,aAAa,CAEnD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,gBAAgB,GAAG,MAAM,CAE7D;AAED,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,gBAAgB,EACvB,MAAM,EAAE,QAAQ,GAAG,UAAU,GAC5B,MAAM,CAUR;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAgB9D;AAiBD;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,aAAa,CAAC,EAAE,aAAa,GAC5B,IAAI,CAmGN"}

package/dist/raw-to-dsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"raw-to-dsl.d.ts","sourceRoot":"","sources":["../src/raw-to-dsl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AAwBH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAIzD;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAcvD;AAwkDD;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CA8C9C;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAGnF"}
+{"version":3,"file":"raw-to-dsl.d.ts","sourceRoot":"","sources":["../src/raw-to-dsl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AAwBH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAIzD;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAcvD;AAojDD;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CA8C9C;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAGnF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-feishu-card/adapter",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "公开 DSL 与飞书内部 RAW JSON 的双向适配器；raw→DSL 对齐 feishu-raw-card-to-dsl",
   "type": "module",
   "main": "./dist/index.cjs",