Skip to content

Commit c96f471

Browse files
Amir-61Amir-61
authored
Merge pull request #1146 from strongloop/2.x_eslint
2.x eslint
2 parents 959a821 + e038b28 commit c96f471

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

+2463
-2370
lines changed

‎.eslintrc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
"ignoreUrls": true,
77
"ignorePattern": "^\\s*var\\s.+=\\s*(require\\s*\\()|(/)"
88
}],
9-
// NOTE(bajtos) we should eventuall remove this override
9+
// NOTE 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"
1213
}
13-
}
14+
}

‎examples/app-noschema.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Node module: loopback-datasource-juggler
33
// This file is licensed under the MIT License.
44
// License text available at https://opensource.org/licenses/MIT
5+
'use strict';
56

67
var DataSource = require('../../loopback-datasource-juggler').DataSource;
78
var ModelBuilder = require('../../loopback-datasource-juggler').ModelBuilder;
@@ -10,14 +11,14 @@ var introspectType = require('../lib/introspection')(ModelBuilder);
1011
var ds = new DataSource('memory');
1112

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

1516
var application = {
1617
owner: 'rfeng',
1718
name: 'MyApp1',
1819
description: 'My first app',
1920
pushSettings: [
20-
{ 'platform': 'apns',
21+
{'platform': 'apns',
2122
'apns': {
2223
'pushOptions': {
2324
'gateway': 'gateway.sandbox.push.apple.com',
@@ -33,7 +34,7 @@ var application = {
3334
'interval': 300,
3435
},
3536
}},
36-
] };
37+
]};
3738

3839
console.log(new Application(application).toObject());
3940

@@ -59,8 +60,8 @@ var user = {
5960
},
6061
friends: ['John', 'Mary'],
6162
emails: [
62-
{ label: 'work', id: '[email protected]' },
63-
{ label: 'home', id: '[email protected]' },
63+
{label: 'work', id: '[email protected]'},
64+
{label: 'home', id: '[email protected]'},
6465
],
6566
tags: [],
6667
};
@@ -69,7 +70,7 @@ var user = {
6970
var schema = introspectType(user);
7071

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

7475
// Use the model for CRUD
7576
var obj = new User(user);

‎examples/app.js‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22
// Node module: loopback-datasource-juggler
33
// This file is licensed under the MIT License.
44
// License text available at https://opensource.org/licenses/MIT
5+
'use strict';
56

67
var ModelBuilder = require('../../loopback-datasource-juggler').ModelBuilder;
78
var modelBuilder = new ModelBuilder();
89
// define models
910
var Post = modelBuilder.define('Post', {
10-
title: { type: String, length: 255 },
11-
content: { type: ModelBuilder.Text },
12-
date: { type: Date, default: function() {
11+
title: {type: String, length: 255},
12+
content: {type: ModelBuilder.Text},
13+
date: {type: Date, default: function() {
1314
return new Date();
14-
} },
15-
timestamp: { type: Number, default: Date.now },
16-
published: { type: Boolean, default: false, index: true },
15+
}},
16+
timestamp: {type: Number, default: Date.now},
17+
published: {type: Boolean, default: false, index: true},
1718
});
1819

1920
// simpler way to describe model
@@ -25,19 +26,19 @@ var User = modelBuilder.define('User', {
2526
age: Number,
2627
});
2728

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

3031
// define any custom method
3132
User.prototype.getNameAndAge = function() {
3233
return this.name + ', ' + this.age;
3334
};
3435

35-
var user = new User({ name: 'Joe' });
36+
var user = new User({name: 'Joe'});
3637
console.log(user);
3738

3839
console.log(modelBuilder.models);
3940
console.log(modelBuilder.definitions);
4041

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

‎examples/datasource-app.js‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@
22
// Node module: loopback-datasource-juggler
33
// This file is licensed under the MIT License.
44
// License text available at https://opensource.org/licenses/MIT
5+
'use strict';
56

67
var DataSource = require('../../loopback-datasource-juggler').DataSource;
78
var ModelBuilder = require('../../loopback-datasource-juggler').ModelBuilder;
89
var ds = new DataSource('memory');
910

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

2122
// simplier way to describe model
@@ -27,73 +28,73 @@ var User = ds.define('User', {
2728
age: Number,
2829
});
2930

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

3233
// define any custom method
3334
User.prototype.getNameAndAge = function() {
3435
return this.name + ', ' + this.age;
3536
};
3637

37-
var user = new User({ name: 'Joe' });
38+
var user = new User({name: 'Joe'});
3839
console.log(user);
3940

4041
// console.log(ds.models);
4142
// console.log(ds.definitions);
4243

4344
// setup relationships
44-
User.hasMany(Post, { as: 'posts', foreignKey: 'userId' });
45+
User.hasMany(Post, {as: 'posts', foreignKey: 'userId'});
4546

4647
// creates instance methods:
4748
// user.posts(conds)
4849
// user.posts.build(data) // like new Post({userId: user.id});
4950
// user.posts.create(data) // build and save
5051

51-
Post.belongsTo(User, { as: 'author', foreignKey: 'userId' });
52+
Post.belongsTo(User, {as: 'author', foreignKey: 'userId'});
5253
// creates instance methods:
5354
// post.author(callback) -- getter when called with function
5455
// post.author() -- sync getter when called without params
5556
// post.author(user) -- setter when called with object
5657

5758
User.hasAndBelongsToMany('groups');
5859

59-
var user2 = new User({ name: 'Smith', age: 14 });
60+
var user2 = new User({name: 'Smith', age: 14});
6061
user2.save(function(err) {
6162
console.log(user2);
62-
var post = user2.posts.build({ title: 'Hello world' });
63+
var post = user2.posts.build({title: 'Hello world'});
6364
post.save(function(err, data) {
6465
console.log(err ? err : data);
6566
});
6667
});
6768

68-
Post.findOne({ where: { published: false }, order: 'date DESC' }, function(err, data) {
69+
Post.findOne({where: {published: false}, order: 'date DESC'}, function(err, data) {
6970
console.log(data);
7071
});
7172

72-
User.create({ name: 'Jeff', age: 12 }, function(err, data) {
73+
User.create({name: 'Jeff', age: 12}, function(err, data) {
7374
if (err) {
7475
console.log(err);
7576
return;
7677
}
7778
console.log(data);
78-
var post = data.posts.build({ title: 'My Post' });
79+
var post = data.posts.build({title: 'My Post'});
7980
console.log(post);
8081
});
8182

82-
User.create({ name: 'Ray' }, function(err, data) {
83+
User.create({name: 'Ray'}, function(err, data) {
8384
console.log(data);
8485
});
8586

86-
User.scope('minors', { where: { age: { lte: 16 }}, include: 'posts' });
87+
User.scope('minors', {where: {age: {lte: 16}}, include: 'posts'});
8788
User.minors(function(err, kids) {
8889
console.log('Kids: ', kids);
8990
});
9091

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

9596
Article.create(function(e, article) {
96-
article.tags.create({ name: 'popular' }, function(err, data) {
97+
article.tags.create({name: 'popular'}, function(err, data) {
9798
Article.findOne(function(e, article) {
9899
article.tags(function(e, tags) {
99100
console.log(tags);
@@ -112,9 +113,9 @@ Color = modelBuilder.define('Color', {
112113
// attach
113114
ds.attach(Color);
114115

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

119120
Color.all(function(err, colors) {
120121
console.log(colors);

‎examples/inclusion.js‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,39 @@
22
// Node module: loopback-datasource-juggler
33
// This file is licensed under the MIT License.
44
// License text available at https://opensource.org/licenses/MIT
5+
'use strict';
56

67
var jdb = require('../index');
78

89
var User, Post, Passport, City, Street, Building;
910
var nbSchemaRequests = 0;
1011

1112
setup(function() {
12-
Passport.find({ include: 'owner' }, function(err, passports) {
13+
Passport.find({include: 'owner'}, function(err, passports) {
1314
console.log('passports.owner', passports);
1415
});
1516

16-
User.find({ include: 'posts' }, function(err, users) {
17+
User.find({include: 'posts'}, function(err, users) {
1718
console.log('users.posts', users);
1819
});
1920

20-
Passport.find({ include: { owner: 'posts' }}, function(err, passports) {
21+
Passport.find({include: {owner: 'posts'}}, function(err, passports) {
2122
console.log('passports.owner.posts', passports);
2223
});
2324

2425
Passport.find({
25-
include: { owner: { posts: 'author' }},
26+
include: {owner: {posts: 'author'}},
2627
}, function(err, passports) {
2728
console.log('passports.owner.posts.author', passports);
2829
});
2930

30-
User.find({ include: ['posts', 'passports'] }, function(err, users) {
31+
User.find({include: ['posts', 'passports']}, function(err, users) {
3132
console.log('users.passports && users.posts', users);
3233
});
3334
});
3435

3536
function setup(done) {
36-
var db = new jdb.DataSource({ connector: 'memory' });
37+
var db = new jdb.DataSource({connector: 'memory'});
3738
City = db.define('City');
3839
Street = db.define('Street');
3940
Building = db.define('Building');
@@ -48,10 +49,10 @@ function setup(done) {
4849
title: String,
4950
});
5051

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' });
52+
Passport.belongsTo('owner', {model: User});
53+
User.hasMany('passports', {foreignKey: 'ownerId'});
54+
User.hasMany('posts', {foreignKey: 'userId'});
55+
Post.belongsTo('author', {model: User, foreignKey: 'userId'});
5556

5657
db.automigrate(function() {
5758
var createdUsers = [];
@@ -62,11 +63,11 @@ function setup(done) {
6263
clearAndCreate(
6364
User,
6465
[
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 },
66+
{name: 'User A', age: 21},
67+
{name: 'User B', age: 22},
68+
{name: 'User C', age: 23},
69+
{name: 'User D', age: 24},
70+
{name: 'User E', age: 25},
7071
],
7172
function(items) {
7273
createdUsers = items;
@@ -79,9 +80,9 @@ function setup(done) {
7980
clearAndCreate(
8081
Passport,
8182
[
82-
{ number: '1', ownerId: createdUsers[0].id },
83-
{ number: '2', ownerId: createdUsers[1].id },
84-
{ number: '3' },
83+
{number: '1', ownerId: createdUsers[0].id},
84+
{number: '2', ownerId: createdUsers[1].id},
85+
{number: '3'},
8586
],
8687
function(items) {
8788
createdPassports = items;
@@ -94,11 +95,11 @@ function setup(done) {
9495
clearAndCreate(
9596
Post,
9697
[
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' },
98+
{title: 'Post A', userId: createdUsers[0].id},
99+
{title: 'Post B', userId: createdUsers[0].id},
100+
{title: 'Post C', userId: createdUsers[0].id},
101+
{title: 'Post D', userId: createdUsers[1].id},
102+
{title: 'Post E'},
102103
],
103104
function(items) {
104105
createdPosts = items;

‎examples/load-schemas.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Node module: loopback-datasource-juggler
33
// This file is licensed under the MIT License.
44
// License text available at https://opensource.org/licenses/MIT
5+
'use strict';
56

67
var path = require('path'),
78
fs = require('fs'),

‎examples/nesting-schema.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Node module: loopback-datasource-juggler
33
// This file is licensed under the MIT License.
44
// License text available at https://opensource.org/licenses/MIT
5+
'use strict';
56

67
var ModelBuilder = require('../../loopback-datasource-juggler').ModelBuilder;
78
var modelBuilder = new ModelBuilder();
@@ -38,8 +39,8 @@ var user = new User({
3839
state: 'CA',
3940
},
4041
emails: [
41-
{ label: 'work', email: '[email protected]' },
42+
{label: 'work', email: '[email protected]'},
4243
],
43-
friends: ['John', 'Mary'] });
44+
friends: ['John', 'Mary']});
4445
console.log(user);
4546
console.log(user.toObject());

0 commit comments

Comments
 (0)