alemonjs 2.1.23 → 2.1.25

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

@@ -1,4 +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 } from '../types';
+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;
 export declare const Text: (val: DataText["value"], options?: DataText["options"]) => DataText;
 export declare const Link: (val: DataLink["value"], options?: DataText["options"]) => DataText;
@@ -30,6 +30,9 @@ 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;
+    content(text: string): DataMarkdownContent;
     title(text: string): DataMarkdownTitle;
     subtitle(text: string): DataMarkdownSubtitle;
     bold(text: string): DataMarkdownBold;

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

@@ -135,6 +135,28 @@ MD.text = (text) => {
         value: text
     };
 };
+MD.mention = (uid, options) => {
+    return {
+        type: 'MD.mention',
+        value: uid || '',
+        options: options ?? {
+            belong: 'all'
+        }
+    };
+};
+MD.button = (title, data) => {
+    return {
+        type: 'MD.button',
+        value: title,
+        options: data
+    };
+};
+MD.content = (text) => {
+    return {
+        type: 'MD.content',
+        value: text
+    };
+};
 MD.title = (text) => {
     return {
         type: 'MD.title',

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

@@ -11,6 +11,8 @@ declare class FormatButtonGroup {
 declare class FormatMarkDown {
     #private;
     get value(): DataMarkDown;
+    addMention(...args: Parameters<typeof MD.button>): this;
+    addContent(...args: Parameters<typeof MD.content>): this;
     addText(...args: Parameters<typeof MD.text>): this;
     addTitle(...args: Parameters<typeof MD.title>): this;
     addSubtitle(...args: Parameters<typeof MD.subtitle>): this;
@@ -35,11 +37,7 @@ export declare class Format {
     static createButtonGroup(): FormatButtonGroup;
     get value(): DataEnums[];
     addText(...args: Parameters<typeof Text>): this;
-    addTextBreak(): this;
-    addLink(...args: Parameters<typeof Link>): this;
     addImage(...args: Parameters<typeof Image>): this;
-    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;
@@ -50,6 +48,9 @@ export declare class Format {
     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;
     clear(): this;
 }
 export declare function createEvent<T extends EventKeys>(options: {

package/lib/app/message-format.js

@@ -1,4 +1,4 @@
-import { Text, Link, Image, ImageFile, ImageURL, Mention, BT, MD, Markdown, Attachment, Audio, Video, Custom } from './message-format-old.js';
+import { Text, Image, Mention, BT, MD, Markdown, Attachment, Audio, Video, Custom, Link, ImageFile, ImageURL } from './message-format-old.js';
 export { Ark } from './message-format-old.js';
 
 class FormatButtonGroup {
@@ -37,6 +37,14 @@ class FormatMarkDown {
     get value() {
         return MD(...this.#data);
     }
+    addMention(...args) {
+        this.#data.push(MD.button(...args));
+        return this;
+    }
+    addContent(...args) {
+        this.#data.push(MD.content(...args));
+        return this;
+    }
     addText(...args) {
         this.#data.push(MD.text(...args));
         return this;
@@ -120,26 +128,10 @@ class Format {
         this.#data.push(Text(...args));
         return this;
     }
-    addTextBreak() {
-        this.#data.push(Text('\n'));
-        return this;
-    }
-    addLink(...args) {
-        this.#data.push(Link(...args));
-        return this;
-    }
     addImage(...args) {
         this.#data.push(Image(...args));
         return this;
     }
-    addImageFile(...args) {
-        this.#data.push(ImageFile(...args));
-        return this;
-    }
-    addImageURL(...args) {
-        this.#data.push(ImageURL(...args));
-        return this;
-    }
     addMention(...args) {
         this.#data.push(Mention(...args));
         return this;
@@ -182,6 +174,18 @@ class Format {
         this.#data.push(Custom(...args));
         return this;
     }
+    addLink(...args) {
+        this.#data.push(Link(...args));
+        return this;
+    }
+    addImageFile(...args) {
+        this.#data.push(ImageFile(...args));
+        return this;
+    }
+    addImageURL(...args) {
+        this.#data.push(ImageURL(...args));
+        return this;
+    }
     clear() {
         this.#data = [];
         return this;

package/lib/core/config.d.ts

@@ -2,20 +2,20 @@ import type { Package } from '../types';
 type ConfigValue = {
     [key: string]: any;
 };
-type ConfigListener = (value: ConfigValue) => void;
-declare class ConfigCore {
+type ConfigListener<T extends ConfigValue = ConfigValue> = (value: T) => void;
+declare class ConfigCore<T extends ConfigValue = ConfigValue> {
     #private;
     constructor(dir: string);
-    get value(): ConfigValue | null;
-    saveValue(value: ConfigValue): void;
-    onWatch(listener: ConfigListener): () => void;
+    get value(): T | null;
+    saveValue(value: T): void;
+    onWatch(listener: ConfigListener<T>): () => void;
     dispose(): void;
     get package(): Package | null;
     get argv(): {
         [key: string]: string;
     };
 }
-export declare const getConfig: () => typeof ConfigCore.prototype;
-export declare const getConfigValue: () => ConfigValue;
-export declare const onWatchConfigValue: (callback: ConfigListener) => (() => void);
+export declare const getConfig: <T extends ConfigValue = ConfigValue>() => ConfigCore<T>;
+export declare const getConfigValue: <T extends ConfigValue = ConfigValue>() => T;
+export declare const onWatchConfigValue: <T extends ConfigValue = ConfigValue>(callback: ConfigListener<T>) => (() => void);
 export {};

package/lib/core/config.js

@@ -12,11 +12,7 @@ class ConfigCore {
     #debounceDelay = 100;
     #argvProxy = null;
     #resolvedDir = null;
-    #initValue = {
-        gui: {
-            port: 17127
-        }
-    };
+    #initValue = {};
     constructor(dir) {
         this.#resolvedDir = join(process.cwd(), dir);
     }
@@ -205,7 +201,9 @@ const getConfig = () => {
     global.__config = new ConfigCore(configDir);
     return global.__config;
 };
-const getConfigValue = () => getConfig()?.value || {};
+const getConfigValue = () => {
+    return (getConfig()?.value || {});
+};
 const onWatchConfigValue = (callback) => {
     return getConfig().onWatch(callback);
 };

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

@@ -1,18 +1,10 @@
 export type DataButton = {
     type: 'Button';
-    value: string | {
-        title: string;
-        label: string;
-    };
+    value: string;
     options?: {
         toolTip?: string;
         autoEnter?: boolean;
-        showList?: boolean;
-        data?: string | {
-            click: string;
-            confirm: string;
-            cancel: string;
-        };
+        data?: string;
         type?: 'command' | 'link' | 'call';
     };
 };

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

@@ -11,6 +11,27 @@ export type DataMarkdownText = {
     type: 'MD.text';
     value: string;
 };
+export type DataMarkdownMention = {
+    type: 'MD.mention';
+    value?: string;
+    options?: {
+        belong?: 'user' | 'channel' | 'all';
+    };
+};
+export type DataMarkdownContent = {
+    type: 'MD.content';
+    value: string;
+};
+export type DataMarkdownButton = {
+    type: 'MD.button';
+    value: string;
+    options?: {
+        toolTip?: string;
+        autoEnter?: boolean;
+        data?: string;
+        type?: 'command' | 'link' | 'call';
+    };
+};
 export type DataMarkdownTitle = {
     type: 'MD.title';
     value: string;
@@ -86,7 +107,7 @@ export type DataCustom = {
         [key: string]: any;
     };
 };
-type DataMarkDownBalue = 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 | DataCustom;
 export type DataMarkDown = {
     type: 'Markdown';
     value: DataMarkDownBalue[];

package/package.json

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