From 907e6f17fae4a2e2f4ea7102979a43c26ccc3d46 Mon Sep 17 00:00:00 2001
From: Bartolomeu <pbartmr@gmail.com>
Date: Sun, 19 Jun 2022 20:25:44 +0000
Subject: [PATCH] Default error messages fixes

---
 package-lock.json                               |  2 +-
 package.json                                    |  2 +-
 .../default-error-messages-types.ts             |  8 +++-----
 src/schemas/base/base-schema.ts                 | 17 ++++++++++++++---
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bb52d96..b98c142 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "not-me",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 787d040..902c784 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "not-me",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "description": "Easy and type-safe validation",
   "main": "lib/index.js",
   "types": "lib/types.d.ts",
diff --git a/src/error-messages/default-messages/default-error-messages-types.ts b/src/error-messages/default-messages/default-error-messages-types.ts
index 56ce479..5c762f4 100644
--- a/src/error-messages/default-messages/default-error-messages-types.ts
+++ b/src/error-messages/default-messages/default-error-messages-types.ts
@@ -8,8 +8,9 @@ export type DefaultErrorMessages = Partial<{
     moreThanMaximum: (maxLength: number) => string;
   }>;
   base: Partial<{
-    isNull: string;
-    isUndefined: string;
+    cannotBeNull: string;
+    cannotBeUndefined: string;
+    isRequired: string;
   }>;
   equals: Partial<{
     notEqual: string;
@@ -27,7 +28,4 @@ export type DefaultErrorMessages = Partial<{
   boolean: Partial<{
     notABoolean: string;
   }>;
-  null: Partial<{
-    notNull: string;
-  }>;
 }>;
diff --git a/src/schemas/base/base-schema.ts b/src/schemas/base/base-schema.ts
index d4de20e..a93ee22 100644
--- a/src/schemas/base/base-schema.ts
+++ b/src/schemas/base/base-schema.ts
@@ -1,3 +1,4 @@
+import { DefaultErrorMessagesManager } from "../../error-messages/default-messages/default-error-messages-manager";
 import { throwError } from "../../utils/throw-error";
 import {
   ValidationResult,
@@ -259,21 +260,31 @@ export abstract class BaseSchema<
   protected markAsDefinedInternally(message: undefined | string): void {
     this.otherFilters.push({
       type: FilterType.UndefinedCatching,
-      message: message || "Input must be defined",
+      message:
+        message ||
+        DefaultErrorMessagesManager.getDefaultMessages().base
+          ?.cannotBeUndefined ||
+        "Input must be defined",
     });
   }
 
   protected markAsNotNullInternally(message: undefined | string): void {
     this.otherFilters.push({
       type: FilterType.NullCatchingFilter,
-      message: message || "Input cannot be null",
+      message:
+        message ||
+        DefaultErrorMessagesManager.getDefaultMessages().base?.cannotBeNull ||
+        "Input cannot be null",
     });
   }
 
   protected markAsRequiredInternally(message: undefined | string): void {
     this.otherFilters.push({
       type: FilterType.NullableCatchingFilter,
-      message: message || "Input is required",
+      message:
+        message ||
+        DefaultErrorMessagesManager.getDefaultMessages().base?.isRequired ||
+        "Input is required",
     });
   }