Update ESLint configuration and fix linting errors in code files

Author: stefandesu

.eslintrc.js

@@ -1,31 +1,12 @@
 module.exports = {
-  "env": {
-    "browser": true,
-    "es6": true
+  env: {
+    es6: true,
+    node: true,
+    mocha: true,
   },
-  "extends": ["eslint:recommended"],
-  "parserOptions": {
-    "sourceType": "module",
-    "ecmaVersion": 2017
+  extends: ["gbv"],
+  parserOptions: {
+    sourceType: "module",
+    ecmaVersion: 2020,
   },
-  "rules": {
-    "indent": [
-      "error",
-      2
-    ],
-    "linebreak-style": [
-      "error",
-      "unix"
-    ],
-    "quotes": [
-      "error",
-      "double"
-    ],
-    "semi": [
-      "error",
-      "never"
-    ],
-    "no-undef": "off",
-    "no-console": "off"
-  }
 }

config.js

@@ -65,22 +65,22 @@ config.serverVersion = require("./package.json").version
 // Concepts (read only)
 config.concepts = {
   read: {
-    auth: false
-  }
+    auth: false,
+  },
 }
 // Mappings (read only by default)
 config.mappings = {
   read: {
-    auth: false
+    auth: false,
   },
   fromSchemeWhitelist: [
     {
-      uri: "http://bartoc.org/en/node/1940"
-    }
+      uri: "http://bartoc.org/en/node/1940",
+    },
   ],
   toSchemeWhitelist: [],
   anonymous: true,
-  cardinality: "1-to-1"
+  cardinality: "1-to-1",
 }
 // Identity requirements
 config.identities = null

lib/debug.js

@@ -4,5 +4,5 @@ const debug = require("debug")
 module.exports = {
   sparql: message => debug("sparql")(message),
   http: message => debug("http")(message),
-  query: message => debug("query")(message)
+  query: message => debug("query")(message),
 }

lib/mappers.js

@@ -9,7 +9,7 @@ const wikidata = require("./wikidata")
 function mapIdentifier (id) {
   return {
     uri: "http://www.wikidata.org/entity/" + id,
-    notation: [ id ]
+    notation: [ id ],
   }
 }
 
@@ -27,7 +27,7 @@ function mapSimpleDescriptions (descriptions) {
     const scopeNote = languages.reduce((notes, lang) => {
       notes[lang] = [ descriptions[lang] ]
       return notes
-    }, { "-": [] }
+    }, { "-": [] },
     )
     return { scopeNote }
   } else {
@@ -48,11 +48,11 @@ function mapMappingClaims (claims, options = {}) {
         list.forEach(mapping => {
           mapping.fromScheme = {
             uri: wikidata.uri,
-            notation: wikidata.notation
+            notation: wikidata.notation,
           }
           mapping.toScheme = {
             uri: scheme.uri,
-            notation: scheme.notation
+            notation: scheme.notation,
           }
           mapping.from = { memberSet: [ ] }
           if (from) {
@@ -71,7 +71,9 @@ function mapMappingClaims (claims, options = {}) {
 }
 
 function mapSimpleClaims (claims) {
-  if (!claims) return {}
+  if (!claims) {
+    return {}
+  }
 
   const mediaUrl = media => "http://commons.wikimedia.org/wiki/Special:FilePath/" + encodeURIComponent(media)
 
@@ -92,7 +94,7 @@ function mapSimpleClaims (claims) {
     P576: ["endDate", false],
     P625: ["location", false, (coord) => {
       return { type: "Point", coordinates: [ coord[1], coord[0] ] } // lon, lat
-    }]
+    }],
   }
 
   var concept = {}
@@ -101,7 +103,9 @@ function mapSimpleClaims (claims) {
     const propertyClaims = claims[property]
 
     var mapping = mappings[property]
-    if (!mapping) continue
+    if (!mapping) {
+      continue
+    }
 
     const field = mapping.shift()
 
@@ -127,39 +131,41 @@ function mapSimpleClaims (claims) {
 }
 
 function mapSimpleSitelinks (sitelinks) {
-  if (!sitelinks) return {}
+  if (!sitelinks) {
+    return {}
+  }
 
   // TODO: get sitelinks-matrix and filter by language?
   return {
     occurrences: [
       {
-        database: { "uri": "http://www.wikidata.org/entity/Q2013" },
+        database: { uri: "http://www.wikidata.org/entity/Q2013" },
         relation: "http://schema.org/about",
-        count: Object.keys(sitelinks).length
-      }
+        count: Object.keys(sitelinks).length,
+      },
     ],
     subjectOf: Object.keys(sitelinks).map(site => {
       try {
         return {
-          url: wdk.getSitelinkUrl(site, sitelinks[site])
+          url: wdk.getSitelinkUrl(site, sitelinks[site]),
         }
       } catch (e) {
         // just ignore unkown sites
 
       }
-    }).filter(site => site)
+    }).filter(site => site),
   }
 }
 
 function mapInfo (entity) {
   const type = [
     "http://www.w3.org/2004/02/skos/core#Concept",
-    entityTypes[entity.type]
+    entityTypes[entity.type],
   ]
   return {
     modified: entity.modified,
     type,
-    inScheme: [{ uri: wikidata.uri }]
+    inScheme: [{ uri: wikidata.uri }],
   }
 }
 
@@ -171,7 +177,7 @@ function mapSimpleEntity (entity) {
     mapSimpleDescriptions(entity.descriptions),
     mapSimpleClaims(entity.claims),
     mapSimpleSitelinks(entity.sitelinks),
-    mapInfo(entity)
+    mapInfo(entity),
   )
 }
 
@@ -194,5 +200,5 @@ module.exports = {
   mapSitelinks: sitelinks => mapSimpleSitelinks(wdk.simplify.sitelinks(sitelinks)),
   mapEntity: entity => mapSimpleEntity(wdk.simplify.entity(entity)),
   mapInfo,
-  mapMappingClaims
+  mapMappingClaims,
 }

lib/mapping-schemes.js

@@ -23,6 +23,6 @@ module.exports = {
     const cachedSchemes = `${cache}/mapping-schemes.ndjson`
     const assetsSchemes = `${assets}/mapping-schemes.ndjson`
     return ndjson.read( fs.existsSync(cachedSchemes) ? cachedSchemes : assetsSchemes )
-  }
+  },
 
 }

lib/ndjson.js

@@ -8,5 +8,5 @@ module.exports = {
     const stream = file ? fs.createWriteStream(file) : process.stdout
     const objects = Array.isArray(data) ? data : [data]
     objects.forEach(obj => stream.write(JSON.stringify(obj) + "\n"))
-  }
+  },
 }

lib/queries/get-backlinks.js

@@ -22,7 +22,7 @@ function getBacklinks (uris, languages, properties) {
           entities[uri] = {
             uri,
             prefLabel: (languages && languages.length ? { "-": "?" } : { }),
-            notation: [uri.split("/").pop()]
+            notation: [uri.split("/").pop()],
           }
         }
 

lib/queries/get-concepts.js

@@ -7,7 +7,9 @@ const { mapEntity } = require("../mappers")
 
 async function getConcepts (query) {
   const concepts = detectWikidataConcepts(query.uri)
-  if (!concepts.length) return []
+  if (!concepts.length) {
+    return []
+  }
 
   const languages = selectedLanguages(query)
   const props = ["info", "sitelinks", "labels", "aliases", "descriptions", "claims"]
@@ -18,9 +20,13 @@ async function getConcepts (query) {
     .then(entities => Object.values(entities).filter(e => !("missing" in e)))
     .then(entities => entities.map(mapEntity))
     .then(entities => {
-      if (!entities.length) return []
+      if (!entities.length) {
+        return []
+      }
       const index = {}
-      entities.forEach(e => { index[e.uri] = e })
+      entities.forEach(e => {
+        index[e.uri] = e 
+      })
       const rels = ["P361", "P31", "P279", "P131"]
       return getBacklinks(Object.keys(index), languages, rels)
         .then(backlinks => {

lib/queries/get-mapping-list.js

@@ -42,7 +42,9 @@ LIMIT ${limit} OFFSET ${offset}`
     .then(rows => rows.map(row => {
 
       const to = toScheme.conceptFromNotation(row.value.value)
-      if (!to) return // malformed notation in Wikidata
+      if (!to) {
+        return
+      } // malformed notation in Wikidata
 
       var type
       if (row.mappingType) {
@@ -52,23 +54,23 @@ LIMIT ${limit} OFFSET ${offset}`
         type = "http://www.w3.org/2004/02/skos/core#mappingRelation"
       }
 
-      return mapping = {
+      return {
         uri: row.statement.value,
         from: {
           memberSet: [ {
             uri: row.item.value,
-          } ]
+          } ],
         },
         to: { memberSet: [ to ] },
         fromScheme: {
           uri: "http://bartoc.org/en/node/1940",
-          notation: ["WD"]
+          notation: ["WD"],
         },
         toScheme: {
           uri: toScheme.uri,
-          notation: toScheme.notation
+          notation: toScheme.notation,
         },
-        type: [ type ]
+        type: [ type ],
       }
     }).filter(Boolean))
 

lib/queries/get-mapping-schemes.js

@@ -61,7 +61,7 @@ function getMappingSchemes () {
         // we cannot escape all special character but spaces are needed
         const escapedNotationPattern = notationPattern.split(" ").join("%20")
         const uriPattern = "^" + template.split("$1").map(s =>
-          s.replace(/[\\^$*+?.()|[\]{}]/g, "\\$&")
+          s.replace(/[\\^$*+?.()|[\]{}]/g, "\\$&"),
         ).join("(" + escapedNotationPattern + ")") + "$"
 
         const scheme = {
@@ -70,7 +70,7 @@ function getMappingSchemes () {
           notationPattern,
           uriPattern,
           namespace: template.replace(/\$1.*/, ""),
-          PROPERTY: row.property.value.split("/").pop()
+          PROPERTY: row.property.value.split("/").pop(),
         }
         if (row.extent) {
           scheme.extent = row.extent.value