@satorijs/adapter-lark 3.10.0 → 3.10.2

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

@@ -136,11 +136,23 @@ async function adaptSession(bot, body) {
         session.type = "interaction/command";
         let content = body.event.action.value.content;
         const args = [], options = /* @__PURE__ */ Object.create(null);
+        const setOption = /* @__PURE__ */ __name((key, value) => {
+          if (key in options) {
+            options[key] += "," + value;
+          } else {
+            options[key] = value;
+          }
+        }, "setOption");
         for (const [key, value] of Object.entries(body.event.action.form_value ?? {})) {
-          if (+key * 0 === 0) {
+          if (key.startsWith("@@")) {
+            if (value) args.push(key.slice(2));
+          } else if (key.startsWith("@")) {
+            const [_key] = key.slice(1).split("=", 1);
+            setOption(_key, key.slice(2 + _key.length));
+          } else if (+key * 0 === 0) {
             args[+key] = value;
           } else {
-            options[key] = value;
+            setOption(key, value);
           }
         }
         const toArg = /* @__PURE__ */ __name((value) => {
@@ -155,9 +167,9 @@ async function adaptSession(bot, body) {
         }
         for (const [key, value] of Object.entries(options)) {
           if (value === true) {
-            content += ` --${key}`;
+            content += ` --${key} 1`;
           } else if (value === false) {
-            content += ` --no-${key}`;
+            content += ` --${key} 0`;
           } else {
             content += ` --${key} ${toArg(value)}`;
           }
@@ -638,7 +650,7 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
         await this.render(children);
         this.card?.elements.push({
           tag: "checker",
-          name: attrs.name,
+          name: (attrs.argument ? "@@" : attrs.option ? `@${attrs.option}=` : "") + attrs.name,
           checked: attrs.checked,
           text: {
             tag: "plain_text",
@@ -789,6 +801,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.0",
+  "version": "3.10.2",
   "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

@@ -266,7 +266,7 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
         await this.render(children)
         this.card?.elements.push({
           tag: 'checker',
-          name: attrs.name,
+          name: (attrs.argument ? '@@' : attrs.option ? `@${attrs.option}=` : '') + attrs.name,
           checked: attrs.checked,
           text: {
             tag: 'plain_text',
@@ -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

@@ -256,11 +256,23 @@ export async function adaptSession<C extends Context>(bot: LarkBot<C>, body: Eve
         session.type = 'interaction/command'
         let content = body.event.action.value.content
         const args: any[] = [], options = Object.create(null)
+        const setOption = (key: string, value: any) => {
+          if (key in options) {
+            options[key] += ',' + value
+          } else {
+            options[key] = value
+          }
+        }
         for (const [key, value] of Object.entries(body.event.action.form_value ?? {})) {
-          if (+key * 0 === 0) {
+          if (key.startsWith('@@')) {
+            if (value) args.push(key.slice(2))
+          } else if (key.startsWith('@')) {
+            const [_key] = key.slice(1).split('=', 1)
+            setOption(_key, key.slice(2 + _key.length))
+          } else if (+key * 0 === 0) {
             args[+key] = value
           } else {
-            options[key] = value
+            setOption(key, value)
           }
         }
         const toArg = (value: any) => {
@@ -275,9 +287,9 @@ export async function adaptSession<C extends Context>(bot: LarkBot<C>, body: Eve
         }
         for (const [key, value] of Object.entries(options)) {
           if (value === true) {
-            content += ` --${key}`
+            content += ` --${key} 1`
           } else if (value === false) {
-            content += ` --no-${key}`
+            content += ` --${key} 0`
           } else {
             content += ` --${key} ${toArg(value)}`
           }