Update Prettier config to minimize changes and follow styleguide

qtomlinson · May 6, 2024 · 29fd50a · 29fd50a
1 parent 1faa1dd
commit 29fd50a
Show file tree

Hide file tree

Showing 126 changed files with 792 additions and 797 deletions.
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -1,5 +1,7 @@
 {
+  "arrowParens": "avoid",
   "printWidth": 120,
   "singleQuote": true,
-  "semi": false
+  "semi": false,
+  "trailingComma": "none"
 }
diff --git a/config/cdConfig.js b/config/cdConfig.js
@@ -5,13 +5,13 @@ const config = require('painless-config')
 
 const cd_azblob = {
   connection: config.get('CRAWLER_AZBLOB_CONNECTION_STRING'),
-  container: config.get('CRAWLER_AZBLOB_CONTAINER_NAME'),
+  container: config.get('CRAWLER_AZBLOB_CONTAINER_NAME')
 }
 
 const githubToken = config.get('CRAWLER_GITHUB_TOKEN')
 
 const cd_file = {
-  location: config.get('FILE_STORE_LOCATION') || (process.platform === 'win32' ? 'c:/temp/cd' : '/tmp/cd'),
+  location: config.get('FILE_STORE_LOCATION') || (process.platform === 'win32' ? 'c:/temp/cd' : '/tmp/cd')
 }
 const crawlerStoreProvider = config.get('CRAWLER_STORE_PROVIDER') || 'cd(file)'
 const maxRequeueAttemptCount = config.get('CRAWLER_MAX_REQUEUE_ATTEMPTS') || 5
@@ -22,20 +22,20 @@ module.exports = {
   searchPath: [module],
   crawler: {
     count: 2,
-    maxRequeueAttemptCount,
+    maxRequeueAttemptCount
   },
   filter: {
     provider: 'filter',
-    filter: {},
+    filter: {}
   },
   fetch: {
     dispatcher: 'cdDispatch',
     cdDispatch: {
-      fetched: { defaultTtlSeconds: fetchedCacheTtlSeconds },
+      fetched: { defaultTtlSeconds: fetchedCacheTtlSeconds }
     },
     cocoapods: { githubToken },
     conda: {
-      cdFileLocation: cd_file.location,
+      cdFileLocation: cd_file.location
     },
     cratesio: {},
     debian: { cdFileLocation: cd_file.location },
@@ -48,7 +48,7 @@ module.exports = {
     nuget: {},
     packagist: {},
     pypi: {},
-    rubygems: {},
+    rubygems: {}
   },
   process: {
     cdsource: {},
@@ -60,7 +60,7 @@ module.exports = {
     debsrc: {},
     fossology: {
       disabled: true,
-      installDir: config.get('FOSSOLOGY_HOME') || '/mnt/c/git/fo/fossology/src/',
+      installDir: config.get('FOSSOLOGY_HOME') || '/mnt/c/git/fo/fossology/src/'
     },
     gem: { githubToken },
     go: { githubToken },
@@ -90,39 +90,39 @@ module.exports = {
         '--classify',
         '--generated',
         '--summary',
-        '--summary-key-files',
+        '--summary-key-files'
         // '--quiet'
       ],
       timeout: 1000,
       processes: 2,
-      format: '--json-pp',
+      format: '--json-pp'
     },
     source: {},
-    top: { githubToken },
+    top: { githubToken }
   },
   store: {
     dispatcher: crawlerStoreProvider,
     cdDispatch: {},
     webhook: {
       url: config.get('CRAWLER_WEBHOOK_URL') || 'http://localhost:4000/webhook',
-      token: config.get('CRAWLER_WEBHOOK_TOKEN'),
+      token: config.get('CRAWLER_WEBHOOK_TOKEN')
     },
     azqueue: {
       connectionString: cd_azblob.connection,
-      queueName: config.get('CRAWLER_HARVESTS_QUEUE_NAME') || 'harvests',
+      queueName: config.get('CRAWLER_HARVESTS_QUEUE_NAME') || 'harvests'
     },
     'cd(azblob)': cd_azblob,
-    'cd(file)': cd_file,
+    'cd(file)': cd_file
   },
   deadletter: {
     provider: config.get('CRAWLER_DEADLETTER_PROVIDER') || crawlerStoreProvider,
     'cd(azblob)': cd_azblob,
-    'cd(file)': cd_file,
+    'cd(file)': cd_file
   },
   queue: {
     provider: config.get('CRAWLER_QUEUE_PROVIDER') || 'memory',
     memory: {
-      weights: { immediate: 3, soon: 2, normal: 3, later: 2 },
+      weights: { immediate: 3, soon: 2, normal: 3, later: 2 }
     },
     storageQueue: {
       weights: { immediate: 3, soon: 2, normal: 3, later: 2 },
@@ -132,8 +132,8 @@ module.exports = {
       visibilityTimeout_remainLocal: fetchedCacheTtlSeconds,
       maxDequeueCount: 5,
       attenuation: {
-        ttl: 3000,
-      },
-    },
-  },
+        ttl: 3000
+      }
+    }
+  }
 }
diff --git a/config/cdMemoryConfig.js b/config/cdMemoryConfig.js
@@ -4,26 +4,26 @@
 module.exports = {
   crawler: {
     count: 1,
-    maxRequeueAttemptCount: 5,
+    maxRequeueAttemptCount: 5
   },
   fetch: {
-    github: {},
+    github: {}
   },
   process: {
     scancode: {},
     licensee: {},
-    reuse: {},
+    reuse: {}
   },
   store: {
-    provider: 'memory',
+    provider: 'memory'
   },
   deadletter: {
-    provider: 'memory',
+    provider: 'memory'
   },
   queue: {
     provider: 'memory',
     memory: {
-      weights: { events: 10, immediate: 3, soon: 2, normal: 3, later: 2 },
-    },
-  },
+      weights: { events: 10, immediate: 3, soon: 2, normal: 3, later: 2 }
+    }
+  }
 }
diff --git a/config/map.js b/config/map.js
@@ -22,7 +22,7 @@ const source = {
   licensee,
   reuse,
   scancode,
-  fossology,
+  fossology
 }
 
 const npm = {
@@ -32,7 +32,7 @@ const npm = {
   licensee,
   reuse,
   scancode,
-  fossology,
+  fossology
 }
 
 const conda = {
@@ -42,7 +42,7 @@ const conda = {
   licensee,
   reuse,
   scancode,
-  fossology,
+  fossology
 }
 
 const crate = {
@@ -52,7 +52,7 @@ const crate = {
   licensee,
   reuse,
   scancode,
-  fossology,
+  fossology
 }
 
 const deb = {
@@ -62,7 +62,7 @@ const deb = {
   licensee,
   reuse,
   scancode,
-  fossology,
+  fossology
 }
 
 const go = {
@@ -72,7 +72,7 @@ const go = {
   licensee,
   reuse,
   scancode,
-  fossology,
+  fossology
 }
 
 const maven = {
@@ -82,7 +82,7 @@ const maven = {
   licensee,
   reuse,
   scancode,
-  fossology,
+  fossology
 }
 
 const nuget = {
@@ -91,7 +91,7 @@ const nuget = {
   clearlydefined,
   licensee,
   scancode,
-  reuse,
+  reuse
 }
 
 const pod = {
@@ -101,7 +101,7 @@ const pod = {
   licensee,
   reuse,
   scancode,
-  fossology,
+  fossology
 }
 
 const pypi = {
@@ -111,7 +111,7 @@ const pypi = {
   licensee,
   reuse,
   scancode,
-  fossology,
+  fossology
 }
 
 const composer = {
@@ -121,7 +121,7 @@ const composer = {
   licensee,
   reuse,
   scancode,
-  fossology,
+  fossology
 }
 
 const gem = {
@@ -131,7 +131,7 @@ const gem = {
   licensee,
   reuse,
   scancode,
-  fossology,
+  fossology
 }
 
 const _package = {
@@ -146,13 +146,13 @@ const _package = {
   pod,
   pypi,
   composer,
-  gem,
+  gem
 }
 
 const component = {
   _type: 'component',
   source,
-  package: _package,
+  package: _package
 }
 
 const entities = {
@@ -176,9 +176,9 @@ const entities = {
   composer,
   pod,
   pypi,
-  gem,
+  gem
 }
 
 module.exports = {
-  default: entities,
+  default: entities
 }
diff --git a/eslint.config.js b/eslint.config.js
@@ -8,17 +8,17 @@ module.exports = [
     languageOptions: {
       globals: {
         ...globals.node,
-        ...globals.mocha,
+        ...globals.mocha
       },
       parserOptions: {
-        sourceType: 'module',
-      },
+        sourceType: 'module'
+      }
     },
     rules: {
       quotes: ['error', 'single'],
       semi: ['error', 'never'],
-      'no-console': 'off',
-    },
+      'no-console': 'off'
+    }
   },
-  eslintConfigPrettier,
+  eslintConfigPrettier
 ]
diff --git a/ghcrawler/app.js b/ghcrawler/app.js
@@ -9,7 +9,7 @@ const morgan = require('morgan')
 const sendHelper = require('./middleware/sendHelper')
 
 function configureApp(service, logger) {
-  process.on('unhandledRejection', (exception) => logger.error('unhandledRejection', exception))
+  process.on('unhandledRejection', exception => logger.error('unhandledRejection', exception))
   auth.initialize(config.get('CRAWLER_SERVICE_AUTH_TOKEN') || 'secret', config.get('CRAWLER_SERVICE_FORCE_AUTH'))
 
   const app = express()
@@ -44,11 +44,11 @@ function configureApp(service, logger) {
         // call the callback but with no args.  An arg indicates an error.
         callback()
       },
-      (error) => {
+      error => {
         console.log(`Service initialization error: ${error.message}`)
         console.dir(error)
         callback(error)
-      },
+      }
     )
   }
 

diff --git a/ghcrawler/bin/www.js b/ghcrawler/bin/www.js
@@ -25,7 +25,7 @@ function run(service, logger) {
   const server = http.createServer(app)
 
   // initialize the apps (if they have async init functions) and start listening
-  init(app, (error) => {
+  init(app, error => {
     if (error) {
       console.log('Error initializing the Express app: ' + error)
       throw new Error(error)
@@ -105,10 +105,10 @@ function run(service, logger) {
         console.log('Server closed.')
         process.exit(0)
       },
-      (error) => {
+      error => {
         console.error(`Closing server: ${error}`)
         process.exit(1)
-      },
+      }
     )
   }