@open-feishu-card/adapter 0.3.4 → 0.3.6

package/dist/index.js

@@ -604,6 +604,65 @@ function parseMarkdown(content) {
   return out;
 }
 
+// src/expand-dsl-colors.ts
+function readColorRegistry(card) {
+  const config = isRecord(card.config) ? card.config : void 0;
+  const style = config && isRecord(config.style) ? config.style : void 0;
+  const color = style && isRecord(style.color) ? style.color : void 0;
+  if (!color) return {};
+  const out = {};
+  for (const [key, value] of Object.entries(color)) {
+    if (!isRecord(value)) continue;
+    const light = typeof value.light_mode === "string" ? value.light_mode : typeof value.lightMode === "string" ? value.lightMode : void 0;
+    const dark = typeof value.dark_mode === "string" ? value.dark_mode : typeof value.darkMode === "string" ? value.darkMode : void 0;
+    if (light && dark) out[key] = { light_mode: light, dark_mode: dark };
+  }
+  return out;
+}
+function isCustomColorAlias(value) {
+  return typeof value === "string" && value.startsWith("cus-");
+}
+function expandBackgroundStyleAlias(style, registry) {
+  if (!isCustomColorAlias(style)) 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;
+  const entry = registry[color];
+  if (!entry) return textStyle;
+  const { color: _drop, ...rest } = textStyle;
+  return {
+    ...rest,
+    customColor: { lightMode: entry.light_mode, darkMode: entry.dark_mode }
+  };
+}
+function expandMarkdownElements(elements, registry) {
+  if (!Array.isArray(elements)) return elements;
+  return elements.map((el) => {
+    const property = el.property ? { ...el.property } : void 0;
+    if (!property) return el;
+    if (Array.isArray(property.elements)) {
+      property.elements = expandMarkdownElements(property.elements, registry);
+    }
+    if (property.textStyle) {
+      const expanded = expandTextStyleColor(property.textStyle, registry);
+      if (expanded) property.textStyle = expanded;
+    }
+    return property === el.property ? el : { ...el, property };
+  });
+}
+function wrapMarkdownContentWithFontColor(content, fontColor) {
+  if (!fontColor || !content || /<font\s+color/i.test(content)) return content;
+  return `<font color='${fontColor}'>${content}</font>`;
+}
+function isRecord(v) {
+  return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+
 // src/dsl-to-raw.ts
 var KEY_RENAME = {
   text_align: "textAlign",
@@ -629,14 +688,22 @@ var KEY_RENAME = {
 };
 var TEXT_LEAF_KEYS = /* @__PURE__ */ new Set(["title", "subtitle", "alt", "hover_tips", "placeholder"]);
 function dslToRaw(dsl) {
-  const root = isRecord(dsl) ? dsl : {};
-  const card = isRecord(root.card) ? root.card : isRecord(root.json_card) ? root.json_card : root;
+  const root = isRecord2(dsl) ? dsl : {};
+  const card = unwrapCard(root);
+  const colors = readColorRegistry(card);
   const out = { schema: typeof card.schema === "string" ? card.schema : "2.0" };
-  if (isRecord(card.header)) out.header = convertHeader(card.header);
-  if (isRecord(card.body)) out.body = convertBody(card.body);
+  if (isRecord2(card.config)) out.config = { ...card.config };
+  if (isRecord2(card.header)) out.header = convertHeader(card.header, colors);
+  if (isRecord2(card.body)) out.body = convertBody(card.body, colors);
   return out;
 }
-function convertHeader(header) {
+function unwrapCard(root) {
+  if (isRecord2(root.dsl)) return root.dsl;
+  if (isRecord2(root.card)) return root.card;
+  if (isRecord2(root.json_card)) return root.json_card;
+  return root;
+}
+function convertHeader(header, colors) {
   const property = {};
   for (const [k, v] of Object.entries(header)) {
     if (k === "tag") continue;
@@ -648,32 +715,32 @@ function convertHeader(header) {
       property[k] = wrapTextLeaf(v);
       continue;
     }
-    if ((k === "icon" || k === "ud_icon") && isRecord(v)) {
-      property[k === "ud_icon" ? "udIcon" : "icon"] = convertEl(v);
+    if ((k === "icon" || k === "ud_icon") && isRecord2(v)) {
+      property[k === "ud_icon" ? "udIcon" : "icon"] = convertEl(v, colors);
       continue;
     }
     if (k === "text_tag_list" && Array.isArray(v)) {
-      property.text_tag_list = v.map(convertNode);
+      property.text_tag_list = v.map((item) => convertNode(item, colors));
       continue;
     }
-    property[renameKey(k)] = coerceValue(k, v);
+    property[renameKey(k)] = coerceValue(k, v, colors);
   }
   return { tag: "card_header", property };
 }
-function convertBody(body) {
-  const property = buildProperty(body, "body");
-  const elements = Array.isArray(body.elements) ? body.elements.map(convertNode) : [];
+function convertBody(body, colors) {
+  const property = buildProperty(body, "body", colors);
+  const elements = Array.isArray(body.elements) ? body.elements.map((n) => convertNode(n, colors)) : [];
   property.elements = elements.filter(Boolean);
   return { tag: "body", property };
 }
-function convertNode(node) {
-  if (isRecord(node) && typeof node.tag === "string") return convertEl(node);
+function convertNode(node, colors) {
+  if (isRecord2(node) && typeof node.tag === "string") return convertEl(node, colors);
   return node;
 }
-function convertEl(el) {
+function convertEl(el, colors) {
   const tag = String(el.tag);
   if (tag === "person") {
-    const property = buildProperty(el, "person_v1");
+    const property = buildProperty(el, "person_v1", colors);
     if (property.style === "capsule") {
       property.pillShaped = true;
       delete property.style;
@@ -681,16 +748,22 @@ function convertEl(el) {
     return { tag: "person_v1", property };
   }
   if (tag === "markdown" || tag === "lark_md") {
-    const property = buildProperty(el, "markdown");
-    if (typeof el.content === "string") property.elements = parseMarkdown(el.content);
+    const property = buildProperty(el, "markdown", colors);
+    const fontColor = typeof el.font_color === "string" ? el.font_color : void 0;
+    let content = typeof el.content === "string" ? el.content : "";
+    content = wrapMarkdownContentWithFontColor(content, fontColor);
+    if (content) {
+      property.elements = expandMarkdownElements(parseMarkdown(content), colors);
+    }
     delete property.content;
+    delete property.font_color;
     return { tag: "markdown", property };
   }
   if (tag === "table") {
-    return { tag, property: convertTableProperty(el) };
+    return { tag, property: convertTableProperty(el, colors) };
   }
   if (tag === "audio" || tag === "video") {
-    const property = buildProperty(el, tag);
+    const property = buildProperty(el, tag, colors);
     if (tag === "audio" && el.width != null) {
       delete property.width;
       if (el.width === "fill" || el.width === "default") {
@@ -708,14 +781,14 @@ function convertEl(el) {
     }
     return { tag, property };
   }
-  return { tag, property: buildProperty(el, tag) };
+  return { tag, property: buildProperty(el, tag, colors) };
 }
-function convertTableProperty(el) {
-  const property = buildProperty(el, "table");
+function convertTableProperty(el, colors) {
+  const property = buildProperty(el, "table", colors);
   const columns = Array.isArray(property.columns) ? property.columns : [];
   const mdColNames = /* @__PURE__ */ new Set();
   for (const col of columns) {
-    if (!isRecord(col)) continue;
+    if (!isRecord2(col)) continue;
     const dt = col.data_type ?? col.dataType;
     if (dt === "lark_md" || dt === "markdown") {
       const name = typeof col.name === "string" ? col.name : "";
@@ -724,7 +797,7 @@ function convertTableProperty(el) {
   }
   if (!mdColNames.size || !Array.isArray(property.rows)) return property;
   property.rows = property.rows.map((row) => {
-    if (!isRecord(row)) return row;
+    if (!isRecord2(row)) return row;
     const out = { ...row };
     for (const name of mdColNames) {
       const cell = out[name];
@@ -732,7 +805,10 @@ function convertTableProperty(el) {
         out[name] = {
           data: {
             tag: "markdown",
-            property: { elements: parseMarkdown(cell), originTag: "lark_md" }
+            property: {
+              elements: expandMarkdownElements(parseMarkdown(cell), colors),
+              originTag: "lark_md"
+            }
           }
         };
       }
@@ -741,10 +817,17 @@ function convertTableProperty(el) {
   });
   return property;
 }
-function buildProperty(el, tag) {
+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")) {
+      const renamed = renameKey(k);
+      property[renamed] = v;
+      const expanded = expandBackgroundStyleAlias(v, colors);
+      if (expanded) property.customBackgroundStyle = expanded;
+      continue;
+    }
     if (tag === "column" && k === "width" && typeof v === "string") {
       const px = pxValue(v);
       if (px != null) {
@@ -757,15 +840,15 @@ function buildProperty(el, tag) {
       continue;
     }
     if (k === "text") {
-      if (tag === "checker" && isRecord(v) && (v.tag === "markdown" || v.tag === "lark_md")) {
-        property.text = convertEl(v);
+      if (tag === "checker" && isRecord2(v) && (v.tag === "markdown" || v.tag === "lark_md")) {
+        property.text = convertEl(v, colors);
       } else {
         property.text = wrapTextLeaf(v);
       }
       continue;
     }
-    if ((k === "icon" || k === "ud_icon") && isRecord(v)) {
-      property[k === "ud_icon" ? "udIcon" : "icon"] = convertEl(v);
+    if ((k === "icon" || k === "ud_icon") && isRecord2(v)) {
+      property[k === "ud_icon" ? "udIcon" : "icon"] = convertEl(v, colors);
       continue;
     }
     if (k === "behaviors" && Array.isArray(v)) {
@@ -776,21 +859,21 @@ function buildProperty(el, tag) {
       property.url = normalizeUrl(v);
       continue;
     }
-    if (k === "button_area" && isRecord(v)) {
+    if (k === "button_area" && isRecord2(v)) {
       const area = { ...v };
-      if (Array.isArray(v.buttons)) area.buttons = v.buttons.map(convertNode);
+      if (Array.isArray(v.buttons)) area.buttons = v.buttons.map((b) => convertNode(b, colors));
       property.button_area = area;
       continue;
     }
-    property[renameKey(k)] = coerceValue(k, v);
+    property[renameKey(k)] = coerceValue(k, v, colors);
   }
   return property;
 }
-function coerceValue(key, value) {
+function coerceValue(key, value, colors) {
   if ((key === "padding" || key === "margin") && typeof value === "string") {
     return parseBox(value);
   }
-  if (Array.isArray(value)) return value.map(convertNode);
+  if (Array.isArray(value)) return value.map((item) => convertNode(item, colors));
   if (key === "url") return normalizeUrl(value);
   return value;
 }
@@ -799,7 +882,7 @@ function renameKey(k) {
 }
 function wrapTextLeaf(v) {
   if (typeof v === "string") return { tag: "plain_text", property: { content: v } };
-  if (isRecord(v)) {
+  if (isRecord2(v)) {
     const property = { content: typeof v.content === "string" ? v.content : "" };
     if (typeof v.text_align === "string") property.textAlign = v.text_align;
     if (typeof v.text_size === "string") property.text_size = v.text_size;
@@ -810,7 +893,7 @@ function wrapTextLeaf(v) {
 }
 function wrapHeaderText(v) {
   if (typeof v === "string") return { tag: "plain_text", property: { content: v } };
-  if (!isRecord(v)) return { tag: "plain_text", property: { content: "" } };
+  if (!isRecord2(v)) return { tag: "plain_text", property: { content: "" } };
   const tag = typeof v.tag === "string" ? v.tag : "plain_text";
   const content = typeof v.content === "string" ? v.content : "";
   if (tag === "lark_md" || tag === "markdown") {
@@ -827,7 +910,7 @@ function wrapHeaderText(v) {
 function behaviorsToActions(behaviors) {
   const out = [];
   for (const b of behaviors) {
-    if (!isRecord(b)) continue;
+    if (!isRecord2(b)) continue;
     const type = typeof b.type === "string" ? b.type : "open_url";
     out.push({ type, action: { url: normalizeUrl(b.default_url) } });
   }
@@ -835,7 +918,7 @@ function behaviorsToActions(behaviors) {
 }
 function normalizeUrl(v) {
   if (typeof v === "string") return v;
-  if (isRecord(v)) return v;
+  if (isRecord2(v)) return v;
   return v;
 }
 function parseBox(s) {
@@ -862,7 +945,7 @@ function pxValue(s) {
   const n = Number(s);
   return Number.isFinite(n) ? n : null;
 }
-function isRecord(v) {
+function isRecord2(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
 
@@ -939,7 +1022,7 @@ function normalizeStoredCardColors(dsl, preRegistered) {
       }
     }
     if (obj.tag === "markdown" && typeof obj.content === "string") {
-      normalizeMarkdownInlineHexColors(obj, ensureAlias);
+      normalizeMarkdownInlineHexColors(obj, ensureAlias, !!preRegistered);
     }
     for (const value of Object.values(obj)) walk(value);
   };
@@ -974,22 +1057,24 @@ function normalizeStoredCardColors(dsl, preRegistered) {
   const existing = style.color && typeof style.color === "object" ? style.color : {};
   style.color = { ...colorEntries, ...existing };
   if (!colorEntries["cus-accent"]) return;
-  const applyDefaultFontColors = (node) => {
-    if (Array.isArray(node)) {
-      for (const child of node) applyDefaultFontColors(child);
-      return;
-    }
-    if (!node || typeof node !== "object") return;
-    const obj = node;
-    if (obj.tag === "markdown" && obj.font_color === void 0) {
-      const size = obj.text_size;
-      const content = typeof obj.content === "string" ? obj.content : "";
-      if (size === "small") obj.font_color = "cus-muted";
-      else if (size === "heading" || content.includes("**")) obj.font_color = "cus-accent";
-    }
-    for (const value of Object.values(obj)) applyDefaultFontColors(value);
-  };
-  applyDefaultFontColors(dsl.body);
+  if (!preRegistered) {
+    const applyDefaultFontColors = (node) => {
+      if (Array.isArray(node)) {
+        for (const child of node) applyDefaultFontColors(child);
+        return;
+      }
+      if (!node || typeof node !== "object") return;
+      const obj = node;
+      if (obj.tag === "markdown" && obj.font_color === void 0) {
+        const size = obj.text_size;
+        const content = typeof obj.content === "string" ? obj.content : "";
+        if (size === "small") obj.font_color = "cus-muted";
+        else if (size === "heading" || content.includes("**")) obj.font_color = "cus-accent";
+      }
+      for (const value of Object.values(obj)) applyDefaultFontColors(value);
+    };
+    applyDefaultFontColors(dsl.body);
+  }
 }
 function unifyMatchingAlias(entries, fromPrefix, to) {
   const renames = /* @__PURE__ */ new Map();
@@ -1033,7 +1118,7 @@ function remapColorReferences(node, aliasRenames) {
   };
   walk(node);
 }
-function normalizeMarkdownInlineHexColors(obj, ensureAlias) {
+function normalizeMarkdownInlineHexColors(obj, ensureAlias, keepFontTags = false) {
   const content = obj.content;
   const hexColor = (raw) => {
     const v = raw.trim();
@@ -1045,7 +1130,7 @@ function normalizeMarkdownInlineHexColors(obj, ensureAlias) {
     return void 0;
   };
   const single = content.match(/^<font color=['"]([^'"]+)['"]\s*>([\s\S]*)<\/font>$/);
-  if (single) {
+  if (single && !keepFontTags) {
     const entry = hexColor(single[1]);
     if (entry) {
       const alias = ensureAlias("cus-text", entry);
@@ -1225,12 +1310,12 @@ var VALUE_ECHO_TARGETS = {
   size_value: "size"
 };
 function convertRoot(root, ctx) {
-  if (!isRecord2(root)) return root;
+  if (!isRecord3(root)) return root;
   const out = {};
   out.schema = typeof root.schema === "string" ? root.schema : "2.0";
-  out.config = convertConfig(isRecord2(root.config) ? root.config : {});
-  if (isRecord2(root.body)) out.body = convertBody2(root.body, ctx);
-  if (isRecord2(root.header)) out.header = convertHeader2(root.header, ctx);
+  out.config = convertConfig(isRecord3(root.config) ? root.config : {});
+  if (isRecord3(root.body)) out.body = convertBody2(root.body, ctx);
+  if (isRecord3(root.header)) out.header = convertHeader2(root.header, ctx);
   normalizeStoredCardColors(out, ctx.colors);
   return out;
 }
@@ -1238,14 +1323,14 @@ function convertConfig(_node) {
   return { update_multi: true };
 }
 function convertHeader2(node, ctx) {
-  const property = isRecord2(node.property) ? node.property : node;
+  const property = isRecord3(node.property) ? node.property : node;
   const out = convertProperty(property, "header", ctx);
   delete out.tag;
   return out;
 }
 function convertHeaderText(rawValue, ctx) {
   const tag = typeof rawValue.tag === "string" ? rawValue.tag : "";
-  const wrapped = isRecord2(rawValue.property);
+  const wrapped = isRecord3(rawValue.property);
   const property = wrapped ? rawValue.property : rawValue;
   if (tag === "plain_text") {
     const content = typeof property.content === "string" ? property.content : "";
@@ -1265,12 +1350,12 @@ function convertHeaderText(rawValue, ctx) {
   return void 0;
 }
 function convertBody2(node, ctx) {
-  const property = isRecord2(node.property) ? node.property : node;
+  const property = isRecord3(node.property) ? node.property : node;
   return convertProperty(property, "body", ctx);
 }
 function unwrap(node, ctx) {
   const tag = typeof node.tag === "string" ? node.tag : void 0;
-  const property = isRecord2(node.property) ? node.property : {};
+  const property = isRecord3(node.property) ? node.property : {};
   if (tag === "markdown") return rebuildMarkdown(property, ctx);
   if (tag === "plain_text") {
     const content = typeof property.content === "string" ? property.content : "";
@@ -1284,7 +1369,7 @@ function unwrap(node, ctx) {
     const heightPx = isPixelScalar(property.heightValue) ? pixelOf(property.heightValue) : void 0;
     if (widthPx !== void 0 && heightPx !== void 0) {
       out.size = `${widthPx}px ${heightPx}px`;
-    } else if (isRecord2(property.size) && hasSide(property.size)) out.size = formatBox(property.size);
+    } else if (isRecord3(property.size) && hasSide(property.size)) out.size = formatBox(property.size);
     else if (isPixelScalar(property.size)) out.size = `${pixelOf(property.size)}px`;
     else if (typeof property.size === "string") out.size = property.size;
     return out;
@@ -1306,7 +1391,7 @@ function unwrap(node, ctx) {
     const out = { tag: "table" };
     const rawColumns = Array.isArray(property.columns) ? property.columns : [];
     out.columns = rawColumns.map((col) => {
-      if (!isRecord2(col)) return {};
+      if (!isRecord3(col)) return {};
       const c = {};
       if (typeof col.name === "string") c.name = col.name;
       const displayName = typeof col.displayName === "string" ? col.displayName : typeof col.display_name === "string" ? col.display_name : void 0;
@@ -1316,22 +1401,22 @@ function unwrap(node, ctx) {
       const hAlign = typeof col.horizontalAlign === "string" ? col.horizontalAlign : typeof col.horizontal_align === "string" ? col.horizontal_align : void 0;
       if (hAlign !== void 0) c.horizontal_align = hAlign;
       const wv = col.widthValue;
-      if (isRecord2(wv)) {
+      if (isRecord3(wv)) {
         if (wv.type === "pixels" && typeof wv.value === "number") c.width = `${wv.value}px`;
         else if (typeof wv.value === "string") c.width = wv.value;
       } else if (typeof col.width === "string" || typeof col.width === "number") {
         c.width = col.width;
       }
-      if (isRecord2(col.format)) c.format = col.format;
+      if (isRecord3(col.format)) c.format = col.format;
       return c;
     });
     const rawRows = Array.isArray(property.rows) ? property.rows : [];
     out.rows = rawRows.map((row) => {
-      if (!isRecord2(row)) return {};
+      if (!isRecord3(row)) return {};
       const r = {};
       for (const [k, cell] of Object.entries(row)) {
-        let value = isRecord2(cell) && "data" in cell ? cell.data : cell;
-        if (isRecord2(value) && value.tag === "markdown" && isRecord2(value.property)) {
+        let value = isRecord3(cell) && "data" in cell ? cell.data : cell;
+        if (isRecord3(value) && value.tag === "markdown" && isRecord3(value.property)) {
           const elements = Array.isArray(value.property.elements) ? value.property.elements : [];
           value = renderChildren(elements, ctx).content;
         }
@@ -1339,13 +1424,13 @@ function unwrap(node, ctx) {
       }
       return r;
     });
-    if (isRecord2(property.headerStyle)) {
+    if (isRecord3(property.headerStyle)) {
       const hs = {};
       for (const [k, v] of Object.entries(property.headerStyle)) {
         const sk = snake(k);
         if (sk === "platform_text_size") continue;
         if (sk === "lines_value") {
-          if (isRecord2(v) && typeof v.value === "number") hs.lines = v.value;
+          if (isRecord3(v) && typeof v.value === "number") hs.lines = v.value;
           continue;
         }
         hs[sk] = v;
@@ -1353,7 +1438,7 @@ function unwrap(node, ctx) {
       out.header_style = hs;
     }
     const rhv = property.rowHeightValue;
-    if (isRecord2(rhv) && typeof rhv.value === "string") out.row_height = rhv.value;
+    if (isRecord3(rhv) && typeof rhv.value === "string") out.row_height = rhv.value;
     else if (typeof property.rowHeight === "string") out.row_height = property.rowHeight;
     if (typeof property.pageSize === "number") out.page_size = property.pageSize;
     if (typeof property.freezeFirstColumn === "boolean") out.freeze_first_column = property.freezeFirstColumn;
@@ -1388,7 +1473,7 @@ function unwrap(node, ctx) {
     if (typeof property.showAvatar === "boolean") out.show_avatar = property.showAvatar;
     if (typeof property.showName === "boolean") out.show_name = property.showName;
     if (typeof property.style === "string") out.style = property.style;
-    if (isRecord2(property.margin) && hasSide(property.margin)) out.margin = formatBox(property.margin);
+    if (isRecord3(property.margin) && hasSide(property.margin)) out.margin = formatBox(property.margin);
     else if (typeof property.margin === "string") out.margin = property.margin;
     return out;
   }
@@ -1400,17 +1485,17 @@ function unwrap(node, ctx) {
     if (typeof property.lines === "number") out.lines = property.lines;
     if (typeof property.dropInvalidUserID === "boolean") out.drop_invalid_user_id = property.dropInvalidUserID;
     else if (typeof property.drop_invalid_user_id === "boolean") out.drop_invalid_user_id = property.drop_invalid_user_id;
-    if (isRecord2(property.margin) && hasSide(property.margin)) out.margin = formatBox(property.margin);
+    if (isRecord3(property.margin) && hasSide(property.margin)) out.margin = formatBox(property.margin);
     else if (typeof property.margin === "string") out.margin = property.margin;
     const rawPersons = Array.isArray(property.persons) ? property.persons : [];
     out.persons = rawPersons.map((p) => {
-      if (!isRecord2(p)) return void 0;
+      if (!isRecord3(p)) return void 0;
       const id = typeof p.id === "string" ? p.id : typeof p.userID === "string" ? p.userID : void 0;
       return id ? { id } : void 0;
     }).filter((p) => p !== void 0);
-    const iconSrc = isRecord2(property.icon) ? property.icon : isRecord2(property.udIcon) ? property.udIcon : void 0;
+    const iconSrc = isRecord3(property.icon) ? property.icon : isRecord3(property.udIcon) ? property.udIcon : void 0;
     if (iconSrc) {
-      const ip = isRecord2(iconSrc.property) ? iconSrc.property : iconSrc;
+      const ip = isRecord3(iconSrc.property) ? iconSrc.property : iconSrc;
       const icon = {};
       const iconTag = typeof iconSrc.tag === "string" ? iconSrc.tag : typeof ip.tag === "string" ? ip.tag : "standard_icon";
       icon.tag = iconTag === "ud_icon" ? "standard_icon" : iconTag;
@@ -1422,25 +1507,25 @@ function unwrap(node, ctx) {
     }
     return out;
   }
-  if (tag === "div" && isRecord2(property.text) && property.fields === void 0) {
+  if (tag === "div" && isRecord3(property.text) && property.fields === void 0) {
     const text = property.text;
     const textTag = typeof text.tag === "string" ? text.tag : "";
-    if ((textTag === "markdown" || textTag === "lark_md") && isRecord2(text.property)) {
+    if ((textTag === "markdown" || textTag === "lark_md") && isRecord3(text.property)) {
       return unwrap(text, ctx);
     }
     if (textTag === "plain_text") {
       const out = { tag: "div" };
       const widthVal = property.widthValue;
-      if (isRecord2(widthVal) && typeof widthVal.value === "string" && typeof widthVal.type === "string" && widthVal.type.startsWith("builtin_")) {
+      if (isRecord3(widthVal) && typeof widthVal.value === "string" && typeof widthVal.type === "string" && widthVal.type.startsWith("builtin_")) {
         out.width = widthVal.value;
       } else if (typeof property.width === "string") {
         out.width = property.width;
       }
-      const tp = isRecord2(text.property) ? text.property : {};
+      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 };
-      if (isRecord2(property.icon)) {
+      if (isRecord3(property.icon)) {
         out.icon = unwrap(property.icon, ctx);
       }
       return out;
@@ -1467,7 +1552,7 @@ function convertProperty(property, ownerTag, ctx) {
     const echoVal = out[echoKey];
     const enumVal = out[enumKey];
     delete out[echoKey];
-    if (!isRecord2(echoVal)) continue;
+    if (!isRecord3(echoVal)) continue;
     const echoType = typeof echoVal.type === "string" ? echoVal.type : "";
     const echoValue = echoVal.value;
     if (echoType.includes("pixels") && typeof echoValue === "number") {
@@ -1476,7 +1561,7 @@ function convertProperty(property, ownerTag, ctx) {
       }
       continue;
     }
-    if (echoType === "aspect_ratio" && isRecord2(echoValue)) {
+    if (echoType === "aspect_ratio" && isRecord3(echoValue)) {
       const w = echoValue.width;
       const h = echoValue.height;
       if (typeof w === "number" && typeof h === "number") {
@@ -1484,7 +1569,7 @@ function convertProperty(property, ownerTag, ctx) {
       }
       continue;
     }
-    if (echoType === "width_height_pixels" && isRecord2(echoValue)) {
+    if (echoType === "width_height_pixels" && isRecord3(echoValue)) {
       const w = echoValue.width;
       const h = echoValue.height;
       if (typeof w === "number" && typeof h === "number") {
@@ -1524,7 +1609,7 @@ function convertField(rawKey, rawValue, ownerTag, ctx, siblings = {}) {
   if (key === "actions" && Array.isArray(rawValue) && rawValue.length === 0) {
     return DROP;
   }
-  if ((key === "padding" || key === "margin") && isRecord2(rawValue) && hasSide(rawValue)) {
+  if ((key === "padding" || key === "margin") && isRecord3(rawValue) && hasSide(rawValue)) {
     return [key, formatBox(rawValue)];
   }
   if (key in VALUE_ECHO_TARGETS) {
@@ -1554,25 +1639,25 @@ function convertField(rawKey, rawValue, ownerTag, ctx, siblings = {}) {
     return DROP;
   }
   if (ownerTag === "video" && VIDEO_RAW_ONLY_FIELDS.has(key)) return DROP;
-  if ((key === "alt" || key === "hover_tips") && isRecord2(rawValue) && rawValue.tag === "plain_text") {
-    const p = isRecord2(rawValue.property) ? rawValue.property : {};
+  if ((key === "alt" || key === "hover_tips") && isRecord3(rawValue) && rawValue.tag === "plain_text") {
+    const p = isRecord3(rawValue.property) ? rawValue.property : {};
     return [key, { tag: "plain_text", content: typeof p.content === "string" ? p.content : "" }];
   }
-  if (key === "text" && isRecord2(rawValue) && rawValue.tag === "plain_text") {
-    const p = isRecord2(rawValue.property) ? rawValue.property : {};
+  if (key === "text" && isRecord3(rawValue) && rawValue.tag === "plain_text") {
+    const p = isRecord3(rawValue.property) ? rawValue.property : {};
     return [key, { tag: "plain_text", content: typeof p.content === "string" ? p.content : "" }];
   }
-  if (ownerTag === "header" && (key === "title" || key === "subtitle") && isRecord2(rawValue)) {
+  if (ownerTag === "header" && (key === "title" || key === "subtitle") && isRecord3(rawValue)) {
     const headerText = convertHeaderText(rawValue, ctx);
     if (headerText) return [key, headerText];
   }
-  if (ownerTag === "header" && key === "ud_icon" && isRecord2(rawValue) && rawValue.tag === "ud_icon") {
-    const p = isRecord2(rawValue.property) ? rawValue.property : {};
+  if (ownerTag === "header" && key === "ud_icon" && isRecord3(rawValue) && rawValue.tag === "ud_icon") {
+    const p = isRecord3(rawValue.property) ? rawValue.property : {};
     const token = typeof p.token === "string" ? p.token : void 0;
     if (!token) return DROP;
     return ["icon", { tag: "standard_icon", token }];
   }
-  if (ownerTag === "collapsible_panel" && key === "header" && isRecord2(rawValue)) {
+  if (ownerTag === "collapsible_panel" && key === "header" && isRecord3(rawValue)) {
     const cleaned = {};
     for (const [k, v] of Object.entries(rawValue)) {
       const sk = snake(k);
@@ -1589,8 +1674,8 @@ function convertField(rawKey, rawValue, ownerTag, ctx, siblings = {}) {
   if (ownerTag === "button" && key === "actions" && Array.isArray(rawValue)) {
     const openUrls = [];
     for (const a of rawValue) {
-      if (!isRecord2(a)) continue;
-      const inner = isRecord2(a.action) ? a.action : {};
+      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);
     }
@@ -1605,8 +1690,8 @@ function convertField(rawKey, rawValue, ownerTag, ctx, siblings = {}) {
   }
   if (ownerTag === "interactive_container" && key === "actions" && Array.isArray(rawValue)) {
     const behaviors = rawValue.map((a) => {
-      if (!isRecord2(a)) return void 0;
-      const inner = isRecord2(a.action) ? a.action : {};
+      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 };
@@ -1619,7 +1704,7 @@ function convertField(rawKey, rawValue, ownerTag, ctx, siblings = {}) {
     if (behaviors.length === 0) return DROP;
     return ["behaviors", behaviors];
   }
-  if (key === "border" && isRecord2(rawValue)) {
+  if (key === "border" && isRecord3(rawValue)) {
     const b = rawValue;
     const out = {};
     if (typeof b.borderColor === "string") out.color = b.borderColor;
@@ -1633,7 +1718,7 @@ function convertField(rawKey, rawValue, ownerTag, ctx, siblings = {}) {
     }
     return [key, out];
   }
-  if (key === "url" && isRecord2(rawValue)) {
+  if (key === "url" && isRecord3(rawValue)) {
     const v = rawValue;
     const main = typeof v.url === "string" ? v.url : "";
     const others = ["androidURL", "iosURL", "pcURL", "harmonyURL"].map((k) => v[k]).filter((x) => typeof x === "string" && x.length > 0);
@@ -1674,7 +1759,7 @@ function renderInlineAudio(prop) {
   if (bg) attrs.push(`background_color='${bg}'`);
   const fill = typeof prop.fillColor === "string" ? prop.fillColor : typeof prop.fill_color === "string" ? prop.fill_color : void 0;
   if (fill) attrs.push(`fill_color='${fill}'`);
-  const urlObj = isRecord2(prop.url) ? prop.url : void 0;
+  const urlObj = isRecord3(prop.url) ? prop.url : void 0;
   if (urlObj) {
     if (typeof urlObj.url === "string" && urlObj.url) attrs.push(`fallback_url='${urlObj.url}'`);
     if (typeof urlObj.pcURL === "string" && urlObj.pcURL) attrs.push(`fallback_pc_url='${urlObj.pcURL}'`);
@@ -1688,9 +1773,9 @@ function renderInlineAudio(prop) {
   } else if (typeof prop.fallback_url === "string" && prop.fallback_url) {
     attrs.push(`fallback_url='${prop.fallback_url}'`);
   }
-  const fb = isRecord2(prop.fallbackText) ? prop.fallbackText : isRecord2(prop.fallback_text) ? prop.fallback_text : void 0;
+  const fb = isRecord3(prop.fallbackText) ? prop.fallbackText : isRecord3(prop.fallback_text) ? prop.fallback_text : void 0;
   if (fb) {
-    const fbProp = isRecord2(fb.property) ? fb.property : fb;
+    const fbProp = isRecord3(fb.property) ? fb.property : fb;
     const fbContent = typeof fbProp.content === "string" ? fbProp.content : typeof fb.content === "string" ? fb.content : "";
     if (fbContent) attrs.push(`fallback_text='${fbContent}'`);
   }
@@ -1708,14 +1793,13 @@ function resolveAtUserId(prop, ctx) {
 function rebuildMarkdown(property, ctx) {
   const out = { tag: "markdown" };
   const elements = Array.isArray(property.elements) ? property.elements : [];
-  const { content, uniformFontColor } = renderChildren(elements, ctx);
+  const { content } = renderChildren(elements, ctx);
   if (content) out.content = content;
-  if (uniformFontColor) out.font_color = uniformFontColor;
   for (const [rawKey, rawValue] of Object.entries(property)) {
     if (rawKey === "elements" || rawKey === "markdownElements" || rawKey === "originTag") continue;
     if (rawKey === "udIcon") continue;
     if (rawKey === "textStyle") {
-      const ts = isRecord2(rawValue) ? rawValue : {};
+      const ts = isRecord3(rawValue) ? rawValue : {};
       const size = typeof ts.size === "string" ? ts.size : void 0;
       if (size) out.text_size = size;
       continue;
@@ -1728,7 +1812,7 @@ function rebuildMarkdown(property, ctx) {
   }
   return out;
 }
-function wrapEmphasis(text, bold, color, colorKind, inlineCustomFont = false) {
+function wrapEmphasis(text, bold, color) {
   if (!bold && !color) return text;
   const lead = text.match(/^\s*/)[0];
   const trail = text.match(/\s*$/)[0];
@@ -1736,10 +1820,7 @@ function wrapEmphasis(text, bold, color, colorKind, inlineCustomFont = false) {
   if (core.length === 0) return text;
   let wrapped = core;
   if (bold) wrapped = `**${wrapped}**`;
-  if (color) {
-    if (colorKind === "enum") wrapped = `<font color='${color}'>${wrapped}</font>`;
-    else if (colorKind === "custom" && inlineCustomFont) wrapped = `<font color='${color}'>${wrapped}</font>`;
-  }
+  if (color) wrapped = `<font color='${color}'>${wrapped}</font>`;
   return lead + wrapped + trail;
 }
 function resolveInlineStyle(ts, ctx) {
@@ -1767,20 +1848,14 @@ function resolveInlineStyle(ts, ctx) {
 function renderChildren(children, ctx) {
   let out = "";
   let buffer = [];
-  let uniformFontColor;
   function flushBuffer() {
     if (buffer.length === 0) return;
-    const customColors = buffer.filter((s) => s.colorKind === "custom" && s.color).map((s) => s.color);
-    const hasEnumColor = buffer.some((s) => s.colorKind === "enum" && s.color);
-    const uniformCustom = customColors.length > 0 && !hasEnumColor && customColors.every((c) => c === customColors[0]) ? customColors[0] : void 0;
-    if (uniformCustom) uniformFontColor = uniformCustom;
     let group = [];
     function emitGroup() {
       if (group.length === 0) return;
       const inner = group.map((s) => s.content).join("");
-      const { bold, color, colorKind } = group[0];
-      const inlineCustomFont = colorKind === "custom" && !!color && color !== uniformCustom;
-      out += wrapEmphasis(inner, bold, color, colorKind, inlineCustomFont);
+      const { bold, color } = group[0];
+      out += wrapEmphasis(inner, bold, color);
       group = [];
     }
     for (const seg of buffer) {
@@ -1800,7 +1875,7 @@ function renderChildren(children, ctx) {
     buffer = [];
   }
   for (const child of children) {
-    if (!isRecord2(child)) continue;
+    if (!isRecord3(child)) continue;
     const inline = childToInlineSegment(child, ctx);
     if (inline) {
       buffer.push(inline);
@@ -1810,12 +1885,12 @@ function renderChildren(children, ctx) {
     out += childToMarkdown(child, ctx);
   }
   flushBuffer();
-  return { content: out, uniformFontColor };
+  return { content: out };
 }
 function childToInlineSegment(child, ctx) {
   const tag = child.tag;
-  const prop = isRecord2(child.property) ? child.property : {};
-  const ts = isRecord2(prop.textStyle) ? prop.textStyle : void 0;
+  const prop = isRecord3(child.property) ? child.property : {};
+  const ts = isRecord3(prop.textStyle) ? prop.textStyle : void 0;
   const { bold, color, colorKind } = resolveInlineStyle(ts, ctx);
   switch (tag) {
     case "plain_text":
@@ -1834,7 +1909,7 @@ function childToInlineSegment(child, ctx) {
       };
     case "link": {
       const text = typeof prop.content === "string" ? prop.content : "";
-      const urlObj = isRecord2(prop.url) ? prop.url : void 0;
+      const urlObj = isRecord3(prop.url) ? prop.url : void 0;
       const url = urlObj && typeof urlObj.url === "string" ? urlObj.url : "";
       return { content: `[${text}](${url})`, bold, color, colorKind };
     }
@@ -1846,8 +1921,8 @@ function childToInlineSegment(child, ctx) {
     }
     case "text_tag": {
       const tagColor = typeof prop.color === "string" ? prop.color : void 0;
-      const inner = isRecord2(prop.text) ? prop.text : void 0;
-      const innerProp = inner && isRecord2(inner.property) ? inner.property : void 0;
+      const inner = isRecord3(prop.text) ? prop.text : void 0;
+      const innerProp = inner && isRecord3(inner.property) ? inner.property : void 0;
       const innerContent = innerProp && typeof innerProp.content === "string" ? innerProp.content : "";
       const rendered = tagColor ? `<text_tag color='${tagColor}'>${innerContent}</text_tag>` : `<text_tag>${innerContent}</text_tag>`;
       return { content: rendered, bold: false };
@@ -1871,13 +1946,13 @@ function childToInlineSegment(child, ctx) {
 }
 function childToMarkdown(child, ctx) {
   const tag = child.tag;
-  const prop = isRecord2(child.property) ? child.property : {};
+  const prop = isRecord3(child.property) ? child.property : {};
   switch (tag) {
     case "plain_text": {
       const content = typeof prop.content === "string" ? prop.content : "";
-      const ts = isRecord2(prop.textStyle) ? prop.textStyle : void 0;
-      const { bold, color, colorKind } = resolveInlineStyle(ts, ctx);
-      return wrapEmphasis(content, bold, color, colorKind, colorKind === "custom");
+      const ts = isRecord3(prop.textStyle) ? prop.textStyle : void 0;
+      const { bold, color } = resolveInlineStyle(ts, ctx);
+      return wrapEmphasis(content, bold, color);
     }
     case "br":
       return "\n";
@@ -1898,7 +1973,7 @@ function childToMarkdown(child, ctx) {
       return renderInlineAudio(prop);
     case "link": {
       const text = typeof prop.content === "string" ? prop.content : "";
-      const urlObj = isRecord2(prop.url) ? prop.url : void 0;
+      const urlObj = isRecord3(prop.url) ? prop.url : void 0;
       const url = urlObj && typeof urlObj.url === "string" ? urlObj.url : "";
       return `[${text}](${url})`;
     }
@@ -1908,8 +1983,8 @@ function childToMarkdown(child, ctx) {
     }
     case "text_tag": {
       const color = typeof prop.color === "string" ? prop.color : void 0;
-      const inner = isRecord2(prop.text) ? prop.text : void 0;
-      const innerProp = inner && isRecord2(inner.property) ? inner.property : void 0;
+      const inner = isRecord3(prop.text) ? prop.text : void 0;
+      const innerProp = inner && isRecord3(inner.property) ? inner.property : void 0;
       const innerContent = innerProp && typeof innerProp.content === "string" ? innerProp.content : "";
       if (color) return `<text_tag color='${color}'>${innerContent}</text_tag>`;
       return `<text_tag>${innerContent}</text_tag>`;
@@ -1918,11 +1993,11 @@ function childToMarkdown(child, ctx) {
       const lang = typeof prop.language === "string" ? prop.language : "";
       const blocks = Array.isArray(prop.contents) ? prop.contents : [];
       const lines = blocks.map((blk) => {
-        if (!isRecord2(blk)) return "";
+        if (!isRecord3(blk)) return "";
         const inner = Array.isArray(blk.contents) ? blk.contents : [];
         let line = "";
         for (const seg of inner) {
-          if (isRecord2(seg) && typeof seg.content === "string") line += seg.content;
+          if (isRecord3(seg) && typeof seg.content === "string") line += seg.content;
         }
         return line;
       });
@@ -1938,14 +2013,14 @@ ${body}
       const lines = [];
       const levelCounters = [];
       for (const item of items) {
-        if (!isRecord2(item)) continue;
+        if (!isRecord3(item)) continue;
         const level = typeof item.level === "number" ? item.level : 0;
         const type = typeof item.type === "string" ? item.type : "ul";
         const indent = "    ".repeat(level);
         const inner = Array.isArray(item.elements) ? item.elements : [];
         let text = "";
         for (const seg of inner) {
-          if (!isRecord2(seg)) continue;
+          if (!isRecord3(seg)) continue;
           text += childToMarkdown(seg, ctx);
         }
         if (type === "ol") {
@@ -1974,7 +2049,7 @@ ${lines.join("\n")}
       const inner = Array.isArray(prop.elements) ? prop.elements : [];
       let body = "";
       for (const seg of inner) {
-        if (isRecord2(seg)) body += childToMarkdown(seg, ctx);
+        if (isRecord3(seg)) body += childToMarkdown(seg, ctx);
       }
       return `
 
@@ -1990,18 +2065,18 @@ ${"#".repeat(level)} ${body}
       const rows = Array.isArray(prop.rows) ? prop.rows : [];
       if (columns.length === 0) return "";
       const headers = columns.map(
-        (col) => isRecord2(col) && typeof col.displayName === "string" ? col.displayName : ""
+        (col) => isRecord3(col) && typeof col.displayName === "string" ? col.displayName : ""
       );
       const headerLine = `| ${headers.join(" | ")} |`;
       const separator = `| ${columns.map(() => "--------").join(" | ")} |`;
       const bodyLines = rows.map((row) => {
-        if (!isRecord2(row)) return `| ${columns.map(() => "").join(" | ")} |`;
+        if (!isRecord3(row)) return `| ${columns.map(() => "").join(" | ")} |`;
         const cells = columns.map((col) => {
-          const name = isRecord2(col) && typeof col.name === "string" ? col.name : "";
-          const cell = isRecord2(row[name]) ? row[name] : void 0;
-          const data = cell && isRecord2(cell.data) ? cell.data : void 0;
+          const name = isRecord3(col) && typeof col.name === "string" ? col.name : "";
+          const cell = isRecord3(row[name]) ? row[name] : void 0;
+          const data = cell && isRecord3(cell.data) ? cell.data : void 0;
           if (!data || data.tag !== "markdown") return "";
-          const cellProp = isRecord2(data.property) ? data.property : {};
+          const cellProp = isRecord3(data.property) ? data.property : {};
           const inner = Array.isArray(cellProp.elements) ? cellProp.elements : [];
           const { content: text } = renderChildren(inner, ctx);
           return text.replace(/\|/g, "\\|").replace(/\n/g, " ");
@@ -2020,7 +2095,7 @@ ${bodyLines.join("\n")}
       const inner = Array.isArray(prop.elements) ? prop.elements : [];
       let body = "";
       for (const seg of inner) {
-        if (isRecord2(seg)) body += childToMarkdown(seg, ctx);
+        if (isRecord3(seg)) body += childToMarkdown(seg, ctx);
       }
       return `
 
@@ -2035,14 +2110,14 @@ ${bodyLines.join("\n")}
 function convertGeneric(value, ctx) {
   if (Array.isArray(value)) {
     return value.map((item) => {
-      if (isRecord2(item) && typeof item.tag === "string" && isRecord2(item.property)) {
+      if (isRecord3(item) && typeof item.tag === "string" && isRecord3(item.property)) {
         return unwrap(item, ctx);
       }
       return convertGeneric(item, ctx);
     });
   }
-  if (isRecord2(value)) {
-    if (typeof value.tag === "string" && isRecord2(value.property)) {
+  if (isRecord3(value)) {
+    if (typeof value.tag === "string" && isRecord3(value.property)) {
       return unwrap(value, ctx);
     }
     if (hasSide(value)) {
@@ -2059,7 +2134,7 @@ function convertGeneric(value, ctx) {
   }
   return value;
 }
-function isRecord2(v) {
+function isRecord3(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
 function resolveAttachmentImgKey(rawValue, ctx) {
@@ -2075,7 +2150,7 @@ function normalizeVideoCover(rawValue, ctx) {
     const imgKey2 = resolveAttachmentImgKey(rawValue, ctx);
     return imgKey2 ? { img_key: imgKey2 } : void 0;
   }
-  if (!isRecord2(rawValue)) return void 0;
+  if (!isRecord3(rawValue)) return void 0;
   if (typeof rawValue.img_key === "string" && rawValue.img_key) {
     return { img_key: rawValue.img_key };
   }
@@ -2084,17 +2159,17 @@ function normalizeVideoCover(rawValue, ctx) {
   return imgKey ? { img_key: imgKey } : void 0;
 }
 function hasSide(v) {
-  return ("top" in v || "bottom" in v || "left" in v || "right" in v) && Object.values(v).some((side) => isRecord2(side) && "type" in side && "value" in side);
+  return ("top" in v || "bottom" in v || "left" in v || "right" in v) && Object.values(v).some((side) => isRecord3(side) && "type" in side && "value" in side);
 }
 function formatBox(v) {
   return `${pixelOf(v.top)}px ${pixelOf(v.right)}px ${pixelOf(v.bottom)}px ${pixelOf(v.left)}px`;
 }
 function isPixelScalar(v) {
-  if (!isRecord2(v)) return false;
+  if (!isRecord3(v)) return false;
   return typeof v.type === "string" && v.type.includes("pixels") && typeof v.value === "number";
 }
 function pixelOf(side) {
-  if (!isRecord2(side)) return 0;
+  if (!isRecord3(side)) return 0;
   const v = side.value;
   if (typeof v === "number") return v;
   if (typeof v === "string") {
@@ -2115,8 +2190,8 @@ function rawToDsl(raw) {
       return raw;
     }
   }
-  if (!isRecord2(raw)) return raw;
-  if (typeof raw.json_card === "string" || isRecord2(raw.json_card)) {
+  if (!isRecord3(raw)) return raw;
+  if (typeof raw.json_card === "string" || isRecord3(raw.json_card)) {
     let inner = raw.json_card;
     if (typeof inner === "string") {
       try {
@@ -2125,16 +2200,16 @@ function rawToDsl(raw) {
         return raw;
       }
     }
-    const attachment = isRecord2(raw.json_attachment) ? raw.json_attachment : {};
+    const attachment = isRecord3(raw.json_attachment) ? raw.json_attachment : {};
     const ctx = makeCtx({
-      images: isRecord2(attachment.images) ? attachment.images : {},
-      atUsers: isRecord2(attachment.at_users) ? attachment.at_users : {}
+      images: isRecord3(attachment.images) ? attachment.images : {},
+      atUsers: isRecord3(attachment.at_users) ? attachment.at_users : {}
     });
     return convertRoot(inner, ctx);
   }
-  if (isRecord2(raw.card)) {
+  if (isRecord3(raw.card)) {
     const card = raw.card;
-    if (typeof card.json_card === "string" || isRecord2(card.json_card)) {
+    if (typeof card.json_card === "string" || isRecord3(card.json_card)) {
       return rawToDsl(card);
     }
     return convertRoot(card, makeCtx());