alemonjs 2.1.57 → 2.1.58

package/lib/app/hook-use/client.js

@@ -7,7 +7,6 @@ import 'path';
 import 'yaml';
 import '../../cbp/processor/config.js';
 import { sendAPI } from '../../cbp/processor/api.js';
-import '../message-format-old.js';
 import { getCurrentEvent } from '../hook-event-context.js';
 
 const createDeepProxy = (event, path = []) => {

package/lib/app/hook-use/me.js

@@ -7,7 +7,6 @@ import 'path';
 import 'yaml';
 import '../../cbp/processor/config.js';
 import 'flatted';
-import '../message-format-old.js';
 import '../hook-event-context.js';
 
 const useMe = () => {

package/lib/app/hook-use/request.js

@@ -7,7 +7,6 @@ import 'path';
 import 'yaml';
 import '../../cbp/processor/config.js';
 import 'flatted';
-import '../message-format-old.js';
 import '../hook-event-context.js';
 
 const useRequest = () => {

package/lib/app/hook-use/user.js

@@ -7,7 +7,6 @@ import 'path';
 import 'yaml';
 import '../../cbp/processor/config.js';
 import 'flatted';
-import '../message-format-old.js';
 import '../hook-event-context.js';
 
 const useUser = () => {

package/lib/app/index.js

@@ -38,5 +38,4 @@ export { getCurrentEvent, getCurrentNext, withEventContext } from './hook-event-
 export { registerAppDir, scheduleCancel, scheduleCancelAll, scheduleCancelByApp, scheduleCron, scheduleInterval, scheduleList, schedulePause, scheduleResume, scheduleTimeout, unregisterAppDir } from './schedule-store.js';
 export { createEventValue, createSelects, onSelects, onState, unChildren, unState, useState } from './event-utils.js';
 export { MessageDirect, createDataFormat, format, getMessageIntent, sendToChannel, sendToUser } from './message-api.js';
-export { Format, FormatButtonGroup, FormatMarkDown } from './message-format.js';
-export { Attachment, Audio, BT, Button, Image, ImageFile, ImageURL, Link, MD, Markdown, MarkdownOriginal, Mention, Text, Video } from './message-format-old.js';
+export { Format, FormatButtonGroup, FormatMarkDown, FormatModal, FormatSelect } from './message-format.js';

package/lib/app/message-format-old.d.ts

@@ -1,4 +1,5 @@
 import { DataMention, DataImage, DataText, DataImageURL, DataImageFile, DataButtonRow, DataButtonGroup, DataButton, DataMarkDown, DataMarkdownTitle, DataMarkdownSubtitle, DataMarkdownBold, DataMarkdownItalic, DataMarkdownItalicStar, DataMarkdownStrikethrough, DataMarkdownLink, DataMarkdownImage, DataMarkdownList, DataMarkdownListItem, DataMarkdownBlockquote, DataMarkdownDivider, DataMarkdownNewline, DataLink, DataMarkdownText, DataMarkdownCode, DataMarkdownOriginal, DataAttachment, DataAudio, DataVideo, DataMarkdownMention, DataMarkdownContent, DataMarkdownButton } from '../types';
+import { Format, FormatMarkDown, FormatButtonGroup } from './message-format.js';
 export declare const Text: (val: DataText["value"], options?: DataText["options"]) => DataText;
 export declare const Link: (val: DataLink["value"], options?: DataText["options"]) => DataText;
 export declare const ImageURL: (val: DataImageURL["value"]) => DataImageURL;
@@ -73,3 +74,4 @@ export declare const MarkdownOriginal: (val: string) => DataMarkdownOriginal;
 export declare const Attachment: (val: string, options?: DataAttachment["options"]) => DataAttachment;
 export declare const Audio: (val: string) => DataAudio;
 export declare const Video: (val: string) => DataVideo;
+export { Format, FormatMarkDown, FormatButtonGroup };

package/lib/app/message-format-old.js

@@ -1,61 +1,32 @@
+import { Format } from './message-format.js';
+export { FormatButtonGroup, FormatMarkDown } from './message-format.js';
+
 const Text = (val, options) => {
-    return {
-        type: 'Text',
-        value: val,
-        options
-    };
+    return Format.create().addText(val, options).value[0];
 };
 const Link = (val, options) => {
-    return {
-        type: 'Text',
-        value: val,
-        options
-    };
+    return Format.create().addLink(val, options).value[0];
 };
 const ImageURL = (val) => {
-    return {
-        type: 'ImageURL',
-        value: val
-    };
+    return Format.create().addImageURL(val).value[0];
 };
 const ImageFile = (val) => {
-    return {
-        type: 'ImageFile',
-        value: val
-    };
+    return Format.create().addImageFile(val).value[0];
 };
 const Image = (val) => {
-    return {
-        type: 'Image',
-        value: typeof val === 'string' ? val : `base64://${val.toString('base64')}`
-    };
+    return Format.create().addImage(val).value[0];
 };
 Image.url = ImageURL;
 Image.file = ImageFile;
 const Mention = (UserId, options) => {
-    return {
-        type: 'Mention',
-        value: UserId,
-        options: options ?? {
-            belong: 'user'
-        }
-    };
+    return Format.create().addMention(UserId, options).value[0];
 };
 const Button = (title, data, options) => {
-    return {
-        type: 'Button',
-        value: title,
-        options: {
-            data,
-            ...options
-        }
-    };
+    const group = Format.createButtonGroup().addButton(title, data, options).value;
+    return group.value[0].value[0];
 };
 const ButtonGroup = (...rows) => {
-    return {
-        type: 'BT.group',
-        value: rows
-    };
+    return Format.create().addButtonGroup(...rows).value[0];
 };
 const ButtonRow = (...buttons) => {
     return {
@@ -67,93 +38,46 @@ Button.group = ButtonGroup;
 Button.row = ButtonRow;
 const BT = Button;
 const Markdown = (...values) => {
-    return {
-        type: 'Markdown',
-        value: values
-    };
+    return Format.create().addMarkdown(...values).value[0];
 };
 Markdown.text = (text) => {
-    return {
-        type: 'MD.text',
-        value: text
-    };
+    return Format.createMarkdown().addText(text).value.value[0];
 };
 Markdown.mention = (uid, options) => {
-    return {
-        type: 'MD.mention',
-        value: uid || 'everyone',
-        options: options ?? {
-            belong: 'user'
-        }
-    };
+    return Format.createMarkdown().addMention(uid, options).value.value[0];
 };
 Markdown.button = (title, data) => {
-    return {
-        type: 'MD.button',
-        value: title,
-        options: data
-    };
+    return Format.createMarkdown().addButton(title, data).value.value[0];
 };
 Markdown.content = (text) => {
-    return {
-        type: 'MD.content',
-        value: text
-    };
+    return Format.createMarkdown().addContent(text).value.value[0];
 };
 Markdown.title = (text) => {
-    return {
-        type: 'MD.title',
-        value: text
-    };
+    return Format.createMarkdown().addTitle(text).value.value[0];
 };
 Markdown.subtitle = (text) => {
-    return {
-        type: 'MD.subtitle',
-        value: text
-    };
+    return Format.createMarkdown().addSubtitle(text).value.value[0];
 };
 Markdown.bold = (text) => {
-    return {
-        type: 'MD.bold',
-        value: text
-    };
+    return Format.createMarkdown().addBold(text).value.value[0];
 };
 Markdown.italic = (text) => {
-    return {
-        type: 'MD.italic',
-        value: text
-    };
+    return Format.createMarkdown().addItalic(text).value.value[0];
 };
 Markdown.italicStar = (text) => {
-    return {
-        type: 'MD.italicStar',
-        value: text
-    };
+    return Format.createMarkdown().addItalicStar(text).value.value[0];
 };
 Markdown.strikethrough = (text) => {
-    return {
-        type: 'MD.strikethrough',
-        value: text
-    };
+    return Format.createMarkdown().addStrikethrough(text).value.value[0];
 };
 Markdown.link = (text, url) => {
-    return {
-        type: 'MD.link',
-        value: { text, url }
-    };
+    return Format.createMarkdown().addLink(text, url).value.value[0];
 };
 Markdown.image = (url, options) => {
-    return {
-        type: 'MD.image',
-        value: url,
-        options
-    };
+    return Format.createMarkdown().addImage(url, options).value.value[0];
 };
 Markdown.list = (...items) => {
-    return {
-        type: 'MD.list',
-        value: items
-    };
+    return Format.createMarkdown().addList(...items).value.value[0];
 };
 Markdown.listItem = (indexOrText, text) => {
     return {
@@ -162,54 +86,29 @@ Markdown.listItem = (indexOrText, text) => {
     };
 };
 Markdown.blockquote = (text) => {
-    return {
-        type: 'MD.blockquote',
-        value: text
-    };
+    return Format.createMarkdown().addBlockquote(text).value.value[0];
 };
 Markdown.divider = () => {
-    return {
-        type: 'MD.divider'
-    };
+    return Format.createMarkdown().addDivider().value.value[0];
 };
 Markdown.newline = (value = false) => {
-    return {
-        type: 'MD.newline',
-        value: value
-    };
+    return Format.createMarkdown().addNewline(value).value.value[0];
 };
 Markdown.code = (value, options) => {
-    return {
-        type: 'MD.code',
-        value: value,
-        options: options
-    };
+    return Format.createMarkdown().addCode(value, options).value.value[0];
 };
 const MD = Markdown;
 const MarkdownOriginal = (val) => {
-    return {
-        type: 'MarkdownOriginal',
-        value: val
-    };
+    return Format.create().addMarkdownOriginal(val).value[0];
 };
 const Attachment = (val, options) => {
-    return {
-        type: 'Attachment',
-        value: val,
-        options
-    };
+    return Format.create().addAttachment(val, options).value[0];
 };
 const Audio = (val) => {
-    return {
-        type: 'Audio',
-        value: val
-    };
+    return Format.create().addAudio(val).value[0];
 };
 const Video = (val) => {
-    return {
-        type: 'Video',
-        value: val
-    };
+    return Format.create().addVideo(val).value[0];
 };
 
-export { Attachment, Audio, BT, Button, Image, ImageFile, ImageURL, Link, MD, Markdown, MarkdownOriginal, Mention, Text, Video };
+export { Attachment, Audio, BT, Button, Format, Image, ImageFile, ImageURL, Link, MD, Markdown, MarkdownOriginal, Mention, Text, Video };

package/lib/app/message-format.d.ts

@@ -1,36 +1,56 @@
-import { DataButtonGroup, DataMarkDown, DataEnums } from '../types';
-import { Text, Image, Link, ImageFile, ImageURL, Mention, BT, MD, MarkdownOriginal, Attachment, Audio, Video } from './message-format-old.js';
-export * from './message-format-old.js';
+import { DataMention, DataText, DataImageURL, DataImageFile, DataButtonRow, DataButtonGroup, DataButton, DataMarkDown, DataLink, DataMarkdownCode, DataAttachment, DataMarkdownMention, DataMarkdownButton, DataEnums, DataSelect, DataSelectOption, DataModal, DataTextInput, DataEmbed } from '../types';
 export declare class FormatButtonGroup {
     #private;
     get value(): DataButtonGroup;
     absorb(group: FormatButtonGroup): this;
     addRow(): this;
-    addButton(...args: Parameters<typeof BT>): this;
+    addButton(title: string, data: DataButton['options']['data'], options?: Omit<DataButton['options'], 'data'>): this;
     clear(): this;
 }
 export declare class FormatMarkDown {
     #private;
     get value(): DataMarkDown;
     absorb(md: FormatMarkDown): this;
-    addContent(...args: Parameters<typeof MD.content>): this;
-    addText(...args: Parameters<typeof MD.text>): this;
-    addTitle(...args: Parameters<typeof MD.title>): this;
-    addSubtitle(...args: Parameters<typeof MD.subtitle>): this;
-    addBold(...args: Parameters<typeof MD.bold>): this;
-    addItalic(...args: Parameters<typeof MD.italic>): this;
-    addItalicStar(...args: Parameters<typeof MD.italicStar>): this;
-    addStrikethrough(...args: Parameters<typeof MD.strikethrough>): this;
-    addLink(...args: Parameters<typeof MD.link>): this;
-    addImage(...args: Parameters<typeof MD.image>): this;
-    addList(...args: Parameters<typeof MD.list>): this;
-    addBlockquote(...args: Parameters<typeof MD.blockquote>): this;
+    addContent(text: string): this;
+    addText(text: string): this;
+    addTitle(text: string): this;
+    addSubtitle(text: string): this;
+    addBold(text: string): this;
+    addItalic(text: string): this;
+    addItalicStar(text: string): this;
+    addStrikethrough(text: string): this;
+    addLink(text: string, url?: string): this;
+    addImage(url: string, options?: {
+        width?: number;
+        height?: number;
+    }): this;
+    addList(...items: any[]): this;
+    addBlockquote(text: string): this;
     addDivider(): this;
-    addNewline(...args: Parameters<typeof MD.newline>): this;
-    addCode(...args: Parameters<typeof MD.code>): this;
+    addNewline(value?: boolean): this;
+    addCode(value: DataMarkdownCode['value'], options?: DataMarkdownCode['options']): this;
     addBreak(): this;
-    addMention(...args: Parameters<typeof MD.mention>): this;
-    addButton(...args: Parameters<typeof MD.button>): this;
+    addMention(uid?: string, options?: DataMarkdownMention['options']): this;
+    addButton(title: string, data: DataMarkdownButton['options']): this;
+    clear(): this;
+}
+export declare class FormatSelect {
+    #private;
+    get value(): DataSelect;
+    setCustomId(customId: string): this;
+    setPlaceholder(placeholder: string): this;
+    setRange(min?: number, max?: number): this;
+    setKind(kind: DataSelect['options']['kind']): this;
+    setDisabled(disabled?: boolean): this;
+    addOption(label: string, value: string, extra?: Omit<DataSelectOption, 'label' | 'value'>): this;
+    clear(): this;
+}
+export declare class FormatModal {
+    #private;
+    get value(): DataModal;
+    setCustomId(customId: string): this;
+    setTitle(title: string): this;
+    addInput(label: string, options: DataTextInput['options']): this;
     clear(): this;
 }
 export declare class Format {
@@ -38,21 +58,28 @@ export declare class Format {
     static create(): Format;
     static createMarkdown(): FormatMarkDown;
     static createButtonGroup(): FormatButtonGroup;
+    static createSelect(): FormatSelect;
+    static createModal(): FormatModal;
     get value(): DataEnums[];
     absorb(format: Format): this;
-    addText(...args: Parameters<typeof Text>): this;
-    addImage(...args: Parameters<typeof Image>): this;
-    addMention(...args: Parameters<typeof Mention>): this;
+    addText(val: DataText['value'], options?: DataText['options']): this;
+    addImage(val: Buffer | string): this;
+    addMention(UserId?: DataMention['value'], options?: DataMention['options']): this;
     addButtonGroup(bt: FormatButtonGroup): this;
-    addButtonGroup(...args: Parameters<typeof BT.group>): this;
+    addButtonGroup(...rows: DataButtonRow[]): this;
     addMarkdown(md: FormatMarkDown): this;
-    addMarkdown(...args: Parameters<typeof MD>): this;
-    addMarkdownOriginal(...args: Parameters<typeof MarkdownOriginal>): this;
-    addAttachment(...args: Parameters<typeof Attachment>): this;
-    addAudio(...args: Parameters<typeof Audio>): this;
-    addVideo(...args: Parameters<typeof Video>): this;
-    addLink(...args: Parameters<typeof Link>): this;
-    addImageFile(...args: Parameters<typeof ImageFile>): this;
-    addImageURL(...args: Parameters<typeof ImageURL>): this;
+    addMarkdown(...values: DataMarkDown['value']): this;
+    addMarkdownOriginal(val: string): this;
+    addAttachment(val: string, options?: DataAttachment['options']): this;
+    addAudio(val: string): this;
+    addVideo(val: string): this;
+    addLink(val: DataLink['value'], options?: DataText['options']): this;
+    addImageFile(val: DataImageFile['value']): this;
+    addImageURL(val: DataImageURL['value']): this;
+    addSelect(select: FormatSelect): this;
+    addSelect(options: DataSelectOption[], meta?: DataSelect['options']): this;
+    addModal(modal: FormatModal): this;
+    addModal(inputs: DataTextInput[], meta: DataModal['options']): this;
+    addEmbed(embed: DataEmbed['value']): this;
     clear(): this;
 }

package/lib/app/message-format.js

@@ -1,16 +1,19 @@
-import { Text, Image, Mention, BT, MD, MarkdownOriginal, Attachment, Audio, Video, Link, ImageFile, ImageURL } from './message-format-old.js';
-export { Button, Markdown } from './message-format-old.js';
-
 class FormatButtonGroup {
     #rows = [];
     #currentRow = null;
     get value() {
         this.#flush();
-        return BT.group(...this.#rows);
+        return {
+            type: 'BT.group',
+            value: this.#rows
+        };
     }
     #flush() {
         if (this.#currentRow && this.#currentRow.length > 0) {
-            this.#rows.push(BT.row(...this.#currentRow));
+            this.#rows.push({
+                type: 'BT.row',
+                value: this.#currentRow
+            });
             this.#currentRow = null;
         }
     }
@@ -26,11 +29,18 @@ class FormatButtonGroup {
         this.#currentRow = [];
         return this;
     }
-    addButton(...args) {
+    addButton(title, data, options) {
         if (!this.#currentRow) {
             this.#currentRow = [];
         }
-        this.#currentRow.push(BT(...args));
+        this.#currentRow.push({
+            type: 'Button',
+            value: title,
+            options: {
+                data,
+                ...options
+            }
+        });
         return this;
     }
     clear() {
@@ -42,82 +52,138 @@ class FormatButtonGroup {
 class FormatMarkDown {
     #data = [];
     get value() {
-        return MD(...this.#data);
+        return {
+            type: 'Markdown',
+            value: this.#data
+        };
     }
     absorb(md) {
         this.#data.push(...md.value.value);
         return this;
     }
-    addContent(...args) {
-        this.#data.push(MD.content(...args));
+    addContent(text) {
+        this.#data.push({
+            type: 'MD.content',
+            value: text
+        });
         return this;
     }
-    addText(...args) {
-        this.#data.push(MD.text(...args));
+    addText(text) {
+        this.#data.push({
+            type: 'MD.text',
+            value: text
+        });
         return this;
     }
-    addTitle(...args) {
-        this.#data.push(MD.title(...args));
+    addTitle(text) {
+        this.#data.push({
+            type: 'MD.title',
+            value: text
+        });
         return this;
     }
-    addSubtitle(...args) {
-        this.#data.push(MD.subtitle(...args));
+    addSubtitle(text) {
+        this.#data.push({
+            type: 'MD.subtitle',
+            value: text
+        });
         return this;
     }
-    addBold(...args) {
-        this.#data.push(MD.bold(...args));
+    addBold(text) {
+        this.#data.push({
+            type: 'MD.bold',
+            value: text
+        });
         return this;
     }
-    addItalic(...args) {
-        this.#data.push(MD.italic(...args));
+    addItalic(text) {
+        this.#data.push({
+            type: 'MD.italic',
+            value: text
+        });
         return this;
     }
-    addItalicStar(...args) {
-        this.#data.push(MD.italicStar(...args));
+    addItalicStar(text) {
+        this.#data.push({
+            type: 'MD.italicStar',
+            value: text
+        });
         return this;
     }
-    addStrikethrough(...args) {
-        this.#data.push(MD.strikethrough(...args));
+    addStrikethrough(text) {
+        this.#data.push({
+            type: 'MD.strikethrough',
+            value: text
+        });
         return this;
     }
-    addLink(...args) {
-        this.#data.push(MD.link(...args));
+    addLink(text, url) {
+        this.#data.push({
+            type: 'MD.link',
+            value: { text, url }
+        });
         return this;
     }
-    addImage(...args) {
-        this.#data.push(MD.image(...args));
+    addImage(url, options) {
+        this.#data.push({
+            type: 'MD.image',
+            value: url,
+            options
+        });
         return this;
     }
-    addList(...args) {
-        this.#data.push(MD.list(...args));
+    addList(...items) {
+        this.#data.push({
+            type: 'MD.list',
+            value: items
+        });
         return this;
     }
-    addBlockquote(...args) {
-        this.#data.push(MD.blockquote(...args));
+    addBlockquote(text) {
+        this.#data.push({
+            type: 'MD.blockquote',
+            value: text
+        });
         return this;
     }
     addDivider() {
-        this.#data.push(MD.divider());
+        this.#data.push({
+            type: 'MD.divider'
+        });
         return this;
     }
-    addNewline(...args) {
-        this.#data.push(MD.newline(...args));
+    addNewline(value = false) {
+        this.#data.push({
+            type: 'MD.newline',
+            value
+        });
         return this;
     }
-    addCode(...args) {
-        this.#data.push(MD.code(...args));
+    addCode(value, options) {
+        this.#data.push({
+            type: 'MD.code',
+            value,
+            options
+        });
         return this;
     }
     addBreak() {
-        this.#data.push(MD.newline());
-        return this;
+        return this.addNewline();
     }
-    addMention(...args) {
-        this.#data.push(MD.mention(...args));
+    addMention(uid, options) {
+        this.#data.push({
+            type: 'MD.mention',
+            value: uid || 'everyone',
+            options: options ?? { belong: 'user' }
+        });
         return this;
     }
-    addButton(...args) {
-        this.#data.push(MD.button(...args));
+    addButton(title, data) {
+        this.#data.push({
+            type: 'MD.button',
+            value: title,
+            options: data
+        });
         return this;
     }
     clear() {
@@ -125,6 +191,83 @@ class FormatMarkDown {
         return this;
     }
 }
+class FormatSelect {
+    #options = [];
+    #meta = {};
+    get value() {
+        return {
+            type: 'Select',
+            value: this.#options,
+            options: this.#meta
+        };
+    }
+    setCustomId(customId) {
+        this.#meta.customId = customId;
+        return this;
+    }
+    setPlaceholder(placeholder) {
+        this.#meta.placeholder = placeholder;
+        return this;
+    }
+    setRange(min, max) {
+        if (min !== undefined) {
+            this.#meta.minValues = min;
+        }
+        if (max !== undefined) {
+            this.#meta.maxValues = max;
+        }
+        return this;
+    }
+    setKind(kind) {
+        this.#meta.kind = kind;
+        return this;
+    }
+    setDisabled(disabled = true) {
+        this.#meta.disabled = disabled;
+        return this;
+    }
+    addOption(label, value, extra) {
+        this.#options.push({ label, value, ...extra });
+        return this;
+    }
+    clear() {
+        this.#options = [];
+        this.#meta = {};
+        return this;
+    }
+}
+class FormatModal {
+    #inputs = [];
+    #meta = { customId: '', title: '' };
+    get value() {
+        return {
+            type: 'Modal',
+            value: this.#inputs,
+            options: this.#meta
+        };
+    }
+    setCustomId(customId) {
+        this.#meta.customId = customId;
+        return this;
+    }
+    setTitle(title) {
+        this.#meta.title = title;
+        return this;
+    }
+    addInput(label, options) {
+        this.#inputs.push({
+            type: 'TextInput',
+            value: label,
+            options
+        });
+        return this;
+    }
+    clear() {
+        this.#inputs = [];
+        this.#meta = { customId: '', title: '' };
+        return this;
+    }
+}
 class Format {
     #data = [];
     static create() {
@@ -136,6 +279,12 @@ class Format {
     static createButtonGroup() {
         return new FormatButtonGroup();
     }
+    static createSelect() {
+        return new FormatSelect();
+    }
+    static createModal() {
+        return new FormatModal();
+    }
     get value() {
         return this.#data;
     }
@@ -143,16 +292,27 @@ class Format {
         this.#data.push(...format.value);
         return this;
     }
-    addText(...args) {
-        this.#data.push(Text(...args));
+    addText(val, options) {
+        this.#data.push({
+            type: 'Text',
+            value: val,
+            options
+        });
         return this;
     }
-    addImage(...args) {
-        this.#data.push(Image(...args));
+    addImage(val) {
+        this.#data.push({
+            type: 'Image',
+            value: typeof val === 'string' ? val : `base64://${val.toString('base64')}`
+        });
         return this;
     }
-    addMention(...args) {
-        this.#data.push(Mention(...args));
+    addMention(UserId, options) {
+        this.#data.push({
+            type: 'Mention',
+            value: UserId,
+            options: options ?? { belong: 'user' }
+        });
         return this;
     }
     addButtonGroup(...args) {
@@ -160,7 +320,10 @@ class Format {
             this.#data.push(args[0].value);
         }
         else {
-            this.#data.push(BT.group(...args));
+            this.#data.push({
+                type: 'BT.group',
+                value: args
+            });
         }
         return this;
     }
@@ -169,36 +332,95 @@ class Format {
             this.#data.push(args[0].value);
         }
         else {
-            this.#data.push(MD(...args));
+            this.#data.push({
+                type: 'Markdown',
+                value: args
+            });
         }
         return this;
     }
-    addMarkdownOriginal(...args) {
-        this.#data.push(MarkdownOriginal(...args));
+    addMarkdownOriginal(val) {
+        this.#data.push({
+            type: 'MarkdownOriginal',
+            value: val
+        });
+        return this;
+    }
+    addAttachment(val, options) {
+        this.#data.push({
+            type: 'Attachment',
+            value: val,
+            options
+        });
         return this;
     }
-    addAttachment(...args) {
-        this.#data.push(Attachment(...args));
+    addAudio(val) {
+        this.#data.push({
+            type: 'Audio',
+            value: val
+        });
         return this;
     }
-    addAudio(...args) {
-        this.#data.push(Audio(...args));
+    addVideo(val) {
+        this.#data.push({
+            type: 'Video',
+            value: val
+        });
         return this;
     }
-    addVideo(...args) {
-        this.#data.push(Video(...args));
+    addLink(val, options) {
+        this.#data.push({
+            type: 'Text',
+            value: val,
+            options
+        });
         return this;
     }
-    addLink(...args) {
-        this.#data.push(Link(...args));
+    addImageFile(val) {
+        this.#data.push({
+            type: 'ImageFile',
+            value: val
+        });
         return this;
     }
-    addImageFile(...args) {
-        this.#data.push(ImageFile(...args));
+    addImageURL(val) {
+        this.#data.push({
+            type: 'ImageURL',
+            value: val
+        });
+        return this;
+    }
+    addSelect(...args) {
+        if (args[0] instanceof FormatSelect) {
+            this.#data.push(args[0].value);
+        }
+        else {
+            this.#data.push({
+                type: 'Select',
+                value: args[0],
+                options: (args[1] ?? {})
+            });
+        }
+        return this;
+    }
+    addModal(...args) {
+        if (args[0] instanceof FormatModal) {
+            this.#data.push(args[0].value);
+        }
+        else {
+            this.#data.push({
+                type: 'Modal',
+                value: args[0],
+                options: args[1]
+            });
+        }
         return this;
     }
-    addImageURL(...args) {
-        this.#data.push(ImageURL(...args));
+    addEmbed(embed) {
+        this.#data.push({
+            type: 'Embed',
+            value: embed
+        });
         return this;
     }
     clear() {
@@ -207,4 +429,4 @@ class Format {
     }
 }
 
-export { Attachment, Audio, BT, Format, FormatButtonGroup, FormatMarkDown, Image, ImageFile, ImageURL, Link, MD, MarkdownOriginal, Mention, Text, Video };
+export { Format, FormatButtonGroup, FormatMarkDown, FormatModal, FormatSelect };

package/lib/cbp/connects/client.js

@@ -16,7 +16,6 @@ import { createResult } from '../../core/utils.js';
 import '../../app/hook-event-context.js';
 import { apiResolves, apiTimeouts, actionResolves, actionTimeouts, FULL_RECEIVE_HEADER } from '../processor/config.js';
 import { setDirectSend } from '../processor/transport.js';
-import '../../app/message-format-old.js';
 import 'cron';
 import '../../app/event-utils.js';
 import '../../app/message-api.js';

package/lib/client.js

@@ -27,7 +27,6 @@ import './app/event-middleware.js';
 import './app/event-processor.js';
 import './app/event-response.js';
 import './app/hook-event-context.js';
-import './app/message-format-old.js';
 import 'cron';
 import './app/event-utils.js';
 import './app/message-api.js';

package/lib/index.js

@@ -45,6 +45,5 @@ export { getCurrentEvent, getCurrentNext, withEventContext } from './app/hook-ev
 export { registerAppDir, scheduleCancel, scheduleCancelAll, scheduleCancelByApp, scheduleCron, scheduleInterval, scheduleList, schedulePause, scheduleResume, scheduleTimeout, unregisterAppDir } from './app/schedule-store.js';
 export { createEventValue, createSelects, onSelects, onState, unChildren, unState, useState } from './app/event-utils.js';
 export { MessageDirect, createDataFormat, format, getMessageIntent, sendToChannel, sendToUser } from './app/message-api.js';
-export { Format, FormatButtonGroup, FormatMarkDown } from './app/message-format.js';
+export { Format, FormatButtonGroup, FormatMarkDown, FormatModal, FormatSelect } from './app/message-format.js';
 export { start } from './main.js';
-export { Attachment, Audio, BT, Button, Image, ImageFile, ImageURL, Link, MD, Markdown, MarkdownOriginal, Mention, Text, Video } from './app/message-format-old.js';

package/lib/server/routers/router.js

@@ -5,9 +5,7 @@ import mime from 'mime-types';
 import hello from './hello.html.js';
 import { safePath, getModuelFile, formatPath, isValidPackageName } from './utils.js';
 import { collectMiddlewares, runMiddlewares } from './middleware.js';
-import { ResultCode } from '../../core/variable.js';
-import 'yaml';
-import '../../core/utils.js';
+import { ResultCode } from 'core';
 import module$1 from 'module';
 
 const initRequire = () => { };

package/lib/types/message/embed.d.ts

@@ -0,0 +1,29 @@
+export type DataEmbedField = {
+    name: string;
+    value: string;
+    inline?: boolean;
+};
+export type DataEmbedAuthor = {
+    name: string;
+    url?: string;
+    iconUrl?: string;
+};
+export type DataEmbedFooter = {
+    text: string;
+    iconUrl?: string;
+};
+export type DataEmbed = {
+    type: 'Embed';
+    value: {
+        title?: string;
+        description?: string;
+        url?: string;
+        color?: number;
+        image?: string;
+        thumbnail?: string;
+        author?: DataEmbedAuthor;
+        footer?: DataEmbedFooter;
+        fields?: DataEmbedField[];
+        timestamp?: string | number | Date;
+    };
+};

package/lib/types/message/embed.js

@@ -0,0 +1 @@
+

package/lib/types/message/index.d.ts

@@ -8,6 +8,9 @@ import { DataAttachment } from './attachment';
 import { DataAudio } from './audio';
 import { DataVideo } from './video';
 import { DataMarkdownOriginal } from './markdown-raw';
+import { DataSelect } from './select';
+import { DataModal, DataTextInput } from './modal';
+import { DataEmbed } from './embed';
 export * from './text';
 export * from './link';
 export * from './mention';
@@ -18,5 +21,8 @@ export * from './markdown-raw';
 export * from './attachment';
 export * from './audio';
 export * from './video';
-export type DataEnums = DataText | DataLink | DataImage | DataImageURL | DataImageFile | DataMention | DataButtonGroup | DataMarkDown | DataMarkdownOriginal | DataAttachment | DataAudio | DataVideo;
+export * from './select';
+export * from './modal';
+export * from './embed';
+export type DataEnums = DataText | DataLink | DataImage | DataImageURL | DataImageFile | DataMention | DataButtonGroup | DataMarkDown | DataMarkdownOriginal | DataAttachment | DataAudio | DataVideo | DataSelect | DataModal | DataTextInput | DataEmbed;
 export type MessageDataFormat = DataEnums[];

package/lib/types/message/modal.d.ts

@@ -0,0 +1,21 @@
+export type DataTextInput = {
+    type: 'TextInput';
+    value: string;
+    options: {
+        customId: string;
+        style?: 'short' | 'paragraph';
+        placeholder?: string;
+        minLength?: number;
+        maxLength?: number;
+        required?: boolean;
+        defaultValue?: string;
+    };
+};
+export type DataModal = {
+    type: 'Modal';
+    value: DataTextInput[];
+    options: {
+        customId: string;
+        title: string;
+    };
+};

package/lib/types/message/modal.js

@@ -0,0 +1 @@
+

package/lib/types/message/select.d.ts

@@ -0,0 +1,19 @@
+export type DataSelectOption = {
+    label: string;
+    value: string;
+    description?: string;
+    emoji?: string;
+    default?: boolean;
+};
+export type DataSelect = {
+    type: 'Select';
+    value: DataSelectOption[];
+    options?: {
+        customId?: string;
+        placeholder?: string;
+        minValues?: number;
+        maxValues?: number;
+        kind?: 'string' | 'user' | 'role' | 'channel' | 'mentionable';
+        disabled?: boolean;
+    };
+};

package/lib/types/message/select.js

@@ -0,0 +1 @@
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.1.57",
+  "version": "2.1.58",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",