Merge pull request #1 from jeremydaly/master

update from upstream

Author: whahoo

.eslintignore

@@ -1,4 +1,4 @@
 coverage
 node_modules
-test
+__tests__
 *.test.js

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 
 node_js:
-  - "8"
+  - "12"
 
 script: "npm run-script test-ci"

README.md

@@ -0,0 +1,38 @@
+// Load simple table creation parameters
+module.exports.createTableParams = require('./tables/create-table.json')
+
+// Include dynalite and config server (use in memory)
+const dynalite = require('dynalite')
+module.exports.dynaliteServer = dynalite({
+  createTableMs: 0,
+  updateTableMs: 0,
+  deleteTableMs: 0
+})
+
+// Load AWS SDK
+const AWS = require('aws-sdk')
+
+// Create DynamoDB connection to dynalite
+module.exports.DynamoDB = new AWS.DynamoDB({
+  endpoint: 'http://localhost:4567',
+  region: 'us-east-1',
+  credentials: new AWS.Credentials({ accessKeyId: 'test', secretAccessKey: 'test' })
+})
+
+// Create our document client
+module.exports.DocumentClient = new AWS.DynamoDB.DocumentClient({
+  endpoint: 'http://localhost:4567',
+  region: 'us-east-1',
+  credentials: new AWS.Credentials({ accessKeyId: 'test', secretAccessKey: 'test' }),
+  // convertEmptyValues: true
+})
+
+// Delay helper
+module.exports.delay = ms => new Promise(res => setTimeout(res, ms))
+
+
+module.exports.DocumentClient2 = new AWS.DynamoDB.DocumentClient({
+  region: 'us-east-1',
+  credentials: new AWS.SharedIniFileCredentials({profile: ''}),
+  // convertEmptyValues: false
+})

__tests__/bootstrap-tests.js

@@ -0,0 +1,60 @@
+const checkAttribute = require('../lib/checkAttribute')
+
+// Require Table and Entity classes
+const Table = require('../classes/Table')
+const Entity = require('../classes/Entity')
+
+
+// Create basic table
+let DefaultTable = new Table({
+  name: 'test-table',
+  partitionKey: 'pk',
+  sortKey: 'sk'
+})
+
+// Create basic entity
+DefaultTable.entities = new Entity({
+  name: 'User',
+  attributes: {
+    pk: { type: 'string', partitionKey: true },
+    sk: { type: 'string', sortKey: true },
+    set: { type: 'set', setType: 'string', alias: 'set_alias' },
+    set_alias2: { type: 'set', setType: 'string', map: 'set2' },
+    number: 'number',
+    list: { type: 'list', alias: 'list_alias' },
+    list_alias2: { type: 'list', map: 'list2' },
+    test: 'map',
+  }
+})
+
+
+describe('checkAttribute', () => {
+
+  it('checks attribute and returns table attribute', () => {
+    expect(checkAttribute('number',DefaultTable.User.schema.attributes)).toBe('number')
+    expect(checkAttribute('set',DefaultTable.User.schema.attributes)).toBe('set')
+    expect(checkAttribute('set_alias',DefaultTable.User.schema.attributes)).toBe('set')
+    expect(checkAttribute('set2',DefaultTable.User.schema.attributes)).toBe('set2')
+    expect(checkAttribute('set_alias2',DefaultTable.User.schema.attributes)).toBe('set2')
+    expect(checkAttribute('set.test',DefaultTable.User.schema.attributes)).toBe('set.test')
+    expect(checkAttribute('set.test[0]',DefaultTable.User.schema.attributes)).toBe('set.test[0]')
+    expect(checkAttribute('set.test.test2[0]',DefaultTable.User.schema.attributes)).toBe('set.test.test2[0]')
+    expect(checkAttribute('set_alias.test',DefaultTable.User.schema.attributes)).toBe('set.test')
+    expect(checkAttribute('set_alias.test[0]',DefaultTable.User.schema.attributes)).toBe('set.test[0]')
+    expect(checkAttribute('set_alias.test.test2[0]',DefaultTable.User.schema.attributes)).toBe('set.test.test2[0]')
+    expect(checkAttribute('set_alias2.test',DefaultTable.User.schema.attributes)).toBe('set2.test')
+    expect(checkAttribute('set_alias2.test[0]',DefaultTable.User.schema.attributes)).toBe('set2.test[0]')
+    expect(checkAttribute('set_alias2.test.test2[0]',DefaultTable.User.schema.attributes)).toBe('set2.test.test2[0]')
+    expect(checkAttribute('test.test',DefaultTable.User.schema.attributes)).toBe('test.test')
+    expect(checkAttribute('test.test[0]',DefaultTable.User.schema.attributes)).toBe('test.test[0]')
+    expect(checkAttribute('list[1]',DefaultTable.User.schema.attributes)).toBe('list[1]')
+    expect(checkAttribute('list[1]',DefaultTable.User.schema.attributes)).toBe('list[1]')
+  })
+
+  it('returns error on invalid attribute', () => {
+    expect(() => {
+      checkAttribute('missing-attribute',DefaultTable.User.schema.attributes)
+    }).toThrow(`'missing-attribute' is not a valid attribute.`)
+  })
+
+})

__tests__/checkAttribute.unit.test.js

@@ -1,20 +1,17 @@
-// SIMPLE MODEL w/ REQUIRED fields for testing
+// SIMPLE ENTITY w/ REQUIRED fields for testing
 
 module.exports = {
-  // Include table name
-  table: 'simple-table',
-
-  // Include model field
-  model: false,
+  // Specify entity name
+  name: 'SimpleEntityReq',
 
   // Include timestamps
   timestamps: false,
 
   // Define partition and sort keys
   partitionKey: 'pk',
 
-  // Define schema
-  schema: {
+  // Define attributes
+  attributes: {
     pk: { type: 'string' },
     test: { type: 'string', required: true },
     test2: { type: 'string', required: 'always' }

__tests__/delete.unit.test.js

@@ -1,11 +1,8 @@
-// SIMPLE MODEL w/ SORT KEY for testing
+// SIMPLE ENTITY w/ SORT KEY for testing
 
 module.exports = {
-  // Include table name
-  table: 'simple-table',
-
-  // Include model field
-  model: false,
+  // Specify entity name
+  name: 'SimpleEntitySK',
 
   // Include timestamps
   timestamps: false,
@@ -14,8 +11,8 @@ module.exports = {
   partitionKey: 'pk',
   sortKey: 'sk',
 
-  // Define schema
-  schema: {
+  // Define attributes
+  attributes: {
     pk: { type: 'string' },
     sk: { type: 'string' },
     test: { type: 'string' }

__tests__/models/simple-model-req.js renamed to __tests__/entities/simple-entity-req.js

@@ -0,0 +1,16 @@
+// SIMPLE ENTITY for testing
+
+module.exports = {
+  // Specify entity name
+  name: 'SimpleEntity',
+
+  // Define attributes
+  attributes: {
+    pk: { type: 'string', partitionKey: true },
+    sk: { type: 'string', hidden: true, sortKey: true },
+    test: { type: 'string' },
+    test_composite: ['sk',0, { save: true }],
+    test_composite2: ['sk',1, { save: false }],
+    test_undefined: { default: () => undefined }
+  }
+}

__tests__/models/simple-model-sk.js renamed to __tests__/entities/simple-entity-sk.js

@@ -1,23 +1,14 @@
-// TEST MODEL for testing
+// TEST ENTITY for testing
 
 module.exports = {
-  // Include table name
-  table: 'test-table',
-
-  // Include model field
-  model: true,
-
-  // Include timestamps
-  timestamps: true,
-
-  // Define partition and sort keys
-  partitionKey: 'pk',
-  sortKey: 'sk',
-
-  // Define schema
-  schema: {
-    pk: { type: 'string', alias: 'email' },
-    sk: { type: 'string', alias: 'type' },
+  // Specify name
+  name: 'TestEntity',
+  // Optional description
+  // description: 'This is a test description for this entity',
+  // Define attributes
+  attributes: {
+    email: { type: 'string', partitionKey: true },
+    test_type: { type: 'string', sortKey: true },
     test_string: { type: 'string', coerce: false, default: 'test string' },
     test_string_coerce: { type: 'string' },
     test_number: { type: 'number', alias: 'count', coerce: false },