Skip to content

Commit fc9b980

Browse files
Amir-61Amir-61
authored
Merge pull request #1062 from strongloop/update_eslint
Update eslint
2 parents 5b46484 + aec678d commit fc9b980

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+2548
-2426
lines changed

‎.eslintrc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
}],
99
// NOTE(bajtos) we should eventually remove this override
1010
// and fix all of those 100+ violations
11-
"one-var": "off"
11+
"one-var": "off",
12+
"no-unused-expressions": "off",
13+
"strict": ["warn", "global"]
1214
}
1315
}

‎examples/app-noschema.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,23 @@
33
// This file is licensed under the MIT License.
44
// License text available at https://opensource.org/licenses/MIT
55

6+
'use strict';
7+
68
var DataSource = require('../../loopback-datasource-juggler').DataSource;
79
var ModelBuilder = require('../../loopback-datasource-juggler').ModelBuilder;
810
var introspectType = require('../lib/introspection')(ModelBuilder);
911

1012
var ds = new DataSource('memory');
1113

1214
// Create a open model that doesn't require a schema
13-
var Application = ds.createModel('Schemaless', {}, { strict: false });
15+
var Application = ds.createModel('Schemaless', {}, {strict: false});
1416

1517
var application = {
1618
owner: 'rfeng',
1719
name: 'MyApp1',
1820
description: 'My first app',
1921
pushSettings: [
20-
{ 'platform': 'apns',
22+
{'platform': 'apns',
2123
'apns': {
2224
'pushOptions': {
2325
'gateway': 'gateway.sandbox.push.apple.com',
@@ -33,7 +35,7 @@ var application = {
3335
'interval': 300,
3436
},
3537
}},
36-
] };
38+
]};
3739

3840
console.log(new Application(application).toObject());
3941

@@ -59,8 +61,8 @@ var user = {
5961
},
6062
friends: ['John', 'Mary'],
6163
emails: [
62-
{ label: 'work', id: '[email protected]' },
63-
{ label: 'home', id: '[email protected]' },
64+
{label: 'work', id: '[email protected]'},
65+
{label: 'home', id: '[email protected]'},
6466
],
6567
tags: [],
6668
};
@@ -69,7 +71,7 @@ var user = {
6971
var schema = introspectType(user);
7072

7173
// Create a model for the generated schema
72-
var User = ds.createModel('User', schema, { idInjection: true });
74+
var User = ds.createModel('User', schema, {idInjection: true});
7375

7476
// Use the model for CRUD
7577
var obj = new User(user);

‎examples/app.js‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@
33
// This file is licensed under the MIT License.
44
// License text available at https://opensource.org/licenses/MIT
55

6+
'use strict';
7+
68
var ModelBuilder = require('../../loopback-datasource-juggler').ModelBuilder;
79
var modelBuilder = new ModelBuilder();
810
// define models
911
var Post = modelBuilder.define('Post', {
10-
title: { type: String, length: 255 },
11-
content: { type: ModelBuilder.Text },
12-
date: { type: Date, default: function() {
12+
title: {type: String, length: 255},
13+
content: {type: ModelBuilder.Text},
14+
date: {type: Date, default: function() {
1315
return new Date();
14-
} },
15-
timestamp: { type: Number, default: Date.now },
16-
published: { type: Boolean, default: false, index: true },
16+
}},
17+
timestamp: {type: Number, default: Date.now},
18+
published: {type: Boolean, default: false, index: true},
1719
});
1820

1921
// simpler way to describe model
@@ -25,19 +27,19 @@ var User = modelBuilder.define('User', {
2527
age: Number,
2628
});
2729

28-
var Group = modelBuilder.define('Group', { group: String });
30+
var Group = modelBuilder.define('Group', {group: String});
2931

3032
// define any custom method
3133
User.prototype.getNameAndAge = function() {
3234
return this.name + ', ' + this.age;
3335
};
3436

35-
var user = new User({ name: 'Joe' });
37+
var user = new User({name: 'Joe'});
3638
console.log(user);
3739

3840
console.log(modelBuilder.models);
3941
console.log(modelBuilder.definitions);
4042

4143
User.mixin(Group);
42-
var user = new User({ name: 'Ray', group: 'Admin' });
44+
var user = new User({name: 'Ray', group: 'Admin'});
4345
console.log(user);

‎examples/datasource-app.js‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,21 @@
33
// This file is licensed under the MIT License.
44
// License text available at https://opensource.org/licenses/MIT
55

6+
'use strict';
7+
68
var DataSource = require('../../loopback-datasource-juggler').DataSource;
79
var ModelBuilder = require('../../loopback-datasource-juggler').ModelBuilder;
810
var ds = new DataSource('memory');
911

1012
// define models
1113
var Post = ds.define('Post', {
12-
title: { type: String, length: 255 },
13-
content: { type: DataSource.Text },
14-
date: { type: Date, default: function() {
14+
title: {type: String, length: 255},
15+
content: {type: DataSource.Text},
16+
date: {type: Date, default: function() {
1517
return new Date;
16-
} },
17-
timestamp: { type: Number, default: Date.now },
18-
published: { type: Boolean, default: false, index: true },
18+
}},
19+
timestamp: {type: Number, default: Date.now},
20+
published: {type: Boolean, default: false, index: true},
1921
});
2022

2123
// simplier way to describe model
@@ -27,73 +29,73 @@ var User = ds.define('User', {
2729
age: Number,
2830
});
2931

30-
var Group = ds.define('Group', { name: String });
32+
var Group = ds.define('Group', {name: String});
3133

3234
// define any custom method
3335
User.prototype.getNameAndAge = function() {
3436
return this.name + ', ' + this.age;
3537
};
3638

37-
var user = new User({ name: 'Joe' });
39+
var user = new User({name: 'Joe'});
3840
console.log(user);
3941

4042
// console.log(ds.models);
4143
// console.log(ds.definitions);
4244

4345
// setup relationships
44-
User.hasMany(Post, { as: 'posts', foreignKey: 'userId' });
46+
User.hasMany(Post, {as: 'posts', foreignKey: 'userId'});
4547

4648
// creates instance methods:
4749
// user.posts(conds)
4850
// user.posts.build(data) // like new Post({userId: user.id});
4951
// user.posts.create(data) // build and save
5052

51-
Post.belongsTo(User, { as: 'author', foreignKey: 'userId' });
53+
Post.belongsTo(User, {as: 'author', foreignKey: 'userId'});
5254
// creates instance methods:
5355
// post.author(callback) -- getter when called with function
5456
// post.author() -- sync getter when called without params
5557
// post.author(user) -- setter when called with object
5658

5759
User.hasAndBelongsToMany('groups');
5860

59-
var user2 = new User({ name: 'Smith', age: 14 });
61+
var user2 = new User({name: 'Smith', age: 14});
6062
user2.save(function(err) {
6163
console.log(user2);
62-
var post = user2.posts.build({ title: 'Hello world' });
64+
var post = user2.posts.build({title: 'Hello world'});
6365
post.save(function(err, data) {
6466
console.log(err ? err : data);
6567
});
6668
});
6769

68-
Post.findOne({ where: { published: false }, order: 'date DESC' }, function(err, data) {
70+
Post.findOne({where: {published: false}, order: 'date DESC'}, function(err, data) {
6971
console.log(data);
7072
});
7173

72-
User.create({ name: 'Jeff', age: 12 }, function(err, data) {
74+
User.create({name: 'Jeff', age: 12}, function(err, data) {
7375
if (err) {
7476
console.log(err);
7577
return;
7678
}
7779
console.log(data);
78-
var post = data.posts.build({ title: 'My Post' });
80+
var post = data.posts.build({title: 'My Post'});
7981
console.log(post);
8082
});
8183

82-
User.create({ name: 'Ray' }, function(err, data) {
84+
User.create({name: 'Ray'}, function(err, data) {
8385
console.log(data);
8486
});
8587

86-
User.scope('minors', { where: { age: { lte: 16 }}, include: 'posts' });
88+
User.scope('minors', {where: {age: {lte: 16}}, include: 'posts'});
8789
User.minors(function(err, kids) {
8890
console.log('Kids: ', kids);
8991
});
9092

91-
var Article = ds.define('Article', { title: String });
92-
var Tag = ds.define('Tag', { name: String });
93+
var Article = ds.define('Article', {title: String});
94+
var Tag = ds.define('Tag', {name: String});
9395
Article.hasAndBelongsToMany('tags');
9496

9597
Article.create(function(e, article) {
96-
article.tags.create({ name: 'popular' }, function(err, data) {
98+
article.tags.create({name: 'popular'}, function(err, data) {
9799
Article.findOne(function(e, article) {
98100
article.tags(function(e, tags) {
99101
console.log(tags);
@@ -112,9 +114,9 @@ Color = modelBuilder.define('Color', {
112114
// attach
113115
ds.attach(Color);
114116

115-
Color.create({ name: 'red' });
116-
Color.create({ name: 'green' });
117-
Color.create({ name: 'blue' });
117+
Color.create({name: 'red'});
118+
Color.create({name: 'green'});
119+
Color.create({name: 'blue'});
118120

119121
Color.all(function(err, colors) {
120122
console.log(colors);

‎examples/inclusion.js‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,39 @@
33
// This file is licensed under the MIT License.
44
// License text available at https://opensource.org/licenses/MIT
55

6+
'use strict';
7+
68
var jdb = require('../index');
79

810
var User, Post, Passport, City, Street, Building;
911
var nbSchemaRequests = 0;
1012

1113
setup(function() {
12-
Passport.find({ include: 'owner' }, function(err, passports) {
14+
Passport.find({include: 'owner'}, function(err, passports) {
1315
console.log('passports.owner', passports);
1416
});
1517

16-
User.find({ include: 'posts' }, function(err, users) {
18+
User.find({include: 'posts'}, function(err, users) {
1719
console.log('users.posts', users);
1820
});
1921

20-
Passport.find({ include: { owner: 'posts' }}, function(err, passports) {
22+
Passport.find({include: {owner: 'posts'}}, function(err, passports) {
2123
console.log('passports.owner.posts', passports);
2224
});
2325

2426
Passport.find({
25-
include: { owner: { posts: 'author' }},
27+
include: {owner: {posts: 'author'}},
2628
}, function(err, passports) {
2729
console.log('passports.owner.posts.author', passports);
2830
});
2931

30-
User.find({ include: ['posts', 'passports'] }, function(err, users) {
32+
User.find({include: ['posts', 'passports']}, function(err, users) {
3133
console.log('users.passports && users.posts', users);
3234
});
3335
});
3436

3537
function setup(done) {
36-
var db = new jdb.DataSource({ connector: 'memory' });
38+
var db = new jdb.DataSource({connector: 'memory'});
3739
City = db.define('City');
3840
Street = db.define('Street');
3941
Building = db.define('Building');
@@ -48,10 +50,10 @@ function setup(done) {
4850
title: String,
4951
});
5052

51-
Passport.belongsTo('owner', { model: User });
52-
User.hasMany('passports', { foreignKey: 'ownerId' });
53-
User.hasMany('posts', { foreignKey: 'userId' });
54-
Post.belongsTo('author', { model: User, foreignKey: 'userId' });
53+
Passport.belongsTo('owner', {model: User});
54+
User.hasMany('passports', {foreignKey: 'ownerId'});
55+
User.hasMany('posts', {foreignKey: 'userId'});
56+
Post.belongsTo('author', {model: User, foreignKey: 'userId'});
5557

5658
db.automigrate(function() {
5759
var createdUsers = [];
@@ -62,11 +64,11 @@ function setup(done) {
6264
clearAndCreate(
6365
User,
6466
[
65-
{ name: 'User A', age: 21 },
66-
{ name: 'User B', age: 22 },
67-
{ name: 'User C', age: 23 },
68-
{ name: 'User D', age: 24 },
69-
{ name: 'User E', age: 25 },
67+
{name: 'User A', age: 21},
68+
{name: 'User B', age: 22},
69+
{name: 'User C', age: 23},
70+
{name: 'User D', age: 24},
71+
{name: 'User E', age: 25},
7072
],
7173
function(items) {
7274
createdUsers = items;
@@ -79,9 +81,9 @@ function setup(done) {
7981
clearAndCreate(
8082
Passport,
8183
[
82-
{ number: '1', ownerId: createdUsers[0].id },
83-
{ number: '2', ownerId: createdUsers[1].id },
84-
{ number: '3' },
84+
{number: '1', ownerId: createdUsers[0].id},
85+
{number: '2', ownerId: createdUsers[1].id},
86+
{number: '3'},
8587
],
8688
function(items) {
8789
createdPassports = items;
@@ -94,11 +96,11 @@ function setup(done) {
9496
clearAndCreate(
9597
Post,
9698
[
97-
{ title: 'Post A', userId: createdUsers[0].id },
98-
{ title: 'Post B', userId: createdUsers[0].id },
99-
{ title: 'Post C', userId: createdUsers[0].id },
100-
{ title: 'Post D', userId: createdUsers[1].id },
101-
{ title: 'Post E' },
99+
{title: 'Post A', userId: createdUsers[0].id},
100+
{title: 'Post B', userId: createdUsers[0].id},
101+
{title: 'Post C', userId: createdUsers[0].id},
102+
{title: 'Post D', userId: createdUsers[1].id},
103+
{title: 'Post E'},
102104
],
103105
function(items) {
104106
createdPosts = items;

‎examples/load-schemas.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// This file is licensed under the MIT License.
44
// License text available at https://opensource.org/licenses/MIT
55

6+
'use strict';
7+
68
var path = require('path'),
79
fs = require('fs'),
810
DataSource = require('../lib/datasource').DataSource;

‎examples/nesting-schema.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// This file is licensed under the MIT License.
44
// License text available at https://opensource.org/licenses/MIT
55

6+
'use strict';
7+
68
var ModelBuilder = require('../../loopback-datasource-juggler').ModelBuilder;
79
var modelBuilder = new ModelBuilder();
810

@@ -32,9 +34,9 @@ var User = modelBuilder.define('User', {
3234
var user = new User({
3335
name: 'Joe',
3436
age: 20,
35-
address: { street: '123 Main St', 'city': 'San Jose', state: 'CA' },
37+
address: {street: '123 Main St', 'city': 'San Jose', state: 'CA'},
3638
emails: [
37-
{ label: 'work', email: '[email protected]' },
39+
{label: 'work', email: '[email protected]'},
3840
],
3941
friends: ['John', 'Mary'],
4042
});

0 commit comments

Comments
 (0)