Skip to content

Commit

Permalink
More vars to const
Browse files Browse the repository at this point in the history
  • Loading branch information
@Wsiegenthaler
Wsiegenthaler committed Jan 19, 2018
1 parent 3646664 commit 2360f8e
Show file tree
Hide file tree
Showing 11 changed files with 101 additions and 101 deletions.
32 changes: 16 additions & 16 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@ npm install --save sequelize-embed
Import `sequelize-embed` and initialize with `sequelize`:

```javascript
var embed = require('sequelize-embed')(sequelize)
const embed = require('sequelize-embed')(sequelize)
```

Setup an example schema - an *Order* can have *Items*, each of which is assigned a *Department*:

```javascript
var Order = sequelize.define('Order', {})
var Item = sequelize.define('Item', { quantity: Sequelize.STRING })
var Department = sequelize.define('Department', { name: Sequelize.STRING })
const Order = sequelize.define('Order', {})
const Item = sequelize.define('Item', { quantity: Sequelize.STRING })
const Department = sequelize.define('Department', { name: Sequelize.STRING })

Order.Items = Order.hasMany(Item, { as: 'items', foreignKey: 'orderId' })
Item.Department = Item.belongsTo(Department, { as: 'department', foreignKey: 'deptId' })`
Expand All @@ -95,16 +95,16 @@ Item.Department = Item.belongsTo(Department, { as: 'department', foreignKey: 'de
Use the `mkInclude` helper to define the associations we wish to include. Here `itemsOnly` will update `Items` while `itemsAndDept` will update `Items` *and* `Departments`.

```javascript
var { mkInclude } = embed.util.helpers
const { mkInclude } = embed.util.helpers
var itemsAndDept = [ mkInclude(Order.Items, mkInclude(Item.Department)) ]
var itemsOnly = [ mkInclude(Order.Items) ]
const itemsAndDept = [ mkInclude(Order.Items, mkInclude(Item.Department)) ]
const itemsOnly = [ mkInclude(Order.Items) ]
```

Insert an order, it's items, and departments by including `itemsAndDept`:
```javascript
var order = {
const order = {
items: [ { quantity: 1, department: { name: 'produce' } } ]
}
Expand All @@ -117,7 +117,7 @@ embed.insert(Order, order, itemsAndDept)
Change the quantity and department of our existing item:
```javascript
var order = {
const order = {
id: 1,
items: [ { id: 1, quantity: 2, department: { name: 'dairy' } } ]
}
Expand All @@ -131,7 +131,7 @@ embed.update(Order, order, itemsAndDept)
For the purposes of demonstration we've included `Departments` in our update, but since a `Department` is shared between orders we probably wouldn't want to include them when updating an order. Let's add another item, this time including just `itemsOnly` and being sure to specify a department known to exist:

```javascript
var order = {
const order = {
id: 1,
items: [
{ id: 1, quantity: 2, department: { id: 2, name: 'dairy' } },
Expand All @@ -150,7 +150,7 @@ Notice that the new item was correctly assigned to the `produce` department desp
Finally, remove the first item and reassign the second to the `dairy` department:
```javascript
var order = {
const order = {
id: 1,
items: [ { id: 2, quantity: 3, department: { id: 2 } } ]
}
Expand All @@ -172,21 +172,21 @@ Since the underlying data is normalized, completing an `update` or `insert` oper
*Sequelize Embed* also provides *Epilogue* middleware for automatically updating associations during PUT and POST operations. This can greatly simplify client development by giving your REST api the feel of a document-oriented database.
```javascript
var embed = require('sequelize-embed')(sequelize)
const embed = require('sequelize-embed')(sequelize)
var includeOnRead = ... // include for get
var includeOnWrite = ... // include for put/post
const includeOnRead = ... // include for get
const includeOnWrite = ... // include for put/post
// setup resource like normal
var resource = epilogue.resource({
const resource = epilogue.resource({
model: Model,
include: includeOnRead,
associations: false,
...
});
// add middleware to the resource, specifying includes
var middleware = embed.Epilogue(epilogue)
const middleware = embed.Epilogue(epilogue)
resource.use(middleware(includeOnWrite))
```
Expand Down
14 changes: 7 additions & 7 deletions test/belongsToSpec.js
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@

var Bluebird = require('bluebird');
const Bluebird = require('bluebird');

var { sequelize, models, sync, clear } = require('./common');
var { Customer, Item, ItemType, Order, Audit } = models;
const { sequelize, models, sync, clear } = require('./common');
const { Customer, Item, ItemType, Order, Audit } = models;

var embed = require('../src/index')(sequelize);
var { mkIncludes, mkInclude } = embed.util.helpers;
const embed = require('../src/index')(sequelize);
const { mkIncludes, mkInclude } = embed.util.helpers;


/* --- setup --- */

var include = mkIncludes(mkInclude(Order.Customer));
var opts = { reload: { include } };
const include = mkIncludes(mkInclude(Order.Customer));
const opts = { reload: { include } };


/* --- tests --- */
Expand Down
28 changes: 14 additions & 14 deletions test/common.js
View file
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@

var lo = require('lodash');
var Bluebird = require('bluebird');
const lo = require('lodash');
const Bluebird = require('bluebird');


/* --------- Test Database --------- */

var Sequelize = require('sequelize')
var sequelize = new Sequelize('testdb', null, null, { dialect: 'sqlite' })
const Sequelize = require('sequelize')
const sequelize = new Sequelize('testdb', null, null, { dialect: 'sqlite' })

/* --------- Models --------- */

var Customer = sequelize.define('Customer', {
const Customer = sequelize.define('Customer', {
name: Sequelize.STRING
})

var Region = sequelize.define('Region', {
const Region = sequelize.define('Region', {
name: Sequelize.STRING
})

var Item = sequelize.define('Item', {
const Item = sequelize.define('Item', {
quantity: Sequelize.INTEGER
})

var ItemType = sequelize.define('ItemType', {
const ItemType = sequelize.define('ItemType', {
dept: Sequelize.STRING
})

var Note = sequelize.define('Note', {
const Note = sequelize.define('Note', {
body: Sequelize.STRING,
orderId: { type: Sequelize.INTEGER, primaryKey: true }
})

var Flag = sequelize.define('Flag', {
const Flag = sequelize.define('Flag', {
code: Sequelize.STRING
})

var Audit = sequelize.define('Audit', {
const Audit = sequelize.define('Audit', {
manager: Sequelize.STRING,
authorized: { type: Sequelize.BOOLEAN, defaultValue: false }
})

var Order = sequelize.define('Order', {
const Order = sequelize.define('Order', {
name: Sequelize.STRING
}, { timestamps: false })

Expand All @@ -60,9 +60,9 @@ Note.Flags = Note.hasMany(Flag, { as: 'flags', foreignKey: 'orderId' });

/* --------- Util --------- */

var sync = done => sequelize.sync({ force: true, logging: false }).then(() => done())
const sync = done => sequelize.sync({ force: true, logging: false }).then(() => done())

var clear = () => Bluebird.all(lo.values(models).map(m => m.destroy({ truncate: true })));
const clear = () => Bluebird.all(lo.values(models).map(m => m.destroy({ truncate: true })));

/* --------- Export --------- */
module.exports = {
Expand Down
14 changes: 7 additions & 7 deletions test/hasManySpec.js
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@

var Bluebird = require('bluebird');
const Bluebird = require('bluebird');

var { sequelize, models, sync, clear } = require('./common');
var { Customer, Item, ItemType, Order, Item } = models;
const { sequelize, models, sync, clear } = require('./common');
const { Customer, Item, ItemType, Order } = models;

var embed = require('../src/index')(sequelize);
var { mkIncludes, mkInclude } = embed.util.helpers;
const embed = require('../src/index')(sequelize);
const { mkIncludes, mkInclude } = embed.util.helpers;


/* --- setup --- */

var include = mkIncludes(mkInclude(Order.Items));
var opts = { reload: { include } };
const include = mkIncludes(mkInclude(Order.Items));
const opts = { reload: { include } };


/* --- tests --- */
Expand Down
14 changes: 7 additions & 7 deletions test/hasOneSpec.js
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@

var Bluebird = require('bluebird');
const Bluebird = require('bluebird');

var { sequelize, models, sync, clear } = require('./common');
var { Customer, Item, ItemType, Order, Audit } = models;
const { sequelize, models, sync, clear } = require('./common');
const { Customer, Item, ItemType, Order, Audit } = models;

var embed = require('../src/index')(sequelize);
var { mkIncludes, mkInclude } = embed.util.helpers;
const embed = require('../src/index')(sequelize);
const { mkIncludes, mkInclude } = embed.util.helpers;


/* --- setup --- */

var include = mkIncludes(mkInclude(Order.Audit));
var opts = { reload: { include } };
const include = mkIncludes(mkInclude(Order.Audit));
const opts = { reload: { include } };


/* --- tests --- */
Expand Down
16 changes: 8 additions & 8 deletions test/issues/4-spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@

var Bluebird = require('bluebird');
const Bluebird = require('bluebird');

var { Sequelize, sequelize, sync } = require('../common');
const { Sequelize, sequelize, sync } = require('../common');

var embed = require('../../src/index')(sequelize);
var { mkIncludes, mkInclude } = embed.util.helpers;
const embed = require('../../src/index')(sequelize);
const { mkIncludes, mkInclude } = embed.util.helpers;


/* --- setup --- */

var ModelA = sequelize.define('ModelA', {});
const ModelA = sequelize.define('ModelA', {});

var ModelB = sequelize.define('ModelB', {
const ModelB = sequelize.define('ModelB', {
valA: Sequelize.STRING,
valB: Sequelize.STRING
});

ModelA.ModelB = ModelA.hasOne(ModelB, { as: 'b', foreignKey: 'aId' });

var include = mkIncludes(mkInclude(ModelA.ModelB));
var opts = { reload: { include } };
const include = mkIncludes(mkInclude(ModelA.ModelB));
const opts = { reload: { include } };


/* --- tests --- */
Expand Down
12 changes: 6 additions & 6 deletions test/miscSpec.js
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@

var { sequelize, models, sync, clear } = require('./common');
var { Customer, Note, Item, ItemType, Order, Audit } = models;
const { sequelize, models, sync, clear } = require('./common');
const { Customer, Note, Item, ItemType, Order, Audit } = models;

var embed = require('../src/index')(sequelize);
var { mkIncludes, mkInclude } = embed.util.helpers;
const embed = require('../src/index')(sequelize);
const { mkIncludes, mkInclude } = embed.util.helpers;


/* --- setup --- */

var include = mkIncludes(mkInclude(Order.Notes));
var opts = { reload: { include } };
const include = mkIncludes(mkInclude(Order.Notes));
const opts = { reload: { include } };


/* --- tests --- */
Expand Down
34 changes: 17 additions & 17 deletions test/nestedSpec.js
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

var Bluebird = require('bluebird');
const Bluebird = require('bluebird');

var { sequelize, models, sync, clear } = require('./common');
var { Customer, Region, Item, ItemType, Order, Audit, Note, Flag } = models;
const { sequelize, models, sync, clear } = require('./common');
const { Customer, Region, Item, ItemType, Order, Audit, Note, Flag } = models;

var embed = require('../src/index')(sequelize);
var { mkIncludes, mkInclude } = embed.util.helpers;
const embed = require('../src/index')(sequelize);
const { mkIncludes, mkInclude } = embed.util.helpers;


/* --- tests --- */
Expand All @@ -16,8 +16,8 @@ describe('nested belongsTo', () => {

describe('within hasMany', () => {

var include = mkIncludes(mkInclude(Order.Items, mkInclude(Item.ItemType)));
var opts = { reload: { include } };
const include = mkIncludes(mkInclude(Order.Items, mkInclude(Item.ItemType)));
const opts = { reload: { include } };

describe('which exists', () => {

Expand Down Expand Up @@ -70,7 +70,7 @@ describe('nested belongsTo', () => {
});

it('should skip nested value if not included', done => {
var include = mkIncludes(mkInclude(Order.Items));
const include = mkIncludes(mkInclude(Order.Items));
ItemType.create({ dept: 'meat' }).then(it =>
Order.create({ name: 'o1' }).then(o =>
Item.create({ orderId: o.id, typeId: it.id, quantity: 7 }).then(i =>
Expand Down Expand Up @@ -120,8 +120,8 @@ describe('nested belongsTo', () => {

describe('within belongsTo', () => {

var include = mkIncludes(mkInclude(Order.Customer, mkInclude(Customer.Region)));
var opts = { reload: { include } };
const include = mkIncludes(mkInclude(Order.Customer, mkInclude(Customer.Region)));
const opts = { reload: { include } };

describe('which exists', () => {

Expand Down Expand Up @@ -176,7 +176,7 @@ describe('nested belongsTo', () => {
});

it('should skip nested value if not included', done => {
var include = mkIncludes(mkInclude(Order.Customer));
const include = mkIncludes(mkInclude(Order.Customer));
Region.create({ name: 'nw' }).then(r =>
Customer.create({ name: 'c1', regionId: r.id }).then(c =>
Order.create({ name: 'o1' }).then(o =>
Expand Down Expand Up @@ -237,8 +237,8 @@ describe('nested hasMany', () => {

describe('within hasMany', () => {

var include = mkIncludes(mkInclude(Order.Notes, mkInclude(Note.Flags)));
var opts = { reload: { include } };
const include = mkIncludes(mkInclude(Order.Notes, mkInclude(Note.Flags)));
const opts = { reload: { include } };

describe('which exists', () => {

Expand Down Expand Up @@ -314,7 +314,7 @@ describe('nested hasMany', () => {
});

it('should skip nested value if not included', done => {
var include = mkIncludes(mkInclude(Order.Notes));
const include = mkIncludes(mkInclude(Order.Notes));
Order.create({ name: 'o1' }).then(o =>
Note.create({ orderId: o.id, body: 'foo' }).then(n =>
Flag.create({ orderId: o.id, code: 'bar' }).then(f =>
Expand Down Expand Up @@ -378,8 +378,8 @@ describe('nested hasMany', () => {

describe('within belongsTo', () => {

var include = mkIncludes(mkInclude(Order.Customer, mkInclude(Customer.Region)));
var opts = { reload: { include } };
const include = mkIncludes(mkInclude(Order.Customer, mkInclude(Customer.Region)));
const opts = { reload: { include } };

describe('which exists', () => {

Expand Down Expand Up @@ -435,7 +435,7 @@ describe('nested hasMany', () => {
});

it('should skip nested value if not included', done => {
var include = mkIncludes(mkInclude(Order.Customer));
const include = mkIncludes(mkInclude(Order.Customer));
Region.create({ name: 'nw' }).then(r =>
Customer.create({ name: 'c1', regionId: r.id }).then(c =>
Order.create({ name: 'o1' }).then(o =>
Expand Down

0 comments on commit 2360f8e

Please sign in to comment.