alemonjs 2.1.10 → 2.1.12

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

@@ -22,4 +22,7 @@ export declare const unChildren: (name?: string) => void;
 export declare const onSelects: <T extends EventKeys[] | EventKeys>(values: T) => T;
 export declare const createSelects: <T extends EventKeys[] | EventKeys>(values: T) => T;
 export declare const useClient: <T extends object>(event: any, _ApiClass: new (...args: any[]) => T) => readonly [T];
+export declare const useMe: () => readonly [{
+    info: () => Promise<Result<any>>;
+}];
 export {};

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

@@ -202,5 +202,30 @@ const useClient = (event, _ApiClass) => {
     });
     return [client];
 };
+const useMe = () => {
+    const info = async () => {
+        try {
+            const results = await sendAction({
+                action: 'me.info',
+                payload: {}
+            });
+            const result = results.find(item => item.code === ResultCode.Ok);
+            if (result) {
+                const data = result.data;
+                return createResult(ResultCode.Ok, 'Successfully retrieved bot information', data);
+            }
+            else {
+                return createResult(ResultCode.Warn, 'No bot information found', null);
+            }
+        }
+        catch (err) {
+            return createResult(ResultCode.Fail, err?.message || 'Failed to get bot information', null);
+        }
+    };
+    const control = {
+        info
+    };
+    return [control];
+};
 
-export { createSelects, onSelects, unChildren, useChannel, useClient, useMenber, useMention, useMessage, useSend, useSends };
+export { createSelects, onSelects, unChildren, useChannel, useClient, useMe, useMenber, useMention, useMessage, useSend, useSends };

package/lib/app/index.js

@@ -12,7 +12,7 @@ export { expendCycle } from './event-processor-cycle.js';
 export { expendEvent } from './event-processor-event.js';
 export { expendMiddleware } from './event-processor-middleware.js';
 export { expendSubscribe, expendSubscribeCreate, expendSubscribeMount, expendSubscribeUnmount } from './event-processor-subscribe.js';
-export { createSelects, onSelects, unChildren, useChannel, useClient, useMenber, useMention, useMessage, useSend, useSends } from './hook-use-api.js';
+export { createSelects, onSelects, unChildren, useChannel, useClient, useMe, useMenber, useMention, useMessage, useSend, useSends } from './hook-use-api.js';
 export { onState, unState, useState } from './hook-use-state.js';
 export { useObserver, useSubscribe } from './hook-use-subscribe.js';
 export { createDataFormat, createEventValue, format, sendToChannel, sendToUser } from './message-api.js';

package/lib/index.js

@@ -19,7 +19,7 @@ export { expendCycle } from './app/event-processor-cycle.js';
 export { expendEvent } from './app/event-processor-event.js';
 export { expendMiddleware } from './app/event-processor-middleware.js';
 export { expendSubscribe, expendSubscribeCreate, expendSubscribeMount, expendSubscribeUnmount } from './app/event-processor-subscribe.js';
-export { createSelects, onSelects, unChildren, useChannel, useClient, useMenber, useMention, useMessage, useSend, useSends } from './app/hook-use-api.js';
+export { createSelects, onSelects, unChildren, useChannel, useClient, useMe, useMenber, useMention, useMessage, useSend, useSends } from './app/hook-use-api.js';
 export { onState, unState, useState } from './app/hook-use-state.js';
 export { useObserver, useSubscribe } from './app/hook-use-subscribe.js';
 export { createDataFormat, createEventValue, format, sendToChannel, sendToUser } from './app/message-api.js';

package/lib/types/actions.d.ts

@@ -83,9 +83,13 @@ export type ActionMessageForwardChannel = {
         }[];
     };
 };
+export type ActionMeInfo = {
+    action: 'me.info';
+    payload: object;
+};
 type base = {
     actionId?: string;
     DeviceId?: string;
 };
-export type Actions = (ActionMessageSend | ActionMentionGet | ActionMessageSendChannel | ActionMessageSendUser | ActionMessageDelete | ActionFileSendChannel | ActionFileSendUser | ActionMessageForwardUser | ActionMessageForwardChannel) & base;
+export type Actions = (ActionMessageSend | ActionMentionGet | ActionMessageSendChannel | ActionMessageSendUser | ActionMessageDelete | ActionFileSendChannel | ActionFileSendUser | ActionMessageForwardUser | ActionMessageForwardChannel | ActionMeInfo) & base;
 export {};

package/lib/utils.d.ts

@@ -22,8 +22,12 @@ export declare const getPublicIP: (options?: Options & {
     force?: boolean;
 }) => Promise<string>;
 export declare class Regular extends RegExp {
-    static or(...regs: RegExp[]): Regular;
-    static and(...regs: RegExp[]): Regular;
-    or(...regs: RegExp[]): Regular;
-    and(...regs: RegExp[]): Regular;
+    static create(pattern: RegExp | string, flags?: string): Regular;
+    private static mergeFlags;
+    static or(...regulars: RegExp[]): Regular;
+    static and(...regulars: RegExp[]): Regular;
+    or(...regulars: RegExp[]): Regular;
+    and(...regulars: RegExp[]): Regular;
+    withFlags(flags: 'i' | 'g' | 'm' | 's' | 'u' | 'y'): Regular;
+    withoutFlags(flagsToRemove: 'i' | 'g' | 'm' | 's' | 'u' | 'y'): Regular;
 }

package/lib/utils.js

@@ -137,17 +137,45 @@ const getPublicIP = async (options = {}) => {
     });
 };
 class Regular extends RegExp {
-    static or(...regs) {
-        return new Regular(`(${regs.map(reg => reg.source).join('|')})`, regs.map(reg => reg.flags).join(''));
+    static create(pattern, flags) {
+        return new Regular(pattern, flags);
+    }
+    static mergeFlags(...flags) {
+        const flagSet = new Set();
+        for (const flagStr of flags) {
+            for (const char of flagStr) {
+                flagSet.add(char);
+            }
+        }
+        return Array.from(flagSet).sort().join('');
+    }
+    static or(...regulars) {
+        const source = regulars.map(reg => `(?:${reg.source})`).join('|');
+        const flags = Regular.mergeFlags(...regulars.map(reg => reg.flags));
+        return new Regular(`(?:${source})`, flags);
     }
-    static and(...regs) {
-        return new Regular(regs.map(reg => `(?=${reg.source})`).join('') + '.*', regs.map(reg => reg.flags).join(''));
+    static and(...regulars) {
+        const lookAHeads = regulars.map(reg => `(?=.*${reg.source})`).join('');
+        const flags = Regular.mergeFlags(...regulars.map(reg => reg.flags));
+        return new Regular(`${lookAHeads}.*`, flags);
     }
-    or(...regs) {
-        return Regular.or(this, ...regs);
+    or(...regulars) {
+        return Regular.or(this, ...regulars);
     }
-    and(...regs) {
-        return Regular.and(this, ...regs);
+    and(...regulars) {
+        return Regular.and(this, ...regulars);
+    }
+    withFlags(flags) {
+        const mergedFlags = Regular.mergeFlags(this.flags, flags);
+        return new Regular(this.source, mergedFlags);
+    }
+    withoutFlags(flagsToRemove) {
+        const currentFlagsSet = new Set(this.flags);
+        for (const char of flagsToRemove) {
+            currentFlagsSet.delete(char);
+        }
+        const newFlags = Array.from(currentFlagsSet).sort().join('');
+        return new Regular(this.source, newFlags);
     }
 }
 

package/package.json

@@ -1,7 +1,6 @@
 {
-  "$schema": "https://json.schemastore.org/package",
   "name": "alemonjs",
-  "version": "2.1.10",
+  "version": "2.1.12",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",