style: prettier

.prettierrc.json

@@ -1,4 +1,5 @@
 {
   "semi": false,
-  "singleQuote": true
+  "singleQuote": true,
+  "trailingComma" : "none"
 }

package.json

@@ -9,8 +9,10 @@
     "build:workspaces": "npm run build --workspaces --if-present",
     "build-declaration": "tsc --declaration --allowJs false",
     "watch": "npm run build -- -w",
+    "prettier": "prettier -w src/",
     "lint": "eslint -c .eslintrc.js --ext .ts --ext .js --fix src/",
-    "ci-lint": "eslint -c .eslintrc.js --ext .ts --ext .js src/",
+    "format": "npm run prettier && npm run lint",
+    "ci-lint": "eslint -c .eslintrc.js --ext .ts --ext .js src/ && npm run prettier src/",
     "prepublishOnly": "npm run lint && npm run build:all && npm run build-declaration",
     "update-latest-release": "git checkout master && git branch -D latest-release || git checkout -b latest-release && git push -f origin/latest-release",
     "start": "node bin/signalk-server",

src/@types/baconjs.d.ts

@@ -1 +1 @@
-declare module 'baconjs'
+declare module 'baconjs'

src/@types/signalk_signalk-schema.d.ts

@@ -1,12 +1,12 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 declare module '@signalk/signalk-schema' {
-    import { EventEmitter } from 'events'
+  import { EventEmitter } from 'events'
 
-    export function getSourceId(source: any): string
-    export class FullSignalK extends EventEmitter {
-        constructor(selfId: string, selfType: string, defaults?: any)
-        addDelta: (_: any) => void
-        retrieve: () => any
-        pruneContexts: () => void
-    }
-}
+  export function getSourceId(source: any): string
+  export class FullSignalK extends EventEmitter {
+    constructor(selfId: string, selfType: string, defaults?: any)
+    addDelta: (_: any) => void
+    retrieve: () => any
+    pruneContexts: () => void
+  }
+}

src/categories.ts

@@ -41,7 +41,7 @@ function getCategories(thePackage: NpmPackageData): string[] {
     )
   }
   const categoryNames = categoryKeywords.map(
-    category => CAT_KEYWORDS_TO_NAMES[category]
+    (category) => CAT_KEYWORDS_TO_NAMES[category]
   )
 
   if (categoryNames.length === 0) {

src/config/development.js

@@ -16,7 +16,7 @@
 
 const { isUndefined } = require('lodash')
 
-module.exports = function(app) {
+module.exports = function (app) {
   'use strict'
 
   if (app.get('env') === 'development') {

src/config/get.js

@@ -9,7 +9,7 @@ const appModules = addModules(appPath)
 const getAppPath = get('config.appPath')
 
 // Build path to the public dir of a module. getInstalledPathSync(moduleName, { local: true })
-const getModulePublic = moduleName =>
+const getModulePublic = (moduleName) =>
   flow(getAppPath, addModules, partialRight(path.join, [moduleName, 'public']))
 
 module.exports = {

src/config/production.js

@@ -16,7 +16,7 @@
 
 const { isUndefined } = require('lodash')
 
-module.exports = function(app) {
+module.exports = function (app) {
   'use strict'
 
   if (app.get('env') === 'production') {

src/deltacache.ts

@@ -43,7 +43,7 @@ export default class DeltaCache {
 
   constructor(app: SignalKServer, streambundle: StreamBundle) {
     this.app = app
-    streambundle.keys.onValue(key => {
+    streambundle.keys.onValue((key) => {
       streambundle.getBus(key).onValue(this.onValue.bind(this))
     })
   }
@@ -67,7 +67,7 @@ export default class DeltaCache {
     if (msg.path.length !== 0) {
       leaf[sourceRef] = msg
     } else if (msg.value) {
-      _.keys(msg.value).forEach(key => {
+      _.keys(msg.value).forEach((key) => {
         if (!leaf[key]) {
           leaf[key] = {}
         }
@@ -155,8 +155,8 @@ export default class DeltaCache {
 
   getCachedDeltas(contextFilter: ContextMatcher, user?: string, key?: string) {
     const contexts: any[] = []
-    _.keys(this.cache).forEach(type => {
-      _.keys(this.cache[type]).forEach(id => {
+    _.keys(this.cache).forEach((type) => {
+      _.keys(this.cache[type]).forEach((id) => {
         const context = `${type}.${id}`
         if (contextFilter({ context })) {
           contexts.push(this.cache[type][id])

src/discovery.js

@@ -21,7 +21,7 @@ const dgram = require('dgram')
 const mdns = require('mdns-js')
 const { networkInterfaces } = require('os')
 
-module.exports.runDiscovery = function(app) {
+module.exports.runDiscovery = function (app) {
   if (canboatjs.discover) {
     try {
       canboatjs.discover(app)
@@ -36,7 +36,7 @@ module.exports.runDiscovery = function(app) {
   discoverSignalkWs('wss')
 
   function findUDPProvider(port) {
-    return app.config.settings.pipedProviders.find(provider => {
+    return app.config.settings.pipedProviders.find((provider) => {
       return (
         provider.pipeElements &&
         provider.pipeElements.length === 1 &&
@@ -50,7 +50,7 @@ module.exports.runDiscovery = function(app) {
   }
 
   function findTCPProvider(host, port) {
-    return app.config.settings.pipedProviders.find(provider => {
+    return app.config.settings.pipedProviders.find((provider) => {
       return (
         provider.pipeElements &&
         provider.pipeElements.length === 1 &&
@@ -65,7 +65,7 @@ module.exports.runDiscovery = function(app) {
   }
 
   function findWSProvider(ip, wsType, host, port) {
-    return app.config.settings.pipedProviders.find(provider => {
+    return app.config.settings.pipedProviders.find((provider) => {
       return (
         provider.pipeElements &&
         provider.pipeElements.length === 1 &&
@@ -84,14 +84,14 @@ module.exports.runDiscovery = function(app) {
   function discoverGoFree() {
     const socket = dgram.createSocket('udp4')
     const found = []
-    socket.on('message', function(buffer, remote) {
+    socket.on('message', function (buffer, remote) {
       const msg = buffer.toString('utf8')
       if (msg[0] === '{') {
         try {
           const json = JSON.parse(msg)
           const serial = json.SerialNumber
           if (json.Services && found.indexOf(serial) === -1) {
-            json.Services.forEach(service => {
+            json.Services.forEach((service) => {
               if (
                 service.Service === 'nmea-0183' &&
                 !findTCPProvider(json.IP, service.Port)
@@ -124,7 +124,7 @@ module.exports.runDiscovery = function(app) {
         }
       }
     })
-    socket.on('error', error => {
+    socket.on('error', (error) => {
       debug('discoverGoFree:', error)
     })
     socket.on('close', () => {
@@ -152,7 +152,7 @@ module.exports.runDiscovery = function(app) {
   function discoverWLN10() {
     if (!findUDPProvider('2000')) {
       let socket = dgram.createSocket('udp4')
-      socket.on('message', function(buffer, remote) {
+      socket.on('message', function (buffer, remote) {
         const msg = buffer.toString('utf8')
         if (msg[0] === '$') {
           socket.close()
@@ -174,7 +174,7 @@ module.exports.runDiscovery = function(app) {
           })
         }
       })
-      socket.on('error', error => {
+      socket.on('error', (error) => {
         debug('discoverWLN10:', error)
       })
       socket.on('close', () => {

src/dummysecurity.ts

@@ -19,7 +19,7 @@
 
 /* tslint:disable */
 
-export default function() {
+export default function () {
   return {
     getConfiguration: () => {
       return {}
@@ -69,11 +69,11 @@ export default function() {
 
     deleteUser: (_config: any, _username: any, _callback: any) => {},
 
-    shouldAllowWrite: function(_req: any, _delta: any) {
+    shouldAllowWrite: function (_req: any, _delta: any) {
       return true
     },
 
-    shouldAllowPut: function(
+    shouldAllowPut: function (
       _req: any,
       _context: any,
       _source: any,

src/index.ts

@@ -363,7 +363,7 @@ class Server {
         debug('ID type: ' + app.selfType)
         debug('ID: ' + app.selfId)
 
-        sendBaseDeltas((app as unknown) as ConfigApp)
+        sendBaseDeltas(app as unknown as ConfigApp)
 
         startInterfaces(app)
         startMdns(app)
@@ -415,10 +415,10 @@ class Server {
       this.app.config.settings = settings
     }
 
-    this.stop().catch(e => console.error(e))
+    this.stop().catch((e) => console.error(e))
 
     setTimeout(() => {
-      self.start().catch(e => console.error(e))
+      self.start().catch((e) => console.error(e))
     }, 1000)
 
     return this
@@ -440,11 +440,11 @@ class Server {
             }
           })
 
-          this.app.intervals.forEach(interval => {
+          this.app.intervals.forEach((interval) => {
             clearInterval(interval)
           })
 
-          this.app.providers.forEach(providerHolder => {
+          this.app.providers.forEach((providerHolder) => {
             providerHolder.pipeElements[0].end()
           })
 

src/interfaces/applicationData.js

@@ -34,7 +34,7 @@ const userApplicationDataUrls = [
   `${prefix}/user/:appid/:version`
 ]
 
-module.exports = function(app) {
+module.exports = function (app) {
   if (app.securityStrategy.isDummy()) {
     debug('ApplicationData disabled because security is off')
 
@@ -49,11 +49,11 @@ module.exports = function(app) {
     return
   }
 
-  applicationDataUrls.forEach(url => {
+  applicationDataUrls.forEach((url) => {
     app.securityStrategy.addAdminWriteMiddleware(url)
   })
 
-  userApplicationDataUrls.forEach(url => {
+  userApplicationDataUrls.forEach((url) => {
     app.securityStrategy.addWriteMiddleware(url)
   })
 
@@ -96,7 +96,7 @@ module.exports = function(app) {
       return
     }
 
-    res.json(fs.readdirSync(dir).map(file => file.slice(0, -5)))
+    res.json(fs.readdirSync(dir).map((file) => file.slice(0, -5)))
   }
 
   function getApplicationData(req, res, isUser) {
@@ -161,7 +161,7 @@ module.exports = function(app) {
       applicationData = req.body
     }
 
-    saveApplicationData(req, appid, version, isUser, applicationData, err => {
+    saveApplicationData(req, appid, version, isUser, applicationData, (err) => {
       if (err) {
         console.log(err)
         res.status(500).send(err.message)