Skip to content

Commit

Permalink
ESLint
Browse files Browse the repository at this point in the history
  • Loading branch information
lujjjh committed Jul 17, 2017
1 parent 88e69ce commit f3f1033
Show file tree
Hide file tree
Showing 10 changed files with 1,049 additions and 64 deletions.
22 changes: 11 additions & 11 deletions examples/restc-example-express/index.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
const express = require('express');
const app = express();
const restc = require('../..');
const express = require('express')
const app = express()
const restc = require('../..')

app.use(restc.express());
app.use(restc.express())

app.get('/', (req, res) => {
res.send({ message: 'Hello world!' });
});
res.send({ message: 'Hello world!' })
})

app.get('/binary', (req, res) => {
res.set('Content-Type', 'application/octet-stream');
res.set('Content-Disposition', 'attachment; filename="hello.txt"');
res.send('Hello world!');
});
res.set('Content-Type', 'application/octet-stream')
res.set('Content-Disposition', 'attachment; filename="hello.txt"')
res.send('Hello world!')
})

app.listen(3000);
app.listen(3000)
14 changes: 7 additions & 7 deletions examples/restc-example-koa/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
const app = require('koa')();
const restc = require('../..');
const app = require('koa')()
const restc = require('../..')

app.use(restc.koa());
app.use(restc.koa())

app.use(function *(next) {
this.body = { message: 'Hello world!' };
});
app.use(function * (next) {
this.body = { message: 'Hello world!' }
})

app.listen(3000);
app.listen(3000)
16 changes: 8 additions & 8 deletions examples/restc-example-koa2/index.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
const Koa = require('koa');
const restc = require('../..');
const app = new Koa();
const Koa = require('koa')
const restc = require('../..')
const app = new Koa()

app.use(restc.koa2());
app.use(restc.koa2())

app.use((ctx, next) => {
ctx.body = { message: 'Hello world!' };
return next();
});
ctx.body = { message: 'Hello world!' }
return next()
})

app.listen(3000);
app.listen(3000)
10 changes: 5 additions & 5 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';
'use strict'

const express = require('./lib/express');
const koa = require('./lib/koa');
const koa2 = require('./lib/koa2');
const express = require('./lib/express')
const koa = require('./lib/koa')
const koa2 = require('./lib/koa2')

module.exports = { express, koa, koa2 };
module.exports = { express, koa, koa2 }
16 changes: 8 additions & 8 deletions lib/express.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
'use strict';
'use strict'

const restc = require('./restc');
const restc = require('./restc')

module.exports = () => (req, res, next) => {
res.vary('Accept');
if (req.accepts([ 'json', 'html' ]) !== 'html') return next();
res.vary('Accept')
if (req.accepts([ 'json', 'html' ]) !== 'html') return next()
restc
.then(html => res.end(html))
.catch(error => {
console.error('[restc]', 'an error occurred when acquiring restc:', error.message);
next();
});
};
console.error('[restc]', 'an error occurred when acquiring restc:', error.message)
next()
})
}
18 changes: 9 additions & 9 deletions lib/koa.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
'use strict';
'use strict'

const restc = require('./restc');
const restc = require('./restc')

module.exports = () => function*(next) {
this.set('Vary', 'Accept');
if (this.accepts([ 'json', 'html' ]) !== 'html') return yield next;
module.exports = () => function * (next) {
this.set('Vary', 'Accept')
if (this.accepts([ 'json', 'html' ]) !== 'html') return yield next
try {
this.body = yield restc;
this.body = yield restc
} catch (error) {
console.error('[restc]', 'an error occurred when acquiring restc:', error.message);
yield next;
console.error('[restc]', 'an error occurred when acquiring restc:', error.message)
yield next
}
};
}
20 changes: 11 additions & 9 deletions lib/koa2.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
'use strict';
'use strict'

const restc = require('./restc');
const restc = require('./restc')

module.exports = () => (ctx, next) => {
ctx.set('Vary', 'Accept');
if (ctx.accepts([ 'json', 'html' ]) !== 'html') return next();
ctx.set('Vary', 'Accept')
if (ctx.accepts([ 'json', 'html' ]) !== 'html') return next()
return restc
.then(html => ctx.body = html)
.then(html => {
ctx.body = html
})
.catch(error => {
console.error('[restc]', 'an error occurred when acquiring restc:', error.message);
return next();
});
};
console.error('[restc]', 'an error occurred when acquiring restc:', error.message)
return next()
})
}
14 changes: 7 additions & 7 deletions lib/restc.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
'use strict';
'use strict'

const fs = require('fs');
const path = require('path');
const fs = require('fs')
const path = require('path')

module.exports = new Promise((resolve, reject) => {
fs.readFile(path.join(__dirname, '../faas/index.html'), (error, result) => {
if (error) {
reject(error);
reject(error)
} else {
resolve(result + '');
resolve(result + '')
}
});
});
})
})
11 changes: 11 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"index.js",
"index.d.ts"
],
"scripts": {
"lint": "eslint --fix ."
},
"faas": {
"domain": "restc",
"public": "faas",
Expand All @@ -21,5 +24,13 @@
"notice": [
"[email protected]"
]
},
"devDependencies": {
"eslint": "^4.2.0",
"eslint-config-standard": "^10.2.1",
"eslint-plugin-import": "^2.7.0",
"eslint-plugin-node": "^5.1.0",
"eslint-plugin-promise": "^3.5.0",
"eslint-plugin-standard": "^3.0.1"
}
}
Loading

0 comments on commit f3f1033

Please sign in to comment.