@open-feishu-card/adapter 0.3.9 → 0.3.11

package/dist/expand-dsl-colors.d.ts

@@ -1,6 +1,9 @@
 /**
- * DSL config.style.color 中的 cus-* 别名在 dslToRaw 时展开为渲染器已支持的
+ * DSL config.style.color 中的自定义色别名在 dslToRaw 时展开为渲染器已支持的
  * customBackgroundStyle / textStyle.customColor（对齐飞书 RAW 真机字段）。
+ *
+ * 别名不限于编辑器默认的 cus-*：业务卡也常用 mm_* 等任意 token 名登记在
+ * config.style.color，真机按 registry 键查找；仅认 cus- 前缀会导致背景/描边丢失。
  */
 import type { CardElement, TextStyle } from './types.js';
 export type CustomColorEntry = {
@@ -9,15 +12,18 @@ export type CustomColorEntry = {
 };
 export type ColorRegistry = Record<string, CustomColorEntry>;
 export declare function readColorRegistry(card: Record<string, unknown>): ColorRegistry;
+/** @deprecated 保留兼容；展开逻辑改为查 registry，不再依赖 cus- 前缀。 */
 export declare function isCustomColorAlias(value: unknown): value is string;
-/** column / column_set background_style cus-N → customBackgroundStyle */
+/** 是否为 config.style.color 中已登记的别名（任意 token 名）。 */
+export declare function isRegisteredColorAlias(value: unknown, registry: ColorRegistry): value is string;
+/** column / column_set / interactive_container background_style → customBackgroundStyle */
 export declare function expandBackgroundStyleAlias(style: unknown, registry: ColorRegistry): {
     light_mode: string;
     dark_mode: string;
 } | undefined;
-/** textStyle.color cus-N → customColor（去掉 color，避免被当成命名色） */
+/** textStyle.color 登记别名 → customColor（去掉 color，避免被当成命名色） */
 export declare function expandTextStyleColor(textStyle: TextStyle | undefined, registry: ColorRegistry): TextStyle | undefined;
-/** border_color / background_style 等 cus-N → customBackgroundStyle 形态（供 RAW 渲染器读取） */
+/** border_color / background_style 等登记别名 → customBackgroundStyle 形态（供 RAW 渲染器读取） */
 export declare function expandColorAlias(style: unknown, registry: ColorRegistry): {
     light_mode: string;
     dark_mode: string;

package/dist/expand-dsl-colors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expand-dsl-colors.d.ts","sourceRoot":"","sources":["../src/expand-dsl-colors.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,MAAM,gBAAgB,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AACzE,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;AAE7D,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,aAAa,CAiB9E;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAElE;AAED,yEAAyE;AACzE,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,aAAa,GACtB;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAKvD;AAED,6DAA6D;AAC7D,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,QAAQ,EAAE,aAAa,GACtB,SAAS,GAAG,SAAS,CAWvB;AAED,sFAAsF;AACtF,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,aAAa,GACtB;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAEvD;AAED,0CAA0C;AAC1C,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,WAAW,EAAE,GAAG,SAAS,EACnC,QAAQ,EAAE,aAAa,GACtB,WAAW,EAAE,GAAG,SAAS,CAG3B;AAuCD,4DAA4D;AAC5D,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,MAAM,CAGR"}
+{"version":3,"file":"expand-dsl-colors.d.ts","sourceRoot":"","sources":["../src/expand-dsl-colors.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,MAAM,gBAAgB,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AACzE,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;AAE7D,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,aAAa,CAiB9E;AAED,sDAAsD;AACtD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAElE;AAED,kDAAkD;AAClD,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,aAAa,GACtB,KAAK,IAAI,MAAM,CAEjB;AAED,2FAA2F;AAC3F,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,aAAa,GACtB;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAIvD;AAED,4DAA4D;AAC5D,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,QAAQ,EAAE,aAAa,GACtB,SAAS,GAAG,SAAS,CAUvB;AAED,oFAAoF;AACpF,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,aAAa,GACtB;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAEvD;AAED,0CAA0C;AAC1C,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,WAAW,EAAE,GAAG,SAAS,EACnC,QAAQ,EAAE,aAAa,GACtB,WAAW,EAAE,GAAG,SAAS,CAG3B;AAuCD,4DAA4D;AAC5D,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,MAAM,CAGR"}

package/dist/index.cjs

@@ -621,21 +621,19 @@ function readColorRegistry(card) {
   }
   return out;
 }
-function isCustomColorAlias(value) {
-  return typeof value === "string" && value.startsWith("cus-");
+function isRegisteredColorAlias(value, registry) {
+  return typeof value === "string" && !!value && Object.prototype.hasOwnProperty.call(registry, value);
 }
 function expandBackgroundStyleAlias(style, registry) {
-  if (!isCustomColorAlias(style)) return void 0;
+  if (!isRegisteredColorAlias(style, registry)) return void 0;
   const entry = registry[style];
-  if (!entry) return void 0;
   return { light_mode: entry.light_mode, dark_mode: entry.dark_mode };
 }
 function expandTextStyleColor(textStyle, registry) {
   if (!textStyle) return textStyle;
   const color = typeof textStyle.color === "string" ? textStyle.color.trim() : void 0;
-  if (!isCustomColorAlias(color)) return textStyle;
+  if (!isRegisteredColorAlias(color, registry)) return textStyle;
   const entry = registry[color];
-  if (!entry) return textStyle;
   const { color: _drop, ...rest } = textStyle;
   return {
     ...rest,
@@ -843,13 +841,27 @@ function buildProperty(el, tag, colors) {
   const property = {};
   for (const [k, v] of Object.entries(el)) {
     if (k === "tag" || k === "id") continue;
-    if ((k === "background_style" || k === "backgroundStyle") && (tag === "column" || tag === "column_set")) {
+    if ((k === "background_style" || k === "backgroundStyle") && (tag === "column" || tag === "column_set" || tag === "interactive_container")) {
       const renamed = renameKey(k);
       property[renamed] = v;
       const expanded = expandBackgroundStyleAlias(v, colors);
       if (expanded) property.customBackgroundStyle = expanded;
       continue;
     }
+    if ((k === "background_color" || k === "backgroundColor") && tag === "collapsible_panel") {
+      const renamed = renameKey(k);
+      property[renamed] = v;
+      const expanded = expandBackgroundStyleAlias(v, colors);
+      if (expanded) property.customBackgroundStyle = expanded;
+      continue;
+    }
+    if (k === "border" && tag === "collapsible_panel" && isRecord2(v)) {
+      const border = { ...v };
+      const expanded = expandBackgroundStyleAlias(border.color, colors);
+      if (expanded) border.color = expanded.light_mode;
+      property.border = border;
+      continue;
+    }
     if ((k === "border_color" || k === "borderColor") && tag === "interactive_container") {
       const renamed = renameKey(k);
       property[renamed] = v;
@@ -869,6 +881,30 @@ function buildProperty(el, tag, colors) {
         continue;
       }
     }
+    if (tag === "interactive_container" && typeof v === "string") {
+      if (k === "width") {
+        if (v === "fill" || v === "auto" || v === "default") {
+          property.widthValue = { type: "builtin_interactive_container_width", value: v };
+          continue;
+        }
+        const px = pxValue(v);
+        if (px != null) {
+          property.widthValue = { type: "pixels", value: px };
+          continue;
+        }
+      }
+      if (k === "height") {
+        if (v === "auto" || v === "default") {
+          property.heightValue = { type: "builtin_interactive_container_height", value: v };
+          continue;
+        }
+        const px = pxValue(v);
+        if (px != null) {
+          property.heightValue = { type: "pixels", value: px };
+          continue;
+        }
+      }
+    }
     if (TEXT_LEAF_KEYS.has(k)) {
       property[renameKey(k)] = wrapTextLeaf(v);
       continue;

package/dist/index.js

@@ -619,21 +619,19 @@ function readColorRegistry(card) {
   }
   return out;
 }
-function isCustomColorAlias(value) {
-  return typeof value === "string" && value.startsWith("cus-");
+function isRegisteredColorAlias(value, registry) {
+  return typeof value === "string" && !!value && Object.prototype.hasOwnProperty.call(registry, value);
 }
 function expandBackgroundStyleAlias(style, registry) {
-  if (!isCustomColorAlias(style)) return void 0;
+  if (!isRegisteredColorAlias(style, registry)) return void 0;
   const entry = registry[style];
-  if (!entry) return void 0;
   return { light_mode: entry.light_mode, dark_mode: entry.dark_mode };
 }
 function expandTextStyleColor(textStyle, registry) {
   if (!textStyle) return textStyle;
   const color = typeof textStyle.color === "string" ? textStyle.color.trim() : void 0;
-  if (!isCustomColorAlias(color)) return textStyle;
+  if (!isRegisteredColorAlias(color, registry)) return textStyle;
   const entry = registry[color];
-  if (!entry) return textStyle;
   const { color: _drop, ...rest } = textStyle;
   return {
     ...rest,
@@ -841,13 +839,27 @@ function buildProperty(el, tag, colors) {
   const property = {};
   for (const [k, v] of Object.entries(el)) {
     if (k === "tag" || k === "id") continue;
-    if ((k === "background_style" || k === "backgroundStyle") && (tag === "column" || tag === "column_set")) {
+    if ((k === "background_style" || k === "backgroundStyle") && (tag === "column" || tag === "column_set" || tag === "interactive_container")) {
       const renamed = renameKey(k);
       property[renamed] = v;
       const expanded = expandBackgroundStyleAlias(v, colors);
       if (expanded) property.customBackgroundStyle = expanded;
       continue;
     }
+    if ((k === "background_color" || k === "backgroundColor") && tag === "collapsible_panel") {
+      const renamed = renameKey(k);
+      property[renamed] = v;
+      const expanded = expandBackgroundStyleAlias(v, colors);
+      if (expanded) property.customBackgroundStyle = expanded;
+      continue;
+    }
+    if (k === "border" && tag === "collapsible_panel" && isRecord2(v)) {
+      const border = { ...v };
+      const expanded = expandBackgroundStyleAlias(border.color, colors);
+      if (expanded) border.color = expanded.light_mode;
+      property.border = border;
+      continue;
+    }
     if ((k === "border_color" || k === "borderColor") && tag === "interactive_container") {
       const renamed = renameKey(k);
       property[renamed] = v;
@@ -867,6 +879,30 @@ function buildProperty(el, tag, colors) {
         continue;
       }
     }
+    if (tag === "interactive_container" && typeof v === "string") {
+      if (k === "width") {
+        if (v === "fill" || v === "auto" || v === "default") {
+          property.widthValue = { type: "builtin_interactive_container_width", value: v };
+          continue;
+        }
+        const px = pxValue(v);
+        if (px != null) {
+          property.widthValue = { type: "pixels", value: px };
+          continue;
+        }
+      }
+      if (k === "height") {
+        if (v === "auto" || v === "default") {
+          property.heightValue = { type: "builtin_interactive_container_height", value: v };
+          continue;
+        }
+        const px = pxValue(v);
+        if (px != null) {
+          property.heightValue = { type: "pixels", value: px };
+          continue;
+        }
+      }
+    }
     if (TEXT_LEAF_KEYS.has(k)) {
       property[renameKey(k)] = wrapTextLeaf(v);
       continue;

package/package.json

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