fix: fully update to shapeshift v4 and set custom error messages

Author: favna

src/lib/validations/fuzzyArgs/base.ts

@@ -25,10 +25,19 @@ export interface BaseFuzzyArgs {
 }
 
 export const baseFuzzySchema: SchemaOf<BaseFuzzyArgs> = s.object({
-  take: s.number
-    .greaterThanOrEqual(1)
-    .lessThanOrEqual(50)
-    .nullish.transform((v) => v ?? 1),
-  offset: s.number.greaterThanOrEqual(0).nullish.transform((v) => v ?? 0),
-  reverse: s.boolean.nullish.transform((v) => v ?? false)
+  take: s
+    .number({ message: 'The amount to take has to be a number' })
+    .greaterThanOrEqual(1, { message: 'You have to take at least 1 result' })
+    .lessThanOrEqual(50, { message: 'You can only take up to 50 results' })
+    .nullish({ message: 'The amount to take has to be a number' })
+    .transform((v) => v ?? 1),
+  offset: s
+    .number({ message: 'The offset has to be a number' })
+    .greaterThanOrEqual(0, { message: 'The offset has to be at least 0' })
+    .nullish({ message: 'The offset has to be a number' })
+    .transform((v) => v ?? 0),
+  reverse: s
+    .boolean({ message: 'The reverse flag has to be a boolean' })
+    .nullish({ message: 'The reverse flag has to be a boolean' })
+    .transform((v) => v ?? false)
 });

src/lib/validations/fuzzyArgs/fuzzyAbilityArgs.ts

@@ -9,7 +9,7 @@ export interface GetFuzzyAbilityArgs extends BaseFuzzyArgs {
 }
 
 const getFuzzyAbilitySchema: SchemaOf<GetFuzzyAbilityArgs> = baseFuzzySchema.extend({
-  ability: s.string
+  ability: s.string({ message: 'The ability has to be a string' })
 });
 
 export function validateGetFuzzyAbilityArgs(args: GetFuzzyAbilityArgs): GetFuzzyAbilityArgs {

src/lib/validations/fuzzyArgs/fuzzyItemArgs.ts

@@ -9,7 +9,7 @@ export interface GetFuzzyItemArgs extends BaseFuzzyArgs {
 }
 
 const getFuzzyItemSchema: SchemaOf<GetFuzzyItemArgs> = baseFuzzySchema.extend({
-  item: s.string
+  item: s.string({ message: 'The item has to be a string' })
 });
 
 export function validateGetFuzzyItemArgs(args: GetFuzzyItemArgs): GetFuzzyItemArgs {

src/lib/validations/fuzzyArgs/fuzzyMoveArgs.ts

@@ -9,7 +9,7 @@ export interface GetFuzzyMoveArgs extends BaseFuzzyArgs {
 }
 
 const getFuzzyMoveSchema: SchemaOf<GetFuzzyMoveArgs> = baseFuzzySchema.extend({
-  move: s.string
+  move: s.string({ message: 'The move has to be a string' })
 });
 
 export function validateGetFuzzyMoveArgs(args: GetFuzzyMoveArgs): GetFuzzyMoveArgs {

src/lib/validations/getAbilityArgs.ts

@@ -8,7 +8,7 @@ export interface GetAbilityArgs {
 }
 
 const getAbilitySchema: SchemaOf<GetAbilityArgs> = s.object({
-  ability: s.string
+  ability: s.string({ message: 'The ability has to be a string' })
 });
 
 export function validateGetAbilityArgs(args: GetAbilityArgs): GetAbilityArgs {

src/lib/validations/getItemArgs.ts

@@ -8,7 +8,7 @@ export interface GetItemArgs {
 }
 
 const getItemSchema: SchemaOf<GetItemArgs> = s.object({
-  item: s.string
+  item: s.string({ message: 'The item has to be a string' })
 });
 
 export function validateGetItemArgs(args: GetItemArgs): GetItemArgs {

src/lib/validations/getLearnsetArgs.ts

@@ -15,11 +15,20 @@ export interface GetLearnsetArgs extends GetPokemonArgs {
 }
 
 const getLearnsetSchema: SchemaOf<GetLearnsetArgs> = getPokemonSchema.extend({
-  moves: s.array(s.string).unique.lengthGreaterThanOrEqual(1),
-  generation: s.number.int
-    .greaterThanOrEqual(1)
-    .lessThanOrEqual(9)
-    .nullish.transform((v) => v ?? 9)
+  moves: s
+    .array(
+      s.string({ message: 'The move has to be a string' }), //
+      { message: 'The list of moves has to be an array' }
+    )
+    .unique({ message: 'The list of moves should be a unique list with no duplicates' })
+    .lengthGreaterThanOrEqual(1, { message: 'The list of moves should have at least one move' }),
+  generation: s
+    .number({ message: 'The generation has to be a number' })
+    .int({ message: 'The generation has to be an integer' })
+    .greaterThanOrEqual(1, { message: 'The minimum generation is 1' })
+    .lessThanOrEqual(9, { message: 'The maximum generation is 9' })
+    .nullish({ message: 'The generation has to be a number' })
+    .transform((v) => v ?? 9)
 });
 
 export function validateGetLearnsetArgs(args: GetLearnsetArgs): NonNullish<GetLearnsetArgs> {

src/lib/validations/getMoveArgs.ts

@@ -8,7 +8,7 @@ export interface GetMoveArgs {
 }
 
 const getMoveSchema: SchemaOf<GetMoveArgs> = s.object({
-  move: s.string
+  move: s.string({ message: 'The move has to be a string' })
 });
 
 export function validateGetMoveArgs(args: GetMoveArgs): GetMoveArgs {

src/lib/validations/getTypeMatchupArgs.ts

@@ -14,8 +14,8 @@ export interface GetTypeMatchupArgs {
 }
 
 const getTypeMatchupSchema: SchemaOf<GetTypeMatchupArgs> = s.object({
-  primaryType: s.nativeEnum(TypesEnum),
-  secondaryType: s.nativeEnum(TypesEnum).nullish
+  primaryType: s.nativeEnum(TypesEnum, { message: 'The primary type has to be a valid type' }),
+  secondaryType: s.nativeEnum(TypesEnum, { message: 'The secondary type has to be a valid type' }).nullish()
 });
 
 export function validateGetTypeMatchupArgs(args: GetTypeMatchupArgs): GetTypeMatchupArgs {

src/lib/validations/pokemonArgs/base.ts

@@ -20,10 +20,19 @@ export interface BasePokemonArgs {
 }
 
 export const basePokemonArgsSchema: SchemaOf<BasePokemonArgs> = s.object({
-  offsetFlavorTexts: s.number.greaterThanOrEqual(0).nullish.transform((v) => v ?? 0),
-  takeFlavorTexts: s.number
-    .greaterThanOrEqual(1)
-    .lessThanOrEqual(50)
-    .nullish.transform((v) => v ?? 1),
-  reverseFlavorTexts: s.boolean.nullish.transform((v) => v ?? true)
+  offsetFlavorTexts: s
+    .number({ message: 'The offset has to be a number' })
+    .greaterThanOrEqual(0, { message: 'The offset has to be at least 0' })
+    .nullish({ message: 'The offset has to be a number' })
+    .transform((v) => v ?? 0),
+  takeFlavorTexts: s
+    .number({ message: 'The amount of flavor texts to take has to be a number' })
+    .greaterThanOrEqual(1, { message: 'You have to take at least 1 result' })
+    .lessThanOrEqual(50, { message: 'You can only take up to 50 results' })
+    .nullish({ message: 'The amount of flavor texts to take has to be a number' })
+    .transform((v) => v ?? 1),
+  reverseFlavorTexts: s
+    .boolean({ message: 'The reverse flag has to be a boolean' })
+    .nullish({ message: 'The reverse flag has to be a boolean' })
+    .transform((v) => v ?? true)
 });