@open-feishu-card/adapter 0.3.8 → 0.3.9

package/dist/index.cjs

@@ -1034,12 +1034,45 @@ function readCustomBackgroundStyle(node) {
 function readCustomBorderColor(node) {
   return readThemeColorPair(node.custom_border_color ?? node.customBorderColor);
 }
+function seedRegistryFromConfigStyle(dsl, colorEntries, bgKeyToAlias, textKeyToAlias) {
+  let bgSeq = 0;
+  let textSeq = 0;
+  const config = dsl.config;
+  if (!config || typeof config !== "object") return { bgSeq, textSeq };
+  const style = config.style;
+  if (!style || typeof style !== "object") return { bgSeq, textSeq };
+  const colors = style.color;
+  if (!colors || typeof colors !== "object") return { bgSeq, textSeq };
+  for (const [alias, entry] of Object.entries(colors)) {
+    if (!entry || typeof entry !== "object") continue;
+    const pair = entry;
+    if (typeof pair.light_mode !== "string" || typeof pair.dark_mode !== "string") continue;
+    const themePair = { light_mode: pair.light_mode, dark_mode: pair.dark_mode };
+    colorEntries[alias] = themePair;
+    const key = colorEntryKey(themePair);
+    if (alias.startsWith("cus-text")) {
+      textKeyToAlias.set(key, alias);
+      const n = /^cus-text-(\d+)$/.exec(alias);
+      if (n) textSeq = Math.max(textSeq, Number(n[1]) + 1);
+    } else {
+      bgKeyToAlias.set(key, alias);
+      const n = /^cus-bg-(\d+)$/.exec(alias);
+      if (n) bgSeq = Math.max(bgSeq, Number(n[1]) + 1);
+    }
+  }
+  return { bgSeq, textSeq };
+}
 function normalizeStoredCardColors(dsl, preRegistered) {
   const colorEntries = { ...preRegistered?.entries ?? {} };
   const bgKeyToAlias = new Map(preRegistered?.bgKeyToAlias ?? []);
   const textKeyToAlias = new Map(preRegistered?.textKeyToAlias ?? []);
   let bgSeq = preRegistered?.bgSeq ?? 0;
   let textSeq = preRegistered?.textSeq ?? 0;
+  if (!preRegistered) {
+    const seeded = seedRegistryFromConfigStyle(dsl, colorEntries, bgKeyToAlias, textKeyToAlias);
+    bgSeq = Math.max(bgSeq, seeded.bgSeq);
+    textSeq = Math.max(textSeq, seeded.textSeq);
+  }
   const ensureAlias = (prefix, entry) => {
     const map = prefix === "cus-bg" ? bgKeyToAlias : textKeyToAlias;
     const existing2 = map.get(colorEntryKey(entry));
@@ -1064,6 +1097,11 @@ function normalizeStoredCardColors(dsl, preRegistered) {
       }
     }
     if (obj.tag === "interactive_container") {
+      const customBg = readCustomBackgroundStyle(obj);
+      if (customBg) {
+        obj.background_style = ensureAlias("cus-bg", customBg);
+        delete obj.custom_background_style;
+      }
       const border = readCustomBorderColor(obj);
       if (border) {
         obj.border_color = ensureAlias("cus-bg", border);

package/dist/index.js

@@ -1032,12 +1032,45 @@ function readCustomBackgroundStyle(node) {
 function readCustomBorderColor(node) {
   return readThemeColorPair(node.custom_border_color ?? node.customBorderColor);
 }
+function seedRegistryFromConfigStyle(dsl, colorEntries, bgKeyToAlias, textKeyToAlias) {
+  let bgSeq = 0;
+  let textSeq = 0;
+  const config = dsl.config;
+  if (!config || typeof config !== "object") return { bgSeq, textSeq };
+  const style = config.style;
+  if (!style || typeof style !== "object") return { bgSeq, textSeq };
+  const colors = style.color;
+  if (!colors || typeof colors !== "object") return { bgSeq, textSeq };
+  for (const [alias, entry] of Object.entries(colors)) {
+    if (!entry || typeof entry !== "object") continue;
+    const pair = entry;
+    if (typeof pair.light_mode !== "string" || typeof pair.dark_mode !== "string") continue;
+    const themePair = { light_mode: pair.light_mode, dark_mode: pair.dark_mode };
+    colorEntries[alias] = themePair;
+    const key = colorEntryKey(themePair);
+    if (alias.startsWith("cus-text")) {
+      textKeyToAlias.set(key, alias);
+      const n = /^cus-text-(\d+)$/.exec(alias);
+      if (n) textSeq = Math.max(textSeq, Number(n[1]) + 1);
+    } else {
+      bgKeyToAlias.set(key, alias);
+      const n = /^cus-bg-(\d+)$/.exec(alias);
+      if (n) bgSeq = Math.max(bgSeq, Number(n[1]) + 1);
+    }
+  }
+  return { bgSeq, textSeq };
+}
 function normalizeStoredCardColors(dsl, preRegistered) {
   const colorEntries = { ...preRegistered?.entries ?? {} };
   const bgKeyToAlias = new Map(preRegistered?.bgKeyToAlias ?? []);
   const textKeyToAlias = new Map(preRegistered?.textKeyToAlias ?? []);
   let bgSeq = preRegistered?.bgSeq ?? 0;
   let textSeq = preRegistered?.textSeq ?? 0;
+  if (!preRegistered) {
+    const seeded = seedRegistryFromConfigStyle(dsl, colorEntries, bgKeyToAlias, textKeyToAlias);
+    bgSeq = Math.max(bgSeq, seeded.bgSeq);
+    textSeq = Math.max(textSeq, seeded.textSeq);
+  }
   const ensureAlias = (prefix, entry) => {
     const map = prefix === "cus-bg" ? bgKeyToAlias : textKeyToAlias;
     const existing2 = map.get(colorEntryKey(entry));
@@ -1062,6 +1095,11 @@ function normalizeStoredCardColors(dsl, preRegistered) {
       }
     }
     if (obj.tag === "interactive_container") {
+      const customBg = readCustomBackgroundStyle(obj);
+      if (customBg) {
+        obj.background_style = ensureAlias("cus-bg", customBg);
+        delete obj.custom_background_style;
+      }
       const border = readCustomBorderColor(obj);
       if (border) {
         obj.border_color = ensureAlias("cus-bg", border);

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":"AAEA;;;;GAIG;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,sDAAsD;IACtD,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,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,CAWR;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAgB9D;AA0BD;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,aAAa,CAAC,EAAE,aAAa,GAC5B,IAAI,CAoHN"}
+{"version":3,"file":"normalize-stored-colors.d.ts","sourceRoot":"","sources":["../src/normalize-stored-colors.ts"],"names":[],"mappings":"AAEA;;;;GAIG;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,sDAAsD;IACtD,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,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,CAWR;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAgB9D;AA8DD;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,aAAa,CAAC,EAAE,aAAa,GAC5B,IAAI,CA+HN"}

package/package.json

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