@open-feishu-card/adapter 0.3.12 → 0.3.14

package/dist/index.cjs

@@ -999,7 +999,11 @@ function behaviorsToActions(behaviors) {
   for (const b of behaviors) {
     if (!isRecord2(b)) continue;
     const type = typeof b.type === "string" ? b.type : "open_url";
-    out.push({ type, action: { url: normalizeUrl(b.default_url) } });
+    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;
+    if (typeof b.android_url === "string" && b.android_url) action.androidURL = b.android_url;
+    out.push({ type, action });
   }
   return out;
 }
@@ -1728,7 +1732,14 @@ function unwrap(node, ctx) {
       const tp = isRecord3(text.property) ? text.property : {};
       const content = typeof tp.content === "string" ? tp.content : "";
       const textAlign = typeof tp.textAlign === "string" ? tp.textAlign : "left";
-      out.text = { tag: "plain_text", content, text_align: textAlign };
+      const outText = { tag: "plain_text", content, text_align: textAlign };
+      const ts = isRecord3(tp.textStyle) ? tp.textStyle : void 0;
+      if (ts && typeof ts.size === "string") outText.text_size = ts.size;
+      const { color } = resolveInlineStyle(ts, ctx);
+      if (color) outText.text_color = color;
+      out.text = outText;
+      if (isRecord3(property.margin) && hasSide(property.margin)) out.margin = formatBox(property.margin);
+      else if (typeof property.margin === "string") out.margin = property.margin;
       if (isRecord3(property.icon)) {
         out.icon = unwrap(property.icon, ctx);
       }
@@ -1739,6 +1750,47 @@ function unwrap(node, ctx) {
   return tag ? { tag, ...converted } : converted;
 }
 var DROP = /* @__PURE__ */ Symbol("drop");
+function projectOpenUrlFields(actionInner) {
+  let bag;
+  let defaultUrl;
+  if (typeof actionInner.url === "string") {
+    defaultUrl = actionInner.url;
+    bag = actionInner;
+  } else if (isRecord3(actionInner.url)) {
+    bag = actionInner.url;
+    defaultUrl = typeof bag.url === "string" ? bag.url : void 0;
+  } else if (isRecord3(actionInner.multiURL)) {
+    bag = actionInner.multiURL;
+    defaultUrl = typeof bag.url === "string" ? bag.url : void 0;
+  } else if (isRecord3(actionInner.multi_url)) {
+    bag = actionInner.multi_url;
+    defaultUrl = typeof bag.url === "string" ? bag.url : void 0;
+  }
+  if (!defaultUrl) return void 0;
+  const pick = (...keys) => {
+    if (!bag) return void 0;
+    for (const k of keys) {
+      const v = bag[k];
+      if (typeof v === "string" && v.length > 0) return v;
+    }
+    return void 0;
+  };
+  const out = { default_url: defaultUrl };
+  const pc = pick("pcURL", "pc_url");
+  const ios = pick("iosURL", "ios_url");
+  const android = pick("androidURL", "android_url");
+  if (pc) out.pc_url = pc;
+  if (ios) out.ios_url = ios;
+  if (android) out.android_url = android;
+  return out;
+}
+function openUrlFieldsToMultiUrl(fields) {
+  const multi = { url: fields.default_url };
+  if (fields.pc_url) multi.pc_url = fields.pc_url;
+  if (fields.ios_url) multi.ios_url = fields.ios_url;
+  if (fields.android_url) multi.android_url = fields.android_url;
+  return multi;
+}
 function convertProperty(property, ownerTag, ctx) {
   const out = {};
   const siblings = {
@@ -1881,15 +1933,17 @@ function convertField(rawKey, rawValue, ownerTag, ctx, siblings = {}) {
       if (!isRecord3(a)) continue;
       const inner = isRecord3(a.action) ? a.action : {};
       const t = typeof a.type === "string" ? a.type : void 0;
-      if (t === "open_url" && typeof inner.url === "string") openUrls.push(inner.url);
+      if (t !== "open_url") continue;
+      const fields = projectOpenUrlFields(inner);
+      if (fields) openUrls.push(fields);
     }
     if (openUrls.length === 0) return DROP;
     if (siblings.buttonActionType === "link") {
-      return ["multi_url", { url: openUrls[0] }];
+      return ["multi_url", openUrlFieldsToMultiUrl(openUrls[0])];
     }
     return [
       "behaviors",
-      openUrls.map((url) => ({ type: "open_url", default_url: url }))
+      openUrls.map((fields) => ({ type: "open_url", ...fields }))
     ];
   }
   if (ownerTag === "interactive_container" && key === "actions" && Array.isArray(rawValue)) {
@@ -1897,8 +1951,9 @@ function convertField(rawKey, rawValue, ownerTag, ctx, siblings = {}) {
       if (!isRecord3(a)) return void 0;
       const inner = isRecord3(a.action) ? a.action : {};
       const t = typeof a.type === "string" ? a.type : void 0;
-      if (t === "open_url" && typeof inner.url === "string") {
-        return { type: "open_url", default_url: inner.url };
+      if (t === "open_url") {
+        const fields = projectOpenUrlFields(inner);
+        return fields ? { type: "open_url", ...fields } : void 0;
       }
       if (t === "callback") {
         return { type: "callback", value: inner.value ?? {} };

package/dist/index.js

@@ -997,7 +997,11 @@ function behaviorsToActions(behaviors) {
   for (const b of behaviors) {
     if (!isRecord2(b)) continue;
     const type = typeof b.type === "string" ? b.type : "open_url";
-    out.push({ type, action: { url: normalizeUrl(b.default_url) } });
+    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;
+    if (typeof b.android_url === "string" && b.android_url) action.androidURL = b.android_url;
+    out.push({ type, action });
   }
   return out;
 }
@@ -1726,7 +1730,14 @@ function unwrap(node, ctx) {
       const tp = isRecord3(text.property) ? text.property : {};
       const content = typeof tp.content === "string" ? tp.content : "";
       const textAlign = typeof tp.textAlign === "string" ? tp.textAlign : "left";
-      out.text = { tag: "plain_text", content, text_align: textAlign };
+      const outText = { tag: "plain_text", content, text_align: textAlign };
+      const ts = isRecord3(tp.textStyle) ? tp.textStyle : void 0;
+      if (ts && typeof ts.size === "string") outText.text_size = ts.size;
+      const { color } = resolveInlineStyle(ts, ctx);
+      if (color) outText.text_color = color;
+      out.text = outText;
+      if (isRecord3(property.margin) && hasSide(property.margin)) out.margin = formatBox(property.margin);
+      else if (typeof property.margin === "string") out.margin = property.margin;
       if (isRecord3(property.icon)) {
         out.icon = unwrap(property.icon, ctx);
       }
@@ -1737,6 +1748,47 @@ function unwrap(node, ctx) {
   return tag ? { tag, ...converted } : converted;
 }
 var DROP = /* @__PURE__ */ Symbol("drop");
+function projectOpenUrlFields(actionInner) {
+  let bag;
+  let defaultUrl;
+  if (typeof actionInner.url === "string") {
+    defaultUrl = actionInner.url;
+    bag = actionInner;
+  } else if (isRecord3(actionInner.url)) {
+    bag = actionInner.url;
+    defaultUrl = typeof bag.url === "string" ? bag.url : void 0;
+  } else if (isRecord3(actionInner.multiURL)) {
+    bag = actionInner.multiURL;
+    defaultUrl = typeof bag.url === "string" ? bag.url : void 0;
+  } else if (isRecord3(actionInner.multi_url)) {
+    bag = actionInner.multi_url;
+    defaultUrl = typeof bag.url === "string" ? bag.url : void 0;
+  }
+  if (!defaultUrl) return void 0;
+  const pick = (...keys) => {
+    if (!bag) return void 0;
+    for (const k of keys) {
+      const v = bag[k];
+      if (typeof v === "string" && v.length > 0) return v;
+    }
+    return void 0;
+  };
+  const out = { default_url: defaultUrl };
+  const pc = pick("pcURL", "pc_url");
+  const ios = pick("iosURL", "ios_url");
+  const android = pick("androidURL", "android_url");
+  if (pc) out.pc_url = pc;
+  if (ios) out.ios_url = ios;
+  if (android) out.android_url = android;
+  return out;
+}
+function openUrlFieldsToMultiUrl(fields) {
+  const multi = { url: fields.default_url };
+  if (fields.pc_url) multi.pc_url = fields.pc_url;
+  if (fields.ios_url) multi.ios_url = fields.ios_url;
+  if (fields.android_url) multi.android_url = fields.android_url;
+  return multi;
+}
 function convertProperty(property, ownerTag, ctx) {
   const out = {};
   const siblings = {
@@ -1879,15 +1931,17 @@ function convertField(rawKey, rawValue, ownerTag, ctx, siblings = {}) {
       if (!isRecord3(a)) continue;
       const inner = isRecord3(a.action) ? a.action : {};
       const t = typeof a.type === "string" ? a.type : void 0;
-      if (t === "open_url" && typeof inner.url === "string") openUrls.push(inner.url);
+      if (t !== "open_url") continue;
+      const fields = projectOpenUrlFields(inner);
+      if (fields) openUrls.push(fields);
     }
     if (openUrls.length === 0) return DROP;
     if (siblings.buttonActionType === "link") {
-      return ["multi_url", { url: openUrls[0] }];
+      return ["multi_url", openUrlFieldsToMultiUrl(openUrls[0])];
     }
     return [
       "behaviors",
-      openUrls.map((url) => ({ type: "open_url", default_url: url }))
+      openUrls.map((fields) => ({ type: "open_url", ...fields }))
     ];
   }
   if (ownerTag === "interactive_container" && key === "actions" && Array.isArray(rawValue)) {
@@ -1895,8 +1949,9 @@ function convertField(rawKey, rawValue, ownerTag, ctx, siblings = {}) {
       if (!isRecord3(a)) return void 0;
       const inner = isRecord3(a.action) ? a.action : {};
       const t = typeof a.type === "string" ? a.type : void 0;
-      if (t === "open_url" && typeof inner.url === "string") {
-        return { type: "open_url", default_url: inner.url };
+      if (t === "open_url") {
+        const fields = projectOpenUrlFields(inner);
+        return fields ? { type: "open_url", ...fields } : void 0;
       }
       if (t === "callback") {
         return { type: "callback", value: inner.value ?? {} };

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

package/package.json

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