move files around for better structure

src/__mocks__/address-mock.ts

@@ -1,4 +1,4 @@
-import { Primitives } from '../utils/validation/ModelValidator';
+import { Primitives } from '../lib/validation/model-validator';
 
 export const mockAddressModel = [
   { key: 'street', required: true, type: Primitives.String },

src/__mocks__/user-mock.ts

@@ -1,5 +1,5 @@
 import { mockAddress, mockAddressModel } from './address-mock';
-import { NonPrimitives, Primitives } from '../utils/validation/ModelValidator';
+import { NonPrimitives, Primitives } from '../lib/validation/model-validator';
 
 export const mockUserModel = [
   { key: 'firstname', required: true, type: Primitives.String },

src/utils/validation/BooleanValidator.spec.ts → src/lib/validation/boolean-validator.spec.ts

@@ -1,4 +1,4 @@
-import { BooleanValidator } from './BooleanValidator';
+import { BooleanValidator } from './boolean-validator';
 
 describe('BooleanValidator', () => {
   const validator = new BooleanValidator();

src/lib/validation/index.ts

@@ -0,0 +1,9 @@
+export interface Validator {
+  validate(value: any): boolean;
+}
+
+export { BooleanValidator } from './boolean-validator';
+export { ModelValidator } from './model-validator';
+export { NumberValidator } from './number-validator';
+export { ObjectValidator } from './object-validator';
+export { StringValidator } from './string-validator';

src/utils/validation/ModelValidator.spec.ts → src/lib/validation/model-validator.spec.ts

@@ -91,7 +91,7 @@ describe('ModelValidator', () => {
         const invalidUserWithAddressValidator = new ModelValidator(invalidMockUserWithAddressModel, validators);
         const { errors, isValid } = invalidUserWithAddressValidator.validate(mockUserWithAddress);
 
-        expect(errors).toEqual(['Model validation error: missing nested model address']);
+        expect(errors).toEqual(['Model validation error: missing nested model for key address']);
         expect(isValid).toEqual(false);
       });
 

src/utils/validation/ModelValidator.ts → src/lib/validation/model-validator.ts

@@ -53,15 +53,11 @@ export class ModelValidator {
     const nestedModels = this.model.filter((property) => property.type === NonPrimitives.Object);
     nestedModels.forEach((nestedModel) => {
       const { key, model } = nestedModel;
-
-      if (model && key) {
-        const nestedObj = obj[key];
-        const validator = new ModelValidator(model, this.typeValidators);
-        const { errors } = validator.validate(nestedObj);
-        errors.forEach(this.invalidate);
-      } else {
-        this.invalidate(`missing nested model ${key}`);
-      }
+      if (!model) return this.invalidate(`missing nested model for key ${key}`);
+      const nestedObj = obj[key];
+      const validator = new ModelValidator(model, this.typeValidators);
+      const { errors } = validator.validate(nestedObj);
+      errors.forEach(this.invalidate);
     });
   };
 
@@ -80,13 +76,9 @@ export class ModelValidator {
       const typeValidator = this.getValidatorForType(expectedType);
       const objectProperty = obj[key];
 
-      if (typeValidator) {
-        if (this.hasInvalidType(objectProperty, typeValidator)) {
-          const errorMsg = `expected ${key} to have type ${expectedType} but has type ${typeof objectProperty}`;
-          return this.invalidate(errorMsg);
-        }
-      } else {
-        return this.invalidate(`missing validator for type ${expectedType}`);
+      if (!typeValidator) return this.invalidate(`missing validator for type ${expectedType}`);
+      if (this.hasInvalidType(objectProperty, typeValidator)) {
+        this.invalidate(`expected ${key} to have type ${expectedType} but has type ${typeof objectProperty}`);
       }
     });
   };

src/utils/validation/NumberValidator.spec.ts → src/lib/validation/number-validator.spec.ts

@@ -1,4 +1,4 @@
-import { NumberValidator } from './NumberValidator';
+import { NumberValidator } from './number-validator';
 
 describe('NumberValidator', () => {
   const validator = new NumberValidator();

src/utils/validation/ObjectValidator.spec.ts → src/lib/validation/object-validator.spec.ts

@@ -1,4 +1,4 @@
-import { ObjectValidator } from './ObjectValidator';
+import { ObjectValidator } from './object-validator';
 
 describe('ObjectValidator', () => {
   const validator = new ObjectValidator();

src/utils/validation/StringValidator.spec.ts → src/lib/validation/string-validator.spec.ts

@@ -1,4 +1,4 @@
-import { StringValidator } from './StringValidator';
+import { StringValidator } from './string-validator';
 
 describe('StringValidator', () => {
   const validator = new StringValidator();