alemonjs 2.1.25 → 2.1.27

package/README.md

@@ -1,5 +1,5 @@
-# ALemonJS
+# [ALemonJS](https://alemonjs.com)
 
-[alemonjs](https://alemonjs.com) 是一个专门用于开发聊天机器人的 Node.js 框架，它提供了完整的事件驱动架构来处理各种聊天平台的消息和交互。
+专用于开发聊天机器人的 Node.js 框架，它提供了完整的事件驱动架构来处理各种聊天平台的消息和交互。
 
-https://alemonjs.com
+官网文档 https://alemonjs.com

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 [{
-    "__#10@#format": DataEnums[];
+    "__#11@#format": DataEnums[];
     readonly currentFormat: DataEnums[];
     addText(val: string, options?: {
         style?: "none" | "bold" | "block" | "strikethrough" | "boldItalic" | "italic";

package/lib/app/index.js

@@ -18,5 +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 { Format, createEvent } from './message-format.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';

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

@@ -1,17 +1,18 @@
 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';
 export * from './message-format-old.js';
-declare class FormatButtonGroup {
+export declare class FormatButtonGroup {
     #private;
     get value(): DataButtonGroup;
+    absorb(group: FormatButtonGroup): this;
     addRow(): this;
     addButton(...args: Parameters<typeof BT>): this;
     clear(): this;
 }
-declare class FormatMarkDown {
+export declare class FormatMarkDown {
     #private;
     get value(): DataMarkDown;
-    addMention(...args: Parameters<typeof MD.button>): this;
+    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;
@@ -28,6 +29,8 @@ declare class FormatMarkDown {
     addNewline(...args: Parameters<typeof MD.newline>): this;
     addCode(...args: Parameters<typeof MD.code>): this;
     addBreak(): this;
+    addMention(...args: Parameters<typeof MD.mention>): this;
+    addButton(...args: Parameters<typeof MD.button>): this;
     clear(): this;
 }
 export declare class Format {
@@ -36,6 +39,7 @@ export declare class Format {
     static createMarkdown(): FormatMarkDown;
     static createButtonGroup(): FormatButtonGroup;
     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;

package/lib/app/message-format.js

@@ -1,4 +1,4 @@
-import { Text, Image, Mention, BT, MD, Markdown, Attachment, Audio, Video, Custom, Link, ImageFile, ImageURL } from './message-format-old.js';
+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';
 
 class FormatButtonGroup {
@@ -14,6 +14,13 @@ class FormatButtonGroup {
             this.#currentRow = null;
         }
     }
+    absorb(group) {
+        if (this.#currentRow && this.#currentRow.length > 0) {
+            this.#flush();
+        }
+        this.#rows.push(...group.value.value);
+        return this;
+    }
     addRow() {
         this.#flush();
         this.#currentRow = [];
@@ -37,8 +44,8 @@ class FormatMarkDown {
     get value() {
         return MD(...this.#data);
     }
-    addMention(...args) {
-        this.#data.push(MD.button(...args));
+    absorb(md) {
+        this.#data.push(...md.value.value);
         return this;
     }
     addContent(...args) {
@@ -105,6 +112,14 @@ class FormatMarkDown {
         this.#data.push(MD.newline());
         return this;
     }
+    addMention(...args) {
+        this.#data.push(MD.mention(...args));
+        return this;
+    }
+    addButton(...args) {
+        this.#data.push(MD.button(...args));
+        return this;
+    }
     clear() {
         this.#data = [];
         return this;
@@ -124,6 +139,10 @@ class Format {
     get value() {
         return this.#data;
     }
+    absorb(format) {
+        this.#data.push(...format.value);
+        return this;
+    }
     addText(...args) {
         this.#data.push(Text(...args));
         return this;
@@ -216,4 +235,4 @@ function createEvent(options) {
     return { ...event, ...o };
 }
 
-export { Attachment, Audio, BT, Custom, Format, Image, ImageFile, ImageURL, Link, MD, Markdown, Mention, Text, Video, createEvent };
+export { Attachment, Audio, BT, Custom, Format, FormatButtonGroup, FormatMarkDown, Image, ImageFile, ImageURL, Link, MD, Markdown, Mention, Text, Video, createEvent };

package/lib/core/variable.d.ts

@@ -28,3 +28,21 @@ export declare const ResultCode: {
     readonly FailInternal: 5000;
 };
 export type ResultCode = (typeof ResultCode)[keyof typeof ResultCode];
+export declare class Result {
+    #private;
+    get value(): {
+        code: ResultCode;
+        message: string;
+        data: null;
+    }[];
+    static create(): Result;
+    push(param: {
+        code: ResultCode;
+        message: string;
+        data: null;
+    }): this;
+    newIndex(): this;
+    updateMessage(msg: string): this;
+    updateData(data: any): this;
+    updateCode(callback: (code: typeof ResultCode) => ResultCode): this;
+}

package/lib/core/variable.js

@@ -26,5 +26,63 @@ const ResultCode = {
     FailAuth,
     FailInternal
 };
+class Result {
+    #data = [];
+    #currentIndex = 0;
+    get value() {
+        return this.#data;
+    }
+    static create() {
+        return new Result();
+    }
+    push(param) {
+        this.#data.push(param);
+        return this;
+    }
+    newIndex() {
+        if (this.#data[this.#currentIndex]) {
+            this.#currentIndex++;
+        }
+        else {
+            this.#currentIndex = 0;
+        }
+        return this;
+    }
+    updateMessage(msg) {
+        if (!this.#data[this.#currentIndex]) {
+            this.#data[this.#currentIndex] = {
+                code: ResultCode.Ok,
+                message: msg,
+                data: null
+            };
+        }
+        this.#data[this.#currentIndex].message = msg;
+        return this;
+    }
+    updateData(data) {
+        if (!this.#data[this.#currentIndex]) {
+            this.#data[this.#currentIndex] = {
+                code: ResultCode.Ok,
+                message: '',
+                data: data
+            };
+        }
+        return this;
+    }
+    updateCode(callback) {
+        const newCode = callback(ResultCode);
+        if (!this.#data[this.#currentIndex]) {
+            this.#data[this.#currentIndex] = {
+                code: newCode,
+                message: '',
+                data: null
+            };
+        }
+        else {
+            this.#data[this.#currentIndex].code = newCode;
+        }
+        return this;
+    }
+}
 
-export { EventMessageText, Fail, FailAuth, FailInternal, FailParams, Ok, ResultCode, Warn, defaultLogin, defaultPlatformCommonPrefix, defaultPlatformPrefix, defaultPort, filePrefixCommon, fileSuffixMiddleware, fileSuffixResponse, processorMaxMapSize, processorRepeatedClearSize, processorRepeatedClearTimeMax, processorRepeatedClearTimeMin, processorRepeatedEventTime, processorRepeatedUserTime };
+export { EventMessageText, Fail, FailAuth, FailInternal, FailParams, Ok, Result, ResultCode, Warn, defaultLogin, defaultPlatformCommonPrefix, defaultPlatformPrefix, defaultPort, filePrefixCommon, fileSuffixMiddleware, fileSuffixResponse, processorMaxMapSize, processorRepeatedClearSize, processorRepeatedClearTimeMax, processorRepeatedClearTimeMin, processorRepeatedEventTime, processorRepeatedUserTime };

package/lib/index.js

@@ -25,6 +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 { Format, createEvent } from './app/message-format.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';

package/package.json

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