@open-feishu-card/adapter 0.3.19 → 0.4.0

package/dist/index.cjs

@@ -818,10 +818,12 @@ function convertEl(el, colors) {
       }
     }
     if (tag === "video") {
-      const cover = el.image_key ?? el.cover_image_key ?? el.coverImageID;
+      const nestedCover = isRecord2(el.cover) ? el.cover.img_key : void 0;
+      const cover = nestedCover ?? el.image_key ?? el.cover_image_key ?? el.coverImageID;
       if (typeof cover === "string" && cover) property.coverImageID = cover;
       delete property.image_key;
       delete property.cover_image_key;
+      delete property.cover;
     }
     return withRawElementId(el, { tag, property });
   }
@@ -936,6 +938,64 @@ function buildProperty(el, tag, colors) {
         }
       }
     }
+    if (tag === "img_combination") {
+      if (k === "combination_mode") {
+        property.combinationMode = v;
+        continue;
+      }
+      if (k === "img_list" && Array.isArray(v)) {
+        property.imgList = v.map((item) => {
+          if (!isRecord2(item)) return item;
+          const key = item.img_key ?? item.imgKey ?? item.img_id ?? item.imgId;
+          return compactRecord({
+            imageID: typeof key === "string" ? key : void 0,
+            transparent: typeof item.transparent === "boolean" ? item.transparent : void 0
+          });
+        });
+        continue;
+      }
+      if (k === "combination_transparent") {
+        property.transparent = v;
+        continue;
+      }
+    }
+    if (tag === "select_img") {
+      if (k === "options" && Array.isArray(v)) {
+        property.options = v.map((item) => {
+          if (!isRecord2(item)) return item;
+          const key = item.img_key ?? item.imgKey ?? item.img_id ?? item.imgId;
+          return compactRecord({
+            imageID: typeof key === "string" ? key : void 0,
+            value: item.value,
+            disabled: item.disabled,
+            disabled_tips: item.disabled_tips !== void 0 ? wrapTextLeaf(item.disabled_tips) : void 0,
+            hover_tips: item.hover_tips !== void 0 ? wrapTextLeaf(item.hover_tips) : void 0,
+            transparent: item.transparent
+          });
+        });
+        continue;
+      }
+      if (k === "multi_select") {
+        property.multiSelect = v;
+        continue;
+      }
+      if (k === "selected_values") {
+        property.selectedValues = v;
+        continue;
+      }
+      if (k === "can_preview") {
+        property.canPreview = v;
+        continue;
+      }
+      if (k === "aspect_ratio") {
+        property.aspectRatio = v;
+        continue;
+      }
+      if (k === "disabled_tips") {
+        property.disabledTips = wrapTextLeaf(v);
+        continue;
+      }
+    }
     if (TEXT_LEAF_KEYS.has(k)) {
       property[renameKey(k)] = wrapTextLeaf(v);
       continue;
@@ -1065,6 +1125,12 @@ function pxValue(s) {
   const n = Number(s);
   return Number.isFinite(n) ? n : null;
 }
+function compactRecord(obj) {
+  for (const key of Object.keys(obj)) {
+    if (obj[key] === void 0) delete obj[key];
+  }
+  return obj;
+}
 function isRecord2(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
@@ -1713,6 +1779,47 @@ function unwrapInner(node, ctx) {
     }
     return out;
   }
+  if (tag === "img_combination") {
+    const converted2 = convertProperty(property, tag, ctx);
+    const out = { tag };
+    if (typeof converted2.combination_mode === "string") {
+      out.combination_mode = converted2.combination_mode;
+    }
+    const rawList = Array.isArray(property.imgList) ? property.imgList : Array.isArray(property.img_list) ? property.img_list : void 0;
+    if (rawList) {
+      out.img_list = rawList.map((item) => isRecord3(item) ? projectImgCombinationItem(item, ctx) : void 0).filter((item) => item !== void 0);
+    }
+    const transparent = property.combinationTransparent ?? property.combination_transparent ?? property.transparent;
+    if (typeof transparent === "boolean") out.combination_transparent = transparent;
+    if (converted2.corner_radius !== void 0) {
+      out.corner_radius = converted2.corner_radius;
+    } else if (typeof property.cornerRadiusValue === "number") {
+      out.corner_radius = `${property.cornerRadiusValue}px`;
+    } else if (typeof property.corner_radius === "string") {
+      out.corner_radius = property.corner_radius;
+    }
+    if (typeof converted2.img_list_length === "number") {
+      out.img_list_length = converted2.img_list_length;
+    }
+    if (converted2.margin !== void 0) out.margin = converted2.margin;
+    return out;
+  }
+  if (tag === "select_img") {
+    const converted2 = convertProperty(property, tag, ctx);
+    const out = { tag, ...converted2 };
+    const rawOptions = Array.isArray(property.options) ? property.options : void 0;
+    if (rawOptions) {
+      out.options = rawOptions.map(
+        (option) => isRecord3(option) ? projectSelectImgOption(option, ctx) : {}
+      );
+    }
+    if (Array.isArray(property.actions)) {
+      const behaviors = property.actions.map((a) => actionEntryToBehavior(a, tag, ctx)).filter((b) => b !== void 0);
+      delete out.actions;
+      if (behaviors.length > 0) out.behaviors = behaviors;
+    }
+    return out;
+  }
   if (tag === "div" && isRecord3(property.text) && property.fields === void 0) {
     const text = property.text;
     const textTag = typeof text.tag === "string" ? text.tag : "";
@@ -2459,6 +2566,38 @@ function resolveAttachmentImgKey(rawValue, ctx) {
   if (id.startsWith("img_")) return id;
   return void 0;
 }
+function projectImageKey(item, ctx) {
+  const direct = typeof item.img_key === "string" ? item.img_key : typeof item.imgKey === "string" ? item.imgKey : void 0;
+  if (direct) return { img_key: direct };
+  const id = item.imageID ?? item.image_id ?? item.imgId ?? item.img_id;
+  const resolved = resolveAttachmentImgKey(id, ctx);
+  if (resolved) return { img_key: resolved };
+  if (typeof id === "string" || typeof id === "number") return { img_id: String(id) };
+  return {};
+}
+function projectImgCombinationItem(item, ctx) {
+  const out = projectImageKey(item, ctx);
+  if (typeof item.transparent === "boolean") out.transparent = item.transparent;
+  return Object.keys(out).length > 0 ? out : void 0;
+}
+function projectSelectImgOption(item, ctx) {
+  const out = projectImageKey(item, ctx);
+  if (typeof item.value === "string") out.value = item.value;
+  if (typeof item.disabled === "boolean") out.disabled = item.disabled;
+  const disabledTips = projectTipsText(item.disabled_tips ?? item.disabledTips);
+  if (disabledTips) out.disabled_tips = disabledTips;
+  const hoverTips = projectTipsText(item.hover_tips ?? item.hoverTips);
+  if (hoverTips) out.hover_tips = hoverTips;
+  if (typeof item.transparent === "boolean") out.transparent = item.transparent;
+  return out;
+}
+function projectTipsText(value) {
+  if (typeof value === "string") return { tag: "plain_text", content: value };
+  if (!isRecord3(value)) return void 0;
+  const property = isRecord3(value.property) ? value.property : value;
+  const content = typeof property.content === "string" ? property.content : "";
+  return { tag: "plain_text", content };
+}
 function normalizeVideoCover(rawValue, ctx) {
   if (typeof rawValue === "string" || typeof rawValue === "number") {
     const imgKey2 = resolveAttachmentImgKey(rawValue, ctx);

package/dist/index.js

@@ -816,10 +816,12 @@ function convertEl(el, colors) {
       }
     }
     if (tag === "video") {
-      const cover = el.image_key ?? el.cover_image_key ?? el.coverImageID;
+      const nestedCover = isRecord2(el.cover) ? el.cover.img_key : void 0;
+      const cover = nestedCover ?? el.image_key ?? el.cover_image_key ?? el.coverImageID;
       if (typeof cover === "string" && cover) property.coverImageID = cover;
       delete property.image_key;
       delete property.cover_image_key;
+      delete property.cover;
     }
     return withRawElementId(el, { tag, property });
   }
@@ -934,6 +936,64 @@ function buildProperty(el, tag, colors) {
         }
       }
     }
+    if (tag === "img_combination") {
+      if (k === "combination_mode") {
+        property.combinationMode = v;
+        continue;
+      }
+      if (k === "img_list" && Array.isArray(v)) {
+        property.imgList = v.map((item) => {
+          if (!isRecord2(item)) return item;
+          const key = item.img_key ?? item.imgKey ?? item.img_id ?? item.imgId;
+          return compactRecord({
+            imageID: typeof key === "string" ? key : void 0,
+            transparent: typeof item.transparent === "boolean" ? item.transparent : void 0
+          });
+        });
+        continue;
+      }
+      if (k === "combination_transparent") {
+        property.transparent = v;
+        continue;
+      }
+    }
+    if (tag === "select_img") {
+      if (k === "options" && Array.isArray(v)) {
+        property.options = v.map((item) => {
+          if (!isRecord2(item)) return item;
+          const key = item.img_key ?? item.imgKey ?? item.img_id ?? item.imgId;
+          return compactRecord({
+            imageID: typeof key === "string" ? key : void 0,
+            value: item.value,
+            disabled: item.disabled,
+            disabled_tips: item.disabled_tips !== void 0 ? wrapTextLeaf(item.disabled_tips) : void 0,
+            hover_tips: item.hover_tips !== void 0 ? wrapTextLeaf(item.hover_tips) : void 0,
+            transparent: item.transparent
+          });
+        });
+        continue;
+      }
+      if (k === "multi_select") {
+        property.multiSelect = v;
+        continue;
+      }
+      if (k === "selected_values") {
+        property.selectedValues = v;
+        continue;
+      }
+      if (k === "can_preview") {
+        property.canPreview = v;
+        continue;
+      }
+      if (k === "aspect_ratio") {
+        property.aspectRatio = v;
+        continue;
+      }
+      if (k === "disabled_tips") {
+        property.disabledTips = wrapTextLeaf(v);
+        continue;
+      }
+    }
     if (TEXT_LEAF_KEYS.has(k)) {
       property[renameKey(k)] = wrapTextLeaf(v);
       continue;
@@ -1063,6 +1123,12 @@ function pxValue(s) {
   const n = Number(s);
   return Number.isFinite(n) ? n : null;
 }
+function compactRecord(obj) {
+  for (const key of Object.keys(obj)) {
+    if (obj[key] === void 0) delete obj[key];
+  }
+  return obj;
+}
 function isRecord2(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
@@ -1711,6 +1777,47 @@ function unwrapInner(node, ctx) {
     }
     return out;
   }
+  if (tag === "img_combination") {
+    const converted2 = convertProperty(property, tag, ctx);
+    const out = { tag };
+    if (typeof converted2.combination_mode === "string") {
+      out.combination_mode = converted2.combination_mode;
+    }
+    const rawList = Array.isArray(property.imgList) ? property.imgList : Array.isArray(property.img_list) ? property.img_list : void 0;
+    if (rawList) {
+      out.img_list = rawList.map((item) => isRecord3(item) ? projectImgCombinationItem(item, ctx) : void 0).filter((item) => item !== void 0);
+    }
+    const transparent = property.combinationTransparent ?? property.combination_transparent ?? property.transparent;
+    if (typeof transparent === "boolean") out.combination_transparent = transparent;
+    if (converted2.corner_radius !== void 0) {
+      out.corner_radius = converted2.corner_radius;
+    } else if (typeof property.cornerRadiusValue === "number") {
+      out.corner_radius = `${property.cornerRadiusValue}px`;
+    } else if (typeof property.corner_radius === "string") {
+      out.corner_radius = property.corner_radius;
+    }
+    if (typeof converted2.img_list_length === "number") {
+      out.img_list_length = converted2.img_list_length;
+    }
+    if (converted2.margin !== void 0) out.margin = converted2.margin;
+    return out;
+  }
+  if (tag === "select_img") {
+    const converted2 = convertProperty(property, tag, ctx);
+    const out = { tag, ...converted2 };
+    const rawOptions = Array.isArray(property.options) ? property.options : void 0;
+    if (rawOptions) {
+      out.options = rawOptions.map(
+        (option) => isRecord3(option) ? projectSelectImgOption(option, ctx) : {}
+      );
+    }
+    if (Array.isArray(property.actions)) {
+      const behaviors = property.actions.map((a) => actionEntryToBehavior(a, tag, ctx)).filter((b) => b !== void 0);
+      delete out.actions;
+      if (behaviors.length > 0) out.behaviors = behaviors;
+    }
+    return out;
+  }
   if (tag === "div" && isRecord3(property.text) && property.fields === void 0) {
     const text = property.text;
     const textTag = typeof text.tag === "string" ? text.tag : "";
@@ -2457,6 +2564,38 @@ function resolveAttachmentImgKey(rawValue, ctx) {
   if (id.startsWith("img_")) return id;
   return void 0;
 }
+function projectImageKey(item, ctx) {
+  const direct = typeof item.img_key === "string" ? item.img_key : typeof item.imgKey === "string" ? item.imgKey : void 0;
+  if (direct) return { img_key: direct };
+  const id = item.imageID ?? item.image_id ?? item.imgId ?? item.img_id;
+  const resolved = resolveAttachmentImgKey(id, ctx);
+  if (resolved) return { img_key: resolved };
+  if (typeof id === "string" || typeof id === "number") return { img_id: String(id) };
+  return {};
+}
+function projectImgCombinationItem(item, ctx) {
+  const out = projectImageKey(item, ctx);
+  if (typeof item.transparent === "boolean") out.transparent = item.transparent;
+  return Object.keys(out).length > 0 ? out : void 0;
+}
+function projectSelectImgOption(item, ctx) {
+  const out = projectImageKey(item, ctx);
+  if (typeof item.value === "string") out.value = item.value;
+  if (typeof item.disabled === "boolean") out.disabled = item.disabled;
+  const disabledTips = projectTipsText(item.disabled_tips ?? item.disabledTips);
+  if (disabledTips) out.disabled_tips = disabledTips;
+  const hoverTips = projectTipsText(item.hover_tips ?? item.hoverTips);
+  if (hoverTips) out.hover_tips = hoverTips;
+  if (typeof item.transparent === "boolean") out.transparent = item.transparent;
+  return out;
+}
+function projectTipsText(value) {
+  if (typeof value === "string") return { tag: "plain_text", content: value };
+  if (!isRecord3(value)) return void 0;
+  const property = isRecord3(value.property) ? value.property : value;
+  const content = typeof property.content === "string" ? property.content : "";
+  return { tag: "plain_text", content };
+}
 function normalizeVideoCover(rawValue, ctx) {
   if (typeof rawValue === "string" || typeof rawValue === "number") {
     const imgKey2 = resolveAttachmentImgKey(rawValue, ctx);

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

@@ -1 +1 @@
-{"version":3,"file":"raw-to-dsl.d.ts","sourceRoot":"","sources":["../src/raw-to-dsl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AAwBH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAIzD;AAED,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAeT;AAED,4CAA4C;AAC5C,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,IAAI,EAAE,qBAAqB,GAAG,0BAA0B,GAAG,wBAAwB,CAAC;IACpF,cAAc;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAwB;AACxB,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;CAC7C;AA+2DD;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CA+CzE;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAGnF"}
+{"version":3,"file":"raw-to-dsl.d.ts","sourceRoot":"","sources":["../src/raw-to-dsl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AAwBH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAIzD;AAED,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAeT;AAED,4CAA4C;AAC5C,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,IAAI,EAAE,qBAAqB,GAAG,0BAA0B,GAAG,wBAAwB,CAAC;IACpF,cAAc;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAwB;AACxB,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;CAC7C;AAk/DD;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CA+CzE;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.19",
+  "version": "0.4.0",
   "description": "公开 DSL 与飞书内部 RAW JSON 的双向适配器；raw→DSL 对齐 feishu-raw-card-to-dsl",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -22,7 +22,7 @@
     "tsx": "^4.19.3",
     "typescript": "^7.0.2",
     "vitest": "^2.1.9",
-    "@open-feishu-card/schema": "0.1.9"
+    "@open-feishu-card/schema": "0.2.0"
   },
   "license": "MIT",
   "publishConfig": {