Merge pull request #457 from MiniGod/update-xo

style: update xo to latest

Author: MiniGod

endpoints/address/graphql_schema.js

@@ -4,7 +4,7 @@ const {
   GraphQLString,
 } = require('graphql')
 
-const lookupAddresses = require('./index')
+const lookupAddresses = require('.')
 
 const addressType = new GraphQLObjectType({
   name: 'Address',
@@ -44,6 +44,6 @@ module.exports = {
   },
   resolve: (_, args) => {
     const address = args.address.replace(' ', '+')
-    return lookupAddresses(address).then(data => data, error => error)
+    return lookupAddresses(address)
   },
 }

endpoints/address/index.js

@@ -28,7 +28,7 @@ const lookupAddresses = address => new Promise((resolve, reject) => {
   })
 })
 
-app.get('/address/:address?', (req, res) => {
+app.get('/address/:address?', async (req, res) => {
   const address = (
     req.query.address || req.params.address || ''
   ).replace(' ', '+')
@@ -39,10 +39,12 @@ app.get('/address/:address?', (req, res) => {
     })
   }
 
-  lookupAddresses(address).then(
-    results => res.cache().json({ results }),
-    () => res.status(500).json({ error: 'www.postur.is refuses to respond or give back data' })
-  )
+  try {
+    const results = await lookupAddresses(address)
+    res.cache().json({ results })
+  } catch (error) {
+    res.status(500).json({ error: 'www.postur.is refuses to respond or give back data' })
+  }
 })
 
 module.exports = lookupAddresses

endpoints/bus/graphql_schema.js

@@ -32,7 +32,8 @@ module.exports = {
   args: {
     busses: { type: GraphQLString },
   },
-  resolve: (_, args) => {
-    return getBusRoutes(args).then(data => data.results, error => error)
+  resolve: async (_, args) => {
+    const data = await getBusRoutes(args)
+    return data.results
   },
 }

endpoints/calendar/graphql_schema.js

@@ -6,7 +6,7 @@ const {
 } = require('graphql')
 const { GraphQLDate } = require('../../graphql/types/GraphQLDate')
 
-const lookupHolidays = require('./index')
+const lookupHolidays = require('.')
 
 const holiday = new GraphQLObjectType({
   name: 'Holiday',
@@ -36,9 +36,11 @@ module.exports = {
     month: { type: GraphQLString },
     day: { type: GraphQLString },
   },
-  resolve: (_, { year, month, day }) => {
-    return lookupHolidays(year, month, day)
-      .then(data => data)
-      .catch(({ error }) => { throw new Error(error) })
+  resolve: async (_, { year, month, day }) => {
+    try {
+      return await lookupHolidays(year, month, day)
+    } catch (error) {
+      throw new Error(error)
+    }
   },
 }

endpoints/calendar/index.js

@@ -54,6 +54,15 @@ const lookupHolidays = (yearStr, monthStr, dayStr) => new Promise((resolve, reje
   }
 })
 
+const lookupAndRespondHolidays = async (res, ...args) => {
+  try {
+    const results = await lookupHolidays(...args)
+    res.json({ results })
+  } catch (error) {
+    res.status(400).json(error)
+  }
+}
+
 app.get('/calendar/', (req, res) => {
   return res.json({
     description: 'Returns if a given date range has or is a holiday',
@@ -68,26 +77,17 @@ app.get('/calendar/', (req, res) => {
 
 app.get('/calendar/:year', (req, res) => {
   const { year } = req.params
-
-  lookupHolidays(year)
-    .then(holidays => res.json({ results: holidays }))
-    .catch(error => res.status(400).json(error))
+  lookupAndRespondHolidays(res, year)
 })
 
 app.get('/calendar/:year/:month', (req, res) => {
   const { year, month } = req.params
-
-  lookupHolidays(year, month)
-    .then(holidays => res.json({ results: holidays }))
-    .catch(error => res.status(400).json(error))
+  lookupAndRespondHolidays(res, year, month)
 })
 
 app.get('/calendar/:year/:month/:day', (req, res) => {
   const { year, month, day } = req.params
-
-  lookupHolidays(year, month, day)
-    .then(holiday => res.json({ results: holiday }))
-    .catch(error => res.status(400).json(error))
+  lookupAndRespondHolidays(res, year, month, day)
 })
 
 module.exports = lookupHolidays

endpoints/calendar/tests/integration_test.js

@@ -1,7 +1,7 @@
 const request = require('request')
 const expect = require('expect')
 const helpers = require('../../../lib/test_helpers')
-const { normalizeParams } = require('../')
+const { normalizeParams } = require('..')
 
 describe('calendar/:year', () => {
   it('should return an array of objects containing correct fields', (done) => {

endpoints/car/graphql_schema.js

@@ -3,7 +3,7 @@ const {
   GraphQLString,
 } = require('graphql')
 
-const lookupCar = require('./index')
+const lookupCar = require('.')
 
 const car = new GraphQLObjectType({
   name: 'Car',
@@ -64,7 +64,11 @@ module.exports = {
       description: 'The numer on the cars plate',
     },
   },
-  resolve: (_, { carPlate }) => lookupCar(carPlate)
-    .then(data => data)
-    .catch((error) => { throw new Error(error) }),
+  resolve: async (_, { carPlate }) => {
+    try {
+      return await lookupCar(carPlate)
+    } catch (error) {
+      throw new Error(error)
+    }
+  }
 }

endpoints/car/index.js

@@ -45,16 +45,19 @@ const lookupCar = plate => new Promise((resolve, reject) => {
   })
 })
 
-app.get('/car', (req, res) => {
+app.get('/car', async (req, res) => {
   const carPlate = req.query.number || req.query.carPlate || ''
 
   if (!carPlate) {
     return res.status(431).json({ error: 'Please provide a valid carPlate to lookup' })
   }
 
-  lookupCar(carPlate)
-    .then(car => res.cache().json({ results: [car] }))
-    .catch(error => res.status(500).json({ error }))
+  try {
+    const car = await lookupCar(carPlate)
+    res.cache().json({ results: [car] })
+  } catch (error) {
+    res.status(500).json({ error })
+  }
 })
 
 module.exports = lookupCar

endpoints/earthquake/index.js

@@ -51,7 +51,7 @@ function parseJavaScriptVariable(body) {
   })
 
   // Convert the variable to JavaScript Object Notation and fix seperators in values.
-  const resString = jsonString.replace(/(:\'[-0-9][0-9]*)(,)([0-9]*)/g, '$1.$3')
+  const resString = jsonString.replace(/(:\'[-0-9]\d*)(,)(\d*)/g, '$1.$3')
 
   // Create a Regular expression and change date representation.
   // eslint-disable-next-line max-len

endpoints/ship/index.js

@@ -109,16 +109,19 @@ const lookupShip = searchStr => new Promise((resolve, reject) => {
   })
 })
 
-app.get('/ship', (req, res) => {
+app.get('/ship', async (req, res) => {
   const search = req.query.search || ''
 
   if (!search) {
     return res.status(431).json({ error: 'Please provide a valid search string to lookup' })
   }
 
-  lookupShip(search)
-    .then(ships => res.cache().json({ results: ships }))
-    .catch(error => res.status(500).json({ error }))
+  try {
+    const ships = await lookupShip(search)
+    res.cache().json({ results: ships })
+  } catch (error) {
+    res.status(500).json({ error })
+  }
 })
 
 module.exports = lookupShip

lib/cache.js

@@ -22,7 +22,9 @@ module.exports = function () {
       if (error) {
         debug('Error in caching layer:', error)
         return next()
-      } else if (reply) {
+      }
+
+      if (reply) {
         debug('cache HIT for %s', key)
         res.type('json')
         res.send(reply)

make-docs.js

@@ -1,8 +1,10 @@
 const fs = require('fs')
 const globby = require('globby')
-const marked = require('marked')
+const marked = require('marked');
+
+(async () => {
+  const paths = await globby(['./docs/*.md', './endpoints/**/*.md', '!node_modules/**'])
 
-globby(['./docs/*.md', './endpoints/**/*.md', '!node_modules/**']).then((paths) => {
   let content = ''
   paths.forEach((path) => {
     content += fs.readFileSync(path, 'utf8')
@@ -13,6 +15,6 @@ globby(['./docs/*.md', './endpoints/**/*.md', '!node_modules/**']).then((paths)
     fs.mkdirSync('./docs/dist/')
   }
   fs.writeFileSync('./docs/dist/index.html', html, 'utf8')
-}).catch((error) => {
+})().catch((error) => {
   console.error(error)
 })