@open-feishu-card/adapter 0.3.2 → 0.3.4

package/dist/custom-colors.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Feishu RAW editor fields for theme-aware custom colors:
+ *   customBackgroundStyle / custom_background_style  → column backgrounds
+ *   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.
+ */
+import type { CustomColorEntry } from './normalize-stored-colors.js';
+export type ThemeColorPair = {
+    light_mode?: string;
+    lightMode?: string;
+    dark_mode?: string;
+    darkMode?: string;
+};
+export declare function readThemeColorLight(pair: unknown): string | undefined;
+export declare function readThemeColorDark(pair: unknown): string | undefined;
+export declare function isCustomHexColor(color: string): boolean;
+/** Enum `color` wins; else fall back to customColor light hex/rgba. */
+export declare function resolveTextStyleColor(textStyle: unknown): string | undefined;
+/** When text color comes from customColor (not enum), return the full light/dark pair. */
+export declare function resolveTextStyleCustomColorPair(textStyle: unknown): ThemeColorPair | undefined;
+export declare function themePairToColorEntry(pair: ThemeColorPair): CustomColorEntry | undefined;
+/** Light hex/rgba from column (or container) custom background, if any. */
+export declare function resolveCustomBackgroundLight(property: unknown): string | undefined;
+//# sourceMappingURL=custom-colors.d.ts.map

package/dist/custom-colors.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"custom-colors.d.ts","sourceRoot":"","sources":["../src/custom-colors.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAGrE,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAOrE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAOpE;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAGvD;AAED,uEAAuE;AACvE,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAO5E;AAED,0FAA0F;AAC1F,wBAAgB,+BAA+B,CAAC,SAAS,EAAE,OAAO,GAAG,cAAc,GAAG,SAAS,CAQ9F;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,cAAc,GAAG,gBAAgB,GAAG,SAAS,CAQxF;AAED,2EAA2E;AAC3E,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAKlF"}

package/dist/index.cjs

@@ -868,6 +868,256 @@ function isRecord(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
 
+// src/normalize-stored-colors.ts
+function createColorRegistry() {
+  return { entries: {}, keyToAlias: /* @__PURE__ */ new Map(), bgSeq: 0, textSeq: 0 };
+}
+function colorEntryKey(entry) {
+  return `${entry.light_mode}|${entry.dark_mode}`;
+}
+function registerColorEntry(registry, entry, prefix) {
+  const key = colorEntryKey(entry);
+  const existing = registry.keyToAlias.get(key);
+  if (existing) return existing;
+  const alias = prefix === "cus-bg" ? `cus-bg-${registry.bgSeq++}` : `cus-text-${registry.textSeq++}`;
+  registry.entries[alias] = entry;
+  registry.keyToAlias.set(key, alias);
+  return alias;
+}
+function hexColorToRgba(hex) {
+  const h = hex.trim().replace(/^#/, "");
+  if (h.length === 8) {
+    const r = parseInt(h.slice(0, 2), 16);
+    const g = parseInt(h.slice(2, 4), 16);
+    const b = parseInt(h.slice(4, 6), 16);
+    const a = Math.round(parseInt(h.slice(6, 8), 16) / 255 * 100) / 100;
+    return `rgba(${r},${g},${b},${a})`;
+  }
+  if (h.length === 6) {
+    const r = parseInt(h.slice(0, 2), 16);
+    const g = parseInt(h.slice(2, 4), 16);
+    const b = parseInt(h.slice(4, 6), 16);
+    return `rgba(${r},${g},${b},1)`;
+  }
+  return void 0;
+}
+function readCustomBackgroundStyle(node) {
+  const raw = node.custom_background_style;
+  if (!raw || typeof raw !== "object") return void 0;
+  const o = raw;
+  const lightRaw = typeof o.light_mode === "string" ? o.light_mode : void 0;
+  const darkRaw = typeof o.dark_mode === "string" ? o.dark_mode : void 0;
+  if (!lightRaw || !darkRaw) return void 0;
+  const light = lightRaw.startsWith("#") ? hexColorToRgba(lightRaw) : lightRaw;
+  const dark = darkRaw.startsWith("#") ? hexColorToRgba(darkRaw) : darkRaw;
+  if (!light || !dark) return void 0;
+  return { light_mode: light, dark_mode: dark };
+}
+function normalizeStoredCardColors(dsl, preRegistered) {
+  const colorEntries = { ...preRegistered?.entries ?? {} };
+  const keyToAlias = new Map(preRegistered?.keyToAlias ?? []);
+  let bgSeq = preRegistered?.bgSeq ?? 0;
+  let textSeq = preRegistered?.textSeq ?? 0;
+  const ensureAlias = (prefix, entry) => {
+    const existing2 = keyToAlias.get(colorEntryKey(entry));
+    if (existing2) return existing2;
+    const alias = prefix === "cus-bg" ? `cus-bg-${bgSeq++}` : `cus-text-${textSeq++}`;
+    colorEntries[alias] = entry;
+    keyToAlias.set(colorEntryKey(entry), alias);
+    return alias;
+  };
+  const walk = (node) => {
+    if (Array.isArray(node)) {
+      for (const child of node) walk(child);
+      return;
+    }
+    if (!node || typeof node !== "object") return;
+    const obj = node;
+    if (obj.tag === "column") {
+      const custom = readCustomBackgroundStyle(obj);
+      if (custom) {
+        obj.background_style = ensureAlias("cus-bg", custom);
+        delete obj.custom_background_style;
+      }
+    }
+    if (obj.tag === "markdown" && typeof obj.content === "string") {
+      normalizeMarkdownInlineHexColors(obj, ensureAlias);
+    }
+    for (const value of Object.values(obj)) walk(value);
+  };
+  walk(dsl.body);
+  if (Object.keys(colorEntries).length === 0) return;
+  const firstBgKey = Object.keys(colorEntries).find((k) => k.startsWith("cus-bg-"));
+  const firstBg = firstBgKey ? colorEntries[firstBgKey] : void 0;
+  if (firstBg) {
+    const m = firstBg.light_mode.match(/^rgba\((\d+),(\d+),(\d+),/);
+    if (m) {
+      colorEntries["cus-accent"] = {
+        light_mode: `rgba(${m[1]},${m[2]},${m[3]},1)`,
+        dark_mode: firstBg.dark_mode.replace(/,\s*[\d.]+\)$/, ",1)")
+      };
+    }
+  }
+  colorEntries["cus-muted"] ??= {
+    light_mode: "rgba(100,106,115,1)",
+    dark_mode: "rgba(166,166,166,1)"
+  };
+  const aliasRenames = /* @__PURE__ */ new Map();
+  for (const to of ["cus-accent", "cus-muted"]) {
+    for (const [from, target] of unifyMatchingAlias(colorEntries, "cus-text", to)) {
+      aliasRenames.set(from, target);
+    }
+  }
+  remapColorReferences(dsl.body, aliasRenames);
+  const config = dsl.config && typeof dsl.config === "object" ? dsl.config : {};
+  dsl.config = config;
+  const style = config.style && typeof config.style === "object" ? config.style : {};
+  config.style = style;
+  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);
+}
+function unifyMatchingAlias(entries, fromPrefix, to) {
+  const renames = /* @__PURE__ */ new Map();
+  const target = entries[to];
+  if (!target) return renames;
+  for (const alias of Object.keys(entries)) {
+    if (alias === to) continue;
+    if (!alias.startsWith(`${fromPrefix}-`) && alias !== fromPrefix) continue;
+    const entry = entries[alias];
+    const matches = to === "cus-accent" || to === "cus-muted" ? entry.light_mode === target.light_mode : colorEntryKey(entry) === colorEntryKey(target);
+    if (matches) {
+      renames.set(alias, to);
+      delete entries[alias];
+    }
+  }
+  return renames;
+}
+function remapColorReferences(node, aliasRenames) {
+  const remap = (alias) => {
+    if (!alias) return alias;
+    return aliasRenames.get(alias) ?? alias;
+  };
+  const walk = (n) => {
+    if (Array.isArray(n)) {
+      for (const c of n) walk(c);
+      return;
+    }
+    if (!n || typeof n !== "object") return;
+    const obj = n;
+    if (typeof obj.font_color === "string") obj.font_color = remap(obj.font_color);
+    if (typeof obj.content === "string" && obj.content.includes("<font")) {
+      obj.content = obj.content.replace(
+        /<font color=['"]([^'"]+)['"]>/g,
+        (_m, color) => {
+          const next = remap(color);
+          return next ? `<font color='${next}'>` : _m;
+        }
+      );
+    }
+    for (const value of Object.values(obj)) walk(value);
+  };
+  walk(node);
+}
+function normalizeMarkdownInlineHexColors(obj, ensureAlias) {
+  const content = obj.content;
+  const hexColor = (raw) => {
+    const v = raw.trim();
+    if (v.startsWith("#")) {
+      const rgba = hexColorToRgba(v);
+      return rgba ? { light_mode: rgba, dark_mode: rgba } : void 0;
+    }
+    if (/^rgba?\(/i.test(v)) return { light_mode: v, dark_mode: v };
+    return void 0;
+  };
+  const single = content.match(/^<font color=['"]([^'"]+)['"]\s*>([\s\S]*)<\/font>$/);
+  if (single) {
+    const entry = hexColor(single[1]);
+    if (entry) {
+      const alias = ensureAlias("cus-text", entry);
+      if (obj.font_color === void 0) obj.font_color = alias;
+      obj.content = single[2];
+      return;
+    }
+  }
+  obj.content = content.replace(/<font color=['"]([^'"]+)['"]>/g, (match, raw) => {
+    const entry = hexColor(raw);
+    if (!entry) return match;
+    const alias = ensureAlias("cus-text", entry);
+    return `<font color='${alias}'>`;
+  });
+}
+
+// src/custom-colors.ts
+function readThemeColorLight(pair) {
+  if (!pair || typeof pair !== "object") return void 0;
+  const o = pair;
+  const raw = o.light_mode ?? o.lightMode;
+  if (typeof raw !== "string") return void 0;
+  const v = raw.trim();
+  return v || void 0;
+}
+function readThemeColorDark(pair) {
+  if (!pair || typeof pair !== "object") return void 0;
+  const o = pair;
+  const raw = o.dark_mode ?? o.darkMode;
+  if (typeof raw !== "string") return void 0;
+  const v = raw.trim();
+  return v || void 0;
+}
+function isCustomHexColor(color) {
+  const v = color.trim();
+  return v.startsWith("#") || /^rgba?\(/i.test(v);
+}
+function resolveTextStyleColor(textStyle) {
+  if (!textStyle || typeof textStyle !== "object") return void 0;
+  const ts = textStyle;
+  const enumColor = typeof ts.color === "string" ? ts.color.trim() : void 0;
+  if (enumColor && enumColor !== "default") return enumColor;
+  const custom = ts.custom_color ?? ts.customColor;
+  return readThemeColorLight(custom);
+}
+function resolveTextStyleCustomColorPair(textStyle) {
+  if (!textStyle || typeof textStyle !== "object") return void 0;
+  const ts = textStyle;
+  const enumColor = typeof ts.color === "string" ? ts.color.trim() : void 0;
+  if (enumColor && enumColor !== "default") return void 0;
+  const custom = ts.custom_color ?? ts.customColor;
+  if (!custom || typeof custom !== "object") return void 0;
+  return custom;
+}
+function themePairToColorEntry(pair) {
+  const lightRaw = readThemeColorLight(pair);
+  const darkRaw = readThemeColorDark(pair);
+  if (!lightRaw || !darkRaw) return void 0;
+  const light = lightRaw.startsWith("#") ? hexColorToRgba(lightRaw) : lightRaw;
+  const dark = darkRaw.startsWith("#") ? hexColorToRgba(darkRaw) : darkRaw;
+  if (!light || !dark) return void 0;
+  return { light_mode: light, dark_mode: dark };
+}
+function resolveCustomBackgroundLight(property) {
+  if (!property || typeof property !== "object") return void 0;
+  const p = property;
+  const custom = p.custom_background_style ?? p.customBackgroundStyle;
+  return readThemeColorLight(custom);
+}
+
 // src/raw-to-dsl.ts
 function isRawCardEnvelope(value) {
   if (typeof value !== "object" || value === null) return false;
@@ -883,12 +1133,19 @@ function rawCardToDsl(envelope) {
   } catch {
     return envelope;
   }
-  const ctx = {
+  const ctx = makeCtx({
     images: env.json_attachment?.images ?? {},
     atUsers: env.json_attachment?.at_users ?? {}
-  };
+  });
   return convertRoot(inner, ctx);
 }
+function makeCtx(partial) {
+  return {
+    images: partial?.images ?? {},
+    atUsers: partial?.atUsers ?? {},
+    colors: createColorRegistry()
+  };
+}
 var RAW_ONLY_FIELDS = /* @__PURE__ */ new Set([
   "new_body",
   "source",
@@ -976,6 +1233,7 @@ function convertRoot(root, ctx) {
   out.config = convertConfig(isRecord2(root.config) ? root.config : {});
   if (isRecord2(root.body)) out.body = convertBody2(root.body, ctx);
   if (isRecord2(root.header)) out.header = convertHeader2(root.header, ctx);
+  normalizeStoredCardColors(out, ctx.colors);
   return out;
 }
 function convertConfig(_node) {
@@ -1077,7 +1335,7 @@ function unwrap(node, ctx) {
         let value = isRecord2(cell) && "data" in cell ? cell.data : cell;
         if (isRecord2(value) && value.tag === "markdown" && isRecord2(value.property)) {
           const elements = Array.isArray(value.property.elements) ? value.property.elements : [];
-          value = renderChildren(elements, ctx);
+          value = renderChildren(elements, ctx).content;
         }
         r[k] = value;
       }
@@ -1452,8 +1710,9 @@ function resolveAtUserId(prop, ctx) {
 function rebuildMarkdown(property, ctx) {
   const out = { tag: "markdown" };
   const elements = Array.isArray(property.elements) ? property.elements : [];
-  const content = renderChildren(elements, ctx);
+  const { content, uniformFontColor } = 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;
@@ -1471,7 +1730,7 @@ function rebuildMarkdown(property, ctx) {
   }
   return out;
 }
-function wrapEmphasis(text, bold, color) {
+function wrapEmphasis(text, bold, color, colorKind, inlineCustomFont = false) {
   if (!bold && !color) return text;
   const lead = text.match(/^\s*/)[0];
   const trail = text.match(/\s*$/)[0];
@@ -1479,20 +1738,51 @@ function wrapEmphasis(text, bold, color) {
   if (core.length === 0) return text;
   let wrapped = core;
   if (bold) wrapped = `**${wrapped}**`;
-  if (color) wrapped = `<font color='${color}'>${wrapped}</font>`;
+  if (color) {
+    if (colorKind === "enum") wrapped = `<font color='${color}'>${wrapped}</font>`;
+    else if (colorKind === "custom" && inlineCustomFont) wrapped = `<font color='${color}'>${wrapped}</font>`;
+  }
   return lead + wrapped + trail;
 }
+function resolveInlineStyle(ts, ctx) {
+  const bold = !!(ts && Array.isArray(ts.attributes) && ts.attributes.includes("bold"));
+  const customPair = resolveTextStyleCustomColorPair(ts);
+  if (customPair) {
+    const entry = themePairToColorEntry(customPair);
+    if (entry) {
+      const alias = registerColorEntry(ctx.colors, entry, "cus-text");
+      return { bold, color: alias, colorKind: "custom" };
+    }
+  }
+  const rawColor = resolveTextStyleColor(ts);
+  const color = rawColor === "default" ? void 0 : rawColor;
+  if (!color) return { bold };
+  if (isCustomHexColor(color)) {
+    const rgba = color.startsWith("#") ? themePairToColorEntry({ lightMode: color, darkMode: color }) : { light_mode: color, dark_mode: color };
+    if (rgba) {
+      const alias = registerColorEntry(ctx.colors, rgba, "cus-text");
+      return { bold, color: alias, colorKind: "custom" };
+    }
+  }
+  return { bold, color, colorKind: "enum" };
+}
 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 } = group[0];
-      out += wrapEmphasis(inner, bold, color);
+      const { bold, color, colorKind } = group[0];
+      const inlineCustomFont = colorKind === "custom" && !!color && color !== uniformCustom;
+      out += wrapEmphasis(inner, bold, color, colorKind, inlineCustomFont);
       group = [];
     }
     for (const seg of buffer) {
@@ -1501,8 +1791,9 @@ function renderChildren(children, ctx) {
         continue;
       }
       const head = group[0];
-      if (head.bold === seg.bold && head.color === seg.color) group.push(seg);
-      else {
+      if (head.bold === seg.bold && head.color === seg.color && head.colorKind === seg.colorKind) {
+        group.push(seg);
+      } else {
         emitGroup();
         group.push(seg);
       }
@@ -1521,33 +1812,33 @@ function renderChildren(children, ctx) {
     out += childToMarkdown(child, ctx);
   }
   flushBuffer();
-  return out;
+  return { content: out, uniformFontColor };
 }
 function childToInlineSegment(child, ctx) {
   const tag = child.tag;
   const prop = isRecord2(child.property) ? child.property : {};
   const ts = isRecord2(prop.textStyle) ? prop.textStyle : void 0;
-  const bold = !!(ts && Array.isArray(ts.attributes) && ts.attributes.includes("bold"));
-  const rawColor = ts && typeof ts.color === "string" ? ts.color : void 0;
-  const color = rawColor === "default" ? void 0 : rawColor;
+  const { bold, color, colorKind } = resolveInlineStyle(ts, ctx);
   switch (tag) {
     case "plain_text":
       return {
         content: typeof prop.content === "string" ? prop.content : "",
         bold,
-        color
+        color,
+        colorKind
       };
     case "code_span":
       return {
         content: `\`${typeof prop.content === "string" ? prop.content : ""}\``,
         bold,
-        color
+        color,
+        colorKind
       };
     case "link": {
       const text = typeof prop.content === "string" ? prop.content : "";
       const urlObj = isRecord2(prop.url) ? prop.url : void 0;
       const url = urlObj && typeof urlObj.url === "string" ? urlObj.url : "";
-      return { content: `[${text}](${url})`, bold, color };
+      return { content: `[${text}](${url})`, bold, color, colorKind };
     }
     case "at_all":
       return { content: "<at id=all></at>", bold, color };
@@ -1587,9 +1878,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 color = ts && typeof ts.color === "string" ? ts.color : void 0;
-      const attrs = ts && Array.isArray(ts.attributes) ? ts.attributes : [];
-      return wrapEmphasis(content, attrs.includes("bold"), color);
+      const { bold, color, colorKind } = resolveInlineStyle(ts, ctx);
+      return wrapEmphasis(content, bold, color, colorKind, colorKind === "custom");
     }
     case "br":
       return "\n";
@@ -1715,7 +2005,7 @@ ${"#".repeat(level)} ${body}
           if (!data || data.tag !== "markdown") return "";
           const cellProp = isRecord2(data.property) ? data.property : {};
           const inner = Array.isArray(cellProp.elements) ? cellProp.elements : [];
-          const text = renderChildren(inner, ctx);
+          const { content: text } = renderChildren(inner, ctx);
           return text.replace(/\|/g, "\\|").replace(/\n/g, " ");
         });
         return `| ${cells.join(" | ")} |`;
@@ -1838,10 +2128,10 @@ function rawToDsl(raw) {
       }
     }
     const attachment = isRecord2(raw.json_attachment) ? raw.json_attachment : {};
-    const ctx = {
+    const ctx = makeCtx({
       images: isRecord2(attachment.images) ? attachment.images : {},
       atUsers: isRecord2(attachment.at_users) ? attachment.at_users : {}
-    };
+    });
     return convertRoot(inner, ctx);
   }
   if (isRecord2(raw.card)) {
@@ -1849,10 +2139,10 @@ function rawToDsl(raw) {
     if (typeof card.json_card === "string" || isRecord2(card.json_card)) {
       return rawToDsl(card);
     }
-    return convertRoot(card, { images: {}, atUsers: {} });
+    return convertRoot(card, makeCtx());
   }
   if ("body" in raw || "header" in raw || "schema" in raw) {
-    return convertRoot(raw, { images: {}, atUsers: {} });
+    return convertRoot(raw, makeCtx());
   }
   return raw;
 }
@@ -1861,109 +2151,18 @@ function degradeUnknown(el) {
   return { tag: "unknown", raw_tag: rawTag, fallback: el };
 }
 
-// src/normalize-stored-colors.ts
-function hexColorToRgba(hex) {
-  const h = hex.trim().replace(/^#/, "");
-  if (h.length === 8) {
-    const r = parseInt(h.slice(0, 2), 16);
-    const g = parseInt(h.slice(2, 4), 16);
-    const b = parseInt(h.slice(4, 6), 16);
-    const a = Math.round(parseInt(h.slice(6, 8), 16) / 255 * 100) / 100;
-    return `rgba(${r},${g},${b},${a})`;
-  }
-  if (h.length === 6) {
-    const r = parseInt(h.slice(0, 2), 16);
-    const g = parseInt(h.slice(2, 4), 16);
-    const b = parseInt(h.slice(4, 6), 16);
-    return `rgba(${r},${g},${b},1)`;
-  }
-  return void 0;
-}
-function readCustomBackgroundStyle(node) {
-  const raw = node.custom_background_style;
-  if (!raw || typeof raw !== "object") return void 0;
-  const o = raw;
-  const lightRaw = typeof o.light_mode === "string" ? o.light_mode : void 0;
-  const darkRaw = typeof o.dark_mode === "string" ? o.dark_mode : void 0;
-  if (!lightRaw || !darkRaw) return void 0;
-  const light = lightRaw.startsWith("#") ? hexColorToRgba(lightRaw) : lightRaw;
-  const dark = darkRaw.startsWith("#") ? hexColorToRgba(darkRaw) : darkRaw;
-  if (!light || !dark) return void 0;
-  return { light_mode: light, dark_mode: dark };
-}
-function normalizeStoredCardColors(dsl) {
-  const colorEntries = {};
-  const styleKey = (entry) => `${entry.light_mode}|${entry.dark_mode}`;
-  const keyToAlias = /* @__PURE__ */ new Map();
-  let bgSeq = 0;
-  const ensureAlias = (prefix, entry) => {
-    const existing2 = keyToAlias.get(styleKey(entry));
-    if (existing2) return existing2;
-    const alias = `${prefix}-${bgSeq++}`;
-    colorEntries[alias] = entry;
-    keyToAlias.set(styleKey(entry), alias);
-    return alias;
-  };
-  const walk = (node) => {
-    if (Array.isArray(node)) {
-      for (const child of node) walk(child);
-      return;
-    }
-    if (!node || typeof node !== "object") return;
-    const obj = node;
-    if (obj.tag === "column") {
-      const custom = readCustomBackgroundStyle(obj);
-      if (custom) {
-        obj.background_style = ensureAlias("cus-bg", custom);
-        delete obj.custom_background_style;
-      }
-    }
-    for (const value of Object.values(obj)) walk(value);
-  };
-  walk(dsl.body);
-  if (Object.keys(colorEntries).length === 0) return;
-  const firstBg = colorEntries["cus-bg-0"] ?? Object.values(colorEntries)[0];
-  if (firstBg) {
-    const m = firstBg.light_mode.match(/^rgba\((\d+),(\d+),(\d+),/);
-    if (m) {
-      colorEntries["cus-accent"] = {
-        light_mode: `rgba(${m[1]},${m[2]},${m[3]},1)`,
-        dark_mode: firstBg.dark_mode.replace(/,\s*[\d.]+\)$/, ",1)")
-      };
-    }
-  }
-  colorEntries["cus-muted"] ??= {
-    light_mode: "rgba(100,106,115,1)",
-    dark_mode: "rgba(166,166,166,1)"
-  };
-  const config = dsl.config && typeof dsl.config === "object" ? dsl.config : {};
-  dsl.config = config;
-  const style = config.style && typeof config.style === "object" ? config.style : {};
-  config.style = style;
-  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);
-}
-
+exports.createColorRegistry = createColorRegistry;
 exports.degradeUnknown = degradeUnknown;
 exports.dslToRaw = dslToRaw;
+exports.isCustomHexColor = isCustomHexColor;
 exports.isRawCardEnvelope = isRawCardEnvelope;
 exports.normalizeStoredCardColors = normalizeStoredCardColors;
 exports.rawCardToDsl = rawCardToDsl;
 exports.rawToDsl = rawToDsl;
+exports.readThemeColorDark = readThemeColorDark;
+exports.readThemeColorLight = readThemeColorLight;
+exports.registerColorEntry = registerColorEntry;
+exports.resolveCustomBackgroundLight = resolveCustomBackgroundLight;
+exports.resolveTextStyleColor = resolveTextStyleColor;
+exports.resolveTextStyleCustomColorPair = resolveTextStyleCustomColorPair;
+exports.themePairToColorEntry = themePairToColorEntry;

package/dist/index.d.ts

@@ -8,7 +8,9 @@
  */
 export { dslToRaw } from './dsl-to-raw.js';
 export { rawToDsl, rawCardToDsl, isRawCardEnvelope, degradeUnknown, } from './raw-to-dsl.js';
-export { normalizeStoredCardColors } from './normalize-stored-colors.js';
+export { normalizeStoredCardColors, createColorRegistry, registerColorEntry } from './normalize-stored-colors.js';
 export type { CustomColorEntry } from './normalize-stored-colors.js';
+export { readThemeColorLight, readThemeColorDark, resolveCustomBackgroundLight, resolveTextStyleColor, resolveTextStyleCustomColorPair, themePairToColorEntry, isCustomHexColor, } from './custom-colors.js';
+export type { ThemeColorPair } from './custom-colors.js';
 export type { CardElement, ElementProperty, JsonCard } from './types.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,iBAAiB,EACjB,cAAc,GACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AACzE,YAAY,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,iBAAiB,EACjB,cAAc,GACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClH,YAAY,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,4BAA4B,EAC5B,qBAAqB,EACrB,+BAA+B,EAC/B,qBAAqB,EACrB,gBAAgB,GACjB,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC"}

package/dist/index.js

@@ -866,6 +866,256 @@ function isRecord(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
 
+// src/normalize-stored-colors.ts
+function createColorRegistry() {
+  return { entries: {}, keyToAlias: /* @__PURE__ */ new Map(), bgSeq: 0, textSeq: 0 };
+}
+function colorEntryKey(entry) {
+  return `${entry.light_mode}|${entry.dark_mode}`;
+}
+function registerColorEntry(registry, entry, prefix) {
+  const key = colorEntryKey(entry);
+  const existing = registry.keyToAlias.get(key);
+  if (existing) return existing;
+  const alias = prefix === "cus-bg" ? `cus-bg-${registry.bgSeq++}` : `cus-text-${registry.textSeq++}`;
+  registry.entries[alias] = entry;
+  registry.keyToAlias.set(key, alias);
+  return alias;
+}
+function hexColorToRgba(hex) {
+  const h = hex.trim().replace(/^#/, "");
+  if (h.length === 8) {
+    const r = parseInt(h.slice(0, 2), 16);
+    const g = parseInt(h.slice(2, 4), 16);
+    const b = parseInt(h.slice(4, 6), 16);
+    const a = Math.round(parseInt(h.slice(6, 8), 16) / 255 * 100) / 100;
+    return `rgba(${r},${g},${b},${a})`;
+  }
+  if (h.length === 6) {
+    const r = parseInt(h.slice(0, 2), 16);
+    const g = parseInt(h.slice(2, 4), 16);
+    const b = parseInt(h.slice(4, 6), 16);
+    return `rgba(${r},${g},${b},1)`;
+  }
+  return void 0;
+}
+function readCustomBackgroundStyle(node) {
+  const raw = node.custom_background_style;
+  if (!raw || typeof raw !== "object") return void 0;
+  const o = raw;
+  const lightRaw = typeof o.light_mode === "string" ? o.light_mode : void 0;
+  const darkRaw = typeof o.dark_mode === "string" ? o.dark_mode : void 0;
+  if (!lightRaw || !darkRaw) return void 0;
+  const light = lightRaw.startsWith("#") ? hexColorToRgba(lightRaw) : lightRaw;
+  const dark = darkRaw.startsWith("#") ? hexColorToRgba(darkRaw) : darkRaw;
+  if (!light || !dark) return void 0;
+  return { light_mode: light, dark_mode: dark };
+}
+function normalizeStoredCardColors(dsl, preRegistered) {
+  const colorEntries = { ...preRegistered?.entries ?? {} };
+  const keyToAlias = new Map(preRegistered?.keyToAlias ?? []);
+  let bgSeq = preRegistered?.bgSeq ?? 0;
+  let textSeq = preRegistered?.textSeq ?? 0;
+  const ensureAlias = (prefix, entry) => {
+    const existing2 = keyToAlias.get(colorEntryKey(entry));
+    if (existing2) return existing2;
+    const alias = prefix === "cus-bg" ? `cus-bg-${bgSeq++}` : `cus-text-${textSeq++}`;
+    colorEntries[alias] = entry;
+    keyToAlias.set(colorEntryKey(entry), alias);
+    return alias;
+  };
+  const walk = (node) => {
+    if (Array.isArray(node)) {
+      for (const child of node) walk(child);
+      return;
+    }
+    if (!node || typeof node !== "object") return;
+    const obj = node;
+    if (obj.tag === "column") {
+      const custom = readCustomBackgroundStyle(obj);
+      if (custom) {
+        obj.background_style = ensureAlias("cus-bg", custom);
+        delete obj.custom_background_style;
+      }
+    }
+    if (obj.tag === "markdown" && typeof obj.content === "string") {
+      normalizeMarkdownInlineHexColors(obj, ensureAlias);
+    }
+    for (const value of Object.values(obj)) walk(value);
+  };
+  walk(dsl.body);
+  if (Object.keys(colorEntries).length === 0) return;
+  const firstBgKey = Object.keys(colorEntries).find((k) => k.startsWith("cus-bg-"));
+  const firstBg = firstBgKey ? colorEntries[firstBgKey] : void 0;
+  if (firstBg) {
+    const m = firstBg.light_mode.match(/^rgba\((\d+),(\d+),(\d+),/);
+    if (m) {
+      colorEntries["cus-accent"] = {
+        light_mode: `rgba(${m[1]},${m[2]},${m[3]},1)`,
+        dark_mode: firstBg.dark_mode.replace(/,\s*[\d.]+\)$/, ",1)")
+      };
+    }
+  }
+  colorEntries["cus-muted"] ??= {
+    light_mode: "rgba(100,106,115,1)",
+    dark_mode: "rgba(166,166,166,1)"
+  };
+  const aliasRenames = /* @__PURE__ */ new Map();
+  for (const to of ["cus-accent", "cus-muted"]) {
+    for (const [from, target] of unifyMatchingAlias(colorEntries, "cus-text", to)) {
+      aliasRenames.set(from, target);
+    }
+  }
+  remapColorReferences(dsl.body, aliasRenames);
+  const config = dsl.config && typeof dsl.config === "object" ? dsl.config : {};
+  dsl.config = config;
+  const style = config.style && typeof config.style === "object" ? config.style : {};
+  config.style = style;
+  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);
+}
+function unifyMatchingAlias(entries, fromPrefix, to) {
+  const renames = /* @__PURE__ */ new Map();
+  const target = entries[to];
+  if (!target) return renames;
+  for (const alias of Object.keys(entries)) {
+    if (alias === to) continue;
+    if (!alias.startsWith(`${fromPrefix}-`) && alias !== fromPrefix) continue;
+    const entry = entries[alias];
+    const matches = to === "cus-accent" || to === "cus-muted" ? entry.light_mode === target.light_mode : colorEntryKey(entry) === colorEntryKey(target);
+    if (matches) {
+      renames.set(alias, to);
+      delete entries[alias];
+    }
+  }
+  return renames;
+}
+function remapColorReferences(node, aliasRenames) {
+  const remap = (alias) => {
+    if (!alias) return alias;
+    return aliasRenames.get(alias) ?? alias;
+  };
+  const walk = (n) => {
+    if (Array.isArray(n)) {
+      for (const c of n) walk(c);
+      return;
+    }
+    if (!n || typeof n !== "object") return;
+    const obj = n;
+    if (typeof obj.font_color === "string") obj.font_color = remap(obj.font_color);
+    if (typeof obj.content === "string" && obj.content.includes("<font")) {
+      obj.content = obj.content.replace(
+        /<font color=['"]([^'"]+)['"]>/g,
+        (_m, color) => {
+          const next = remap(color);
+          return next ? `<font color='${next}'>` : _m;
+        }
+      );
+    }
+    for (const value of Object.values(obj)) walk(value);
+  };
+  walk(node);
+}
+function normalizeMarkdownInlineHexColors(obj, ensureAlias) {
+  const content = obj.content;
+  const hexColor = (raw) => {
+    const v = raw.trim();
+    if (v.startsWith("#")) {
+      const rgba = hexColorToRgba(v);
+      return rgba ? { light_mode: rgba, dark_mode: rgba } : void 0;
+    }
+    if (/^rgba?\(/i.test(v)) return { light_mode: v, dark_mode: v };
+    return void 0;
+  };
+  const single = content.match(/^<font color=['"]([^'"]+)['"]\s*>([\s\S]*)<\/font>$/);
+  if (single) {
+    const entry = hexColor(single[1]);
+    if (entry) {
+      const alias = ensureAlias("cus-text", entry);
+      if (obj.font_color === void 0) obj.font_color = alias;
+      obj.content = single[2];
+      return;
+    }
+  }
+  obj.content = content.replace(/<font color=['"]([^'"]+)['"]>/g, (match, raw) => {
+    const entry = hexColor(raw);
+    if (!entry) return match;
+    const alias = ensureAlias("cus-text", entry);
+    return `<font color='${alias}'>`;
+  });
+}
+
+// src/custom-colors.ts
+function readThemeColorLight(pair) {
+  if (!pair || typeof pair !== "object") return void 0;
+  const o = pair;
+  const raw = o.light_mode ?? o.lightMode;
+  if (typeof raw !== "string") return void 0;
+  const v = raw.trim();
+  return v || void 0;
+}
+function readThemeColorDark(pair) {
+  if (!pair || typeof pair !== "object") return void 0;
+  const o = pair;
+  const raw = o.dark_mode ?? o.darkMode;
+  if (typeof raw !== "string") return void 0;
+  const v = raw.trim();
+  return v || void 0;
+}
+function isCustomHexColor(color) {
+  const v = color.trim();
+  return v.startsWith("#") || /^rgba?\(/i.test(v);
+}
+function resolveTextStyleColor(textStyle) {
+  if (!textStyle || typeof textStyle !== "object") return void 0;
+  const ts = textStyle;
+  const enumColor = typeof ts.color === "string" ? ts.color.trim() : void 0;
+  if (enumColor && enumColor !== "default") return enumColor;
+  const custom = ts.custom_color ?? ts.customColor;
+  return readThemeColorLight(custom);
+}
+function resolveTextStyleCustomColorPair(textStyle) {
+  if (!textStyle || typeof textStyle !== "object") return void 0;
+  const ts = textStyle;
+  const enumColor = typeof ts.color === "string" ? ts.color.trim() : void 0;
+  if (enumColor && enumColor !== "default") return void 0;
+  const custom = ts.custom_color ?? ts.customColor;
+  if (!custom || typeof custom !== "object") return void 0;
+  return custom;
+}
+function themePairToColorEntry(pair) {
+  const lightRaw = readThemeColorLight(pair);
+  const darkRaw = readThemeColorDark(pair);
+  if (!lightRaw || !darkRaw) return void 0;
+  const light = lightRaw.startsWith("#") ? hexColorToRgba(lightRaw) : lightRaw;
+  const dark = darkRaw.startsWith("#") ? hexColorToRgba(darkRaw) : darkRaw;
+  if (!light || !dark) return void 0;
+  return { light_mode: light, dark_mode: dark };
+}
+function resolveCustomBackgroundLight(property) {
+  if (!property || typeof property !== "object") return void 0;
+  const p = property;
+  const custom = p.custom_background_style ?? p.customBackgroundStyle;
+  return readThemeColorLight(custom);
+}
+
 // src/raw-to-dsl.ts
 function isRawCardEnvelope(value) {
   if (typeof value !== "object" || value === null) return false;
@@ -881,12 +1131,19 @@ function rawCardToDsl(envelope) {
   } catch {
     return envelope;
   }
-  const ctx = {
+  const ctx = makeCtx({
     images: env.json_attachment?.images ?? {},
     atUsers: env.json_attachment?.at_users ?? {}
-  };
+  });
   return convertRoot(inner, ctx);
 }
+function makeCtx(partial) {
+  return {
+    images: partial?.images ?? {},
+    atUsers: partial?.atUsers ?? {},
+    colors: createColorRegistry()
+  };
+}
 var RAW_ONLY_FIELDS = /* @__PURE__ */ new Set([
   "new_body",
   "source",
@@ -974,6 +1231,7 @@ function convertRoot(root, ctx) {
   out.config = convertConfig(isRecord2(root.config) ? root.config : {});
   if (isRecord2(root.body)) out.body = convertBody2(root.body, ctx);
   if (isRecord2(root.header)) out.header = convertHeader2(root.header, ctx);
+  normalizeStoredCardColors(out, ctx.colors);
   return out;
 }
 function convertConfig(_node) {
@@ -1075,7 +1333,7 @@ function unwrap(node, ctx) {
         let value = isRecord2(cell) && "data" in cell ? cell.data : cell;
         if (isRecord2(value) && value.tag === "markdown" && isRecord2(value.property)) {
           const elements = Array.isArray(value.property.elements) ? value.property.elements : [];
-          value = renderChildren(elements, ctx);
+          value = renderChildren(elements, ctx).content;
         }
         r[k] = value;
       }
@@ -1450,8 +1708,9 @@ function resolveAtUserId(prop, ctx) {
 function rebuildMarkdown(property, ctx) {
   const out = { tag: "markdown" };
   const elements = Array.isArray(property.elements) ? property.elements : [];
-  const content = renderChildren(elements, ctx);
+  const { content, uniformFontColor } = 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;
@@ -1469,7 +1728,7 @@ function rebuildMarkdown(property, ctx) {
   }
   return out;
 }
-function wrapEmphasis(text, bold, color) {
+function wrapEmphasis(text, bold, color, colorKind, inlineCustomFont = false) {
   if (!bold && !color) return text;
   const lead = text.match(/^\s*/)[0];
   const trail = text.match(/\s*$/)[0];
@@ -1477,20 +1736,51 @@ function wrapEmphasis(text, bold, color) {
   if (core.length === 0) return text;
   let wrapped = core;
   if (bold) wrapped = `**${wrapped}**`;
-  if (color) wrapped = `<font color='${color}'>${wrapped}</font>`;
+  if (color) {
+    if (colorKind === "enum") wrapped = `<font color='${color}'>${wrapped}</font>`;
+    else if (colorKind === "custom" && inlineCustomFont) wrapped = `<font color='${color}'>${wrapped}</font>`;
+  }
   return lead + wrapped + trail;
 }
+function resolveInlineStyle(ts, ctx) {
+  const bold = !!(ts && Array.isArray(ts.attributes) && ts.attributes.includes("bold"));
+  const customPair = resolveTextStyleCustomColorPair(ts);
+  if (customPair) {
+    const entry = themePairToColorEntry(customPair);
+    if (entry) {
+      const alias = registerColorEntry(ctx.colors, entry, "cus-text");
+      return { bold, color: alias, colorKind: "custom" };
+    }
+  }
+  const rawColor = resolveTextStyleColor(ts);
+  const color = rawColor === "default" ? void 0 : rawColor;
+  if (!color) return { bold };
+  if (isCustomHexColor(color)) {
+    const rgba = color.startsWith("#") ? themePairToColorEntry({ lightMode: color, darkMode: color }) : { light_mode: color, dark_mode: color };
+    if (rgba) {
+      const alias = registerColorEntry(ctx.colors, rgba, "cus-text");
+      return { bold, color: alias, colorKind: "custom" };
+    }
+  }
+  return { bold, color, colorKind: "enum" };
+}
 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 } = group[0];
-      out += wrapEmphasis(inner, bold, color);
+      const { bold, color, colorKind } = group[0];
+      const inlineCustomFont = colorKind === "custom" && !!color && color !== uniformCustom;
+      out += wrapEmphasis(inner, bold, color, colorKind, inlineCustomFont);
       group = [];
     }
     for (const seg of buffer) {
@@ -1499,8 +1789,9 @@ function renderChildren(children, ctx) {
         continue;
       }
       const head = group[0];
-      if (head.bold === seg.bold && head.color === seg.color) group.push(seg);
-      else {
+      if (head.bold === seg.bold && head.color === seg.color && head.colorKind === seg.colorKind) {
+        group.push(seg);
+      } else {
         emitGroup();
         group.push(seg);
       }
@@ -1519,33 +1810,33 @@ function renderChildren(children, ctx) {
     out += childToMarkdown(child, ctx);
   }
   flushBuffer();
-  return out;
+  return { content: out, uniformFontColor };
 }
 function childToInlineSegment(child, ctx) {
   const tag = child.tag;
   const prop = isRecord2(child.property) ? child.property : {};
   const ts = isRecord2(prop.textStyle) ? prop.textStyle : void 0;
-  const bold = !!(ts && Array.isArray(ts.attributes) && ts.attributes.includes("bold"));
-  const rawColor = ts && typeof ts.color === "string" ? ts.color : void 0;
-  const color = rawColor === "default" ? void 0 : rawColor;
+  const { bold, color, colorKind } = resolveInlineStyle(ts, ctx);
   switch (tag) {
     case "plain_text":
       return {
         content: typeof prop.content === "string" ? prop.content : "",
         bold,
-        color
+        color,
+        colorKind
       };
     case "code_span":
       return {
         content: `\`${typeof prop.content === "string" ? prop.content : ""}\``,
         bold,
-        color
+        color,
+        colorKind
       };
     case "link": {
       const text = typeof prop.content === "string" ? prop.content : "";
       const urlObj = isRecord2(prop.url) ? prop.url : void 0;
       const url = urlObj && typeof urlObj.url === "string" ? urlObj.url : "";
-      return { content: `[${text}](${url})`, bold, color };
+      return { content: `[${text}](${url})`, bold, color, colorKind };
     }
     case "at_all":
       return { content: "<at id=all></at>", bold, color };
@@ -1585,9 +1876,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 color = ts && typeof ts.color === "string" ? ts.color : void 0;
-      const attrs = ts && Array.isArray(ts.attributes) ? ts.attributes : [];
-      return wrapEmphasis(content, attrs.includes("bold"), color);
+      const { bold, color, colorKind } = resolveInlineStyle(ts, ctx);
+      return wrapEmphasis(content, bold, color, colorKind, colorKind === "custom");
     }
     case "br":
       return "\n";
@@ -1713,7 +2003,7 @@ ${"#".repeat(level)} ${body}
           if (!data || data.tag !== "markdown") return "";
           const cellProp = isRecord2(data.property) ? data.property : {};
           const inner = Array.isArray(cellProp.elements) ? cellProp.elements : [];
-          const text = renderChildren(inner, ctx);
+          const { content: text } = renderChildren(inner, ctx);
           return text.replace(/\|/g, "\\|").replace(/\n/g, " ");
         });
         return `| ${cells.join(" | ")} |`;
@@ -1836,10 +2126,10 @@ function rawToDsl(raw) {
       }
     }
     const attachment = isRecord2(raw.json_attachment) ? raw.json_attachment : {};
-    const ctx = {
+    const ctx = makeCtx({
       images: isRecord2(attachment.images) ? attachment.images : {},
       atUsers: isRecord2(attachment.at_users) ? attachment.at_users : {}
-    };
+    });
     return convertRoot(inner, ctx);
   }
   if (isRecord2(raw.card)) {
@@ -1847,10 +2137,10 @@ function rawToDsl(raw) {
     if (typeof card.json_card === "string" || isRecord2(card.json_card)) {
       return rawToDsl(card);
     }
-    return convertRoot(card, { images: {}, atUsers: {} });
+    return convertRoot(card, makeCtx());
   }
   if ("body" in raw || "header" in raw || "schema" in raw) {
-    return convertRoot(raw, { images: {}, atUsers: {} });
+    return convertRoot(raw, makeCtx());
   }
   return raw;
 }
@@ -1859,104 +2149,4 @@ function degradeUnknown(el) {
   return { tag: "unknown", raw_tag: rawTag, fallback: el };
 }
 
-// src/normalize-stored-colors.ts
-function hexColorToRgba(hex) {
-  const h = hex.trim().replace(/^#/, "");
-  if (h.length === 8) {
-    const r = parseInt(h.slice(0, 2), 16);
-    const g = parseInt(h.slice(2, 4), 16);
-    const b = parseInt(h.slice(4, 6), 16);
-    const a = Math.round(parseInt(h.slice(6, 8), 16) / 255 * 100) / 100;
-    return `rgba(${r},${g},${b},${a})`;
-  }
-  if (h.length === 6) {
-    const r = parseInt(h.slice(0, 2), 16);
-    const g = parseInt(h.slice(2, 4), 16);
-    const b = parseInt(h.slice(4, 6), 16);
-    return `rgba(${r},${g},${b},1)`;
-  }
-  return void 0;
-}
-function readCustomBackgroundStyle(node) {
-  const raw = node.custom_background_style;
-  if (!raw || typeof raw !== "object") return void 0;
-  const o = raw;
-  const lightRaw = typeof o.light_mode === "string" ? o.light_mode : void 0;
-  const darkRaw = typeof o.dark_mode === "string" ? o.dark_mode : void 0;
-  if (!lightRaw || !darkRaw) return void 0;
-  const light = lightRaw.startsWith("#") ? hexColorToRgba(lightRaw) : lightRaw;
-  const dark = darkRaw.startsWith("#") ? hexColorToRgba(darkRaw) : darkRaw;
-  if (!light || !dark) return void 0;
-  return { light_mode: light, dark_mode: dark };
-}
-function normalizeStoredCardColors(dsl) {
-  const colorEntries = {};
-  const styleKey = (entry) => `${entry.light_mode}|${entry.dark_mode}`;
-  const keyToAlias = /* @__PURE__ */ new Map();
-  let bgSeq = 0;
-  const ensureAlias = (prefix, entry) => {
-    const existing2 = keyToAlias.get(styleKey(entry));
-    if (existing2) return existing2;
-    const alias = `${prefix}-${bgSeq++}`;
-    colorEntries[alias] = entry;
-    keyToAlias.set(styleKey(entry), alias);
-    return alias;
-  };
-  const walk = (node) => {
-    if (Array.isArray(node)) {
-      for (const child of node) walk(child);
-      return;
-    }
-    if (!node || typeof node !== "object") return;
-    const obj = node;
-    if (obj.tag === "column") {
-      const custom = readCustomBackgroundStyle(obj);
-      if (custom) {
-        obj.background_style = ensureAlias("cus-bg", custom);
-        delete obj.custom_background_style;
-      }
-    }
-    for (const value of Object.values(obj)) walk(value);
-  };
-  walk(dsl.body);
-  if (Object.keys(colorEntries).length === 0) return;
-  const firstBg = colorEntries["cus-bg-0"] ?? Object.values(colorEntries)[0];
-  if (firstBg) {
-    const m = firstBg.light_mode.match(/^rgba\((\d+),(\d+),(\d+),/);
-    if (m) {
-      colorEntries["cus-accent"] = {
-        light_mode: `rgba(${m[1]},${m[2]},${m[3]},1)`,
-        dark_mode: firstBg.dark_mode.replace(/,\s*[\d.]+\)$/, ",1)")
-      };
-    }
-  }
-  colorEntries["cus-muted"] ??= {
-    light_mode: "rgba(100,106,115,1)",
-    dark_mode: "rgba(166,166,166,1)"
-  };
-  const config = dsl.config && typeof dsl.config === "object" ? dsl.config : {};
-  dsl.config = config;
-  const style = config.style && typeof config.style === "object" ? config.style : {};
-  config.style = style;
-  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);
-}
-
-export { degradeUnknown, dslToRaw, isRawCardEnvelope, normalizeStoredCardColors, rawCardToDsl, rawToDsl };
+export { createColorRegistry, degradeUnknown, dslToRaw, isCustomHexColor, isRawCardEnvelope, normalizeStoredCardColors, rawCardToDsl, rawToDsl, readThemeColorDark, readThemeColorLight, registerColorEntry, resolveCustomBackgroundLight, resolveTextStyleColor, resolveTextStyleCustomColorPair, themePairToColorEntry };

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

@@ -6,9 +6,20 @@ export type CustomColorEntry = {
     light_mode: string;
     dark_mode: string;
 };
+export type ColorRegistry = {
+    entries: Record<string, CustomColorEntry>;
+    keyToAlias: Map<string, string>;
+    bgSeq: number;
+    textSeq: number;
+};
+export declare function createColorRegistry(): ColorRegistry;
+export declare function colorEntryKey(entry: CustomColorEntry): string;
+export declare function registerColorEntry(registry: ColorRegistry, entry: CustomColorEntry, prefix: 'cus-bg' | 'cus-text'): string;
+export declare function hexColorToRgba(hex: string): string | undefined;
 /**
  * 将飞书回读的 custom_background_style 还原为可再次发送的 background_style cus-N + config.style.color。
  * 若 markdown 缺少 font_color，按 text_size / 加粗内容补 cus-accent / cus-muted（飞书回读会丢 font_color）。
+ * rawToDsl 可传入已登记的文字自定义色（preRegistered），与背景色一并写入 config.style.color。
  */
-export declare function normalizeStoredCardColors(dsl: Record<string, unknown>): void;
+export declare function normalizeStoredCardColors(dsl: Record<string, unknown>, preRegistered?: ColorRegistry): void;
 //# sourceMappingURL=normalize-stored-colors.d.ts.map

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;AAmCzE;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAoF5E"}
+{"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"}

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

@@ -56,7 +56,8 @@ export declare function rawToDsl(raw: unknown): unknown;
 /**
  * Optional helper: wrap a private/unknown element as
  * `{ tag: 'unknown', raw_tag, fallback }`.
- * Not applied automatically by `rawToDsl` / `rawCardToDsl` (parity with upstream).
+ * Not applied automatically by `degradeUnknown` (parity with upstream feishu-raw-card-to-dsl).
+ * `convertRoot` / `rawCardToDsl` always run `normalizeStoredCardColors` on output.
  */
 export declare function degradeUnknown(el: Record<string, unknown>): Record<string, unknown>;
 //# sourceMappingURL=raw-to-dsl.d.ts.map

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;AAWH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAIzD;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAcvD;AAmgDD;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CA8C9C;AAED;;;;GAIG;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;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"}

package/package.json

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