chore(cleanup): remove unused code

get rid of enum mapper which is not required because we use normal number or string mapper

Author: michaelwittwer

src/decorator/decorators.spec.ts

@@ -13,13 +13,11 @@ import {
   ModelWithABunchOfIndexes,
   ModelWithCustomMapperModel,
   ModelWithEnum,
-  ModelWithEnumDeclared,
   ModelWithGSI,
   NestedObject,
   SimpleModel,
 } from '../../test/models'
 import { Form } from '../../test/models/real-world'
-import { EnumType } from '../mapper'
 import { GSIPartitionKey, GSISortKey, LSISortKey, PartitionKey, Property, SortedSet, SortKey, Transient } from './impl'
 import { Model } from './impl/model/model.decorator'
 import { Metadata, metadataForClass, metadataForModel, ModelMetadata } from './index'
@@ -336,20 +334,6 @@ describe('Decorators should add correct metadata', () => {
     })
   })
 
-  describe('enum', () => {
-    let metadata: Metadata<ModelWithEnumDeclared>
-
-    beforeEach(() => {
-      metadata = metadataForClass(ModelWithEnumDeclared)
-    })
-
-    it('should add enum type to property', () => {
-      const enumPropertyMetadata = metadata.forProperty('type')!
-      expect(enumPropertyMetadata.typeInfo).toBeDefined()
-      expect(enumPropertyMetadata.typeInfo).toEqual({ type: EnumType, isCustom: true })
-    })
-  })
-
   describe('with inheritance', () => {
     it('should override the table name', () => {
       @Model({ tableName: 'super-table-name' })

src/decorator/impl/enum/enum.decorator.ts

@@ -4,8 +4,6 @@ export * from './collection/typed-set.decorator'
 export * from './collection/typed-array.decorator'
 // date
 export * from './date/date.decorator'
-// enum
-export * from './enum/enum.decorator'
 // index
 export * from './index/secondary-index'
 export * from './index/gsi-partition-key.decorator'

src/decorator/impl/index.ts

@@ -2,7 +2,6 @@ export * from './type/attribute.type'
 export * from './type/attribute-value-type.type'
 export * from './type/attribute-type.type'
 export * from './mapper'
-export * from './type/enum.type'
 export * from './type/null.type'
 export * from './type/undefined.type'
 export * from './type/binary.type'

src/mapper/index.ts

@@ -24,6 +24,7 @@ import {
   OrganizationEvent,
   Product,
   ProductNested,
+  StringType,
   Type,
 } from '../../test/models'
 import { IdMapper } from '../../test/models/model-with-custom-mapper.model'
@@ -45,7 +46,6 @@ import {
   StringAttribute,
   StringSetAttribute,
 } from './type/attribute.type'
-import { EnumType } from './type/enum.type'
 
 describe('Mapper', () => {
   describe('should map single values', () => {
@@ -83,13 +83,20 @@ describe('Mapper', () => {
         expect(attrValue.NULL).toBe(true)
       })
 
-      it('enum (no enum decorator)', () => {
+      it('enum (number)', () => {
         const attrValue = <NumberAttribute>toDbOne(Type.FirstType)!
         expect(attrValue).toBeDefined()
         expect(keyOf(attrValue)).toBe('N')
         expect(attrValue.N).toBe('0')
       })
 
+      it('enum (string)', () => {
+        const attrValue = <StringAttribute>toDbOne(StringType.FirstType)!
+        expect(attrValue).toBeDefined()
+        expect(keyOf(attrValue)).toBe('S')
+        expect(attrValue.S).toBe('first')
+      })
+
       it('enum (propertyMetadata -> no enum decorator)', () => {
         const attrValue: Attribute = <MapAttribute>toDbOne(Type.FirstType, <any>{
           typeInfo: { type: Object, isCustom: true },
@@ -99,15 +106,6 @@ describe('Mapper', () => {
         expect(attrValue.M).toEqual({})
       })
 
-      it('enum (with decorator)', () => {
-        const attrValue = <NumberAttribute>toDbOne(Type.FirstType, <any>{
-          typeInfo: { type: EnumType, isCustom: true },
-        })!
-        expect(attrValue).toBeDefined()
-        expect(keyOf(attrValue)).toBe('N')
-        expect(attrValue.N).toBe('0')
-      })
-
       it('array -> SS (homogen, no duplicates)', () => {
         const attrValue = <StringSetAttribute>toDbOne(['foo', 'bar'])!
         expect(attrValue).toBeDefined()

src/mapper/mapper.spec.ts

@@ -1,20 +1,18 @@
-import {v4 as uuidv4} from 'uuid'
+import { v4 as uuidv4 } from 'uuid'
 import { Metadata } from '../decorator/metadata/metadata'
 import { metadataForClass, metadataForProperty } from '../decorator/metadata/metadata-helper'
 import { Key, PropertyMetadata } from '../decorator/metadata/property-metadata.model'
 import { ModelConstructor } from '../model'
 import { MapperForType } from './for-type/base.mapper'
 import { BooleanMapper } from './for-type/boolean.mapper'
 import { CollectionMapper } from './for-type/collection.mapper'
-import { EnumMapper } from './for-type/enum.mapper'
 import { NullMapper } from './for-type/null.mapper'
 import { NumberMapper } from './for-type/number.mapper'
 import { ObjectMapper } from './for-type/object.mapper'
 import { StringMapper } from './for-type/string.mapper'
 import { AttributeValueType } from './type/attribute-value-type.type'
 import { Attribute, Attributes } from './type/attribute.type'
 import { Binary } from './type/binary.type'
-import { EnumType } from './type/enum.type'
 import { NullType } from './type/null.type'
 import { UndefinedType } from './type/undefined.type'
 import { typeOf, typeOfFromDb } from './util'
@@ -48,7 +46,6 @@ export function toDb<T>(item: T, modelConstructor?: ModelConstructor<T>): Attrib
 
     let attributeValue: Attribute | undefined | null
 
-    // TODO concept maybe make this configurable how to map undefined & null values
     if (propertyValue === undefined || propertyValue === null) {
       // noop ignore because we can't map it
     } else {
@@ -159,8 +156,7 @@ export function createToKeyFn<T>(modelConstructor: ModelConstructor<T>): (item:
           throw new Error(`there is no value for property ${propMeta.name.toString()} but is ${propMeta.key.type} key`)
         }
 
-        // fixme: typings
-        ;(<any>key)[propMeta.name] = <Attribute>toDbOne(propertyValue, propMeta)
+        key[propMeta.name] = <Attribute>toDbOne(propertyValue, propMeta)
         return key
       },
       <Attributes<T>>{},
@@ -257,9 +253,6 @@ export function forType(type: AttributeValueType): MapperForType<any, Attribute>
       case Boolean:
         mapper = BooleanMapper
         break
-      case EnumType:
-        mapper = EnumMapper
-        break
       case Map:
         // Maps support complex types as keys, we only support String & Number as Keys, otherwise a .toString() method should be implemented,
         // so we now how to save a  key
@@ -278,7 +271,6 @@ export function forType(type: AttributeValueType): MapperForType<any, Attribute>
         mapper = NullMapper
         break
       case Binary:
-        // TODO LOW:BINARY add binary mapper
         throw new Error('no mapper for binary type implemented yet')
       case UndefinedType:
         mapper = ObjectMapper

src/mapper/mapper.ts

@@ -6,10 +6,8 @@ export * from './model-with-custom-mapper.model'
 export * from './model-with-custom-mapper-for-sort-key.model'
 export * from './model-with-date.model'
 export * from './model-with-enum.model'
-export * from './model-with-enum-declared.model'
 export * from './model-with-indexes.model'
 export * from './model-with-date-as-key.model'
-export * from './model-with-typed-enum-declared.model'
 export * from './model-without-custom-mapper.model'
 export * from './nested-complex.model'
 export * from './nested-object.model'