feat(typings): update yup types

package.json

@@ -36,7 +36,13 @@
   "dependencies": {},
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.1",
-    "react-dom": "^16.8.0 || ^17.0.1"
+    "react-dom": "^16.8.0 || ^17.0.1",
+    "yup": "^0.32.11"
+  },
+  "peerDependenciesMeta": {
+    "yup": {
+      "optional": true
+    }
   },
   "devDependencies": {
     "@babel/preset-env": "^7.12.7",
@@ -54,7 +60,7 @@
     "@types/jest": "^27.0.2",
     "@types/react": "^17.0.0",
     "@types/react-dom": "^17.0.0",
-    "@types/yup": "^0.29.9",
+    "@types/yup": "^0.29.13",
     "@typescript-eslint/eslint-plugin": "^5.3.0",
     "@typescript-eslint/parser": "^5.3.0",
     "babel-jest": "^27.3.1",
@@ -78,7 +84,7 @@
     "rollup-plugin-typescript2": "^0.29.0",
     "ts-jest": "^27.0.7",
     "typescript": "^4.1.2",
-    "yup": "^0.31.0"
+    "yup": "^0.32.11"
   },
   "keywords": [
     "react",

src/types.ts

@@ -385,11 +385,11 @@ export type ValidateFunction<
   value: ValuesType[K],
   values: ValuesType,
   context: Context
-) => yup.Schema<any> | Error | undefined;
+) => yup.AnySchema | Error | undefined;
 
 export type Validations<ValuesType> = {
   [K in keyof ValuesType]?:
-    | yup.Schema<any>
+    | yup.AnySchema
     | ValidateFunction<ValuesType, K, unknown>;
 };
 
@@ -401,19 +401,19 @@ export type DefaultError<
 };
 
 export type DefaultValidationReturnType<
-  VF extends yup.Schema<any> | ValidateFunction<any, any> | undefined
-> = VF extends yup.Schema<any>
+  VF extends yup.AnySchema | ValidateFunction<any, any> | undefined
+> = VF extends yup.AnySchema
   ? string[]
   : VF extends ValidateFunction<any, any, infer E>
-  ? E extends yup.Schema<any>
-    ? string[] | Exclude<E, yup.Schema<any>>
+  ? E extends yup.AnySchema
+    ? string[] | Exclude<E, yup.AnySchema>
     : E
   : never;
 
 export interface ValidateYupSchemaArgs<ValuesType, K extends keyof ValuesType> {
   value: ValuesType[K];
   values: ValuesType;
-  schema: yup.Schema<any>;
+  schema: yup.AnySchema;
   context: object;
 }
 

src/validation/DefaultValidator.ts

@@ -31,9 +31,9 @@ export class DefaultValidator<
   }: ValidateFunctionArgs<ValuesType, K, E>) {
     const schemaOrResult = validate(value, values, context);
 
-    const schema = schemaOrResult as yup.Schema<any>;
+    const schema = schemaOrResult as yup.AnySchema;
 
-    if (schema && schema.validateSync) {
+    if (isYupSchema(schema)) {
       return this.validateYupSchema({ value, values, schema, context });
     } else {
       return schemaOrResult as E | undefined;
@@ -48,7 +48,7 @@ export class DefaultValidator<
   }: ValidateYupSchemaArgs<ValuesType, K>) {
     try {
       schema.validateSync(value, { context: { ...values, ...context } });
-    } catch (err) {
+    } catch (err: any) {
       if (err.name === "ValidationError") {
         return err.errors;
       } else {
@@ -81,12 +81,12 @@ export class DefaultValidator<
       return this.validateYupSchema({
         value,
         values,
-        schema: validate as yup.Schema<any>,
+        schema: validate as yup.AnySchema,
         context,
       });
     } else {
       console.warn(
-        `Expected validation of type function or yup.Schema, but received type: ${typeof validate})`,
+        `Expected validation of type function or yup.AnySchema, but received type: ${typeof validate})`,
         validate
       );
     }

test/DefaultValidator.test.ts

@@ -42,7 +42,7 @@ describe("DefaultValidator", () => {
       const validator = new DefaultValidator<TestModel>({
         aString: yup.string().when("aString", {
           is: () => 1 / 0,
-          then: "erro should be thrown before",
+          then: "error should be thrown before" as any,
         }),
       });