alemonjs 2.0.4 → 2.0.5-alpha.2

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

@@ -1,4 +1,4 @@
-import { DataText, DataImage, DataImageURL, DataImageFile, DataMention } from '../typing/message/index.js';
+import { DataText, DataImageURL, DataImageFile, DataImage, DataMention, DataButton, ButtonRow, DataButtonGroup } from '../typing/message/index.js';
 
 /**
  * 文本消息
@@ -7,12 +7,6 @@ import { DataText, DataImage, DataImageURL, DataImageFile, DataMention } from '.
  * @returns
  */
 declare const Text: (val: DataText["value"], options?: DataText["options"]) => DataText;
-/**
- * 图片消息
- * @param val
- * @returns
- */
-declare const Image: (val: DataImage["value"]) => DataImage;
 /**
  * 图片链接，http 或 https 开头
  * @param val
@@ -25,6 +19,17 @@ declare const ImageURL: (val: DataImageURL["value"]) => DataImageURL;
  * @returns
  */
 declare const ImageFile: (val: DataImageFile["value"]) => DataImageFile;
+/**
+ * 图片消息
+ * @param val
+ * @returns
+ */
+declare const Image: {
+    (val: DataImage["value"]): DataImage;
+    url: (val: DataImageURL["value"]) => DataImageURL;
+    file: (val: DataImageFile["value"]) => DataImageFile;
+};
+
 /**
  * 提及
  * @param UserId 默认 @ 所有人
@@ -32,5 +37,11 @@ declare const ImageFile: (val: DataImageFile["value"]) => DataImageFile;
  * @returns
  */
 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(value: DataButtonGroup["options"]["template_id"]): DataButtonGroup;
+    row(...buttons: DataButton[]): ButtonRow;
+};
 
-export { Image, ImageFile, ImageURL, Mention, Text };
+export { BT, Image, ImageFile, ImageURL, Mention, Text };

package/lib/app/message-format.js

@@ -12,38 +12,40 @@ const Text = (val, options) => {
     };
 };
 /**
- * 图片消息
+ * 图片链接，http 或 https 开头
  * @param val
  * @returns
  */
-const Image = (val) => {
+const ImageURL = (val) => {
     return {
-        type: 'Image',
+        type: 'ImageURL',
         value: val
     };
 };
 /**
- * 图片链接，http 或 https 开头
+ * 本地图片文件
  * @param val
  * @returns
  */
-const ImageURL = (val) => {
+const ImageFile = (val) => {
     return {
-        type: 'ImageURL',
+        type: 'ImageFile',
         value: val
     };
 };
 /**
- * 本地图片文件
+ * 图片消息
  * @param val
  * @returns
  */
-const ImageFile = (val) => {
+const Image = (val) => {
     return {
-        type: 'ImageFile',
+        type: 'Image',
         value: val
     };
 };
+Image.url = ImageURL;
+Image.file = ImageFile;
 /**
  * 提及
  * @param UserId 默认 @ 所有人
@@ -54,11 +56,53 @@ 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(value) {
+    return {
+        type: 'BT.group',
+        value: [],
+        options: {
+            template_id: value
+        }
+    };
+};
+BT.row = function Row(...buttons) {
+    return {
+        type: 'BT.row',
+        value: buttons
+    };
+};
+// const Send = (...x: DataButtonGroup[]) => {
+//   return x;
+// };
+// Send(
+//   BT.template('123'),
+//   BT.group(
+//     BT.row(BT("开始", "/开始游戏")),
+//     BT.row(BT("百度一下", "https://baidu.com", { isLink: true })),
+//     BT.row(BT("是否同意", { click: "/同意", confirm: "/同意", cancel: "/不同意" })),
+//     BT.row(BT("哈哈", "/哈哈", { autoEnter: false, showList: true, toolTip: '不支持' }))
+//   )
+// )
 
-export { Image, ImageFile, ImageURL, Mention, Text };
+export { BT, Image, ImageFile, ImageURL, Mention, Text };

package/lib/index.d.ts

@@ -14,7 +14,7 @@ export { Current, CurrentResult, DefineBot, DefineBotCallback, DefineBotValue, D
 export { EventKeys, Events, EventsEnum, EventsKeyEnum, EventsMessageCreate, EventsMessageCreateEnum, EventsMessageCreateKeys } from './typing/event/map.js';
 export { LoggerUtils } from './typing/logger/index.js';
 export { ClientAPI } from './typing/client/index.js';
-export { DataEnums, DataImage, DataImageFile, DataImageURL, DataMap, DataMention, DataText, MessageDataFormat, ParseKeys } from './typing/message/index.js';
+export { ButtonRow, DataButton, DataButtonGroup, DataEnums, DataImage, DataImageFile, DataImageURL, DataMap, DataMention, DataText, MessageDataFormat } from './typing/message/index.js';
 export { StoreChildrenApp, StoreMiddleware, StoreMiddlewareItem, StoreResponse, StoreResponseItem } from './typing/store/res.js';
 export { StateSubscribeMap, SubscribeKeysMap, SubscribeMap, SubscribeValue } from './typing/subscribe/index.js';
 export { core, logger } from './global.js';
@@ -29,7 +29,7 @@ export { eventState, onState, unEventState, unState, useState } from './app/hook
 export { useObserver, useSubscribe } from './app/hook-use-subscribe.js';
 export { loadChildren, loadChildrenFile, loadModule, moduleChildrenFiles } from './app/load.js';
 export { createSendDataFormat, sendToChannel, sendToUser } from './app/message-api.js';
-export { Image, ImageFile, ImageURL, Mention, Text } from './app/message-format.js';
+export { BT, Image, ImageFile, ImageURL, Mention, Text } from './app/message-format.js';
 export { ChildrenApp, Core, Logger, Middleware, Response, State, StateSubscribe, SubscribeList } from './app/store.js';
 export { ErrorModule, createEventName, createHash, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey } from './app/utils.js';
 export { run, start } from './main.js';

package/lib/index.js

@@ -12,7 +12,7 @@ export { eventState, onState, unEventState, unState, useState } from './app/hook
 export { useObserver, useSubscribe } from './app/hook-use-subscribe.js';
 export { loadChildren, loadChildrenFile, loadModule, moduleChildrenFiles } from './app/load.js';
 export { createSendDataFormat, sendToChannel, sendToUser } from './app/message-api.js';
-export { Image, ImageFile, ImageURL, Mention, Text } from './app/message-format.js';
+export { BT, Image, ImageFile, ImageURL, Mention, Text } from './app/message-format.js';
 export { ChildrenApp, Core, Logger, Middleware, Response, State, StateSubscribe, SubscribeList } from './app/store.js';
 export { ErrorModule, createEventName, createHash, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey } from './app/utils.js';
 export { run, start } from './main.js';

package/lib/jsx.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { EventKeys, Events } from './typing/event/map.js';
-import { DataText, DataImageURL, DataImageFile, DataImage, DataMention, DataEnums } from './typing/message/index.js';
+import { DataText, DataImage, DataImageURL, DataImageFile, DataMention, DataEnums, DataButton } from './typing/message/index.js';
 
 /**
  *
@@ -8,21 +8,25 @@ import { DataText, DataImageURL, DataImageFile, DataImage, DataMention, DataEnum
  * @returns
  */
 declare function Text(_props: {
-    children: DataText['value'] | DataText['value'][];
+    children?: DataText['value'] | DataText['value'][];
+    style?: DataText['options']['style'];
+} | {
+    value?: DataText['value'] | DataText['value'][];
     style?: DataText['options']['style'];
 }): React.ReactElement<{
     dataType: string;
 }, string | React.JSXElementConstructor<any>>;
-/**
- *
- * @param _props
- * @returns
- */
-declare function ImageURL(_props: {
-    src: DataImageURL['value'];
-}): React.ReactElement<{
-    dataType: string;
-}, string | React.JSXElementConstructor<any>>;
+declare const Image: React.FC<{
+    value: DataImage['value'];
+}> & {
+    url: React.FC<{
+        src: DataImageURL['value'];
+    }>;
+    file: React.FC<{
+        src: DataImageURL['value'];
+    }>;
+};
+
 /**
  *
  * @param _props
@@ -38,8 +42,8 @@ declare function ImageFile(_props: {
  * @param _props
  * @returns
  */
-declare function Image(_props: {
-    value: DataImage['value'];
+declare function ImageURL(_props: {
+    src: DataImageURL['value'];
 }): React.ReactElement<{
     dataType: string;
 }, string | React.JSXElementConstructor<any>>;
@@ -54,6 +58,27 @@ declare function Mention(_props: {
 }): React.ReactElement<{
     dataType: string;
 }, string | React.JSXElementConstructor<any>>;
+interface BTProps {
+    text: DataButton['value'];
+    data: DataButton['options']['data'];
+    autoEnter?: DataButton['options']['autoEnter'];
+    toolTip?: DataButton['options']['toolTip'];
+    showList?: DataButton['options']['showList'];
+    isLink?: DataButton['options']['isLink'];
+    children?: DataButton['value'];
+}
+declare const BT: React.FC<BTProps> & {
+    group: React.FC<{
+        children?: React.ReactNode;
+    }>;
+    row: React.FC<{
+        children?: React.ReactNode;
+    }>;
+    template: React.FC<{
+        id: string;
+    }>;
+};
+
 /**
  *  转换数据
  * ***
@@ -88,4 +113,4 @@ declare const sendToChannel: (channel_id: string, data: React.JSX.Element[]) =>
  */
 declare const sendToUser: (user_id: string, data: React.JSX.Element[]) => Promise<any[]>;
 
-export { Image, ImageFile, ImageURL, JSX, Mention, Text, sendToChannel, sendToUser, useSend };
+export { BT, Image, ImageFile, ImageURL, JSX, Mention, Text, sendToChannel, sendToUser, useSend };

package/lib/jsx.js

@@ -10,7 +10,7 @@ import 'node:fs';
 import 'log4js';
 import './app/load.js';
 import { sendToChannel as sendToChannel$1, sendToUser as sendToUser$1 } from './app/message-api.js';
-import { Text as Text$1, ImageURL as ImageURL$1, ImageFile as ImageFile$1, Image as Image$1, Mention as Mention$1 } from './app/message-format.js';
+import { Text as Text$1, ImageURL as ImageURL$1, ImageFile as ImageFile$1, Image as Image$1, Mention as Mention$1, BT as BT$1 } from './app/message-format.js';
 import './app/utils.js';
 
 /**
@@ -23,16 +23,22 @@ function Text(_props) {
         dataType: 'Text'
     });
 }
-/**
- *
- * @param _props
- * @returns
- */
-function ImageURL(_props) {
+const Image = _props => {
+    return React.createElement('div', {
+        dataType: 'Image'
+    });
+};
+// BT.group 子组件
+Image.url = _props => {
     return React.createElement('div', {
         dataType: 'ImageURL'
     });
-}
+};
+Image.file = _props => {
+    return React.createElement('div', {
+        dataType: 'ImageFile'
+    });
+};
 /**
  *
  * @param _props
@@ -48,9 +54,9 @@ function ImageFile(_props) {
  * @param _props
  * @returns
  */
-function Image(_props) {
+function ImageURL(_props) {
     return React.createElement('div', {
-        dataType: 'Image'
+        dataType: 'ImageURL'
     });
 }
 /**
@@ -63,6 +69,32 @@ function Mention(_props) {
         dataType: 'Mention'
     });
 }
+const BT = _props => {
+    return React.createElement('div', {
+        dataType: 'Button'
+    });
+};
+function ButtonGroup(_props) {
+    return React.createElement('div', {
+        dataType: 'BT.group'
+    });
+}
+function ButtonRows(_props) {
+    return React.createElement('div', {
+        dataType: 'BT.row'
+    });
+}
+function ButtonTemplate(_props) {
+    return React.createElement('div', {
+        dataType: 'BT.group'
+    });
+}
+// BT.group 子组件
+BT.group = ButtonGroup;
+// BT.template 子组件
+BT.template = ButtonTemplate;
+// BT.row 子组件
+BT.row = ButtonRows;
 /**
  *  转换数据
  * ***
@@ -81,11 +113,16 @@ function JSX(...arg) {
         const props = item.props;
         const dataType = item.type()?.props?.dataType;
         if (dataType === 'Text') {
-            if (!props?.children)
-                continue;
-            data.push(Text$1(Array.isArray(props.children) ? props.children.join('') : props.children, {
-                style: props?.style
-            }));
+            if (props?.value) {
+                data.push(Text$1(props.value, {
+                    style: props?.style
+                }));
+            }
+            else if (props?.children) {
+                data.push(Text$1(Array.isArray(props.children) ? props.children.join('') : props.children, {
+                    style: props?.style
+                }));
+            }
         }
         else if (dataType === 'ImageURL') {
             data.push(ImageURL$1(props.src));
@@ -104,6 +141,45 @@ function JSX(...arg) {
                 }
                 : null));
         }
+        else if (dataType === 'BT.group') {
+            const id = props?.id;
+            if (id) {
+                data.push(BT$1.template(id));
+            }
+            else {
+                console.log('Button', props, item.type());
+                if (Array.isArray(props?.children)) {
+                    const rows = [];
+                    for (const child of props?.children) {
+                        // 拿到每个子组件
+                        const bts = [];
+                        if (Array.isArray(child.children)) {
+                            for (const chi of child.children) {
+                                // const type = chi.children
+                                const value = chi.props?.text;
+                                const data = chi.props?.data;
+                                const options = {};
+                                if (chi.props?.autoEnter) {
+                                    options['autoEnter'] = chi.props?.autoEnter ? true : false;
+                                }
+                                if (chi.props?.toolTip) {
+                                    options['toolTip'] = chi.props?.toolTip ?? '';
+                                }
+                                if (chi.props?.showList) {
+                                    options['showList'] = chi.props?.showList ? true : false;
+                                }
+                                if (chi.props?.isLink) {
+                                    options['isLink'] = chi.props?.isLink ? true : false;
+                                }
+                                bts.push(BT$1(value, data, options));
+                            }
+                        }
+                        rows.push(BT$1.row(...bts));
+                    }
+                    data.push(BT$1.group(...rows));
+                }
+            }
+        }
     }
     if (data.length === 0) {
         logger.error('Invalid data: data must be a non-empty array');
@@ -138,5 +214,22 @@ const sendToChannel = async (channel_id, data) => {
 const sendToUser = async (user_id, data) => {
     return sendToUser$1(user_id, JSX(...data));
 };
+// const Send = (..._x: any[]) => {
+//   //
+// }
+// Send(
+//   <Text value="" />,
+//   <Text >xxxx</Text>,
+//   <Image.url src="" />,
+//   <Image.file src="" />,
+//   <BT.template id="12121" />,
+//   <BT.group>
+//     <BT.row><BT text="登录" data="/登录游戏" /><BT text="退出" data="/退出游戏" /></BT.row>
+//     <BT.row><BT text="是否同意" data={{ "click": "/点击", "confirm": "/同意", "cancel": "/不同意" }} /></BT.row>
+//     <BT.row><BT text="百度一下" data="htts://baidu.com" isLink /></BT.row>
+//     <BT.row><BT text="自动" data="/自动发出" autoEnter /></BT.row>
+//     <BT.row><BT text="禁用的" data="/点不了" toolTip="不支持点击" /></BT.row>
+//   </BT.group>
+// )
 
-export { Image, ImageFile, ImageURL, JSX, Mention, Text, sendToChannel, sendToUser, useSend };
+export { BT, Image, ImageFile, ImageURL, JSX, Mention, Text, sendToChannel, sendToUser, useSend };

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

@@ -43,31 +43,44 @@ type DataMention = {
         payload?: User | Guild | Channel | 'everyone';
     };
 };
+type DataButton = {
+    type: 'Button';
+    value: string | {
+        title: string;
+        label: string;
+    };
+    options?: {
+        toolTip?: string;
+        autoEnter?: boolean;
+        showList?: boolean;
+        data?: string | {
+            click: string;
+            confirm: string;
+            cancel: string;
+        };
+        isLink?: boolean;
+    };
+};
+type ButtonRow = {
+    type: 'BT.row';
+    value: DataButton[];
+};
+type DataButtonGroup = {
+    type: 'BT.group';
+    value: ButtonRow[];
+    options?: {
+        template_id?: string;
+    };
+};
 type DataMap = {
     Text: DataText;
     Image: DataImage;
     ImageURL: DataImageURL;
     ImageFile: DataImageFile;
     Mention: DataMention;
+    ButtonGroup: DataButtonGroup;
 };
-type ParseKeys = {
-    Text: string | undefined;
-    Image: Buffer[] | undefined;
-    Link: any;
-    Mention: {
-        value: string;
-        typing: string;
-        name: string;
-        avatar: string;
-        bot: boolean;
-    }[] | undefined;
-    Button: any;
-    File: any;
-    Voice: any;
-    Video: any;
-    ButtonBox: any;
-};
-type DataEnums = DataText | DataImage | DataImageURL | DataImageFile | DataMention;
+type DataEnums = DataText | DataImage | DataImageURL | DataImageFile | DataMention | DataButtonGroup;
 type MessageDataFormat = DataEnums[];
 
-export type { DataEnums, DataImage, DataImageFile, DataImageURL, DataMap, DataMention, DataText, MessageDataFormat, ParseKeys };
+export type { ButtonRow, DataButton, DataButtonGroup, DataEnums, DataImage, DataImageFile, DataImageURL, DataMap, DataMention, DataText, MessageDataFormat };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.0.4",
+  "version": "2.0.5-alpha.2",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",