Lint existing codebase

Mostly converting to arrow functions and fixing some minor stuff. No
major changes.

Author: rylnd

src/lib/hashingFunctions.ts

@@ -10,12 +10,12 @@ const _multiplication = (a, b) => {
   return a * b;
 };
 
-export const sum = (array) => {
+export const sum = array => {
   return array.reduce(_addition, 0);
 };
 
-export const sumAndDiff = (array) => {
-  return array.reduce(function(prev, curr, index) {
+export const sumAndDiff = array => {
+  return array.reduce((prev, curr, index) => {
     if (index % 2 === 0) {
       return _addition(prev, curr);
     } else {
@@ -24,6 +24,6 @@ export const sumAndDiff = (array) => {
   }, 0);
 };
 
-export const product = (array) => {
+export const product = array => {
   return array.reduce(_multiplication, 1);
 };

src/lib/imageFiles.ts

@@ -4,24 +4,27 @@ import path from 'path';
 const DEFAULT_IMAGE_DIR = path.join(__dirname, '..', 'img');
 
 export const dirFor = (type, imageDir = DEFAULT_IMAGE_DIR) => {
-  if (type) return path.join(imageDir, type);
-  else return imageDir;
+  if (type) {
+    return path.join(imageDir, type);
+  }
+
+  return imageDir;
 };
 
 export const allNames = (type, imageDir = DEFAULT_IMAGE_DIR) => {
-  return fs.readdirSync(dirFor(type, imageDir)).filter(function(imageFileName) {
-    return imageFileName.match(/\.png/);
-  }).map(function(imageFileName) {
-    return imageFileName.replace(/\.png/, '');
-  });
+  return fs
+    .readdirSync(dirFor(type, imageDir))
+    .filter(imageFileName => {
+      return imageFileName.match(/\.png/);
+    })
+    .map(imageFileName => {
+      return imageFileName.replace(/\.png/, '');
+    });
 };
 
 export const allPaths = (type, imageDir = DEFAULT_IMAGE_DIR) => {
-  var dir;
-  dir = dirFor(type, imageDir);
-  return allNames(type, imageDir).map(function(name) {
-    return path.join(dir, name + '.png');
-  });
+  const dir = dirFor(type, imageDir);
+  return allNames(type, imageDir).map(name => path.join(dir, name + '.png'));
 };
 
 export const pathFor = (type, fileName, imageDir = DEFAULT_IMAGE_DIR) => {

src/lib/imager.ts

@@ -1,50 +1,49 @@
-import gm          from 'gm';
+import gm from 'gm';
 const imageMagick = gm.subClass({ imageMagick: true });
 
 const minSize = 40;
 const maxSize = 400;
 
-const _clamp = (num) => {
+const _clamp = num => {
   return Math.min(Math.max(num, minSize), maxSize);
 };
 
-const _parseSize = (size) => {
+const _parseSize = size => {
   const ref = size.split('x');
   const width = ref[0];
   let height = ref[1];
 
-  if (height === null) height = width;
+  if (height === null) {
+    height = width;
+  }
 
   return {
     width: _clamp(width),
-    height: _clamp(height)
+    height: _clamp(height),
   };
 };
 
-export const combine = (face, size, callback) => {
-  if (size) { size = _parseSize(size); }
-  else {
-    size = { width: maxSize, height: maxSize };
-  }
+export const combine = (face, _size, callback) => {
+  const size = _size ? _parseSize(_size) : { width: maxSize, height: maxSize };
 
   imageMagick('')
-  .quality(0)
-  .in(face.eyes)
-  .in(face.nose)
-  .in(face.mouth)
-  .background(face.color)
-  .mosaic()
-  .resize(size.width, size.height)
-  .trim()
-  .gravity('Center')
-  .extent(size.width, size.height)
-  .stream('png', callback);
+    .quality(0)
+    .in(face.eyes)
+    .in(face.nose)
+    .in(face.mouth)
+    .background(face.color)
+    .mosaic()
+    .resize(size.width, size.height)
+    .trim()
+    .gravity('Center')
+    .extent(size.width, size.height)
+    .stream('png', callback);
 };
 
 export const resize = (imagePath, size, callback) => {
   size = _parseSize(size);
 
   imageMagick(imagePath)
-  .resize(size.width, size.height)
-  .stream('png', callback);
+    .resize(size.width, size.height)
+    .stream('png', callback);
 };

src/lib/potato.ts

@@ -12,15 +12,15 @@ const colors = [
   '#6ff2c5',
   '#f0da5e',
   '#eb5972',
-  '#f6be5d'
+  '#f6be5d',
 ];
 
 class Potato {
   constructor(
     private colorMachine = new SlotMachine(colors),
     private eyesMachine = new SlotMachine(allPaths('eyes')),
     private noseMachine = new SlotMachine(allPaths('nose')),
-    private mouthMachine = new SlotMachine(allPaths('mouth'), sumAndDiff)
+    private mouthMachine = new SlotMachine(allPaths('mouth'), sumAndDiff),
   ) {}
 
   // Construct Faces Parts
@@ -29,7 +29,7 @@ class Potato {
       color: this.colorMachine.pull(string),
       eyes: this.eyesMachine.pull(string),
       nose: this.noseMachine.pull(string),
-      mouth: this.mouthMachine.pull(string)
+      mouth: this.mouthMachine.pull(string),
     };
   }
 }

src/routes/avatars.ts

@@ -10,46 +10,44 @@ const partTypes = ['eyes', 'nose', 'mouth'];
 
 const router = Router();
 
-router.param('id', function(req, res, next, id) {
-  var faceParts;
-  faceParts = potato.parts(id);
-  //@ts-ignore
+router.param('id', (req, res, next, id) => {
+  const faceParts = potato.parts(id);
+  // @ts-ignore
   req.faceParts = faceParts;
   return next();
 });
 
-router.get('/list', function(req, res) {
-  let response = { face: {} };
+router.get('/list', (req, res) => {
+  const response = { face: {} };
 
-  partTypes.forEach(function(type) {
+  partTypes.forEach(type => {
     response.face[type] = allNames(type);
   });
 
   return res.set('Content-Type', 'application/json').send(response);
 });
 
-router.get('/:size?/random', function(req, res) {
-  var faceParts;
-  faceParts = potato.parts(uuid.v4());
-  //@ts-ignore
+router.get('/:size?/random', (req, res) => {
+  const faceParts = potato.parts(uuid.v4());
+  // @ts-ignore
   req.faceParts = faceParts;
 
-  return combine(faceParts, req.params.size, function(err, stdout) {
+  return combine(faceParts, req.params.size, (err, stdout) => {
     return common.sendImage(err, stdout, req, res);
   });
 });
 
-router.get('/:size?/:id', function(req, res, next) {
-  //@ts-ignore
-  return combine(req.faceParts, req.params.size, function(err, stdout) {
+router.get('/:size?/:id', (req, res, next) => {
+  // @ts-ignore
+  return combine(req.faceParts, req.params.size, (err, stdout) => {
     return common.sendImage(err, stdout, req, res, next);
   });
 });
 
-router.get('/face/:eyes/:nose/:mouth/:color/:size?', function(req, res, next) {
-  let faceParts = { color: '#' + req.params.color };
+router.get('/face/:eyes/:nose/:mouth/:color/:size?', (req, res, next) => {
+  const faceParts = { color: '#' + req.params.color };
 
-  partTypes.forEach(function(type) {
+  partTypes.forEach(type => {
     const possibleFileNames = allNames(type);
     const requestedFileName = req.params[type];
 
@@ -65,7 +63,7 @@ router.get('/face/:eyes/:nose/:mouth/:color/:size?', function(req, res, next) {
     faceParts[type] = pathFor(type, fileName);
   });
 
-  return combine(faceParts, req.params.size, function(err, stdout) {
+  return combine(faceParts, req.params.size, (err, stdout) => {
     return common.sendImage(err, stdout, req, res, next);
   });
 });

src/routes/common.ts

@@ -3,7 +3,7 @@ const common = {
     res.setHeader('Expires', new Date(Date.now() + 604800000));
     res.setHeader('Content-Type', 'image/png');
     stdout.pipe(res);
-  }
+  },
 };
 
 export default common;

test/integration.test.ts

@@ -5,88 +5,88 @@ import webserver from './server';
 
 const im = subClass({ imageMagick: true });
 
-const parseImage = function(res, callback) {
+const parseImage = (res, callback) => {
   res.setEncoding('binary');
   res.data = '';
 
-  res.on('data', function(chunk) {
+  res.on('data', chunk => {
     res.data += chunk;
   });
 
-  res.on('end', function() {
+  res.on('end', () => {
     callback(null, new Buffer(res.data, 'binary'));
   });
 };
 
-describe('routing', function() {
-  var request;
+describe('routing', () => {
+  let request;
 
-  beforeEach(function() {
+  beforeEach(() => {
     request = supertest(webserver);
   });
 
-  describe('v2 avatar request', function() {
-    it('responds with an image', function(done) {
+  describe('v2 avatar request', () => {
+    it('responds with an image', done => {
       request
         .get('/avatars/abott')
         .expect('Content-Type', /image/)
         .end(done);
     });
 
-    it('can resize an image', function(done) {
+    it('can resize an image', done => {
       request
         .get('/avatars/220/abott')
         .parse(parseImage)
-        .end(function(err, res) {
-          im(res.body).size(function(_, size) {
+        .end((err, res) => {
+          im(res.body).size((_, size) => {
             expect(size).to.eql({ height: 220, width: 220 });
             done();
           });
         });
     });
 
-    it('can manually compose an image', function(done) {
+    it('can manually compose an image', done => {
       request
         .get('/avatars/face/eyes1/nose4/mouth11/bbb')
         .expect(200)
         .expect('Content-Type', /image/)
         .end(done);
     });
 
-    it('can manually compose an image with a custom size', function(done) {
+    it('can manually compose an image with a custom size', done => {
       request
         .get('/avatars/face/eyes1/nose4/mouth11/bbb/50')
         .expect(200)
         .expect('Content-Type', /image/)
         .parse(parseImage)
-        .end(function(err, res) {
-          im(res.body).size(function(_, size) {
+        .end((err, res) => {
+          im(res.body).size((_, size) => {
             expect(size).to.eql({ height: 50, width: 50 });
             done();
           });
         });
     });
   });
 
-  describe('v2 avatar list requests', function() {
-    it('responds with json', function(done) {
+  describe('v2 avatar list requests', () => {
+    it('responds with json', done => {
       request
         .get('/avatars/list')
         .expect('Content-Type', /json/)
         .end(done);
     });
 
-    it('responds with a list of possible face parts', function(done) {
-      request.get('/avatars/list').end(function(err, res) {
+    it('responds with a list of possible face parts', done => {
+      request.get('/avatars/list').end((err, res) => {
         const faceParts = res.body.face;
         expect(faceParts).to.have.keys('eyes', 'mouth', 'nose');
         done();
       });
     });
   });
 
-  describe('v2 avatar random requests', function() {
-    it('can randomly generate a new avatar', function(done) {
+  describe('v2 avatar random requests', () => {
+    it('can randomly generate a new avatar', done => {
       const getRandom = () =>
         request
           .get('/avatars/random')
@@ -96,9 +96,9 @@ describe('routing', function() {
 
       getRandom().end((_, r1) => {
         getRandom().end((_, r2) => {
-          //@ts-ignore
+          // @ts-ignore
           im(r1.body).identify('%#', (_, id1) => {
-            //@ts-ignore
+            // @ts-ignore
             im(r2.body).identify('%#', (_, id2) => {
               expect(id1).not.to.equal(id2);
               done();
@@ -108,14 +108,14 @@ describe('routing', function() {
       });
     });
 
-    it('supports a custom size parameter', function(done) {
+    it('supports a custom size parameter', done => {
       request
         .get('/avatars/50/random')
         .expect(200)
         .expect('Content-Type', /image/)
         .parse(parseImage)
-        .end(function(err, res) {
-          im(res.body).size(function(_, size) {
+        .end((err, res) => {
+          im(res.body).size((_, size) => {
             expect(size).to.eql({ height: 50, width: 50 });
             done();
           });