alemonjs 2.1.27 → 2.1.29

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

@@ -18,7 +18,7 @@ export declare const useMention: <T extends EventKeys>(event: Events[T]) => [{
 }];
 export declare const useMessage: <T extends EventKeys>(event: Events[T]) => readonly [{
     "__#11@#format": DataEnums[];
-    readonly currentFormat: DataEnums[];
+    readonly currentFormat: any[];
     addText(val: string, options?: {
         style?: "none" | "bold" | "block" | "strikethrough" | "boldItalic" | "italic";
     }): any;
@@ -33,11 +33,9 @@ export declare const useMessage: <T extends EventKeys>(event: Events[T]) => read
         payload?: User | import("..").Guild | import("..").Channel | "everyone";
     }): any;
     addButtonGroup(...args: Parameters<typeof BT.group>): any;
-    addButtonTemplate(templateId: string): any;
+    addButtonTemplate(...args: Parameters<typeof BT.template>): any;
     addMarkdown(...args: Parameters<typeof MD>): any;
-    addMarkdownTemplate(templateId: string, params?: {
-        [key: string]: string;
-    }): any;
+    addMarkdownTemplate(...args: Parameters<typeof MD.template>): any;
     addFormat(val: DataEnums[]): any;
     clear(): any;
     send(params?: {
@@ -47,7 +45,7 @@ export declare const useMessage: <T extends EventKeys>(event: Events[T]) => read
 export declare const useMember: <T extends EventKeys>(event: Events[T]) => readonly [{}];
 export declare const useChannel: <T extends EventKeys>(event: Events[T]) => readonly [{}];
 export declare const useSend: <T extends EventKeys>(event: Events[T]) => (...val: DataEnums[]) => Promise<Result[]>;
-export declare const useSends: <T extends EventKeys>(event: Events[T]) => readonly [(params?: DataEnums[] | {
+export declare const useSends: <T extends EventKeys>(event: Events[T]) => readonly [(params?: any[] | {
     format: Format | DataEnums[];
 }) => Promise<Result[]>];
 export declare const unChildren: (name?: string) => void;

package/lib/app/index.js

@@ -19,4 +19,4 @@ 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 { Format, FormatButtonGroup, FormatMarkDown, createEvent } from './message-format.js';
-export { Ark, Attachment, Audio, BT, Custom, Image, ImageFile, ImageURL, Link, MD, Markdown, Mention, Text, Video } from './message-format-old.js';
+export { Ark, Attachment, Audio, BT, Button, Image, ImageFile, ImageURL, Link, MD, Markdown, MarkdownOriginal, Mention, Text, Video } from './message-format-old.js';

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

@@ -1,5 +1,4 @@
-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, DataCustom, DataMarkdownOriginal, DataAttachment, DataAudio, DataVideo, DataMarkdownMention, DataMarkdownContent, DataMarkdownButton } from '../types';
-export declare const Custom: (value: DataCustom["value"], options?: DataCustom["options"], type?: DataCustom["type"]) => DataCustom;
+import { DataMention, DataImage, DataText, DataImageURL, DataImageFile, DataButtonRow, DataButtonGroup, DataButton, DataArkList, DataArkListTip, DataArkListContent, DataArkListItem, DataArkCard, DataArkBigCard, 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';
 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;
@@ -11,13 +10,16 @@ declare const Image: {
 };
 export { Image };
 export declare const Mention: (UserId?: DataMention["value"], options?: DataMention["options"]) => DataMention;
-declare const BT: {
+export declare const Button: {
     (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;
+    group: (...rows: DataButtonRow[]) => DataButtonGroup;
+    row: (...buttons: DataButton[]) => DataButtonRow;
+};
+export declare const BT: {
+    (title: string, data: DataButton["options"]["data"], options?: Omit<DataButton["options"], "data">): DataButton;
+    group: (...rows: DataButtonRow[]) => DataButtonGroup;
+    row: (...buttons: DataButton[]) => DataButtonRow;
 };
-export { BT };
 export declare const Ark: {
     list: (values_0: DataArkListTip, values_1: DataArkListContent) => DataArkList;
     listTip: (options: DataArkListTip["value"]) => DataArkListTip;
@@ -26,9 +28,32 @@ export declare const Ark: {
     Card: (value: DataArkCard["value"]) => DataArkCard;
     BigCard: (value: DataArkBigCard["value"]) => DataArkBigCard;
 };
-declare const MD: {
+declare const Markdown: {
+    (...values: DataMarkDown["value"]): DataMarkDown;
+    text(text: string): DataMarkdownText;
+    mention(uid?: string, options?: DataMarkdownMention["options"]): DataMarkdownMention;
+    button(title: string, data: DataMarkdownButton["options"]): DataMarkdownButton;
+    content(text: string): DataMarkdownContent;
+    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 declare const MD: {
     (...values: DataMarkDown["value"]): DataMarkDown;
-    template(templateId: DataMarkdownTemplate["value"], params?: DataMarkdownTemplate["options"]["params"]): DataMarkdownTemplate;
     text(text: string): DataMarkdownText;
     mention(uid?: string, options?: DataMarkdownMention["options"]): DataMarkdownMention;
     button(title: string, data: DataMarkdownButton["options"]): DataMarkdownButton;
@@ -51,8 +76,8 @@ declare const MD: {
     newline(value?: boolean): DataMarkdownNewline;
     code(value: DataMarkdownCode["value"], options?: DataMarkdownCode["options"]): DataMarkdownCode;
 };
-export { MD };
-export declare const Markdown: (val: string) => DataMarkdownOriginal;
+export { Markdown };
+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;

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

@@ -1,10 +1,3 @@
-const Custom = (value, options, type) => {
-    return {
-        type: type,
-        value,
-        options
-    };
-};
 const Text = (val, options) => {
     return {
         type: 'Text',
@@ -48,7 +41,7 @@ const Mention = (UserId, options) => {
         }
     };
 };
-const BT = (title, data, options) => {
+const Button = (title, data, options) => {
     return {
         type: 'Button',
         value: title,
@@ -58,24 +51,21 @@ const BT = (title, data, options) => {
         }
     };
 };
-BT.group = function Group(...rows) {
+const ButtonGroup = (...rows) => {
     return {
         type: 'BT.group',
         value: rows
     };
 };
-BT.template = function Template(templateId) {
-    return {
-        type: 'ButtonTemplate',
-        value: templateId
-    };
-};
-BT.row = function Row(...buttons) {
+const ButtonRow = (...buttons) => {
     return {
         type: 'BT.row',
         value: buttons
     };
 };
+Button.group = ButtonGroup;
+Button.row = ButtonRow;
+const BT = Button;
 const Ark = {
     list: (...values) => {
         return {
@@ -114,135 +104,127 @@ const Ark = {
         };
     }
 };
-const MD = (...values) => {
+const Markdown = (...values) => {
     return {
         type: 'Markdown',
         value: values
     };
 };
-MD.template = (templateId, params) => {
-    return {
-        type: 'MarkdownTemplate',
-        value: templateId,
-        options: {
-            params
-        }
-    };
-};
-MD.text = (text) => {
+Markdown.text = (text) => {
     return {
         type: 'MD.text',
         value: text
     };
 };
-MD.mention = (uid, options) => {
+Markdown.mention = (uid, options) => {
     return {
         type: 'MD.mention',
-        value: uid || '',
+        value: uid || 'everyone',
         options: options ?? {
-            belong: 'all'
+            belong: 'user'
         }
     };
 };
-MD.button = (title, data) => {
+Markdown.button = (title, data) => {
     return {
         type: 'MD.button',
         value: title,
         options: data
     };
 };
-MD.content = (text) => {
+Markdown.content = (text) => {
     return {
         type: 'MD.content',
         value: text
     };
 };
-MD.title = (text) => {
+Markdown.title = (text) => {
     return {
         type: 'MD.title',
         value: text
     };
 };
-MD.subtitle = (text) => {
+Markdown.subtitle = (text) => {
     return {
         type: 'MD.subtitle',
         value: text
     };
 };
-MD.bold = (text) => {
+Markdown.bold = (text) => {
     return {
         type: 'MD.bold',
         value: text
     };
 };
-MD.italic = (text) => {
+Markdown.italic = (text) => {
     return {
         type: 'MD.italic',
         value: text
     };
 };
-MD.italicStar = (text) => {
+Markdown.italicStar = (text) => {
     return {
         type: 'MD.italicStar',
         value: text
     };
 };
-MD.strikethrough = (text) => {
+Markdown.strikethrough = (text) => {
     return {
         type: 'MD.strikethrough',
         value: text
     };
 };
-MD.link = (text, url) => {
+Markdown.link = (text, url) => {
     return {
         type: 'MD.link',
         value: { text, url }
     };
 };
-MD.image = (url, options) => {
+Markdown.image = (url, options) => {
     return {
         type: 'MD.image',
         value: url,
         options
     };
 };
-MD.list = (...items) => {
+Markdown.list = (...items) => {
     return {
         type: 'MD.list',
         value: items
     };
 };
-MD.listItem = (indexOrText, text) => {
+Markdown.listItem = (indexOrText, text) => {
     return {
         type: 'MD.listItem',
         value: typeof indexOrText === 'number' ? { index: indexOrText, text } : indexOrText
     };
 };
-MD.blockquote = (text) => {
+Markdown.blockquote = (text) => {
     return {
         type: 'MD.blockquote',
         value: text
     };
 };
-MD.divider = () => {
+Markdown.divider = () => {
     return {
         type: 'MD.divider'
     };
 };
-MD.newline = (value = false) => {
+Markdown.newline = (value = false) => {
     return {
         type: 'MD.newline',
         value: value
     };
 };
-MD.code = (value, options) => {
+Markdown.code = (value, options) => {
     return {
         type: 'MD.code',
         value: value,
         options: options
     };
 };
-const Markdown = (val) => {
+const MD = Markdown;
+const MarkdownOriginal = (val) => {
     return {
         type: 'MarkdownOriginal',
         value: val
@@ -268,4 +250,4 @@ const Video = (val) => {
     };
 };
 
-export { Ark, Attachment, Audio, BT, Custom, Image, ImageFile, ImageURL, Link, MD, Markdown, Mention, Text, Video };
+export { Ark, Attachment, Audio, BT, Button, Image, ImageFile, ImageURL, Link, MD, Markdown, MarkdownOriginal, Mention, Text, Video };

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

@@ -1,5 +1,5 @@
 import { DataButtonGroup, DataMarkDown, DataEnums, EventKeys, Events } from '../types';
-import { Text, Link, Image, ImageFile, ImageURL, Mention, BT, MD, Markdown, Attachment, Audio, Video, Custom } from './message-format-old.js';
+import { Text, Image, Link, ImageFile, ImageURL, Mention, BT, MD, MarkdownOriginal, Attachment, Audio, Video } from './message-format-old.js';
 export * from './message-format-old.js';
 export declare class FormatButtonGroup {
     #private;
@@ -47,11 +47,10 @@ export declare class Format {
     addButtonGroup(...args: Parameters<typeof BT.group>): this;
     addMarkdown(md: FormatMarkDown): this;
     addMarkdown(...args: Parameters<typeof MD>): this;
-    addMarkdownOriginal(...args: Parameters<typeof Markdown>): 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;
-    addCustom(...args: Parameters<typeof Custom>): this;
     addLink(...args: Parameters<typeof Link>): this;
     addImageFile(...args: Parameters<typeof ImageFile>): this;
     addImageURL(...args: Parameters<typeof ImageURL>): this;

package/lib/app/message-format.js

@@ -1,5 +1,5 @@
-import { BT, MD, Text, Image, Mention, Markdown, Attachment, Audio, Video, Custom, Link, ImageFile, ImageURL } from './message-format-old.js';
-export { Ark } from './message-format-old.js';
+import { BT, MD, Text, Image, Mention, MarkdownOriginal, Attachment, Audio, Video, Link, ImageFile, ImageURL } from './message-format-old.js';
+export { Ark, Button, Markdown } from './message-format-old.js';
 
 class FormatButtonGroup {
     #rows = [];
@@ -174,7 +174,7 @@ class Format {
         return this;
     }
     addMarkdownOriginal(...args) {
-        this.#data.push(Markdown(...args));
+        this.#data.push(MarkdownOriginal(...args));
         return this;
     }
     addAttachment(...args) {
@@ -189,10 +189,6 @@ class Format {
         this.#data.push(Video(...args));
         return this;
     }
-    addCustom(...args) {
-        this.#data.push(Custom(...args));
-        return this;
-    }
     addLink(...args) {
         this.#data.push(Link(...args));
         return this;
@@ -235,4 +231,4 @@ function createEvent(options) {
     return { ...event, ...o };
 }
 
-export { Attachment, Audio, BT, Custom, Format, FormatButtonGroup, FormatMarkDown, Image, ImageFile, ImageURL, Link, MD, Markdown, Mention, Text, Video, createEvent };
+export { Attachment, Audio, BT, Format, FormatButtonGroup, FormatMarkDown, Image, ImageFile, ImageURL, Link, MD, MarkdownOriginal, Mention, Text, Video, createEvent };

package/lib/index.js

@@ -27,4 +27,4 @@ export { useObserver, useSubscribe } from './app/hook-use-subscribe.js';
 export { createDataFormat, createEventValue, format, getMessageIntent, sendToChannel, sendToUser } from './app/message-api.js';
 export { Format, FormatButtonGroup, FormatMarkDown, createEvent } from './app/message-format.js';
 export { start } from './main.js';
-export { Ark, Attachment, Audio, BT, Custom, Image, ImageFile, ImageURL, Link, MD, Markdown, Mention, Text, Video } from './app/message-format-old.js';
+export { Ark, Attachment, Audio, BT, Button, Image, ImageFile, ImageURL, Link, MD, Markdown, MarkdownOriginal, Mention, Text, Video } from './app/message-format-old.js';

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

@@ -8,15 +8,11 @@ export type DataButton = {
         type?: 'command' | 'link' | 'call';
     };
 };
-export type ButtonRow = {
-    type: 'BT.row';
+export type DataButtonRow = {
+    type: 'ButtonRow' | 'BT.row';
     value: DataButton[];
 };
 export type DataButtonGroup = {
-    type: 'BT.group';
-    value: ButtonRow[];
-};
-export type DataButtonTemplate = {
-    type: 'ButtonTemplate';
-    value: string;
+    type: 'ButtonGroup' | 'BT.group';
+    value: DataButtonRow[];
 };

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

@@ -1,6 +1,6 @@
 import { DataButtonGroup, DataButtonTemplate } from './button';
 import { DataArkBigCard, DataArkCard, DataArkList } from './ark';
-import { DataMarkDown, DataMarkdownTemplate, DataCustom } from './markdown';
+import { DataMarkDown, DataMarkdownTemplate } from './markdown';
 import { DataImage, DataImageFile, DataImageURL } from './image';
 import { DataText } from './text';
 import { DataMention } from './mention';
@@ -20,5 +20,5 @@ export * from './markdown-raw';
 export * from './attachment';
 export * from './audio';
 export * from './video';
-export type DataEnums = DataText | DataLink | DataImage | DataImageURL | DataImageFile | DataMention | DataButtonGroup | DataButtonTemplate | DataArkList | DataArkCard | DataArkBigCard | DataMarkDown | DataMarkdownTemplate | DataMarkdownOriginal | DataAttachment | DataAudio | DataVideo | DataCustom;
+export type DataEnums = DataText | DataLink | DataImage | DataImageURL | DataImageFile | DataMention | DataButtonGroup | DataButtonTemplate | DataArkList | DataArkCard | DataArkBigCard | DataMarkDown | DataMarkdownTemplate | DataMarkdownOriginal | DataAttachment | DataAudio | DataVideo;
 export type MessageDataFormat = DataEnums[];

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

@@ -1,21 +1,12 @@
-export type DataMarkdownTemplate = {
-    type: 'MarkdownTemplate';
-    value: string;
-    options: {
-        params: {
-            [key: string]: string;
-        };
-    };
-};
 export type DataMarkdownText = {
     type: 'MD.text';
     value: string;
 };
 export type DataMarkdownMention = {
     type: 'MD.mention';
-    value?: string;
+    value?: string | 'everyone';
     options?: {
-        belong?: 'user' | 'channel' | 'all';
+        belong?: 'user' | 'channel';
     };
 };
 export type DataMarkdownContent = {
@@ -100,14 +91,7 @@ export type DataMarkdownCode = {
         language?: string;
     };
 };
-export type DataCustom = {
-    type: string;
-    value: string;
-    options?: {
-        [key: string]: any;
-    };
-};
-type DataMarkDownBalue = DataMarkdownMention | DataMarkdownContent | DataMarkdownButton | DataMarkdownText | DataMarkdownTitle | DataMarkdownSubtitle | DataMarkdownBold | DataMarkdownItalic | DataMarkdownItalicStar | DataMarkdownStrikethrough | DataMarkdownLink | DataMarkdownImage | DataMarkdownList | DataMarkdownBlockquote | DataMarkdownDivider | DataMarkdownNewline | DataMarkdownCode | DataCustom;
+type DataMarkDownBalue = DataMarkdownMention | DataMarkdownContent | DataMarkdownButton | DataMarkdownText | DataMarkdownTitle | DataMarkdownSubtitle | DataMarkdownBold | DataMarkdownItalic | DataMarkdownItalicStar | DataMarkdownStrikethrough | DataMarkdownLink | DataMarkdownImage | DataMarkdownList | DataMarkdownBlockquote | DataMarkdownDivider | DataMarkdownNewline | DataMarkdownCode;
 export type DataMarkDown = {
     type: 'Markdown';
     value: DataMarkDownBalue[];

package/package.json

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