@satorijs/adapter-lark 3.10.1 → 3.10.3

package/lib/content.d.ts

@@ -419,12 +419,29 @@ export declare namespace MessageContent {
                 type: 'text' | 'primary_text' | 'danger_text';
             }
         }
+        interface ColumnSetElement extends BaseElement<'column_set'> {
+            horizontal_spacing?: string;
+            horizontal_align?: 'left' | 'center' | 'right';
+            margin?: string;
+            flex_mode?: 'none' | 'stretch' | 'flow' | 'bisect' | 'trisect';
+            background_style?: string;
+            columns: ColumnElement[];
+        }
+        interface ColumnElement extends BaseElement<'column'> {
+            background_style?: string;
+            width?: 'auto' | 'weighted' | string;
+            weight?: number;
+            vertical_align?: 'top' | 'center' | 'bottom';
+            vertical_spacing?: 'default' | 'medium' | 'large' | string;
+            padding?: string;
+            elements: Element[];
+        }
         namespace ButtonElement {
             type Size = 'tiny' | 'small' | 'medium' | 'large';
             type Width = 'default' | 'fill' | string;
             type Type = 'default' | 'primary' | 'danger' | 'text' | 'primary_text' | 'danger_text' | 'primary_filled' | 'danger_filled' | 'laser';
         }
-        type Element = DivElement | MarkdownElement | HRElement | ActionElement | NoteElement | ChartElement | TableElement | ImageElement | FormElement | InputElement | ButtonElement | CheckerElement;
+        type Element = DivElement | MarkdownElement | HRElement | ActionElement | NoteElement | ChartElement | TableElement | ImageElement | FormElement | InputElement | ButtonElement | CheckerElement | ColumnSetElement;
     }
     interface Template {
         type: 'template';

package/lib/index.cjs

@@ -71,10 +71,12 @@ async function adaptMessage(bot, data, session, details = true) {
       text.split(" ").forEach((word) => {
         if (word.startsWith("@")) {
           const mention = data.message.mentions.find((mention2) => mention2.key === word);
-          content.push(import_core.h.at(mention.id.open_id, { name: mention.name }));
-        } else {
-          content.push(word);
+          if (mention) {
+            content.push(import_core.h.at(mention.id.open_id, { name: mention.name }));
+            return;
+          }
         }
+        content.push(word);
       });
       break;
     }
@@ -203,10 +205,12 @@ async function decodeMessage(bot, body, details = true) {
       text.split(" ").forEach((word) => {
         if (word.startsWith("@")) {
           const mention = body.mentions.find((mention2) => mention2.key === word);
-          content.push(import_core.h.at(mention.id, { name: mention.name }));
-        } else {
-          content.push(import_core.h.text(word));
+          if (mention) {
+            content.push(import_core.h.at(mention.id, { name: mention.name }));
+            return;
+          }
         }
+        content.push(import_core.h.text(word));
       });
       break;
     }
@@ -801,6 +805,37 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
           tag: "standard_icon",
           token: attrs.token
         });
+      } else if (tag === "column-set") {
+        this.flushText();
+        const parent = this.card;
+        const columns = [];
+        parent?.elements.push({
+          tag: "column_set",
+          margin: attrs.margin,
+          flex_mode: attrs.flexMode,
+          horizontal_align: attrs.horizontalAlign,
+          horizontal_spacing: attrs.horizontalSpacing,
+          background_style: attrs.backgroundStyle,
+          columns
+        });
+        for (const child of children) {
+          if (child.type !== "lark:column" && child.type !== "feishu:column") {
+            continue;
+          }
+          this.card = { elements: [] };
+          await this.render(child.children);
+          columns.push({
+            tag: "column",
+            width: child.attrs.width,
+            weight: child.attrs.weight,
+            padding: child.attrs.padding,
+            vertical_align: child.attrs.verticalAlign,
+            vertical_spacing: child.attrs.verticalSpacing,
+            background_style: child.attrs.backgroundStyle,
+            elements: this.card.elements
+          });
+        }
+        this.card = parent;
       }
     } else {
       await this.render(children);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@satorijs/adapter-lark",
   "description": "Lark (飞书) Adapter for Satorijs",
-  "version": "3.10.1",
+  "version": "3.10.3",
   "type": "module",
   "main": "lib/index.cjs",
   "types": "lib/index.d.ts",

package/src/content.ts

@@ -512,6 +512,27 @@ export namespace MessageContent {
       }
     }
 
+    export interface ColumnSetElement extends BaseElement<'column_set'> {
+      horizontal_spacing?: string
+      horizontal_align?: 'left' | 'center' | 'right'
+      margin?: string
+      flex_mode?: 'none' | 'stretch' | 'flow' | 'bisect' | 'trisect'
+      background_style?: string
+      columns: ColumnElement[]
+      // action?: Action
+    }
+
+    export interface ColumnElement extends BaseElement<'column'> {
+      background_style?: string
+      width?: 'auto' | 'weighted' | string
+      weight?: number
+      vertical_align?: 'top' | 'center' | 'bottom'
+      vertical_spacing?: 'default' | 'medium' | 'large' | string
+      padding?: string
+      elements: Element[]
+      // action?: Action
+    }
+
     export namespace ButtonElement {
       export type Size = 'tiny' | 'small' | 'medium' | 'large'
       export type Width = 'default' | 'fill' | string
@@ -531,6 +552,7 @@ export namespace MessageContent {
       | InputElement
       | ButtonElement
       | CheckerElement
+      | ColumnSetElement
   }
 
   export interface Template {

package/src/message.ts

@@ -417,6 +417,38 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
           tag: 'standard_icon',
           token: attrs.token,
         })
+      } else if (tag === 'column-set') {
+        this.flushText()
+        const parent = this.card
+        const columns: MessageContent.Card.ColumnElement[] = []
+        parent?.elements.push({
+          tag: 'column_set',
+          margin: attrs.margin,
+          flex_mode: attrs.flexMode,
+          horizontal_align: attrs.horizontalAlign,
+          horizontal_spacing: attrs.horizontalSpacing,
+          background_style: attrs.backgroundStyle,
+          columns,
+        })
+        for (const child of children) {
+          if (child.type !== 'lark:column' && child.type !== 'feishu:column') {
+            // throw unexpected?
+            continue
+          }
+          this.card = { elements: [] }
+          await this.render(child.children)
+          columns.push({
+            tag: 'column',
+            width: child.attrs.width,
+            weight: child.attrs.weight,
+            padding: child.attrs.padding,
+            vertical_align: child.attrs.verticalAlign,
+            vertical_spacing: child.attrs.verticalSpacing,
+            background_style: child.attrs.backgroundStyle,
+            elements: this.card.elements,
+          })
+        }
+        this.card = parent
       }
     } else {
       await this.render(children)

package/src/utils.ts

@@ -188,10 +188,12 @@ export async function adaptMessage<C extends Context = Context>(
       text.split(' ').forEach((word) => {
         if (word.startsWith('@')) {
           const mention = data.message.mentions.find((mention) => mention.key === word)!
-          content.push(h.at(mention.id.open_id, { name: mention.name }))
-        } else {
-          content.push(word)
+          if (mention) {
+            content.push(h.at(mention.id.open_id, { name: mention.name }))
+            return
+          }
         }
+        content.push(word)
       })
       break
     }
@@ -327,10 +329,12 @@ export async function decodeMessage<C extends Context = Context>(bot: LarkBot<C>
       text.split(' ').forEach((word) => {
         if (word.startsWith('@')) {
           const mention = body.mentions!.find((mention) => mention.key === word)!
-          content.push(h.at(mention.id, { name: mention.name }))
-        } else {
-          content.push(h.text(word))
+          if (mention) {
+            content.push(h.at(mention.id, { name: mention.name }))
+            return
+          }
         }
+        content.push(h.text(word))
       })
       break
     }