@open-feishu-card/adapter 0.3.15 → 0.3.17

package/dist/index.cjs

@@ -768,6 +768,14 @@ function convertNode(node, colors) {
   if (isRecord2(node) && typeof node.tag === "string") return convertEl(node, colors);
   return node;
 }
+var PUBLIC_ELEMENT_ID_RE = /^[A-Za-z][A-Za-z0-9_]{0,19}$/;
+function withRawElementId(el, raw) {
+  const eid = typeof el.element_id === "string" ? el.element_id : void 0;
+  if (eid && PUBLIC_ELEMENT_ID_RE.test(eid)) {
+    raw.id = eid;
+  }
+  return raw;
+}
 function convertEl(el, colors) {
   const tag = String(el.tag);
   if (tag === "person") {
@@ -776,13 +784,16 @@ function convertEl(el, colors) {
       property.pillShaped = true;
       delete property.style;
     }
-    return { tag: "person_v1", property };
+    return withRawElementId(el, { tag: "person_v1", property });
   }
   if (tag === "avatar") {
-    return { tag: "avatar", property: buildProperty(el, "avatar", colors) };
+    return withRawElementId(el, { tag: "avatar", property: buildProperty(el, "avatar", colors) });
   }
   if (tag === "picker_date") {
-    return { tag: "date_picker", property: buildProperty(el, "date_picker", colors) };
+    return withRawElementId(el, {
+      tag: "date_picker",
+      property: buildProperty(el, "date_picker", colors)
+    });
   }
   if (tag === "markdown" || tag === "lark_md") {
     const property = buildProperty(el, "markdown", colors);
@@ -794,10 +805,10 @@ function convertEl(el, colors) {
     }
     delete property.content;
     delete property.font_color;
-    return { tag: "markdown", property };
+    return withRawElementId(el, { tag: "markdown", property });
   }
   if (tag === "table") {
-    return { tag, property: convertTableProperty(el, colors) };
+    return withRawElementId(el, { tag, property: convertTableProperty(el, colors) });
   }
   if (tag === "audio" || tag === "video") {
     const property = buildProperty(el, tag, colors);
@@ -816,9 +827,9 @@ function convertEl(el, colors) {
       delete property.image_key;
       delete property.cover_image_key;
     }
-    return { tag, property };
+    return withRawElementId(el, { tag, property });
   }
-  return { tag, property: buildProperty(el, tag, colors) };
+  return withRawElementId(el, { tag, property: buildProperty(el, tag, colors) });
 }
 function convertTableProperty(el, colors) {
   const property = buildProperty(el, "table", colors);
@@ -857,7 +868,14 @@ function convertTableProperty(el, colors) {
 function buildProperty(el, tag, colors) {
   const property = {};
   for (const [k, v] of Object.entries(el)) {
-    if (k === "tag" || k === "id") continue;
+    if (k === "tag" || k === "id" || k === "element_id") continue;
+    if ((tag === "column_set" || tag === "column") && k === "action" && isRecord2(v)) {
+      const multi = isRecord2(v.multi_url) ? v.multi_url : void 0;
+      if (multi && (typeof multi.url === "string" || typeof multi.default_url === "string")) {
+        property.actions = [multiUrlToOpenUrlAction(multi)];
+      }
+      continue;
+    }
     if ((k === "background_style" || k === "backgroundStyle") && (tag === "column" || tag === "column_set" || tag === "interactive_container")) {
       const renamed = renameKey(k);
       property[renamed] = v;
@@ -999,6 +1017,10 @@ function behaviorsToActions(behaviors) {
   for (const b of behaviors) {
     if (!isRecord2(b)) continue;
     const type = typeof b.type === "string" ? b.type : "open_url";
+    if (type === "callback") {
+      out.push({ type: "callback", action: { value: isRecord2(b.value) ? b.value : {} } });
+      continue;
+    }
     const action = { url: normalizeUrl(b.default_url) };
     if (typeof b.pc_url === "string" && b.pc_url) action.pcURL = b.pc_url;
     if (typeof b.ios_url === "string" && b.ios_url) action.iosURL = b.ios_url;
@@ -1007,6 +1029,16 @@ function behaviorsToActions(behaviors) {
   }
   return out;
 }
+function multiUrlToOpenUrlAction(multi) {
+  const url = typeof multi.url === "string" ? multi.url : typeof multi.default_url === "string" ? multi.default_url : "";
+  const action = { url };
+  if (typeof multi.pc_url === "string" && multi.pc_url) action.pcURL = multi.pc_url;
+  if (typeof multi.ios_url === "string" && multi.ios_url) action.iosURL = multi.ios_url;
+  if (typeof multi.android_url === "string" && multi.android_url) {
+    action.androidURL = multi.android_url;
+  }
+  return { type: "open_url", action };
+}
 function normalizeUrl(v) {
   if (typeof v === "string") return v;
   if (isRecord2(v)) return v;
@@ -1492,7 +1524,23 @@ function convertBody2(node, ctx) {
   const property = isRecord3(node.property) ? node.property : node;
   return convertProperty(property, "body", ctx);
 }
+var PUBLIC_ELEMENT_ID_RE2 = /^[A-Za-z][A-Za-z0-9_]{0,19}$/;
+function isPublicElementId(id) {
+  return PUBLIC_ELEMENT_ID_RE2.test(id);
+}
+function attachPublicElementId(node, result) {
+  if (!isRecord3(result)) return result;
+  if (typeof result.element_id === "string" && isPublicElementId(result.element_id)) {
+    return result;
+  }
+  const rawId = typeof node.id === "string" ? node.id : typeof node.element_id === "string" ? node.element_id : void 0;
+  if (!rawId || !isPublicElementId(rawId)) return result;
+  return { ...result, element_id: rawId };
+}
 function unwrap(node, ctx) {
+  return attachPublicElementId(node, unwrapInner(node, ctx));
+}
+function unwrapInner(node, ctx) {
   const tag = typeof node.tag === "string" ? node.tag : void 0;
   const property = isRecord3(node.property) ? node.property : {};
   if (tag === "markdown") return rebuildMarkdown(property, ctx);
@@ -1879,23 +1927,26 @@ function convertField(rawKey, rawValue, ownerTag, ctx, siblings = {}) {
   }
   if (ownerTag === "button" && key === "action_type") return DROP;
   if (ownerTag === "button" && key === "actions" && Array.isArray(rawValue)) {
-    const openUrls = [];
+    const behaviors = [];
     for (const a of rawValue) {
       if (!isRecord3(a)) continue;
       const inner = isRecord3(a.action) ? a.action : {};
       const t = typeof a.type === "string" ? a.type : void 0;
+      if (t === "callback") {
+        behaviors.push({ type: "callback", value: isRecord3(inner.value) ? inner.value : {} });
+        continue;
+      }
       if (t !== "open_url") continue;
       const fields = projectOpenUrlFields(inner);
-      if (fields) openUrls.push(fields);
+      if (fields) behaviors.push({ type: "open_url", ...fields });
     }
-    if (openUrls.length === 0) return DROP;
-    if (siblings.buttonActionType === "link") {
-      return ["multi_url", openUrlFieldsToMultiUrl(openUrls[0])];
+    if (behaviors.length === 0) return DROP;
+    if (siblings.buttonActionType === "link" && behaviors.length === 1 && behaviors[0]?.type === "open_url") {
+      const only = behaviors[0];
+      const { type: _type, ...fields } = only;
+      return ["multi_url", openUrlFieldsToMultiUrl(fields)];
     }
-    return [
-      "behaviors",
-      openUrls.map((fields) => ({ type: "open_url", ...fields }))
-    ];
+    return ["behaviors", behaviors];
   }
   if (ownerTag === "interactive_container" && key === "actions" && Array.isArray(rawValue)) {
     const behaviors = rawValue.map((a) => {
@@ -1914,6 +1965,17 @@ function convertField(rawKey, rawValue, ownerTag, ctx, siblings = {}) {
     if (behaviors.length === 0) return DROP;
     return ["behaviors", behaviors];
   }
+  if ((ownerTag === "column_set" || ownerTag === "column") && key === "actions" && Array.isArray(rawValue)) {
+    for (const a of rawValue) {
+      if (!isRecord3(a)) continue;
+      if (a.type !== "open_url") continue;
+      const inner = isRecord3(a.action) ? a.action : {};
+      const fields = projectOpenUrlFields(inner);
+      if (!fields) continue;
+      return ["action", { multi_url: openUrlFieldsToMultiUrl(fields) }];
+    }
+    return DROP;
+  }
   if (key === "border" && isRecord3(rawValue)) {
     const b = rawValue;
     const out = {};

package/dist/index.js

@@ -766,6 +766,14 @@ function convertNode(node, colors) {
   if (isRecord2(node) && typeof node.tag === "string") return convertEl(node, colors);
   return node;
 }
+var PUBLIC_ELEMENT_ID_RE = /^[A-Za-z][A-Za-z0-9_]{0,19}$/;
+function withRawElementId(el, raw) {
+  const eid = typeof el.element_id === "string" ? el.element_id : void 0;
+  if (eid && PUBLIC_ELEMENT_ID_RE.test(eid)) {
+    raw.id = eid;
+  }
+  return raw;
+}
 function convertEl(el, colors) {
   const tag = String(el.tag);
   if (tag === "person") {
@@ -774,13 +782,16 @@ function convertEl(el, colors) {
       property.pillShaped = true;
       delete property.style;
     }
-    return { tag: "person_v1", property };
+    return withRawElementId(el, { tag: "person_v1", property });
   }
   if (tag === "avatar") {
-    return { tag: "avatar", property: buildProperty(el, "avatar", colors) };
+    return withRawElementId(el, { tag: "avatar", property: buildProperty(el, "avatar", colors) });
   }
   if (tag === "picker_date") {
-    return { tag: "date_picker", property: buildProperty(el, "date_picker", colors) };
+    return withRawElementId(el, {
+      tag: "date_picker",
+      property: buildProperty(el, "date_picker", colors)
+    });
   }
   if (tag === "markdown" || tag === "lark_md") {
     const property = buildProperty(el, "markdown", colors);
@@ -792,10 +803,10 @@ function convertEl(el, colors) {
     }
     delete property.content;
     delete property.font_color;
-    return { tag: "markdown", property };
+    return withRawElementId(el, { tag: "markdown", property });
   }
   if (tag === "table") {
-    return { tag, property: convertTableProperty(el, colors) };
+    return withRawElementId(el, { tag, property: convertTableProperty(el, colors) });
   }
   if (tag === "audio" || tag === "video") {
     const property = buildProperty(el, tag, colors);
@@ -814,9 +825,9 @@ function convertEl(el, colors) {
       delete property.image_key;
       delete property.cover_image_key;
     }
-    return { tag, property };
+    return withRawElementId(el, { tag, property });
   }
-  return { tag, property: buildProperty(el, tag, colors) };
+  return withRawElementId(el, { tag, property: buildProperty(el, tag, colors) });
 }
 function convertTableProperty(el, colors) {
   const property = buildProperty(el, "table", colors);
@@ -855,7 +866,14 @@ function convertTableProperty(el, colors) {
 function buildProperty(el, tag, colors) {
   const property = {};
   for (const [k, v] of Object.entries(el)) {
-    if (k === "tag" || k === "id") continue;
+    if (k === "tag" || k === "id" || k === "element_id") continue;
+    if ((tag === "column_set" || tag === "column") && k === "action" && isRecord2(v)) {
+      const multi = isRecord2(v.multi_url) ? v.multi_url : void 0;
+      if (multi && (typeof multi.url === "string" || typeof multi.default_url === "string")) {
+        property.actions = [multiUrlToOpenUrlAction(multi)];
+      }
+      continue;
+    }
     if ((k === "background_style" || k === "backgroundStyle") && (tag === "column" || tag === "column_set" || tag === "interactive_container")) {
       const renamed = renameKey(k);
       property[renamed] = v;
@@ -997,6 +1015,10 @@ function behaviorsToActions(behaviors) {
   for (const b of behaviors) {
     if (!isRecord2(b)) continue;
     const type = typeof b.type === "string" ? b.type : "open_url";
+    if (type === "callback") {
+      out.push({ type: "callback", action: { value: isRecord2(b.value) ? b.value : {} } });
+      continue;
+    }
     const action = { url: normalizeUrl(b.default_url) };
     if (typeof b.pc_url === "string" && b.pc_url) action.pcURL = b.pc_url;
     if (typeof b.ios_url === "string" && b.ios_url) action.iosURL = b.ios_url;
@@ -1005,6 +1027,16 @@ function behaviorsToActions(behaviors) {
   }
   return out;
 }
+function multiUrlToOpenUrlAction(multi) {
+  const url = typeof multi.url === "string" ? multi.url : typeof multi.default_url === "string" ? multi.default_url : "";
+  const action = { url };
+  if (typeof multi.pc_url === "string" && multi.pc_url) action.pcURL = multi.pc_url;
+  if (typeof multi.ios_url === "string" && multi.ios_url) action.iosURL = multi.ios_url;
+  if (typeof multi.android_url === "string" && multi.android_url) {
+    action.androidURL = multi.android_url;
+  }
+  return { type: "open_url", action };
+}
 function normalizeUrl(v) {
   if (typeof v === "string") return v;
   if (isRecord2(v)) return v;
@@ -1490,7 +1522,23 @@ function convertBody2(node, ctx) {
   const property = isRecord3(node.property) ? node.property : node;
   return convertProperty(property, "body", ctx);
 }
+var PUBLIC_ELEMENT_ID_RE2 = /^[A-Za-z][A-Za-z0-9_]{0,19}$/;
+function isPublicElementId(id) {
+  return PUBLIC_ELEMENT_ID_RE2.test(id);
+}
+function attachPublicElementId(node, result) {
+  if (!isRecord3(result)) return result;
+  if (typeof result.element_id === "string" && isPublicElementId(result.element_id)) {
+    return result;
+  }
+  const rawId = typeof node.id === "string" ? node.id : typeof node.element_id === "string" ? node.element_id : void 0;
+  if (!rawId || !isPublicElementId(rawId)) return result;
+  return { ...result, element_id: rawId };
+}
 function unwrap(node, ctx) {
+  return attachPublicElementId(node, unwrapInner(node, ctx));
+}
+function unwrapInner(node, ctx) {
   const tag = typeof node.tag === "string" ? node.tag : void 0;
   const property = isRecord3(node.property) ? node.property : {};
   if (tag === "markdown") return rebuildMarkdown(property, ctx);
@@ -1877,23 +1925,26 @@ function convertField(rawKey, rawValue, ownerTag, ctx, siblings = {}) {
   }
   if (ownerTag === "button" && key === "action_type") return DROP;
   if (ownerTag === "button" && key === "actions" && Array.isArray(rawValue)) {
-    const openUrls = [];
+    const behaviors = [];
     for (const a of rawValue) {
       if (!isRecord3(a)) continue;
       const inner = isRecord3(a.action) ? a.action : {};
       const t = typeof a.type === "string" ? a.type : void 0;
+      if (t === "callback") {
+        behaviors.push({ type: "callback", value: isRecord3(inner.value) ? inner.value : {} });
+        continue;
+      }
       if (t !== "open_url") continue;
       const fields = projectOpenUrlFields(inner);
-      if (fields) openUrls.push(fields);
+      if (fields) behaviors.push({ type: "open_url", ...fields });
     }
-    if (openUrls.length === 0) return DROP;
-    if (siblings.buttonActionType === "link") {
-      return ["multi_url", openUrlFieldsToMultiUrl(openUrls[0])];
+    if (behaviors.length === 0) return DROP;
+    if (siblings.buttonActionType === "link" && behaviors.length === 1 && behaviors[0]?.type === "open_url") {
+      const only = behaviors[0];
+      const { type: _type, ...fields } = only;
+      return ["multi_url", openUrlFieldsToMultiUrl(fields)];
     }
-    return [
-      "behaviors",
-      openUrls.map((fields) => ({ type: "open_url", ...fields }))
-    ];
+    return ["behaviors", behaviors];
   }
   if (ownerTag === "interactive_container" && key === "actions" && Array.isArray(rawValue)) {
     const behaviors = rawValue.map((a) => {
@@ -1912,6 +1963,17 @@ function convertField(rawKey, rawValue, ownerTag, ctx, siblings = {}) {
     if (behaviors.length === 0) return DROP;
     return ["behaviors", behaviors];
   }
+  if ((ownerTag === "column_set" || ownerTag === "column") && key === "actions" && Array.isArray(rawValue)) {
+    for (const a of rawValue) {
+      if (!isRecord3(a)) continue;
+      if (a.type !== "open_url") continue;
+      const inner = isRecord3(a.action) ? a.action : {};
+      const fields = projectOpenUrlFields(inner);
+      if (!fields) continue;
+      return ["action", { multi_url: openUrlFieldsToMultiUrl(fields) }];
+    }
+    return DROP;
+  }
   if (key === "border" && isRecord3(rawValue)) {
     const b = rawValue;
     const out = {};

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,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAcvD;AA8rDD;;;;;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"}
+{"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;AA2vDD;;;;;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.15",
+  "version": "0.3.17",
   "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.5"
+    "@open-feishu-card/schema": "0.1.6"
   },
   "license": "MIT",
   "publishConfig": {