remove type requirement from table attributes and fix mappings issue

Author: jeremydaly

__tests__/entity-creation.unit.test.js

@@ -323,7 +323,7 @@ describe('Entity creation', ()=> {
     expect(TestTable.Table.entityField).toBe('_et')
     expect(TestTable.Table.indexes).toEqual({})
     expect(TestTable.Table.attributes).toEqual({
-      _et: { type: 'string' },
+      _et: { type: 'string', mappings: {} },
       pk: { type: 'string', mappings: { TestEnt: { pk: 'string' } } },
       _ct: { mappings: { TestEnt: { created: 'string' } } },
       _md: { mappings: { TestEnt: { modified: 'string' } } }

__tests__/parseTable.unit.test.js

@@ -24,9 +24,9 @@ describe('parseTable', () => {
     let tbl = parseTable(table)
     expect(tbl.name).toBe('test-table')
     expect(tbl.alias).toBe('test-table-alias')
-    expect(tbl.Table.attributes.entity).toEqual({ type: 'string' })
-    expect(tbl.Table.attributes.pk).toEqual({ type: 'string' })
-    expect(tbl.Table.attributes.sk).toEqual({ type: 'string' })
+    expect(tbl.Table.attributes.entity).toEqual({ type: 'string', mappings: {} })
+    expect(tbl.Table.attributes.pk).toEqual({ type: 'string', mappings: {} })
+    expect(tbl.Table.attributes.sk).toEqual({ type: 'string', mappings: {} })
     expect(tbl.Table.entityField).toBe('entity')
     expect(tbl._entities).toEqual([])
     expect(tbl.autoExecute).toBe(false)

__tests__/parseTableAttributes.unit.test.js

@@ -9,10 +9,10 @@ let attrs = {
 describe('parseTableAttributes', () => {
 
   it('parse simple attributes', async () => {
-    expect(parseTableAttributes(attrs,'pk','sk')).toEqual({ pk: { type: 'string' }, sk: { type: 'string' } })
+    expect(parseTableAttributes(attrs,'pk','sk')).toEqual({ pk: { type: 'string', mappings: {} }, sk: { type: 'string', mappings: {} } })
   })
 
-  it('fails when attribute is missing type', async () => {
+  it.skip('fails when attribute is missing type', async () => {
     expect(() => {
       parseTableAttributes(Object.assign({},attrs,{ test: {} }),'pk','sk')
     }).toThrow(`Invalid or missing type for 'test'. Valid types are 'string', 'boolean', 'number', 'list', 'map', 'binary', and 'set'.`)

__tests__/table-creation.unit.test.js

@@ -20,7 +20,7 @@ describe('Table creation', ()=> {
     expect(TestTable.Table.sortKey).toBeNull()
     expect(TestTable.Table.entityField).toBe('_et')
     expect(TestTable.Table.indexes).toEqual({})
-    expect(TestTable.Table.attributes).toEqual({ _et: { type: 'string' } })
+    expect(TestTable.Table.attributes).toEqual({ _et: { type: 'string', mappings: {} } })
     expect(TestTable.autoExecute).toBe(true)
     expect(TestTable.autoParse).toBe(true)
     expect(TestTable.entities).toEqual([])
@@ -43,7 +43,7 @@ describe('Table creation', ()=> {
     expect(TestTable.Table.sortKey).toBe('sk')
     expect(TestTable.Table.entityField).toBe('entity')
     expect(TestTable.Table.indexes).toEqual({})
-    expect(TestTable.Table.attributes).toEqual({ entity: { type: 'string' } })
+    expect(TestTable.Table.attributes).toEqual({ entity: { type: 'string', mappings: {} } })
     expect(TestTable.autoExecute).toBe(false)
     expect(TestTable.autoParse).toBe(false)
     expect(TestTable.entities).toEqual([])
@@ -79,16 +79,16 @@ describe('Table creation', ()=> {
 
     // Check attribute parsing
     expect(TestTable.Table.attributes).toEqual({
-      stringAttr: { type: 'string' },
-      numberAttr: { type: 'number' },
-      binaryAttr: { type: 'binary' },
-      booleanAttr: { type: 'boolean' },
-      listAttr: { type: 'list' },
-      mapAttr: { type: 'map' },
-      stringSetAttr: { type: 'set' },
-      numberSetAttr: { type: 'set', setType: 'number' },
-      binarySetAttr: { type: 'set', setType: 'binary' },
-      _et: { type: 'string' }
+      stringAttr: { type: 'string', mappings: {} },
+      numberAttr: { type: 'number', mappings: {} },
+      binaryAttr: { type: 'binary', mappings: {} },
+      booleanAttr: { type: 'boolean', mappings: {} },
+      listAttr: { type: 'list', mappings: {} },
+      mapAttr: { type: 'map', mappings: {} },
+      stringSetAttr: { type: 'set', mappings: {} },
+      numberSetAttr: { type: 'set', setType: 'number', mappings: {} },
+      binarySetAttr: { type: 'set', setType: 'binary', mappings: {} },
+      _et: { type: 'string', mappings: {} }
     })
   }) // end table w/ attributes
 
@@ -114,7 +114,7 @@ describe('Table creation', ()=> {
     expect(TestTable.Table.partitionKey).toBe('pk')
     expect(TestTable.Table.sortKey).toBeNull()
     expect(TestTable.Table.entityField).toBe('_et')
-    expect(TestTable.Table.attributes).toEqual({ _et: { type: 'string' } })
+    expect(TestTable.Table.attributes).toEqual({ _et: { type: 'string', mappings: {} } })
     expect(TestTable.autoExecute).toBe(true)
     expect(TestTable.autoParse).toBe(true)
     expect(TestTable.entities).toEqual([])
@@ -143,7 +143,7 @@ describe('Table creation', ()=> {
     expect(TestTable.Table.sortKey).toBeNull()
     expect(TestTable.Table.entityField).toBe('_et')
     expect(TestTable.Table.indexes).toEqual({})
-    expect(TestTable.Table.attributes).toEqual({ _et: { type: 'string' } })
+    expect(TestTable.Table.attributes).toEqual({ _et: { type: 'string', mappings: {} } })
     expect(TestTable.autoExecute).toBe(true)
     expect(TestTable.autoParse).toBe(true)
     expect(TestTable.entities).toEqual([])
@@ -166,7 +166,7 @@ describe('Table creation', ()=> {
     expect(TestTable.Table.sortKey).toBeNull()
     expect(TestTable.Table.entityField).toBe('_et')
     expect(TestTable.Table.indexes).toEqual({})
-    expect(TestTable.Table.attributes).toEqual({ _et: { type: 'string' } })
+    expect(TestTable.Table.attributes).toEqual({ _et: { type: 'string', mappings: {} } })
     expect(TestTable.autoExecute).toBe(true)
     expect(TestTable.autoParse).toBe(true)
     expect(TestTable.entities).toEqual([])

lib/parseTableAttributes.js

@@ -16,10 +16,10 @@ module.exports = (attrs,partitionKey,sortKey) => Object.keys(attrs).reduce((acc,
       : validTypes.includes(attrs[field]) ?
         Object.assign(acc,parseAttributeConfig(field,{ type: attrs[field] }))
         : typeError(field)
-  } else {
+  } else {  
     return [partitionKey,sortKey].includes(field) && !validKeyTypes.includes(attrs[field].type) ?
       keyTypeError(field)
-      : validTypes.includes(attrs[field].type) ?
+      : (validTypes.includes(attrs[field].type) || !attrs[field].type) ?
         Object.assign(acc,parseAttributeConfig(field,attrs[field]))
         : typeError(field)
   }
@@ -47,6 +47,6 @@ const parseAttributeConfig = (field,config) => {
   // if (!config.type) config.type = 'string'
 
   return {
-    [field]: config
+    [field]: { ...config, mappings: {} }
   }
 }