alemonjs 2.1.50 → 2.1.52

package/lib/app/event-processor-callHandler.js

@@ -20,10 +20,11 @@ const createCallHandler = valueEvent => {
                 return;
             }
             try {
-                const res = await withEventContext(valueEvent, () => currents[index](valueEvent, (...cns) => {
+                const nextFn = (...cns) => {
                     isNext = true;
                     nextEvent(...cns);
-                }));
+                };
+                const res = await withEventContext(valueEvent, nextFn, () => currents[index](valueEvent, nextFn));
                 if (res !== true) {
                     isClose = true;
                 }

package/lib/app/hook-event-context.d.ts

@@ -1,3 +1,4 @@
 import { EventKeys, Events } from '../types';
-export declare const withEventContext: <T extends EventKeys, R>(event: Events[T], runner: () => R) => R;
+export declare const withEventContext: <T extends EventKeys, R>(event: Events[T], next: (...args: boolean[]) => void, runner: () => R) => R;
 export declare const getCurrentEvent: <T extends EventKeys>() => Events[T] | undefined;
+export declare const getCurrentNext: () => ((...args: boolean[]) => void) | undefined;

package/lib/app/hook-event-context.js

@@ -1,11 +1,14 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
 
 const eventStore = new AsyncLocalStorage();
-const withEventContext = (event, runner) => {
-    return eventStore.run(event, runner);
+const withEventContext = (event, next, runner) => {
+    return eventStore.run({ event, next }, runner);
 };
 const getCurrentEvent = () => {
-    return eventStore.getStore();
+    return eventStore.getStore()?.event;
+};
+const getCurrentNext = () => {
+    return eventStore.getStore()?.next;
 };
 
-export { getCurrentEvent, withEventContext };
+export { getCurrentEvent, getCurrentNext, withEventContext };

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

@@ -5,9 +5,9 @@ import { createResult, Result } from '../../core/utils';
 import { sendAction } from '../../cbp/processor/actions';
 import { sendAPI } from '../../cbp/processor/api';
 import { Format } from '../message-format';
-import { getCurrentEvent } from '../hook-event-context';
+import { getCurrentEvent, getCurrentNext } from '../hook-event-context';
 export type { DataEnums, EventKeys, Events, User, GuildInfo, ChannelInfo, MemberInfo, RoleInfo, PaginationParams, PaginatedResult, Result };
-export { ResultCode, ChildrenApp, createResult, sendAction, sendAPI, Format, getCurrentEvent };
+export { ResultCode, ChildrenApp, createResult, sendAction, sendAPI, Format, getCurrentEvent, getCurrentNext };
 export type Options = {
     UserId?: string;
     UserKey?: string;

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

@@ -5,6 +5,7 @@ export { sendAction } from '../../cbp/processor/actions.js';
 export { sendAPI } from '../../cbp/processor/api.js';
 export { Format } from '../message-format.js';
 import { getCurrentEvent } from '../hook-event-context.js';
+export { getCurrentNext } from '../hook-event-context.js';
 
 const getEventOrThrow = (event) => {
     const currentEvent = event ?? getCurrentEvent();

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

@@ -1,4 +1,4 @@
-import { EventKeys, Events } from 'types';
+import { EventKeys, Events } from '../../types';
 type UseEventOptions<T extends EventKeys> = {
     selects: T | T[];
     regular?: RegExp;
@@ -15,6 +15,19 @@ type UseEventResult<T extends EventKeys> = {
         exact: boolean;
     };
 };
-export declare function useEvent<T extends EventKeys>(options?: UseEventOptions<T>): readonly [UseEventResult<T>];
-export declare function useEvent<T extends EventKeys>(event?: Events[T], options?: UseEventOptions<T>): readonly [UseEventResult<T>];
+export declare function useEvent<T extends EventKeys>(options?: UseEventOptions<T>): readonly [UseEventResult<T>, (...args: boolean[]) => void];
+export declare function useEvent<T extends EventKeys>(event?: Events[T], options?: UseEventOptions<T>): readonly [UseEventResult<T>, (...args: boolean[]) => void];
+export declare function createEvent<T extends EventKeys>(options: {
+    event: any;
+    selects: T | T[];
+    regular?: RegExp;
+    prefix?: string;
+    exact?: string;
+}): Events[T] & {
+    value: Events[T]["value"];
+    selects: boolean;
+    regular: boolean;
+    prefix: boolean;
+    exact: boolean;
+};
 export {};

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

@@ -1,4 +1,5 @@
 import { getEventOrThrow } from './common.js';
+import { getCurrentNext } from '../hook-event-context.js';
 
 const isOptions = (v) => {
     return typeof v === 'object' && 'selects' in v;
@@ -32,7 +33,19 @@ function useEvent(eventOrOptions, options) {
             return eventValue.value;
         }
     });
-    return [r];
+    const next = getCurrentNext() ?? (() => { });
+    return [r, next];
+}
+function createEvent(options) {
+    const { event, selects, regular, prefix, exact } = options;
+    const [eventRef] = useEvent(event, { selects, regular, prefix, exact });
+    const o = eventRef.match;
+    const e = eventRef.current;
+    return {
+        ...e,
+        ...o,
+        value: eventRef.value
+    };
 }
 
-export { useEvent };
+export { createEvent, useEvent };

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

@@ -14,4 +14,4 @@ export { useRequest } from './request.js';
 export { useRole } from './role.js';
 export { useUser } from './user.js';
 export { useObserver, useSubscribe } from './subscribe.js';
-export { useEvent } from './event.js';
+export { createEvent, useEvent } from './event.js';

package/lib/app/index.js

@@ -31,9 +31,9 @@ export { useRequest } from './hook-use/request.js';
 export { useRole } from './hook-use/role.js';
 export { useUser } from './hook-use/user.js';
 export { useObserver, useSubscribe } from './hook-use/subscribe.js';
-export { useEvent } from './hook-use/event.js';
-export { getCurrentEvent, withEventContext } from './hook-event-context.js';
+export { createEvent, useEvent } from './hook-use/event.js';
+export { getCurrentEvent, getCurrentNext, withEventContext } from './hook-event-context.js';
 export { createEventValue, createSelects, onSelects, onState, unChildren, unState, useState } from './event-utils.js';
 export { MessageDirect, createDataFormat, format, getMessageIntent, sendToChannel, sendToUser } from './message-api.js';
-export { Format, FormatButtonGroup, FormatMarkDown, createEvent } from './message-format.js';
+export { Format, FormatButtonGroup, FormatMarkDown } from './message-format.js';
 export { Attachment, Audio, BT, Button, Image, ImageFile, ImageURL, Link, MD, Markdown, MarkdownOriginal, Mention, Text, Video } from './message-format-old.js';

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

@@ -1,4 +1,4 @@
-import { DataButtonGroup, DataMarkDown, DataEnums, EventKeys, Events } from '../types';
+import { DataButtonGroup, DataMarkDown, DataEnums } from '../types';
 import { Text, Image, Link, ImageFile, ImageURL, Mention, BT, MD, MarkdownOriginal, Attachment, Audio, Video } from './message-format-old.js';
 export * from './message-format-old.js';
 export declare class FormatButtonGroup {
@@ -56,15 +56,3 @@ export declare class Format {
     addImageURL(...args: Parameters<typeof ImageURL>): this;
     clear(): this;
 }
-export declare function createEvent<T extends EventKeys>(options: {
-    event: any;
-    selects: T | T[];
-    regular?: RegExp;
-    prefix?: string;
-    exact?: string;
-}): Events[T] & {
-    selects: boolean;
-    regular: boolean;
-    prefix: boolean;
-    exact: boolean;
-};

package/lib/app/message-format.js

@@ -206,29 +206,5 @@ class Format {
         return this;
     }
 }
-function createEvent(options) {
-    const { event, selects, regular, prefix, exact } = options;
-    const { name, MessageText } = event || {};
-    const selectsArr = Array.isArray(selects) ? selects : [selects];
-    const o = {
-        selects: false,
-        regular: false,
-        prefix: false,
-        exact: false
-    };
-    if (selectsArr.includes(name)) {
-        o.selects = true;
-    }
-    if (exact && MessageText && MessageText === exact) {
-        o.exact = true;
-    }
-    if (prefix && MessageText?.startsWith(prefix)) {
-        o.prefix = true;
-    }
-    if (regular && MessageText && new RegExp(regular).test(MessageText)) {
-        o.regular = true;
-    }
-    return { ...event, ...o };
-}
 
-export { Attachment, Audio, BT, Format, FormatButtonGroup, FormatMarkDown, Image, ImageFile, ImageURL, Link, MD, MarkdownOriginal, Mention, Text, Video, createEvent };
+export { Attachment, Audio, BT, Format, FormatButtonGroup, FormatMarkDown, Image, ImageFile, ImageURL, Link, MD, MarkdownOriginal, Mention, Text, Video };

package/lib/index.js

@@ -38,10 +38,10 @@ export { useRequest } from './app/hook-use/request.js';
 export { useRole } from './app/hook-use/role.js';
 export { useUser } from './app/hook-use/user.js';
 export { useObserver, useSubscribe } from './app/hook-use/subscribe.js';
-export { useEvent } from './app/hook-use/event.js';
-export { getCurrentEvent, withEventContext } from './app/hook-event-context.js';
+export { createEvent, useEvent } from './app/hook-use/event.js';
+export { getCurrentEvent, getCurrentNext, withEventContext } from './app/hook-event-context.js';
 export { createEventValue, createSelects, onSelects, onState, unChildren, unState, useState } from './app/event-utils.js';
 export { MessageDirect, createDataFormat, format, getMessageIntent, sendToChannel, sendToUser } from './app/message-api.js';
-export { Format, FormatButtonGroup, FormatMarkDown, createEvent } from './app/message-format.js';
+export { Format, FormatButtonGroup, FormatMarkDown } from './app/message-format.js';
 export { start } from './main.js';
 export { Attachment, Audio, BT, Button, Image, ImageFile, ImageURL, Link, MD, Markdown, MarkdownOriginal, Mention, Text, Video } from './app/message-format-old.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.1.50",
+  "version": "2.1.52",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",
@@ -69,5 +69,5 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   },
-  "gitHead": "41d135f9d54dda92785d1bec929db4afcf4a3f25"
+  "gitHead": "90cafaf98cefa01152764922f58e543f0c513811"
 }