renames & 2nd phase todos (#8)

* refactor: renames and add second phase todos

* fix: add 'unknown' overlap to property dto

Co-authored-by: Idanpt <idan.ptichi@naturalint.com>
Co-authored-by: Omer Morad <omer.moradd@gmail.com>

src/class-processor.ts

@@ -2,7 +2,7 @@ import { ClassReflector } from './class-reflector';
 import { CallbackValueHandler } from './handlers/callback-value-handler';
 import { ObjectLiteralValueHandler } from './handlers/object-literal-value-handler';
 import { EnumValueHandler } from './handlers/enum-value-handler';
-import { MultiClassValueHandler } from './handlers/multi-class-value-handler';
+import { ArrayValueHandler } from './handlers/array-value-handler';
 import { SingleClassValueHandler } from './handlers/single-class-value-handler';
 import { PrimitiveValueHandler } from './handlers/primitive-value-handler';
 import { ClassLiteral, Class, FixtureOptions } from './types/fixture-options.type';
@@ -15,7 +15,7 @@ import FakerStatic = Faker.FakerStatic;
 export class ClassProcessor<T> implements IClassProcessor<T> {
   private static readonly VALUE_INSPECTORS: Class<ValueHandler<FixtureOptions>>[] = [
     EnumValueHandler,
-    MultiClassValueHandler,
+    ArrayValueHandler,
     SingleClassValueHandler,
     CallbackValueHandler,
     ObjectLiteralValueHandler,

src/handlers/multi-class-value-handler.test.ts → src/handlers/array-value-handler.test.ts

@@ -1,15 +1,15 @@
 import { PropertyDto } from '../types/property-dto.interface';
-import { MultiClassValueHandler } from '../handlers/multi-class-value-handler';
+import { ArrayValueHandler } from './array-value-handler';
 import { ClassProcessor } from '../class-processor';
 import { MultiClass } from '../types/fixture-options.type';
 
 import FakerStatic = Faker.FakerStatic;
 
-describe('MultiClassValueHandler Unit', () => {
+describe('ArrayValueHandler Unit', () => {
   const DTO_CLASS_VALUE = class TestClass {};
   const DEFAULT_COUNT_FOR_DTO = 3;
 
-  let handler: MultiClassValueHandler<MultiClass>;
+  let handler: ArrayValueHandler<MultiClass>;
 
   const dto: PropertyDto<MultiClass> = {
     type: 'object',
@@ -34,9 +34,9 @@ describe('MultiClassValueHandler Unit', () => {
     },
   } as unknown) as FakerStatic;
 
-  describe('given a MultiClassValueHandler', () => {
+  describe('given a ArrayValueHandler', () => {
     beforeAll(() => {
-      handler = new MultiClassValueHandler(fakerMock, classProcessorMock);
+      handler = new ArrayValueHandler(fakerMock, classProcessorMock);
     });
 
     describe("when calling 'shouldHandle' with type 'object' and value of multi class ({ type: ClassType })", () => {

src/handlers/multi-class-value-handler.ts → src/handlers/array-value-handler.ts

@@ -7,21 +7,20 @@ import { PrimitiveHandlerAbstract } from './primitive-handler-abstract';
 
 import FakerStatic = Faker.FakerStatic;
 
-export class MultiClassValueHandler<P extends MultiClass>
-  extends PrimitiveHandlerAbstract<P>
-  implements ValueHandler<P> {
+// TODO: refactor (2nd phase). All other fixture options should be wrapped with 'multiple' functionality
+export class ArrayValueHandler<P extends MultiClass> extends PrimitiveHandlerAbstract<P> implements ValueHandler<P> {
   public constructor(protected readonly faker: FakerStatic, protected readonly classProcessor: ClassProcessor<Class>) {
     super(faker);
   }
 
-  public static isTypeValue(propertyDto: PropertyDto<any>): boolean {
+  public static hasTypeKey(propertyDto: PropertyDto<MultiClass>): boolean {
     const { value } = propertyDto;
 
     return Object.prototype.hasOwnProperty.call(value, 'type');
   }
 
   public shouldHandle(propertyDto: PropertyDto<P>): boolean {
-    return propertyDto.type === 'object' && MultiClassValueHandler.isTypeValue(propertyDto);
+    return propertyDto.type === 'object' && ArrayValueHandler.hasTypeKey(propertyDto);
   }
 
   public produceValue<T>(propertyDto: PropertyDto<P>): any {

src/handlers/object-literal-value-handler.ts

@@ -1,4 +1,4 @@
-import { MultiClassValueHandler } from './multi-class-value-handler';
+import { ArrayValueHandler } from './array-value-handler';
 import { EnumValueHandler } from './enum-value-handler';
 import { ValueHandler } from '../types/value-handler.interface';
 import { PropertyDto } from '../types/property-dto.interface';
@@ -8,7 +8,7 @@ export class ObjectLiteralValueHandler<P extends ObjectLiteral> implements Value
   public shouldHandle(propertyDto: PropertyDto<P>): boolean {
     return (
       propertyDto.type === 'object' &&
-      !MultiClassValueHandler.isTypeValue((propertyDto as unknown) as PropertyDto<MultiClass>) &&
+      !ArrayValueHandler.hasTypeKey((propertyDto as unknown) as PropertyDto<MultiClass>) &&
       !EnumValueHandler.isEnumValue((propertyDto as unknown) as PropertyDto<EnumObject>)
     );
   }

src/handlers/primitive-value-handler.ts

@@ -2,7 +2,7 @@ import { PrimitiveHandlerAbstract } from './primitive-handler-abstract';
 import { ValueHandler } from '../types/value-handler.interface';
 import { PropertyDto } from '../types/property-dto.interface';
 import { ExactValue, MultiClass } from '../types/fixture-options.type';
-import { MultiClassValueHandler } from '../handlers/multi-class-value-handler';
+import { ArrayValueHandler } from './array-value-handler';
 
 import FakerStatic = Faker.FakerStatic;
 
@@ -21,7 +21,7 @@ export class PrimitiveValueHandler<P extends ExactValue>
     const { value } = propertyDto;
 
     if (typeof value !== 'undefined') {
-      if (MultiClassValueHandler.isTypeValue((propertyDto as unknown) as PropertyDto<MultiClass>)) {
+      if (ArrayValueHandler.hasTypeKey((propertyDto as unknown) as PropertyDto<MultiClass>)) {
         throw new Error(
           'Type mismatch. Properties decorated with @Fixture({ type: ClassType }) must be typed as array (e.g. prop: string[])'
         );

src/types/property-dto.interface.ts

@@ -1,6 +1,7 @@
 import { FixtureOptions } from './fixture-options.type';
 
 // TODO: Make generic
+// TODO: refactor (2nd phase). change to class, which will contain all relevant methods which are now speared as static functions in different classes
 export interface PropertyDto<T extends FixtureOptions> {
   value: T;
   name: string;