Skip to content

Commit 8437409

Browse files
committed
Merge pull request #217 from strongloop/eslint-generated-code
Use ESlint in replace of jshint
2 parents 627e058 + f56b103 commit 8437409

13 files changed

+324
-351
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
apidocs/loopback-core.js

.eslintrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": "loopback"
3+
}

.jshintignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

.jshintrc

Lines changed: 0 additions & 24 deletions
This file was deleted.

apidocs/describe-builtin-models.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var loopbackCoreJs = path.resolve(__dirname, 'loopback-core.js');
66
try {
77
var generator = require('..');
88
var loopback = require('loopback');
9-
} catch(err) {
9+
} catch (err) {
1010
if (err.code === 'MODULE_NOT_FOUND' && fs.existsSync(loopbackCoreJs)) {
1111
console.log('Cannot load the generator, node_modules were not installed.');
1212
console.log('Ignoring the error since the output file is already there.');

karma.conf.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module.exports = function(config) {
2020
{ pattern: 'test.e2e/**/*.js', included: false },
2121

2222
// Include lib/ files to let Karma watch for changes there
23-
{ pattern: 'lib/**/*.js', included: false }
23+
{ pattern: 'lib/**/*.js', included: false },
2424
],
2525

2626
// list of files to exclude
@@ -35,7 +35,7 @@ module.exports = function(config) {
3535

3636
// CI friendly test output
3737
junitReporter: {
38-
outputFile: 'karma-xunit.xml'
38+
outputFile: 'karma-xunit.xml',
3939
},
4040

4141

@@ -73,6 +73,6 @@ module.exports = function(config) {
7373

7474
// Continuous Integration mode
7575
// if true, it capture browsers, run tests and exit
76-
singleRun: false
76+
singleRun: false,
7777
});
7878
};

lib/services.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var fs = require('fs');
22
var ejs = require('ejs');
33

44
ejs.filters.q = function(obj) {
5-
return JSON.stringify(obj, null, 2 );
5+
return JSON.stringify(obj, null, 2);
66
};
77

88
/**
@@ -38,7 +38,7 @@ module.exports = function generateServices(app, ngModuleName, apiUrl) {
3838
return ejs.render(servicesTemplate, {
3939
moduleName: ngModuleName,
4040
models: models,
41-
urlBase: apiUrl.replace(/\/+$/, '')
41+
urlBase: apiUrl.replace(/\/+$/, ''),
4242
});
4343
};
4444

@@ -60,25 +60,25 @@ function describeModels(app) {
6060
// the sharedCtor parameters should be added to the parameters
6161
// of prototype methods.
6262
c.methods.forEach(function fixArgsOfPrototypeMethods(method, key) {
63-
if (method.name=='create') {
63+
if (method.name == 'create') {
6464
var createMany = Object.create(method);
65-
createMany.name = 'createMany';
66-
createMany.isReturningArray = function() { return true; };
67-
c.methods.splice(key+1, 0, createMany);
65+
createMany.name = 'createMany';
66+
createMany.isReturningArray = function() { return true; };
67+
c.methods.splice(key + 1, 0, createMany);
6868
}
6969
var ctor = method.restClass.ctor;
7070
if (!ctor || method.sharedMethod.isStatic) return;
7171
method.accepts = ctor.accepts.concat(method.accepts);
7272

73-
if(!method.accepts) return;
73+
if (!method.accepts) return;
7474

7575
// Any extra http action arguments in the path need to be added to the
7676
// angular resource actions as params
7777
method.accepts.forEach(function findResourceParams(arg) {
78-
if(!arg.http) return;
78+
if (!arg.http) return;
7979

80-
if(arg.http.source === 'path' && arg.arg !== 'id') {
81-
if(!method.resourceParams) {
80+
if (arg.http.source === 'path' && arg.arg !== 'id') {
81+
if (!method.resourceParams) {
8282
method.resourceParams = [];
8383
method.hasResourceParams = true;
8484
}
@@ -152,7 +152,7 @@ function buildScopeMethod(models, modelName, method) {
152152

153153
modelClass.scopes[scopeName] = {
154154
methods: {},
155-
targetClass: targetClass
155+
targetClass: targetClass,
156156
};
157157
} else if (modelClass.scopes[scopeName] === null) {
158158
// Skip the scope, the warning was already reported
@@ -184,18 +184,18 @@ function buildScopeMethod(models, modelName, method) {
184184

185185
var reverseModel = findModelByName(models, targetClass);
186186
reverseModel.methods.push(reverseMethod);
187-
if(reverseMethod.name.match(/create/)){
187+
if (reverseMethod.name.match(/create/)) {
188188
var createMany = Object.create(reverseMethod);
189-
createMany.name = createMany.name.replace(
189+
createMany.name = createMany.name.replace(
190190
/create/,
191191
'createMany'
192192
);
193-
createMany.internal = createMany.internal.replace(
193+
createMany.internal = createMany.internal.replace(
194194
/create/,
195195
'createMany'
196196
);
197-
createMany.isReturningArray = function() { return true; };
198-
reverseModel.methods.push(createMany);
197+
createMany.isReturningArray = function() { return true; };
198+
reverseModel.methods.push(createMany);
199199
}
200200

201201
var scopeMethod = Object.create(method);
@@ -204,7 +204,7 @@ function buildScopeMethod(models, modelName, method) {
204204
scopeMethod.deprecated = false;
205205
scopeMethod.internal = false;
206206
modelClass.scopes[scopeName].methods[apiName] = scopeMethod;
207-
if(scopeMethod.name.match(/create/)){
207+
if (scopeMethod.name.match(/create/)) {
208208
var scopeCreateMany = Object.create(scopeMethod);
209209
scopeCreateMany.name = scopeCreateMany.name.replace(
210210
/create/,

0 commit comments

Comments
 (0)