fix: use zod instead of ow for max/min option validation (#66)

Co-authored-by: Vlad Frangu <kingdgrizzle@gmail.com>
discordjs · Dec 22, 2021 · beb35fb · beb35fb
1 parent 2e1e860
commit beb35fb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/interactions/slashCommands/options/integer.ts b/src/interactions/slashCommands/options/integer.ts
@@ -1,8 +1,8 @@
 import { ApplicationCommandOptionType } from 'discord-api-types/v9';
 import { ApplicationCommandNumberOptionBase } from '../mixins/CommandNumberOptionBase';
-import ow from 'ow';
+import { z } from 'zod';
 
-const numberPredicate = ow.number.integer;
+const numberValidator = z.number().int().nonnegative();
 
 export class SlashCommandIntegerOption extends ApplicationCommandNumberOptionBase {
 	public override readonly type = ApplicationCommandOptionType.Integer as const;
@@ -12,13 +12,13 @@ export class SlashCommandIntegerOption extends ApplicationCommandNumberOptionBas
 	}
 
 	public setMaxValue(max: number): this {
-		ow(max, numberPredicate);
+		numberValidator.parse(max);
 		this.maxValue = max;
 		return this;
 	}
 
 	public setMinValue(min: number): this {
-		ow(min, numberPredicate);
+		numberValidator.parse(min);
 		this.minValue = min;
 		return this;
 	}

diff --git a/src/interactions/slashCommands/options/number.ts b/src/interactions/slashCommands/options/number.ts
@@ -1,9 +1,8 @@
 import { ApplicationCommandOptionType } from 'discord-api-types/v9';
 import { ApplicationCommandNumberOptionBase } from '../mixins/CommandNumberOptionBase';
+import { z } from 'zod';
 
-import ow from 'ow';
-
-const numberPredicate = ow.number;
+const numberValidator = z.number().nonnegative();
 
 export class SlashCommandNumberOption extends ApplicationCommandNumberOptionBase {
 	public override readonly type = ApplicationCommandOptionType.Number as const;
@@ -13,13 +12,13 @@ export class SlashCommandNumberOption extends ApplicationCommandNumberOptionBase
 	}
 
 	public setMaxValue(max: number): this {
-		ow(max, numberPredicate);
+		numberValidator.parse(max);
 		this.maxValue = max;
 		return this;
 	}
 
 	public setMinValue(min: number): this {
-		ow(min, numberPredicate);
+		numberValidator.parse(min);
 		this.minValue = min;
 		return this;
 	}