alemonjs 2.0.15 → 2.0.16

package/README.md

@@ -20,9 +20,9 @@ start('src/index.js')
 > src/response/res.js
 
 ```js
-import { createSelects, onResponse, Text, useSend } from 'alemonjs'
+import { onSelects, onResponse, Text, useSend } from 'alemonjs'
 // 创建事件类型
-export const selects = createSelects(['message.create'])
+export const selects = onSelects(['message.create'])
 // 导出响应
 export default onResponse(selects, event => {
   // 使用发送函数

package/lib/app/event-processor.js

@@ -50,7 +50,9 @@ const callback = () => {
     // 下一次清理的时间，应该随着长度的增加而减少
     const length = ProcessorEventAutoClearMap.size + ProcessorEventUserAudoClearMap.size;
     // 长度控制在37个以内
-    const time = length > processor_repeated_clear_size ? processor_repeated_clear_time_min : processor_repeated_clear_time_max;
+    const time = length > processor_repeated_clear_size
+        ? processor_repeated_clear_time_min
+        : processor_repeated_clear_time_max;
     setTimeout(callback, time);
 };
 setTimeout(callback, processor_repeated_clear_time_min);

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

@@ -31,6 +31,7 @@ declare const useMention: <T extends EventKeys>(event: Events[T]) => {
  * @throws {Error} - 如果 event 无效，抛出错误。
  */
 declare const useSend: <T extends EventKeys>(event: Events[T]) => (...val: DataEnums[]) => Promise<Result | ClientAPIMessageResult[]>;
+declare const useSends: <T extends EventKeys>(event: Events[T]) => ((val: DataEnums[]) => Promise<Result | ClientAPIMessageResult[]>)[];
 /**
  * 卸载模块
  * @param name
@@ -47,6 +48,11 @@ declare const unMount: () => void;
  * @param values
  * @returns
  */
+declare const onSelects: <T extends EventKeys[] | EventKeys>(values: T) => T;
+/**
+ * 废弃,请使用onSelects
+ * @deprecated
+ */
 declare const createSelects: <T extends EventKeys[] | EventKeys>(values: T) => T;
 
-export { createSelects, unChildren, unMount, useMention, useSend };
+export { createSelects, onSelects, unChildren, unMount, useMention, useSend, useSends };

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

@@ -113,6 +113,23 @@ const useSend = (event) => {
         return await alemonjsBot.api.use.send(event, val);
     };
 };
+const useSends = (event) => {
+    if (!event || typeof event !== 'object') {
+        logger.error({
+            code: ResultCode.FailParams,
+            message: 'Invalid event: event must be an object',
+            data: null
+        });
+        throw new Error('Invalid event: event must be an object');
+    }
+    const send = async (val) => {
+        if (!val || val.length === 0) {
+            return createResult(ResultCode.FailParams, 'Invalid val: val must be a non-empty array', null);
+        }
+        return await alemonjsBot.api.use.send(event, val);
+    };
+    return [send];
+};
 /**
  * 卸载模块
  * @param name
@@ -146,6 +163,12 @@ const unMount = () => {
  * @param values
  * @returns
  */
-const createSelects = (values) => values;
+const onSelects = (values) => values;
+global.onSelects = onSelects;
+/**
+ * 废弃,请使用onSelects
+ * @deprecated
+ */
+const createSelects = onSelects;
 
-export { createSelects, unChildren, unMount, useMention, useSend };
+export { createSelects, onSelects, unChildren, unMount, useMention, useSend, useSends };

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

@@ -10,10 +10,13 @@ import '../global.js';
  */
 declare const useSubscribe: <T extends EventKeys>(event: Events[T], select: T) => ((callback: Current<T>, keys: (keyof Events[T])[]) => void)[];
 /**
- * 使用观察者
- * @param event
- * @param option
- * @returns
+ * 废弃，请使用
+ * ***
+ * const [_, observer] = useSubscribe(event, option)
+ * ***
+ * observer()
+ * ***
+ * @deprecated
  */
 declare const useObserver: <T extends EventKeys>(event: Events[T], option: T) => (callback: Current<T>, keys: (keyof Events[T])[]) => void;
 

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

@@ -55,10 +55,13 @@ const useSubscribe = (event, select) => {
     return [create, mountBefore, unmount];
 };
 /**
- * 使用观察者
- * @param event
- * @param option
- * @returns
+ * 废弃，请使用
+ * ***
+ * const [_, observer] = useSubscribe(event, option)
+ * ***
+ * observer()
+ * ***
+ * @deprecated
  */
 const useObserver = (event, option) => {
     const [_, mount] = useSubscribe(event, option);

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

@@ -1,3 +1,4 @@
+import { OnDataFormatFunc } from '../typing/event/index.js';
 import { ClientAPIMessageResult } from '../typing/client/index.js';
 import { DataEnums } from '../typing/message/index.js';
 import '../global.js';
@@ -8,7 +9,12 @@ import '../global.js';
  * @returns {DataEnums[]} - 返回格式化后的数据数组。
  * @throws {Error} - 如果 data 无效，抛出错误。
  */
-declare const createSendDataFormat: (...data: DataEnums[]) => DataEnums[];
+declare const format: OnDataFormatFunc;
+/**
+ * 废弃
+ * @deprecated
+ */
+declare const createSendDataFormat: OnDataFormatFunc;
 /**
  * 向指定频道发送消息。
  * @param {string} channel_id - 目标频道的 ID。
@@ -24,4 +30,4 @@ declare const sendToChannel: (channel_id: string, data: DataEnums[]) => Promise<
  */
 declare const sendToUser: (user_id: string, data: DataEnums[]) => Promise<ClientAPIMessageResult[]>;
 
-export { createSendDataFormat, sendToChannel, sendToUser };
+export { createSendDataFormat, format, sendToChannel, sendToUser };

package/lib/app/message-api.js

@@ -6,7 +6,7 @@ import { ResultCode } from '../core/code.js';
  * @returns {DataEnums[]} - 返回格式化后的数据数组。
  * @throws {Error} - 如果 data 无效，抛出错误。
  */
-const createSendDataFormat = (...data) => {
+const format = (...data) => {
     if (!data || data.length === 0) {
         logger.error({
             code: ResultCode.FailParams,
@@ -17,6 +17,12 @@ const createSendDataFormat = (...data) => {
     }
     return data;
 };
+global.format = format;
+/**
+ * 废弃
+ * @deprecated
+ */
+const createSendDataFormat = format;
 /**
  * 向指定频道发送消息。
  * @param {string} channel_id - 目标频道的 ID。
@@ -52,4 +58,4 @@ const sendToUser = async (user_id, data) => {
     return await alemonjsBot.api.active.send.user(user_id, data);
 };
 
-export { createSendDataFormat, sendToChannel, sendToUser };
+export { createSendDataFormat, format, sendToChannel, sendToUser };

package/lib/global.d.ts

@@ -1,4 +1,4 @@
-import { OnResponseFunc, OnResponseReversalFunc, OnMiddlewareFunc, OnMiddlewareReversalFunc, DefineChildrenFunc, DefinePlatformFunc } from './typing/event/index.js';
+import { OnResponseFunc, OnResponseReversalFunc, OnMiddlewareFunc, OnMiddlewareReversalFunc, DefineChildrenFunc, DefinePlatformFunc, OnSelectsFunc, OnDataFormatFunc } from './typing/event/index.js';
 import { ClientAPI } from './typing/client/index.js';
 import { StoreChildrenApp } from './typing/store/res.js';
 import { StateSubscribeMap, SubscribeKeysMap } from './typing/subscribe/index.js';
@@ -68,6 +68,14 @@ declare global {
      * 定义一个平台
      */
     var definePlatform: DefinePlatformFunc;
+    /**
+     * 定义选择器
+     */
+    var onSelects: OnSelectsFunc;
+    /**
+     * 定义数据格式
+     */
+    var format: OnDataFormatFunc;
 }
 declare const logger: any;
 declare const core: {

package/lib/index.d.ts

@@ -10,7 +10,7 @@ export { PublicEventMessageCreate, PublicEventMessageDelete, PublicEventMessageR
 export { PrivateEventMessageCreate, PrivateEventMessageDelete, PrivateEventMessageUpdate } from './typing/event/message/private.message.js';
 export { PrivateEventRequestFriendAdd, PrivateEventRequestGuildAdd } from './typing/event/request/index.js';
 export { ActionsEventEnum } from './typing/event/actions.js';
-export { Current, CurrentResult, CurrentResultValue, DefineBot, DefineBotCallback, DefineBotValue, DefineChildrenCallback, DefineChildrenFunc, DefineChildrenValue, DefinePlatformCallback, DefinePlatformFunc, DefinePlatformValue, OnMiddlewareFunc, OnMiddlewareReversalFunc, OnMiddlewareValue, OnResponseFunc, OnResponseReversalFunc, OnResponseValue } from './typing/event/index.js';
+export { Current, CurrentResult, CurrentResultValue, DefineBot, DefineBotCallback, DefineBotValue, DefineChildrenCallback, DefineChildrenFunc, DefineChildrenValue, DefinePlatformCallback, DefinePlatformFunc, DefinePlatformValue, OnDataFormatFunc, OnMiddlewareFunc, OnMiddlewareReversalFunc, OnMiddlewareValue, OnResponseFunc, OnResponseReversalFunc, OnResponseValue, OnSelectsFunc } from './typing/event/index.js';
 export { EventKeys, Events, EventsEnum, EventsKeyEnum, EventsMessageCreate, EventsMessageCreateEnum, EventsMessageCreateKeys } from './typing/event/map.js';
 export { LoggerUtils } from './typing/logger/index.js';
 export { ClientAPI, ClientAPIMessageResult } from './typing/client/index.js';
@@ -24,11 +24,11 @@ export { defineChildren } from './app/define-chidren.js';
 export { OnMiddleware, onMiddleware } from './app/event-middleware.js';
 export { OnProcessor, onProcessor } from './app/event-processor.js';
 export { OnResponse, onResponse } from './app/event-response.js';
-export { createSelects, unChildren, unMount, useMention, useSend } from './app/hook-use-api.js';
+export { createSelects, onSelects, unChildren, unMount, useMention, useSend, useSends } from './app/hook-use-api.js';
 export { eventState, onState, unEventState, unState, useState } from './app/hook-use-state.js';
 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 { createSendDataFormat, format, sendToChannel, sendToUser } from './app/message-api.js';
 export { Ark, BT, Image, ImageFile, ImageURL, Link, MD, Mention, Text } from './app/message-format.js';
 export { ChildrenApp, Core, Logger, Middleware, ProcessorEventAutoClearMap, ProcessorEventUserAudoClearMap, Response, State, StateSubscribe, SubscribeList } from './app/store.js';
 export { ErrorModule, Result, createEventName, createHash, createResult, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey } from './app/utils.js';

package/lib/index.js

@@ -7,11 +7,11 @@ export { defineChildren } from './app/define-chidren.js';
 export { OnMiddleware, onMiddleware } from './app/event-middleware.js';
 export { OnProcessor, onProcessor } from './app/event-processor.js';
 export { OnResponse, onResponse } from './app/event-response.js';
-export { createSelects, unChildren, unMount, useMention, useSend } from './app/hook-use-api.js';
+export { createSelects, onSelects, unChildren, unMount, useMention, useSend, useSends } from './app/hook-use-api.js';
 export { eventState, onState, unEventState, unState, useState } from './app/hook-use-state.js';
 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 { createSendDataFormat, format, sendToChannel, sendToUser } from './app/message-api.js';
 export { Ark, BT, Image, ImageFile, ImageURL, Link, MD, Mention, Text } from './app/message-format.js';
 export { ChildrenApp, Core, Logger, Middleware, ProcessorEventAutoClearMap, ProcessorEventUserAudoClearMap, Response, State, StateSubscribe, SubscribeList } from './app/store.js';
 export { ErrorModule, createEventName, createHash, createResult, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey } from './app/utils.js';

package/lib/jsx.d.ts

@@ -85,6 +85,11 @@ declare const BT: React.FC<BTProps> & {
     }>;
 };
 
+declare function Format(_props: {
+    children?: React.ReactNode;
+}): React.ReactElement<{
+    dataType: string;
+}, string | React.JSXElementConstructor<any>>;
 /**
  *  转换数据
  * ***
@@ -104,6 +109,12 @@ declare function JSX(...arg: React.JSX.Element[]): DataEnums[];
  * @returns
  */
 declare const useSend: <T extends EventKeys>(e: Events[T]) => (...arg: React.JSX.Element[]) => Promise<Result | ClientAPIMessageResult[]>;
+/**
+ * 发送消息
+ * @param e
+ * @returns
+ */
+declare const useSends: <T extends EventKeys>(e: Events[T]) => ((arg: React.JSX.Element) => Promise<Result | ClientAPIMessageResult[]>)[];
 /**
  *
  * @param channel_id
@@ -119,4 +130,4 @@ declare const sendToChannel: (channel_id: string, data: React.JSX.Element[]) =>
  */
 declare const sendToUser: (user_id: string, data: React.JSX.Element[]) => Promise<ClientAPIMessageResult[]>;
 
-export { BT, Image, ImageFile, ImageURL, JSX, Mention, Text, sendToChannel, sendToUser, useSend };
+export { BT, Format, Image, ImageFile, ImageURL, JSX, Mention, Text, sendToChannel, sendToUser, useSend, useSends };

package/lib/jsx.js

@@ -100,6 +100,11 @@ BT.group = ButtonGroup;
 BT.template = ButtonTemplate;
 // BT.row 子组件
 BT.row = ButtonRows;
+function Format(_props) {
+    return React.createElement('div', {
+        dataType: 'Format'
+    });
+}
 /**
  *  转换数据
  * ***
@@ -184,6 +189,24 @@ function JSX(...arg) {
                 }
             }
         }
+        else if (dataType === 'Format') {
+            // Format 的 children 就是直接复用 JSX
+            let children = [];
+            if (Array.isArray(props?.children)) {
+                children = props?.children;
+            }
+            else {
+                children = [props?.children];
+            }
+            if (children.length > 0) {
+                const format = JSX(...children);
+                format.forEach((item) => {
+                    if (item) {
+                        data.push(item);
+                    }
+                });
+            }
+        }
     }
     if (data.length === 0) {
         logger.warn({
@@ -203,6 +226,16 @@ const useSend = (e) => {
     const Send = useSend$1(e);
     return (...arg) => Send(...JSX(...arg));
 };
+/**
+ * 发送消息
+ * @param e
+ * @returns
+ */
+const useSends = (e) => {
+    const Send = useSend$1(e);
+    const send = (arg) => Send(...JSX(arg));
+    return [send];
+};
 /**
  *
  * @param channel_id
@@ -222,4 +255,4 @@ const sendToUser = async (user_id, data) => {
     return sendToUser$1(user_id, JSX(...data));
 };
 
-export { BT, Image, ImageFile, ImageURL, JSX, Mention, Text, sendToChannel, sendToUser, useSend };
+export { BT, Format, Image, ImageFile, ImageURL, JSX, Mention, Text, sendToChannel, sendToUser, useSend, useSends };

package/lib/main.js

@@ -8,10 +8,12 @@ import './app/define-chidren.js';
 import './app/event-middleware.js';
 import './app/event-processor.js';
 import './app/event-response.js';
+import './app/hook-use-api.js';
+import { useState } from './app/hook-use-state.js';
 import { ResultCode } from './core/code.js';
 import 'node:fs';
 import 'log4js';
-import { useState } from './app/hook-use-state.js';
+import './app/message-api.js';
 import './app/message-format.js';
 import { file_prefix_common, default_login, default_platform_prefix, default_platform_common_prefix, file_prefix_framework } from './core/variable.js';
 
@@ -54,7 +56,9 @@ const start = async (input, pm) => {
     const platform$1 = pm ?? cfg.argv?.platform ?? cfg.value?.platform;
     const login$1 = platform$1 ? platform$1.replace(file_prefix_common, '') : null;
     const login = login$1 ?? cfg.argv?.login ?? cfg.value?.login ?? default_login;
-    const prefix = platform$1 && file_prefix_framework.test(platform$1) ? default_platform_prefix : default_platform_common_prefix;
+    const prefix = platform$1 && file_prefix_framework.test(platform$1)
+        ? default_platform_prefix
+        : default_platform_common_prefix;
     const platform = `${prefix}${login}`;
     // 启动机器人
     try {

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

@@ -70,6 +70,14 @@ type DefinePlatformValue = {
  * 定义一个平台
  */
 type DefinePlatformFunc = (callback: DefinePlatformCallback) => DefinePlatformValue;
+/**
+ * 定义选择器
+ */
+type OnSelectsFunc = <T extends EventKeys[] | EventKeys>(values: T) => T;
+/**
+ * 定义数据格式
+ */
+type OnDataFormatFunc = (...data: DataEnums[]) => DataEnums[];
 /**
  * 废弃，请使用 DefinePlatformCallback
  * @deprecated
@@ -86,4 +94,4 @@ type DefineBotValue = DefinePlatformValue;
  */
 type DefineBot = DefinePlatformFunc;
 
-export type { Current, CurrentResult, CurrentResultValue, DefineBot, DefineBotCallback, DefineBotValue, DefineChildrenCallback, DefineChildrenFunc, DefineChildrenValue, DefinePlatformCallback, DefinePlatformFunc, DefinePlatformValue, OnMiddlewareFunc, OnMiddlewareReversalFunc, OnMiddlewareValue, OnResponseFunc, OnResponseReversalFunc, OnResponseValue };
+export type { Current, CurrentResult, CurrentResultValue, DefineBot, DefineBotCallback, DefineBotValue, DefineChildrenCallback, DefineChildrenFunc, DefineChildrenValue, DefinePlatformCallback, DefinePlatformFunc, DefinePlatformValue, OnDataFormatFunc, OnMiddlewareFunc, OnMiddlewareReversalFunc, OnMiddlewareValue, OnResponseFunc, OnResponseReversalFunc, OnResponseValue, OnSelectsFunc };

package/package.json

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