chore: add support to OnValidateError actionReturn

gramiojs · Aug 30, 2024 · f3c5fad · f3c5fad
1 parent 83ab571
commit f3c5fad
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@gramio/prompt",
-	"version": "1.1.2",
+	"version": "1.1.3",
 	"description": "Prompt plugin for GramIO",
 	"main": "dist/index.cjs",
 	"module": "dist/index.js",

diff --git a/src/index.ts b/src/index.ts
@@ -90,7 +90,7 @@ export function prompt<GlobalData = never>(options?: {
 						if (typeof prompt.onValidateError === "string")
 							return context.send(prompt.onValidateError);
 						// @ts-ignore
-						if (prompt.onValidateError) return prompt.onValidateError(context);
+						if (prompt.onValidateError) return prompt.onValidateError(context, prompt.actionReturn);
 						if (prompt.text)
 							return context.send(prompt.text, prompt.sendParams);
 						return;

diff --git a/src/types.ts b/src/types.ts
@@ -83,15 +83,27 @@ export type ValidateFunction<Event extends EventsUnion> = (
 export type TransformFunction<Event extends EventsUnion, Data> = (
 	context: PromptAnswer<Event, never>,
 ) => MaybePromise<Data>;
-export type OnValidateErrorFunction<Event extends EventsUnion, Data> = (
+export type OnValidateErrorFunction<
+	Event extends EventsUnion,
+	Data,
+	ActionReturn = never,
+> = (
 	context: PromptAnswer<Event>,
+	...data: IsNever<ActionReturn> extends true
+		? []
+		: [actionReturn: ActionReturn]
 ) => any;
 
-interface PromptData<Event extends EventsUnion, Data = never> {
+interface PromptData<
+	Event extends EventsUnion,
+	Data = never,
+	ActionReturn = any,
+> {
 	resolve: (context: PromptAnswer<Event, Data>) => void;
 	events?: Event[];
 	validate?: ValidateFunction<Event>;
 	onValidateError?: string | OnValidateErrorFunction<Event, Data>;
+	actionReturn?: ActionReturn;
 	transform?: TransformFunction<Event, Data>;
 	sendParams?: Optional<SendMessageParams, "chat_id" | "text">;
 	text?: string;
@@ -154,7 +166,9 @@ export interface WaitWithActionFunction<GlobalData = never> {
 			| {
 					validate?: ValidateFunction<Event>;
 					transform?: TransformFunction<Event, Data>;
-					onValidateError?: string | OnValidateErrorFunction<Event, Data>;
+					onValidateError?:
+						| string
+						| OnValidateErrorFunction<Event, Data, ActionReturn>;
 			  },
 	): Promise<[PromptAnswer<Event, Data>, ActionReturn]>;
 }

diff --git a/src/utils.ts b/src/utils.ts
@@ -196,6 +196,7 @@ export function getWaitWithAction(
 
 		return new Promise<[PromptAnswer<Event>, ActionReturn]>((resolve) => {
 			prompts.set(id, {
+				actionReturn,
 				// @ts-expect-error
 				resolve: resolve,
 				events: Array.isArray(events) ? events : [events],