alemonjs 2.1.19 → 2.1.21

package/lib/app/define-router.js

@@ -5,7 +5,6 @@ const lazy = (fnc) => {
             return c;
         }
         const mod = await fnc();
-        console.warn('Lazy load module:', mod);
         if (!mod || !mod.default) ;
         c = mod.default;
         return c;

package/lib/app/event-processor-cycleRoute.js

@@ -4,13 +4,13 @@ import 'path';
 import 'yaml';
 import { showErrorModule } from '../core/utils.js';
 
-function isPromise(value) {
-    return value !== null && (typeof value === 'object' || typeof value === 'function') && typeof value.then === 'function';
-}
 function isAsyncFunction(fn) {
     const AsyncFunction = (async () => { }).constructor;
     return fn instanceof AsyncFunction;
 }
+function isFunction(value) {
+    return isAsyncFunction(value) || typeof value === 'function' || value instanceof Function;
+}
 const createRouteProcessChildren = (valueEvent, select, nextCycle, callHandler) => {
     const processChildren = (nodes, middleware, next) => {
         if (!nodes || nodes.length === 0) {
@@ -67,7 +67,7 @@ const createRouteProcessChildren = (valueEvent, select, nextCycle, callHandler)
                 const currents = [];
                 for (const item of currentsAndMiddleware) {
                     const app = await item();
-                    if (isPromise(app) || isAsyncFunction(app)) {
+                    if (isFunction(app)) {
                         currents.push(app);
                         continue;
                     }

package/lib/app/hook-use-api.d.ts

@@ -17,7 +17,7 @@ export declare const useMention: <T extends EventKeys>(event: Events[T]) => [{
     }>;
 }];
 export declare const useMessage: <T extends EventKeys>(event: Events[T]) => readonly [{
-    "__#8@#format": DataEnums[];
+    "__#10@#format": DataEnums[];
     readonly currentFormat: DataEnums[];
     addText(val: string, options?: {
         style?: "none" | "bold" | "block" | "strikethrough" | "boldItalic" | "italic";

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

@@ -3,7 +3,8 @@ import { ChildrenApp } from './store.js';
 import { createResult } from '../core/utils.js';
 import { sendAction } from '../cbp/processor/actions.js';
 import { sendAPI } from '../cbp/processor/api.js';
-import { Text, Link, Image, ImageFile, ImageURL, Mention, BT, MD, Format } from './message-format.js';
+import { Format } from './message-format.js';
+import { Text, Link, Image, ImageFile, ImageURL, Mention, BT, MD } from './message-format-old.js';
 
 const useMention = (event) => {
     if (!event || typeof event !== 'object') {

package/lib/app/index.js

@@ -18,4 +18,5 @@ export { createSelects, onSelects, unChildren, useChannel, useClient, useMe, use
 export { onState, unState, useState } from './hook-use-state.js';
 export { useObserver, useSubscribe } from './hook-use-subscribe.js';
 export { createDataFormat, createEventValue, format, getMessageIntent, sendToChannel, sendToUser } from './message-api.js';
-export { Ark, BT, Format, Image, ImageFile, ImageURL, Link, MD, Mention, Text, createEvent } from './message-format.js';
+export { Format, createEvent } from './message-format.js';
+export { Ark, BT, Image, ImageFile, ImageURL, Link, MD, Mention, Text } from './message-format-old.js';

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

@@ -0,0 +1,50 @@
+import { DataMention, DataImage, DataText, DataImageURL, DataImageFile, ButtonRow, DataButtonGroup, DataButton, DataArkList, DataArkListTip, DataArkListContent, DataArkListItem, DataArkCard, DataArkBigCard, DataMarkdownTemplate, DataMarkDown, DataMarkdownTitle, DataMarkdownSubtitle, DataMarkdownBold, DataMarkdownItalic, DataMarkdownItalicStar, DataMarkdownStrikethrough, DataMarkdownLink, DataMarkdownImage, DataMarkdownList, DataMarkdownListItem, DataMarkdownBlockquote, DataMarkdownDivider, DataMarkdownNewline, DataLink, DataMarkdownText, DataButtonTemplate, DataMarkdownCode } from '../types';
+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;
+export declare const ImageFile: (val: DataImageFile["value"]) => DataImageFile;
+declare const Image: {
+    (val: Buffer): DataImage;
+    url: (val: DataImageURL["value"]) => DataImageURL;
+    file: (val: DataImageFile["value"]) => DataImageFile;
+};
+export { Image };
+export declare const Mention: (UserId?: DataMention["value"], options?: DataMention["options"]) => DataMention;
+declare const BT: {
+    (title: string, data: DataButton["options"]["data"], options?: Omit<DataButton["options"], "data">): DataButton;
+    group(...rows: ButtonRow[]): DataButtonGroup;
+    template(templateId: DataButtonTemplate["value"]): DataButtonTemplate;
+    row(...buttons: DataButton[]): ButtonRow;
+};
+export { BT };
+export declare const Ark: {
+    list: (values_0: DataArkListTip, values_1: DataArkListContent) => DataArkList;
+    listTip: (options: DataArkListTip["value"]) => DataArkListTip;
+    listContent: (...values: DataArkListContent["value"]) => DataArkListContent;
+    listItem: (value: DataArkListItem["value"]) => DataArkListItem;
+    Card: (value: DataArkCard["value"]) => DataArkCard;
+    BigCard: (value: DataArkBigCard["value"]) => DataArkBigCard;
+};
+declare const MD: {
+    (...values: DataMarkDown["value"]): DataMarkDown;
+    template(templateId: DataMarkdownTemplate["value"], params?: DataMarkdownTemplate["options"]["params"]): DataMarkdownTemplate;
+    text(text: string): DataMarkdownText;
+    title(text: string): DataMarkdownTitle;
+    subtitle(text: string): DataMarkdownSubtitle;
+    bold(text: string): DataMarkdownBold;
+    italic(text: string): DataMarkdownItalic;
+    italicStar(text: string): DataMarkdownItalicStar;
+    strikethrough(text: string): DataMarkdownStrikethrough;
+    link(text: string, url: string): DataMarkdownLink;
+    image(url: string, options?: {
+        width?: number;
+        height?: number;
+    }): DataMarkdownImage;
+    list(...items: any[]): DataMarkdownList;
+    listItem(indexOrText: number | string, text?: string): DataMarkdownListItem;
+    blockquote(text: string): DataMarkdownBlockquote;
+    divider(): DataMarkdownDivider;
+    newline(value?: boolean): DataMarkdownNewline;
+    code(value: DataMarkdownCode["value"], options?: DataMarkdownCode["options"]): DataMarkdownCode;
+};
+export { MD };

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

@@ -0,0 +1,217 @@
+const Text = (val, options) => {
+    return {
+        type: 'Text',
+        value: val,
+        options
+    };
+};
+const Link = (val, options) => {
+    return {
+        type: 'Text',
+        value: val,
+        options
+    };
+};
+const ImageURL = (val) => {
+    return {
+        type: 'ImageURL',
+        value: val
+    };
+};
+const ImageFile = (val) => {
+    return {
+        type: 'ImageFile',
+        value: val
+    };
+};
+const Image = (val) => {
+    return {
+        type: 'Image',
+        value: val.toString('base64')
+    };
+};
+Image.url = ImageURL;
+Image.file = ImageFile;
+const Mention = (UserId, options) => {
+    return {
+        type: 'Mention',
+        value: UserId,
+        options: options ?? {
+            belong: 'user'
+        }
+    };
+};
+const BT = (title, data, options) => {
+    return {
+        type: 'Button',
+        value: title,
+        options: {
+            data,
+            ...options
+        }
+    };
+};
+BT.group = function Group(...rows) {
+    return {
+        type: 'BT.group',
+        value: rows
+    };
+};
+BT.template = function Template(templateId) {
+    return {
+        type: 'ButtonTemplate',
+        value: templateId
+    };
+};
+BT.row = function Row(...buttons) {
+    return {
+        type: 'BT.row',
+        value: buttons
+    };
+};
+const Ark = {
+    list: (...values) => {
+        return {
+            type: 'Ark.list',
+            value: values
+        };
+    },
+    listTip: (options) => {
+        return {
+            type: 'Ark.listTip',
+            value: options
+        };
+    },
+    listContent: (...values) => {
+        return {
+            type: 'Ark.listContent',
+            value: values
+        };
+    },
+    listItem: (value) => {
+        return {
+            type: 'Ark.listItem',
+            value: value
+        };
+    },
+    Card: (value) => {
+        return {
+            type: 'Ark.Card',
+            value: value
+        };
+    },
+    BigCard: (value) => {
+        return {
+            type: 'Ark.BigCard',
+            value
+        };
+    }
+};
+const MD = (...values) => {
+    return {
+        type: 'Markdown',
+        value: values
+    };
+};
+MD.template = (templateId, params) => {
+    return {
+        type: 'MarkdownTemplate',
+        value: templateId,
+        options: {
+            params
+        }
+    };
+};
+MD.text = (text) => {
+    return {
+        type: 'MD.text',
+        value: text
+    };
+};
+MD.title = (text) => {
+    return {
+        type: 'MD.title',
+        value: text
+    };
+};
+MD.subtitle = (text) => {
+    return {
+        type: 'MD.subtitle',
+        value: text
+    };
+};
+MD.bold = (text) => {
+    return {
+        type: 'MD.bold',
+        value: text
+    };
+};
+MD.italic = (text) => {
+    return {
+        type: 'MD.italic',
+        value: text
+    };
+};
+MD.italicStar = (text) => {
+    return {
+        type: 'MD.italicStar',
+        value: text
+    };
+};
+MD.strikethrough = (text) => {
+    return {
+        type: 'MD.strikethrough',
+        value: text
+    };
+};
+MD.link = (text, url) => {
+    return {
+        type: 'MD.link',
+        value: { text, url }
+    };
+};
+MD.image = (url, options) => {
+    return {
+        type: 'MD.image',
+        value: url,
+        options
+    };
+};
+MD.list = (...items) => {
+    return {
+        type: 'MD.list',
+        value: items
+    };
+};
+MD.listItem = (indexOrText, text) => {
+    return {
+        type: 'MD.listItem',
+        value: typeof indexOrText === 'number' ? { index: indexOrText, text } : indexOrText
+    };
+};
+MD.blockquote = (text) => {
+    return {
+        type: 'MD.blockquote',
+        value: text
+    };
+};
+MD.divider = () => {
+    return {
+        type: 'MD.divider'
+    };
+};
+MD.newline = (value = false) => {
+    return {
+        type: 'MD.newline',
+        value: value
+    };
+};
+MD.code = (value, options) => {
+    return {
+        type: 'MD.code',
+        value: value,
+        options: options
+    };
+};
+
+export { Ark, BT, Image, ImageFile, ImageURL, Link, MD, Mention, Text };

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

@@ -1,56 +1,38 @@
-import { DataMention, DataImage, DataText, DataImageURL, DataImageFile, ButtonRow, DataButtonGroup, DataButton, DataArkList, DataArkListTip, DataArkListContent, DataArkListItem, DataArkCard, DataArkBigCard, DataMarkdownTemplate, DataMarkDown, DataMarkdownTitle, DataMarkdownSubtitle, DataMarkdownBold, DataMarkdownItalic, DataMarkdownItalicStar, DataMarkdownStrikethrough, DataMarkdownLink, DataMarkdownImage, DataMarkdownList, DataMarkdownListItem, DataMarkdownBlockquote, DataMarkdownDivider, DataMarkdownNewline, DataLink, DataMarkdownText, DataButtonTemplate, DataMarkdownCode, DataEnums, EventKeys, Events } from '../types';
-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;
-export declare const ImageFile: (val: DataImageFile["value"]) => DataImageFile;
-declare const Image: {
-    (val: Buffer): DataImage;
-    url: (val: DataImageURL["value"]) => DataImageURL;
-    file: (val: DataImageFile["value"]) => DataImageFile;
-};
-export { Image };
-export declare const Mention: (UserId?: DataMention["value"], options?: DataMention["options"]) => DataMention;
-declare const BT: {
-    (title: string, data: DataButton["options"]["data"], options?: Omit<DataButton["options"], "data">): DataButton;
-    group(...rows: ButtonRow[]): DataButtonGroup;
-    template(templateId: DataButtonTemplate["value"]): DataButtonTemplate;
-    row(...buttons: DataButton[]): ButtonRow;
-};
-export { BT };
-export declare const Ark: {
-    list: (values_0: DataArkListTip, values_1: DataArkListContent) => DataArkList;
-    listTip: (options: DataArkListTip["value"]) => DataArkListTip;
-    listContent: (...values: DataArkListContent["value"]) => DataArkListContent;
-    listItem: (value: DataArkListItem["value"]) => DataArkListItem;
-    Card: (value: DataArkCard["value"]) => DataArkCard;
-    BigCard: (value: DataArkBigCard["value"]) => DataArkBigCard;
-};
-declare const MD: {
-    (...values: DataMarkDown["value"]): DataMarkDown;
-    template(templateId: DataMarkdownTemplate["value"], params?: DataMarkdownTemplate["options"]["params"]): DataMarkdownTemplate;
-    text(text: string): DataMarkdownText;
-    title(text: string): DataMarkdownTitle;
-    subtitle(text: string): DataMarkdownSubtitle;
-    bold(text: string): DataMarkdownBold;
-    italic(text: string): DataMarkdownItalic;
-    italicStar(text: string): DataMarkdownItalicStar;
-    strikethrough(text: string): DataMarkdownStrikethrough;
-    link(text: string, url: string): DataMarkdownLink;
-    image(url: string, options?: {
-        width?: number;
-        height?: number;
-    }): DataMarkdownImage;
-    list(...items: any[]): DataMarkdownList;
-    listItem(indexOrText: number | string, text?: string): DataMarkdownListItem;
-    blockquote(text: string): DataMarkdownBlockquote;
-    divider(): DataMarkdownDivider;
-    newline(value?: boolean): DataMarkdownNewline;
-    code(value: DataMarkdownCode["value"], options?: DataMarkdownCode["options"]): DataMarkdownCode;
-};
-export { MD };
+import { DataButtonGroup, DataMarkDown, DataEnums, EventKeys, Events } from '../types';
+import { Text, Link, Image, ImageFile, ImageURL, Mention, BT, MD } from './message-format-old.js';
+export * from './message-format-old.js';
+declare class FormatButtonGroup {
+    #private;
+    get value(): DataButtonGroup;
+    addRow(): this;
+    addButton(...args: Parameters<typeof BT>): this;
+    clear(): this;
+}
+declare class FormatMarkDown {
+    #private;
+    get value(): DataMarkDown;
+    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;
+    addDivider(): this;
+    addNewline(...args: Parameters<typeof MD.newline>): this;
+    addCode(...args: Parameters<typeof MD.code>): this;
+    addBreak(): this;
+    clear(): this;
+}
 export declare class Format {
     #private;
     static create(): Format;
+    createMarkdown(): FormatMarkDown;
+    createButtonGroup(): FormatButtonGroup;
     get value(): DataEnums[];
     addText(...args: Parameters<typeof Text>): this;
     addTextBreak(): this;
@@ -59,10 +41,10 @@ export declare class Format {
     addImageFile(...args: Parameters<typeof ImageFile>): this;
     addImageURL(...args: Parameters<typeof ImageURL>): this;
     addMention(...args: Parameters<typeof Mention>): this;
+    addButtonGroup(bt: FormatButtonGroup): this;
     addButtonGroup(...args: Parameters<typeof BT.group>): this;
-    addButtonTemplate(...args: Parameters<typeof BT.template>): this;
+    addMarkdown(md: FormatMarkDown): this;
     addMarkdown(...args: Parameters<typeof MD>): this;
-    addMarkdownTemplate(...args: Parameters<typeof MD.template>): this;
     clear(): this;
 }
 export declare function createEvent<T extends EventKeys>(options: {
@@ -71,9 +53,9 @@ export declare function createEvent<T extends EventKeys>(options: {
     regular?: RegExp;
     prefix?: string;
     exact?: string;
-}): (Events[T] & {
+}): Events[T] & {
     selects: boolean;
     regular: boolean;
     prefix: boolean;
     exact: boolean;
-});
+};

package/lib/app/message-format.js

@@ -1,223 +1,118 @@
-const Text = (val, options) => {
-    return {
-        type: 'Text',
-        value: val,
-        options
-    };
-};
-const Link = (val, options) => {
-    return {
-        type: 'Text',
-        value: val,
-        options
-    };
-};
-const ImageURL = (val) => {
-    return {
-        type: 'ImageURL',
-        value: val
-    };
-};
-const ImageFile = (val) => {
-    return {
-        type: 'ImageFile',
-        value: val
-    };
-};
-const Image = (val) => {
-    return {
-        type: 'Image',
-        value: val.toString('base64')
-    };
-};
-Image.url = ImageURL;
-Image.file = ImageFile;
-const Mention = (UserId, options) => {
-    return {
-        type: 'Mention',
-        value: UserId,
-        options: options ?? {
-            belong: 'user'
-        }
-    };
-};
-const BT = (title, data, options) => {
-    return {
-        type: 'Button',
-        value: title,
-        options: {
-            data,
-            ...options
+import { Text, Link, Image, ImageFile, ImageURL, Mention, BT, MD } from './message-format-old.js';
+export { Ark } from './message-format-old.js';
+
+class FormatButtonGroup {
+    #rows = [];
+    #currentRow = null;
+    get value() {
+        this.#flush();
+        return BT.group(...this.#rows);
+    }
+    #flush() {
+        if (this.#currentRow && this.#currentRow.length > 0) {
+            this.#rows.push(BT.row(...this.#currentRow));
+            this.#currentRow = null;
         }
-    };
-};
-BT.group = function Group(...rows) {
-    return {
-        type: 'BT.group',
-        value: rows
-    };
-};
-BT.template = function Template(templateId) {
-    return {
-        type: 'ButtonTemplate',
-        value: templateId
-    };
-};
-BT.row = function Row(...buttons) {
-    return {
-        type: 'BT.row',
-        value: buttons
-    };
-};
-const Ark = {
-    list: (...values) => {
-        return {
-            type: 'Ark.list',
-            value: values
-        };
-    },
-    listTip: (options) => {
-        return {
-            type: 'Ark.listTip',
-            value: options
-        };
-    },
-    listContent: (...values) => {
-        return {
-            type: 'Ark.listContent',
-            value: values
-        };
-    },
-    listItem: (value) => {
-        return {
-            type: 'Ark.listItem',
-            value: value
-        };
-    },
-    Card: (value) => {
-        return {
-            type: 'Ark.Card',
-            value: value
-        };
-    },
-    BigCard: (value) => {
-        return {
-            type: 'Ark.BigCard',
-            value
-        };
-    }
-};
-const MD = (...values) => {
-    return {
-        type: 'Markdown',
-        value: values
-    };
-};
-MD.template = (templateId, params) => {
-    return {
-        type: 'MarkdownTemplate',
-        value: templateId,
-        options: {
-            params
+    }
+    addRow() {
+        this.#flush();
+        this.#currentRow = [];
+        return this;
+    }
+    addButton(...args) {
+        if (!this.#currentRow) {
+            this.#currentRow = [];
         }
-    };
-};
-MD.text = (text) => {
-    return {
-        type: 'MD.text',
-        value: text
-    };
-};
-MD.title = (text) => {
-    return {
-        type: 'MD.title',
-        value: text
-    };
-};
-MD.subtitle = (text) => {
-    return {
-        type: 'MD.subtitle',
-        value: text
-    };
-};
-MD.bold = (text) => {
-    return {
-        type: 'MD.bold',
-        value: text
-    };
-};
-MD.italic = (text) => {
-    return {
-        type: 'MD.italic',
-        value: text
-    };
-};
-MD.italicStar = (text) => {
-    return {
-        type: 'MD.italicStar',
-        value: text
-    };
-};
-MD.strikethrough = (text) => {
-    return {
-        type: 'MD.strikethrough',
-        value: text
-    };
-};
-MD.link = (text, url) => {
-    return {
-        type: 'MD.link',
-        value: { text, url }
-    };
-};
-MD.image = (url, options) => {
-    return {
-        type: 'MD.image',
-        value: url,
-        options
-    };
-};
-MD.list = (...items) => {
-    return {
-        type: 'MD.list',
-        value: items
-    };
-};
-MD.listItem = (indexOrText, text) => {
-    return {
-        type: 'MD.listItem',
-        value: typeof indexOrText === 'number' ? { index: indexOrText, text } : indexOrText
-    };
-};
-MD.blockquote = (text) => {
-    return {
-        type: 'MD.blockquote',
-        value: text
-    };
-};
-MD.divider = () => {
-    return {
-        type: 'MD.divider'
-    };
-};
-MD.newline = (value = false) => {
-    return {
-        type: 'MD.newline',
-        value: value
-    };
-};
-MD.code = (value, options) => {
-    return {
-        type: 'MD.code',
-        value: value,
-        options: options
-    };
-};
+        this.#currentRow.push(BT(...args));
+        return this;
+    }
+    clear() {
+        this.#rows = [];
+        this.#currentRow = null;
+        return this;
+    }
+}
+class FormatMarkDown {
+    #data = [];
+    get value() {
+        return MD(...this.#data);
+    }
+    addText(...args) {
+        this.#data.push(MD.text(...args));
+        return this;
+    }
+    addTitle(...args) {
+        this.#data.push(MD.title(...args));
+        return this;
+    }
+    addSubtitle(...args) {
+        this.#data.push(MD.subtitle(...args));
+        return this;
+    }
+    addBold(...args) {
+        this.#data.push(MD.bold(...args));
+        return this;
+    }
+    addItalic(...args) {
+        this.#data.push(MD.italic(...args));
+        return this;
+    }
+    addItalicStar(...args) {
+        this.#data.push(MD.italicStar(...args));
+        return this;
+    }
+    addStrikethrough(...args) {
+        this.#data.push(MD.strikethrough(...args));
+        return this;
+    }
+    addLink(...args) {
+        this.#data.push(MD.link(...args));
+        return this;
+    }
+    addImage(...args) {
+        this.#data.push(MD.image(...args));
+        return this;
+    }
+    addList(...args) {
+        this.#data.push(MD.list(...args));
+        return this;
+    }
+    addBlockquote(...args) {
+        this.#data.push(MD.blockquote(...args));
+        return this;
+    }
+    addDivider() {
+        this.#data.push(MD.divider());
+        return this;
+    }
+    addNewline(...args) {
+        this.#data.push(MD.newline(...args));
+        return this;
+    }
+    addCode(...args) {
+        this.#data.push(MD.code(...args));
+        return this;
+    }
+    addBreak() {
+        this.#data.push(MD.newline());
+        return this;
+    }
+    clear() {
+        this.#data = [];
+        return this;
+    }
+}
 class Format {
     #data = [];
     static create() {
         return new Format();
     }
+    createMarkdown() {
+        return new FormatMarkDown();
+    }
+    createButtonGroup() {
+        return new FormatButtonGroup();
+    }
     get value() {
         return this.#data;
     }
@@ -250,19 +145,21 @@ class Format {
         return this;
     }
     addButtonGroup(...args) {
-        this.#data.push(BT.group(...args));
-        return this;
-    }
-    addButtonTemplate(...args) {
-        this.#data.push(BT.template(...args));
+        if (args[0] instanceof FormatButtonGroup) {
+            this.#data.push(args[0].value);
+        }
+        else {
+            this.#data.push(BT.group(...args));
+        }
         return this;
     }
     addMarkdown(...args) {
-        this.#data.push(MD(...args));
-        return this;
-    }
-    addMarkdownTemplate(...args) {
-        this.#data.push(MD.template(...args));
+        if (args[0] instanceof FormatMarkDown) {
+            this.#data.push(args[0].value);
+        }
+        else {
+            this.#data.push(MD(...args));
+        }
         return this;
     }
     clear() {
@@ -295,4 +192,4 @@ function createEvent(options) {
     return { ...event, ...o };
 }
 
-export { Ark, BT, Format, Image, ImageFile, ImageURL, Link, MD, Mention, Text, createEvent };
+export { BT, Format, Image, ImageFile, ImageURL, Link, MD, Mention, Text, createEvent };

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

@@ -0,0 +1,50 @@
+import { DataMention, DataImage, DataText, DataImageURL, DataImageFile, ButtonRow, DataButtonGroup, DataButton, DataArkList, DataArkListTip, DataArkListContent, DataArkListItem, DataArkCard, DataArkBigCard, DataMarkdownTemplate, DataMarkDown, DataMarkdownTitle, DataMarkdownSubtitle, DataMarkdownBold, DataMarkdownItalic, DataMarkdownItalicStar, DataMarkdownStrikethrough, DataMarkdownLink, DataMarkdownImage, DataMarkdownList, DataMarkdownListItem, DataMarkdownBlockquote, DataMarkdownDivider, DataMarkdownNewline, DataLink, DataMarkdownText, DataButtonTemplate, DataMarkdownCode } from '../types';
+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;
+export declare const ImageFile: (val: DataImageFile["value"]) => DataImageFile;
+declare const Image: {
+    (val: Buffer): DataImage;
+    url: (val: DataImageURL["value"]) => DataImageURL;
+    file: (val: DataImageFile["value"]) => DataImageFile;
+};
+export { Image };
+export declare const Mention: (UserId?: DataMention["value"], options?: DataMention["options"]) => DataMention;
+declare const BT: {
+    (title: string, data: DataButton["options"]["data"], options?: Omit<DataButton["options"], "data">): DataButton;
+    group(...rows: ButtonRow[]): DataButtonGroup;
+    template(templateId: DataButtonTemplate["value"]): DataButtonTemplate;
+    row(...buttons: DataButton[]): ButtonRow;
+};
+export { BT };
+export declare const Ark: {
+    list: (values_0: DataArkListTip, values_1: DataArkListContent) => DataArkList;
+    listTip: (options: DataArkListTip["value"]) => DataArkListTip;
+    listContent: (...values: DataArkListContent["value"]) => DataArkListContent;
+    listItem: (value: DataArkListItem["value"]) => DataArkListItem;
+    Card: (value: DataArkCard["value"]) => DataArkCard;
+    BigCard: (value: DataArkBigCard["value"]) => DataArkBigCard;
+};
+declare const MD: {
+    (...values: DataMarkDown["value"]): DataMarkDown;
+    template(templateId: DataMarkdownTemplate["value"], params?: DataMarkdownTemplate["options"]["params"]): DataMarkdownTemplate;
+    text(text: string): DataMarkdownText;
+    title(text: string): DataMarkdownTitle;
+    subtitle(text: string): DataMarkdownSubtitle;
+    bold(text: string): DataMarkdownBold;
+    italic(text: string): DataMarkdownItalic;
+    italicStar(text: string): DataMarkdownItalicStar;
+    strikethrough(text: string): DataMarkdownStrikethrough;
+    link(text: string, url: string): DataMarkdownLink;
+    image(url: string, options?: {
+        width?: number;
+        height?: number;
+    }): DataMarkdownImage;
+    list(...items: any[]): DataMarkdownList;
+    listItem(indexOrText: number | string, text?: string): DataMarkdownListItem;
+    blockquote(text: string): DataMarkdownBlockquote;
+    divider(): DataMarkdownDivider;
+    newline(value?: boolean): DataMarkdownNewline;
+    code(value: DataMarkdownCode["value"], options?: DataMarkdownCode["options"]): DataMarkdownCode;
+};
+export { MD };

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

@@ -0,0 +1,217 @@
+const Text = (val, options) => {
+    return {
+        type: 'Text',
+        value: val,
+        options
+    };
+};
+const Link = (val, options) => {
+    return {
+        type: 'Text',
+        value: val,
+        options
+    };
+};
+const ImageURL = (val) => {
+    return {
+        type: 'ImageURL',
+        value: val
+    };
+};
+const ImageFile = (val) => {
+    return {
+        type: 'ImageFile',
+        value: val
+    };
+};
+const Image = (val) => {
+    return {
+        type: 'Image',
+        value: val.toString('base64')
+    };
+};
+Image.url = ImageURL;
+Image.file = ImageFile;
+const Mention = (UserId, options) => {
+    return {
+        type: 'Mention',
+        value: UserId,
+        options: options ?? {
+            belong: 'user'
+        }
+    };
+};
+const BT = (title, data, options) => {
+    return {
+        type: 'Button',
+        value: title,
+        options: {
+            data,
+            ...options
+        }
+    };
+};
+BT.group = function Group(...rows) {
+    return {
+        type: 'BT.group',
+        value: rows
+    };
+};
+BT.template = function Template(templateId) {
+    return {
+        type: 'ButtonTemplate',
+        value: templateId
+    };
+};
+BT.row = function Row(...buttons) {
+    return {
+        type: 'BT.row',
+        value: buttons
+    };
+};
+const Ark = {
+    list: (...values) => {
+        return {
+            type: 'Ark.list',
+            value: values
+        };
+    },
+    listTip: (options) => {
+        return {
+            type: 'Ark.listTip',
+            value: options
+        };
+    },
+    listContent: (...values) => {
+        return {
+            type: 'Ark.listContent',
+            value: values
+        };
+    },
+    listItem: (value) => {
+        return {
+            type: 'Ark.listItem',
+            value: value
+        };
+    },
+    Card: (value) => {
+        return {
+            type: 'Ark.Card',
+            value: value
+        };
+    },
+    BigCard: (value) => {
+        return {
+            type: 'Ark.BigCard',
+            value
+        };
+    }
+};
+const MD = (...values) => {
+    return {
+        type: 'Markdown',
+        value: values
+    };
+};
+MD.template = (templateId, params) => {
+    return {
+        type: 'MarkdownTemplate',
+        value: templateId,
+        options: {
+            params
+        }
+    };
+};
+MD.text = (text) => {
+    return {
+        type: 'MD.text',
+        value: text
+    };
+};
+MD.title = (text) => {
+    return {
+        type: 'MD.title',
+        value: text
+    };
+};
+MD.subtitle = (text) => {
+    return {
+        type: 'MD.subtitle',
+        value: text
+    };
+};
+MD.bold = (text) => {
+    return {
+        type: 'MD.bold',
+        value: text
+    };
+};
+MD.italic = (text) => {
+    return {
+        type: 'MD.italic',
+        value: text
+    };
+};
+MD.italicStar = (text) => {
+    return {
+        type: 'MD.italicStar',
+        value: text
+    };
+};
+MD.strikethrough = (text) => {
+    return {
+        type: 'MD.strikethrough',
+        value: text
+    };
+};
+MD.link = (text, url) => {
+    return {
+        type: 'MD.link',
+        value: { text, url }
+    };
+};
+MD.image = (url, options) => {
+    return {
+        type: 'MD.image',
+        value: url,
+        options
+    };
+};
+MD.list = (...items) => {
+    return {
+        type: 'MD.list',
+        value: items
+    };
+};
+MD.listItem = (indexOrText, text) => {
+    return {
+        type: 'MD.listItem',
+        value: typeof indexOrText === 'number' ? { index: indexOrText, text } : indexOrText
+    };
+};
+MD.blockquote = (text) => {
+    return {
+        type: 'MD.blockquote',
+        value: text
+    };
+};
+MD.divider = () => {
+    return {
+        type: 'MD.divider'
+    };
+};
+MD.newline = (value = false) => {
+    return {
+        type: 'MD.newline',
+        value: value
+    };
+};
+MD.code = (value, options) => {
+    return {
+        type: 'MD.code',
+        value: value,
+        options: options
+    };
+};
+
+export { Ark, BT, Image, ImageFile, ImageURL, Link, MD, Mention, Text };

package/lib/cbp/connects/client.js

@@ -15,7 +15,7 @@ import '../../app/event-response.js';
 import { createResult } from '../../core/utils.js';
 import '../../app/hook-use-api.js';
 import '../../app/message-api.js';
-import '../../app/message-format.js';
+import '../../app/message-format-old.js';
 import { apiResolves, apiTimeouts, actionResolves, actionTimeouts, FULL_RECEIVE_HEADER } from '../processor/config.js';
 import { createWSConnector } from './base.js';
 

package/lib/client.js

@@ -25,7 +25,7 @@ import './app/event-processor.js';
 import './app/event-response.js';
 import './app/hook-use-api.js';
 import './app/message-api.js';
-import './app/message-format.js';
+import './app/message-format-old.js';
 import './process/platform.js';
 import './process/module.js';
 import { createServer } from './server/main.js';

package/lib/index.js

@@ -25,5 +25,6 @@ export { createSelects, onSelects, unChildren, useChannel, useClient, useMe, use
 export { onState, unState, useState } from './app/hook-use-state.js';
 export { useObserver, useSubscribe } from './app/hook-use-subscribe.js';
 export { createDataFormat, createEventValue, format, getMessageIntent, sendToChannel, sendToUser } from './app/message-api.js';
-export { Ark, BT, Format, Image, ImageFile, ImageURL, Link, MD, Mention, Text, createEvent } from './app/message-format.js';
+export { Format, createEvent } from './app/message-format.js';
 export { start } from './main.js';
+export { Ark, BT, Image, ImageFile, ImageURL, Link, MD, Mention, Text } from './app/message-format-old.js';

package/package.json

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