@open-feishu-card/adapter 0.3.0 → 0.3.2

package/dist/index.cjs

@@ -642,6 +642,10 @@ function convertHeader(header) {
   const property = {};
   for (const [k, v] of Object.entries(header)) {
     if (k === "tag") continue;
+    if (k === "title" || k === "subtitle") {
+      property[k] = wrapHeaderText(v);
+      continue;
+    }
     if (TEXT_LEAF_KEYS.has(k)) {
       property[k] = wrapTextLeaf(v);
       continue;
@@ -806,6 +810,22 @@ function wrapTextLeaf(v) {
   }
   return { tag: "plain_text", property: { content: "" } };
 }
+function wrapHeaderText(v) {
+  if (typeof v === "string") return { tag: "plain_text", property: { content: v } };
+  if (!isRecord(v)) return { tag: "plain_text", property: { content: "" } };
+  const tag = typeof v.tag === "string" ? v.tag : "plain_text";
+  const content = typeof v.content === "string" ? v.content : "";
+  if (tag === "lark_md" || tag === "markdown") {
+    return {
+      tag: "markdown",
+      property: {
+        elements: parseMarkdown(content),
+        originTag: "lark_md"
+      }
+    };
+  }
+  return wrapTextLeaf(v);
+}
 function behaviorsToActions(behaviors) {
   const out = [];
   for (const b of behaviors) {
@@ -962,10 +982,32 @@ function convertConfig(_node) {
   return { update_multi: true };
 }
 function convertHeader2(node, ctx) {
-  const property = isRecord2(node.property) ? node.property : {};
+  const property = isRecord2(node.property) ? node.property : node;
   const out = convertProperty(property, "header", ctx);
+  delete out.tag;
   return out;
 }
+function convertHeaderText(rawValue, ctx) {
+  const tag = typeof rawValue.tag === "string" ? rawValue.tag : "";
+  const wrapped = isRecord2(rawValue.property);
+  const property = wrapped ? rawValue.property : rawValue;
+  if (tag === "plain_text") {
+    const content = typeof property.content === "string" ? property.content : "";
+    return { tag: "plain_text", content };
+  }
+  if (tag === "markdown" || tag === "lark_md") {
+    if (wrapped && Array.isArray(property.elements)) {
+      const rebuilt = rebuildMarkdown(property, ctx);
+      return { tag: "lark_md", content: typeof rebuilt.content === "string" ? rebuilt.content : "" };
+    }
+    const content = typeof property.content === "string" ? property.content : "";
+    return { tag: "lark_md", content };
+  }
+  if (!wrapped && typeof rawValue.content === "string" && !tag) {
+    return { tag: "plain_text", content: rawValue.content };
+  }
+  return void 0;
+}
 function convertBody2(node, ctx) {
   const property = isRecord2(node.property) ? node.property : node;
   return convertProperty(property, "body", ctx);
@@ -1264,6 +1306,10 @@ function convertField(rawKey, rawValue, ownerTag, ctx, siblings = {}) {
     const p = isRecord2(rawValue.property) ? rawValue.property : {};
     return [key, { tag: "plain_text", content: typeof p.content === "string" ? p.content : "" }];
   }
+  if (ownerTag === "header" && (key === "title" || key === "subtitle") && isRecord2(rawValue)) {
+    const headerText = convertHeaderText(rawValue, ctx);
+    if (headerText) return [key, headerText];
+  }
   if (ownerTag === "header" && key === "ud_icon" && isRecord2(rawValue) && rawValue.tag === "ud_icon") {
     const p = isRecord2(rawValue.property) ? rawValue.property : {};
     const token = typeof p.token === "string" ? p.token : void 0;
@@ -1815,8 +1861,109 @@ 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.degradeUnknown = degradeUnknown;
 exports.dslToRaw = dslToRaw;
 exports.isRawCardEnvelope = isRawCardEnvelope;
+exports.normalizeStoredCardColors = normalizeStoredCardColors;
 exports.rawCardToDsl = rawCardToDsl;
 exports.rawToDsl = rawToDsl;

package/dist/index.d.ts

@@ -8,5 +8,7 @@
  */
 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 type { CustomColorEntry } from './normalize-stored-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,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,MAAM,8BAA8B,CAAC;AACzE,YAAY,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC"}

package/dist/index.js

@@ -640,6 +640,10 @@ function convertHeader(header) {
   const property = {};
   for (const [k, v] of Object.entries(header)) {
     if (k === "tag") continue;
+    if (k === "title" || k === "subtitle") {
+      property[k] = wrapHeaderText(v);
+      continue;
+    }
     if (TEXT_LEAF_KEYS.has(k)) {
       property[k] = wrapTextLeaf(v);
       continue;
@@ -804,6 +808,22 @@ function wrapTextLeaf(v) {
   }
   return { tag: "plain_text", property: { content: "" } };
 }
+function wrapHeaderText(v) {
+  if (typeof v === "string") return { tag: "plain_text", property: { content: v } };
+  if (!isRecord(v)) return { tag: "plain_text", property: { content: "" } };
+  const tag = typeof v.tag === "string" ? v.tag : "plain_text";
+  const content = typeof v.content === "string" ? v.content : "";
+  if (tag === "lark_md" || tag === "markdown") {
+    return {
+      tag: "markdown",
+      property: {
+        elements: parseMarkdown(content),
+        originTag: "lark_md"
+      }
+    };
+  }
+  return wrapTextLeaf(v);
+}
 function behaviorsToActions(behaviors) {
   const out = [];
   for (const b of behaviors) {
@@ -960,10 +980,32 @@ function convertConfig(_node) {
   return { update_multi: true };
 }
 function convertHeader2(node, ctx) {
-  const property = isRecord2(node.property) ? node.property : {};
+  const property = isRecord2(node.property) ? node.property : node;
   const out = convertProperty(property, "header", ctx);
+  delete out.tag;
   return out;
 }
+function convertHeaderText(rawValue, ctx) {
+  const tag = typeof rawValue.tag === "string" ? rawValue.tag : "";
+  const wrapped = isRecord2(rawValue.property);
+  const property = wrapped ? rawValue.property : rawValue;
+  if (tag === "plain_text") {
+    const content = typeof property.content === "string" ? property.content : "";
+    return { tag: "plain_text", content };
+  }
+  if (tag === "markdown" || tag === "lark_md") {
+    if (wrapped && Array.isArray(property.elements)) {
+      const rebuilt = rebuildMarkdown(property, ctx);
+      return { tag: "lark_md", content: typeof rebuilt.content === "string" ? rebuilt.content : "" };
+    }
+    const content = typeof property.content === "string" ? property.content : "";
+    return { tag: "lark_md", content };
+  }
+  if (!wrapped && typeof rawValue.content === "string" && !tag) {
+    return { tag: "plain_text", content: rawValue.content };
+  }
+  return void 0;
+}
 function convertBody2(node, ctx) {
   const property = isRecord2(node.property) ? node.property : node;
   return convertProperty(property, "body", ctx);
@@ -1262,6 +1304,10 @@ function convertField(rawKey, rawValue, ownerTag, ctx, siblings = {}) {
     const p = isRecord2(rawValue.property) ? rawValue.property : {};
     return [key, { tag: "plain_text", content: typeof p.content === "string" ? p.content : "" }];
   }
+  if (ownerTag === "header" && (key === "title" || key === "subtitle") && isRecord2(rawValue)) {
+    const headerText = convertHeaderText(rawValue, ctx);
+    if (headerText) return [key, headerText];
+  }
   if (ownerTag === "header" && key === "ud_icon" && isRecord2(rawValue) && rawValue.tag === "ud_icon") {
     const p = isRecord2(rawValue.property) ? rawValue.property : {};
     const token = typeof p.token === "string" ? p.token : void 0;
@@ -1813,4 +1859,104 @@ function degradeUnknown(el) {
   return { tag: "unknown", raw_tag: rawTag, fallback: el };
 }
 
-export { degradeUnknown, dslToRaw, isRawCardEnvelope, rawCardToDsl, rawToDsl };
+// 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 };

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

@@ -0,0 +1,14 @@
+/**
+ * 飞书存储卡片时会将 config.style.color 的 cus-N 展开为 custom_background_style（#RRGGBBAA），
+ * 并丢弃 config.style 与 markdown.font_color。回读底稿后须 normalize，否则 modify 再发会丢色。
+ */
+export type CustomColorEntry = {
+    light_mode: string;
+    dark_mode: string;
+};
+/**
+ * 将飞书回读的 custom_background_style 还原为可再次发送的 background_style cus-N + config.style.color。
+ * 若 markdown 缺少 font_color，按 text_size / 加粗内容补 cus-accent / cus-muted（飞书回读会丢 font_color）。
+ */
+export declare function normalizeStoredCardColors(dsl: Record<string, unknown>): void;
+//# sourceMappingURL=normalize-stored-colors.d.ts.map

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

@@ -0,0 +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"}

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;AAo9CD;;;;;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;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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-feishu-card/adapter",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "公开 DSL 与飞书内部 RAW JSON 的双向适配器；raw→DSL 对齐 feishu-raw-card-to-dsl",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -21,7 +21,8 @@
     "tsup": "^8.3.5",
     "tsx": "^4.19.3",
     "typescript": "^7.0.2",
-    "vitest": "^2.1.9"
+    "vitest": "^2.1.9",
+    "@open-feishu-card/schema": "0.1.4"
   },
   "license": "MIT",
   "publishConfig": {