@orion-js/schema 3.2.21 → 3.2.33

package/lib/fieldTypes/email.js

@@ -6,14 +6,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fieldType_1 = __importDefault(require("../fieldType"));
 const isString_1 = __importDefault(require("lodash/isString"));
 const Errors_1 = __importDefault(require("../Errors"));
+const isNil_1 = __importDefault(require("lodash/isNil"));
 exports.default = (0, fieldType_1.default)({
     name: 'email',
-    validate(value) {
-        if (!(0, isString_1.default)(value))
+    validate(value, { currentSchema }) {
+        if ((value === '' || (0, isNil_1.default)(value)) && !currentSchema.optional) {
+            return Errors_1.default.REQUIRED;
+        }
+        if (value && !(0, isString_1.default)(value))
             return Errors_1.default.NOT_A_STRING;
         // eslint-disable-next-line
-        const regex = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
-        if (!regex.test(value))
+        const regex = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+        if (value && !regex.test(value))
             return Errors_1.default.NOT_AN_EMAIL;
     },
     clean(value) {

package/lib/fieldTypes/email.test.js

@@ -6,13 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const email_1 = __importDefault(require("./email"));
 const Errors_1 = __importDefault(require("../Errors"));
 test('return an error when the value is incorrect', async () => {
-    //@ts-ignore
     expect(email_1.default.validate(['Hello'])).toBe(Errors_1.default.NOT_A_STRING);
-    //@ts-ignore
     expect(email_1.default.validate({ name: 'Nicolás' })).toBe(Errors_1.default.NOT_A_STRING);
-    //@ts-ignore
     expect(email_1.default.validate(new Date())).toBe(Errors_1.default.NOT_A_STRING);
     expect(email_1.default.validate('astring')).toBe(Errors_1.default.NOT_AN_EMAIL);
+    expect(email_1.default.validate(null)).toBe(Errors_1.default.REQUIRED);
+    expect(email_1.default.validate('')).toBe(Errors_1.default.REQUIRED);
+    expect(email_1.default.validate('', { currentSchema: { optional: true } })).toBeFalsy();
+    expect(email_1.default.validate(null, { currentSchema: { optional: true } })).toBeFalsy();
 });
 test('return no error when the value is correct', async () => {
     expect(email_1.default.validate('aemail@email.com')).toBeFalsy();

package/lib/fieldTypes/string.test.js

@@ -6,11 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const string_1 = __importDefault(require("./string"));
 const Errors_1 = __importDefault(require("../Errors"));
 test('return an error when the value is incorrect', async () => {
-    //@ts-ignore
     expect(string_1.default.validate(['Hello'])).toBe(Errors_1.default.NOT_A_STRING);
-    //@ts-ignore
     expect(string_1.default.validate({ name: 'Nicolás' })).toBe(Errors_1.default.NOT_A_STRING);
-    //@ts-ignore
     expect(string_1.default.validate(new Date())).toBe(Errors_1.default.NOT_A_STRING);
 });
 test('return no error when the value is correct', async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/schema",
-  "version": "3.2.21",
+  "version": "3.2.33",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "160e776b7a8448c8e4f67cae79849d6520eaf0c1"
+  "gitHead": "3b0bf99ff75e304ce8fc0e8d9d766039cdbcc624"
 }