fix dynamodb-toolbox#69 by adding alias support to defaults data object

Author: jeremydaly

__tests__/entity.put.unit.test.js

@@ -70,6 +70,23 @@ const TestEntity3 = new Entity({
   table: TestTable2
 })
 
+const TestTable3 = new Table({
+  name: 'TestTable3',
+  partitionKey: 'pk',
+  sortKey: 'sk',
+  DocumentClient
+})
+
+const TestEntity4 = new Entity({
+  name: 'TestEntity4',
+  attributes: {
+    id: { partitionKey: true},
+    sk: { hidden: true, sortKey: true, default: (data) => data.id },
+    test: { alias: 'xyz' }
+  },
+  table: TestTable3
+});
+
 describe('put',()=>{
 
   it('creates basic item',() => {
@@ -366,4 +383,12 @@ describe('put',()=>{
     expect(TableName).toBe('test-table')
   })
 
+
+  it('correctly aliases pks', () => {
+    let { Item } = TestEntity4.putParams({ id: 3, xyz: '123' })
+    expect(Item.sk).toBe('3')
+    // expect(TableName).toBe('test-table')
+  })
+
+
 })

classes/Entity.js

@@ -701,13 +701,16 @@ class Entity {
   putParams(item={},options={},params={}) {
     // Extract schema and defaults
     const { schema, defaults, required, linked, _table } = this
-
+    
     // Initialize validateType with the DocumentClient
     const validateType = validateTypes(this.DocumentClient)
 
     // Merge defaults
     const data = normalizeData(this.DocumentClient)(schema.attributes,linked,Object.assign({},defaults,item))
 
+    // console.log(data);
+    
+
     // Extract valid options
     const {
       conditions, // ConditionExpression

lib/normalizeData.js

@@ -15,16 +15,33 @@ module.exports = (DocumentClient) => (schema,linked,data,filter=false) => {
   // Intialize validate type
   const validateType = validateTypes(DocumentClient)
 
-  let _data = Object.keys(data).reduce((acc,field) => {
+  // Generate normalized data object
+  let dataMap = Object.keys(data).reduce((acc,field) => {
 
+    // Return a map with normalized data and alias references
     return Object.assign(acc,
-      schema[field] ? { [schema[field].map || field] : data[field] }
+      schema[field] ? { 
+        data: { ...acc.data, [schema[field].map || field] : data[field] },
+        aliases: { ...acc.aliases, [schema[field].alias || field] : data[field] }
+      }
       : filter ? {} // this will filter out non-mapped fields
-      : field === '$remove' ? { $remove: data[field] } // support for removes
+      : field === '$remove' ? { data: { ...acc.data, $remove: data[field] } } // support for removes
       : error(`Field '${field}' does not have a mapping or alias`)
     )
+    
+  },{ data: {}, aliases: {} })
+
+  
+  // Generate final data and evaluate function expressions
+  let _data = Object.keys(dataMap.data).reduce((acc,field) => {
+    return Object.assign(acc, { 
+      [field]: typeof dataMap.data[field] === 'function' ? dataMap.data[field]({ ...dataMap.data, ...dataMap.aliases }) : dataMap.data[field]
+    })
   },{})
 
+  // console.log(_data)
+  
+
   // Process linked
   let composites = Object.keys(linked).reduce((acc,attr) => {
 

lib/validateTypes.js

@@ -9,11 +9,11 @@
 const { toBool, hasValue, error } = require('./utils')
 
 // Performs type validation/coercian
-module.exports = (DocumentClient) => (mapping,field,input,data={}) => {
+module.exports = (DocumentClient) => (mapping,field,value,data={}) => {
 
   // Evaluate function expressions
   // TODO: should this happen here?
-  let value = typeof input === 'function' ? input(data) : input
+  // let value = typeof input === 'function' ? input(data) : input
 
   // return if undefined or null
   if (!hasValue(value)) return value