@satorijs/adapter-lark 3.11.0 → 3.11.1

package/lib/index.cjs

@@ -769,8 +769,7 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
   textContent = "";
   richContent = [];
   card;
-  noteElements;
-  actionElements = [];
+  elements = [];
   isForm = false;
   editMessageIds;
   async post(data) {
@@ -832,32 +831,20 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
       this.errors.push(e);
     }
   }
-  flushText(button = false) {
-    if ((this.textContent || !button) && this.actionElements.length) {
-      this.card.elements.push({ tag: "action", actions: this.actionElements, layout: "flow" });
-      this.actionElements = [];
-    }
-    if (this.textContent) {
-      this.richContent.push([{ tag: "md", text: this.textContent }]);
-      if (this.noteElements) {
-        this.noteElements.push({ tag: "plain_text", content: this.textContent });
-      } else if (this.card) {
-        this.card.elements.push({ tag: "markdown", content: this.textContent });
-      }
-      this.textContent = "";
-    }
+  flushText() {
+    if (!this.textContent) return;
+    this.richContent.push([{ tag: "md", text: this.textContent }]);
+    this.elements.push({ tag: "markdown", content: this.textContent });
+    this.textContent = "";
   }
   async flush() {
     this.flushText();
     if (!this.card && !this.richContent.length) return;
     if (this.card) {
-      this.bot.logger.debug("card", JSON.stringify(this.card.elements));
+      this.bot.logger.debug("card %o", JSON.parse(JSON.stringify(this.card)));
       await this.post({
         msg_type: "interactive",
-        content: JSON.stringify({
-          header: this.card.header,
-          elements: this.card.elements
-        })
+        content: JSON.stringify(this.card)
       });
     } else {
       await this.post({
@@ -921,14 +908,14 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
       content: JSON.stringify({ file_key })
     });
   }
-  createBehavior(attrs) {
+  createBehaviors(attrs) {
     const behaviors = [];
     if (attrs.type === "link") {
       behaviors.push({
         type: "open_url",
         default_url: attrs.href
       });
-    } else if (attrs.type === "input") {
+    } else if (attrs.type === "input" || attrs.type === "submit") {
       behaviors.push({
         type: "callback",
         value: {
@@ -985,26 +972,24 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
     } else if (type === "hr") {
       this.flushText();
       this.richContent.push([{ tag: "hr" }]);
-      this.card?.elements.push({ tag: "hr" });
+      this.elements.push({ tag: "hr" });
     } else if (type === "form") {
       this.flushText();
-      const length = this.card?.elements.length;
+      const parent = this.elements;
+      parent.push({
+        tag: "form",
+        name: attrs.name || "Form",
+        elements: this.elements = []
+      });
       this.isForm = true;
       await this.render(children);
       this.isForm = false;
-      if (this.card?.elements.length > length) {
-        const elements = this.card?.elements.splice(length);
-        this.card.elements.push({
-          tag: "form",
-          name: attrs.name || "Form",
-          elements
-        });
-      }
+      this.elements = parent;
     } else if (type === "input") {
       if (attrs.type === "checkbox") {
         this.flushText();
         await this.render(children);
-        this.card?.elements.push({
+        this.elements.push({
           tag: "checker",
           name: (attrs.argument ? "@@" : attrs.option ? `@${attrs.option}=` : "") + attrs.name,
           checked: attrs.value,
@@ -1015,20 +1000,17 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
         });
         this.textContent = "";
       } else if (attrs.type === "submit") {
-        this.flushText(true);
+        this.flushText();
         await this.render(children);
-        this.card?.elements.push({
+        this.elements.push({
           tag: "button",
           name: attrs.name,
           text: {
             tag: "plain_text",
             content: this.textContent
           },
-          action_type: "form_submit",
-          value: {
-            _satori_type: "command",
-            content: attrs.text
-          }
+          form_action_type: "submit",
+          behaviors: this.createBehaviors(attrs)
         });
         this.textContent = "";
       } else {
@@ -1047,19 +1029,10 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
           },
           default_value: attrs.value,
           disabled: attrs.disabled,
-          required: attrs.required
+          required: attrs.required,
+          behaviors: this.createBehaviors(attrs)
         };
-        if (this.isForm) {
-          this.card?.elements.push(input);
-        } else {
-          this.card?.elements.push({
-            tag: "action",
-            actions: [{
-              ...input,
-              behaviors: this.createBehavior(attrs)
-            }]
-          });
-        }
+        this.elements.push(input);
       }
     } else if (type === "select") {
       this.flushText();
@@ -1074,7 +1047,8 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
           tag: "plain_text",
           content: attrs.placeholder
         },
-        options: []
+        options: [],
+        behaviors: this.createBehaviors(attrs)
       };
       for (const child of children) {
         if (child.type !== "option") continue;
@@ -1088,29 +1062,17 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
         });
         this.textContent = "";
       }
-      if (this.isForm) {
-        this.card?.elements.push(select);
-      } else {
-        this.card?.elements.push({
-          tag: "action",
-          actions: [{
-            ...select,
-            behaviors: this.createBehavior(attrs)
-          }]
-        });
-      }
+      this.elements.push(select);
     } else if (type === "button") {
-      this.card ??= { elements: [] };
-      this.flushText(true);
+      this.flushText();
       await this.render(children);
-      this.actionElements.push({
+      this.elements.push({
         tag: "button",
         text: {
           tag: "plain_text",
           content: this.textContent
         },
         disabled: attrs.disabled,
-        behaviors: this.createBehavior(attrs),
         type: attrs["lark:type"],
         size: attrs["lark:size"],
         width: attrs["lark:width"],
@@ -1125,13 +1087,25 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
         disabled_tips: attrs["lark:disabled-tips"] && {
           tag: "plain_text",
           content: attrs["lark:disabled-tips"]
-        }
+        },
+        behaviors: this.createBehaviors(attrs)
       });
       this.textContent = "";
-    } else if (type === "button-group") {
+    } else if (type === "div") {
       this.flushText();
       await this.render(children);
-      this.flushText();
+      this.elements.push({
+        tag: "markdown",
+        text_align: attrs.align,
+        text_size: attrs.size,
+        content: this.textContent,
+        margin: attrs.margin,
+        icon: attrs.icon && {
+          tag: "standard_icon",
+          token: attrs.icon
+        }
+      });
+      this.textContent = "";
     } else if (type.startsWith("lark:") || type.startsWith("feishu:")) {
       const tag = type.slice(type.split(":", 1)[0].length + 1);
       if (tag === "share-chat") {
@@ -1161,7 +1135,7 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
       } else if (tag === "card") {
         await this.flush();
         this.card = {
-          elements: [],
+          schema: "2.0",
           header: attrs.title && {
             template: attrs.color,
             ud_icon: attrs.icon && {
@@ -1176,40 +1150,16 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
               tag: "plain_text",
               content: attrs.subtitle
             }
+          },
+          body: {
+            elements: this.elements = []
           }
         };
         await this.render(children, true);
-      } else if (tag === "div") {
-        this.flushText();
-        await this.render(children);
-        this.card?.elements.push({
-          tag: "markdown",
-          text_align: attrs.align,
-          text_size: attrs.size,
-          content: this.textContent
-        });
-        this.textContent = "";
-      } else if (tag === "note") {
-        this.flushText();
-        this.noteElements = [];
-        await this.render(children);
-        this.flushText();
-        this.card?.elements.push({
-          tag: "note",
-          elements: this.noteElements
-        });
-        this.noteElements = void 0;
-      } else if (tag === "icon") {
-        this.flushText();
-        this.noteElements?.push({
-          tag: "standard_icon",
-          token: attrs.token
-        });
       } else if (tag === "column-set") {
         this.flushText();
-        const parent = this.card;
         const columns = [];
-        parent?.elements.push({
+        this.elements.push({
           tag: "column_set",
           margin: attrs.margin,
           flex_mode: attrs.flexMode,
@@ -1218,11 +1168,12 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
           background_style: attrs.backgroundStyle,
           columns
         });
+        const parent = this.elements;
         for (const child of children) {
           if (child.type !== "lark:column" && child.type !== "feishu:column") {
             continue;
           }
-          this.card = { elements: [] };
+          this.elements = [];
           await this.render(child.children);
           this.flushText();
           columns.push({
@@ -1233,11 +1184,30 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
             vertical_align: child.attrs.verticalAlign ?? "center",
             vertical_spacing: child.attrs.verticalSpacing ?? "0px",
             background_style: child.attrs.backgroundStyle,
-            elements: this.card.elements
+            elements: this.elements
           });
         }
-        this.card = parent;
+        this.elements = parent;
       }
+    } else if (type === "button-group") {
+      this.flushText();
+      const parent = this.elements;
+      this.elements = [];
+      await this.render(children);
+      this.flushText();
+      parent.push({
+        tag: "column_set",
+        margin: attrs.margin,
+        flex_mode: attrs.flexMode,
+        horizontal_align: attrs.horizontalAlign,
+        horizontal_spacing: attrs.horizontalSpacing,
+        background_style: attrs.backgroundStyle,
+        columns: this.elements.map((element2) => ({
+          tag: "column",
+          elements: [element2]
+        }))
+      });
+      this.elements = parent;
     } else {
       await this.render(children);
     }

package/lib/message.d.ts

@@ -7,8 +7,7 @@ export declare class LarkMessageEncoder<C extends Context = Context> extends Mes
     private textContent;
     private richContent;
     private card;
-    private noteElements;
-    private actionElements;
+    private elements;
     private isForm;
     editMessageIds: string[] | undefined;
     post(data?: any): Promise<void>;
@@ -16,7 +15,7 @@ export declare class LarkMessageEncoder<C extends Context = Context> extends Mes
     flush(): Promise<void>;
     createImage(url: string): Promise<string>;
     sendFile(_type: 'video' | 'audio' | 'file', attrs: any): Promise<void>;
-    private createBehavior;
+    private createBehaviors;
     visit(element: h): Promise<void>;
 }
 export { LarkMessageEncoder as FeishuMessageEncoder };

package/package.json

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