Merge pull request #655 from ninachaubal/block-level-scope

Use block level scope instead of function level scope

Author: RubenVerborgh

lib/api/authn/webid-tls.js

@@ -1,6 +1,6 @@
-var webid = require('webid/tls')
-var debug = require('../../debug').authentication
-var x509 // optional dependency, load lazily
+const webid = require('webid/tls')
+const debug = require('../../debug').authentication
+let x509 // optional dependency, load lazily
 
 const CERTIFICATE_MATCHER = /^-----BEGIN CERTIFICATE-----\n(?:[A-Za-z0-9+/=]+\n)+-----END CERTIFICATE-----$/m
 

lib/capability-discovery.js

@@ -29,7 +29,7 @@ module.exports = capabilityDiscovery
  * @return {Router} Express router
  */
 function capabilityDiscovery () {
-  var router = express.Router('/')
+  const router = express.Router('/')
 
   // Advertise the server capability discover endpoint
   router.get('/.well-known/solid', serviceCapabilityDocument(serviceConfigDefaults))

lib/create-server.js

@@ -1,20 +1,20 @@
 module.exports = createServer
 
-var express = require('express')
-var fs = require('fs')
-var https = require('https')
-var http = require('http')
-var SolidWs = require('solid-ws')
-var debug = require('./debug')
-var createApp = require('./create-app')
+const express = require('express')
+const fs = require('fs')
+const https = require('https')
+const http = require('http')
+const SolidWs = require('solid-ws')
+const debug = require('./debug')
+const createApp = require('./create-app')
 const globalTunnel = require('global-tunnel-ng')
 
 function createServer (argv, app) {
   argv = argv || {}
   app = app || express()
-  var ldpApp = createApp(argv)
-  var ldp = ldpApp.locals.ldp || {}
-  var mount = argv.mount || '/'
+  const ldpApp = createApp(argv)
+  const ldp = ldpApp.locals.ldp || {}
+  let mount = argv.mount || '/'
   // Removing ending '/'
   if (mount.length > 1 &&
     mount[mount.length - 1] === '/') {
@@ -33,8 +33,8 @@ function createServer (argv, app) {
     globalTunnel.initialize(argv.httpProxy)
   }
 
-  var server
-  var needsTLS = argv.sslKey || argv.sslCert ||
+  let server
+  const needsTLS = argv.sslKey || argv.sslCert ||
                  (ldp.webid || ldp.multiuser) && !argv.certificateHeader
   if (!needsTLS) {
     server = http.createServer(app)
@@ -54,21 +54,21 @@ function createServer (argv, app) {
       throw new Error('Missing path for SSL cert')
     }
 
-    var key
+    let key
     try {
       key = fs.readFileSync(argv.sslKey)
     } catch (e) {
       throw new Error('Can\'t find SSL key in ' + argv.sslKey)
     }
 
-    var cert
+    let cert
     try {
       cert = fs.readFileSync(argv.sslCert)
     } catch (e) {
       throw new Error('Can\'t find SSL cert in ' + argv.sslCert)
     }
 
-    var credentials = Object.assign({
+    const credentials = Object.assign({
       key: key,
       cert: cert
     }, argv)
@@ -100,7 +100,7 @@ function createServer (argv, app) {
 
   // Setup Express app
   if (ldp.live) {
-    var solidWs = SolidWs(server, ldpApp)
+    const solidWs = SolidWs(server, ldpApp)
     ldpApp.locals.ldp.live = solidWs.publish.bind(solidWs)
   }
 

lib/debug.js

@@ -1,4 +1,4 @@
-var debug = require('debug')
+const debug = require('debug')
 
 exports.handlers = debug('solid:handlers')
 exports.errors = debug('solid:errors')

lib/handlers/allow.js

@@ -1,14 +1,14 @@
 module.exports = allow
 
-var ACL = require('../acl-checker')
-var $rdf = require('rdflib')
-var utils = require('../utils')
-var debug = require('../debug.js').ACL
-var LegacyResourceMapper = require('../legacy-resource-mapper')
+const ACL = require('../acl-checker')
+const $rdf = require('rdflib')
+const utils = require('../utils')
+const debug = require('../debug.js').ACL
+const LegacyResourceMapper = require('../legacy-resource-mapper')
 
 function allow (mode) {
   return function allowHandler (req, res, next) {
-    var ldp = req.app.locals.ldp || {}
+    const ldp = req.app.locals.ldp || {}
     if (!ldp.webid) {
       return next()
     }
@@ -22,7 +22,7 @@ function allow (mode) {
     })
 
     // Determine the actual path of the request
-    var reqPath = res && res.locals && res.locals.path
+    let reqPath = res && res.locals && res.locals.path
       ? res.locals.path
       : req.path
 

lib/handlers/delete.js

@@ -1,11 +1,11 @@
 module.exports = handler
 
-var debug = require('../debug').handlers
+const debug = require('../debug').handlers
 
 function handler (req, res, next) {
   debug('DELETE -- Request on' + req.originalUrl)
 
-  var ldp = req.app.locals.ldp
+  const ldp = req.app.locals.ldp
   ldp.delete(req.hostname, req.path, function (err) {
     if (err) {
       debug('DELETE -- Failed to delete: ' + err)

lib/handlers/get.js

@@ -1,32 +1,32 @@
 module.exports = handler
 
-var fs = require('fs')
-var glob = require('glob')
-var _path = require('path')
-var $rdf = require('rdflib')
-var S = require('string')
-var Negotiator = require('negotiator')
+const fs = require('fs')
+const glob = require('glob')
+const _path = require('path')
+const $rdf = require('rdflib')
+const S = require('string')
+const Negotiator = require('negotiator')
 const url = require('url')
 const mime = require('mime-types')
 
-var debug = require('debug')('solid:get')
-var debugGlob = require('debug')('solid:glob')
-var allow = require('./allow')
+const debug = require('debug')('solid:get')
+const debugGlob = require('debug')('solid:glob')
+const allow = require('./allow')
 
-var utils = require('../utils.js')
-var translate = require('../utils.js').translate
-var error = require('../http-error')
+const utils = require('../utils.js')
+const translate = require('../utils.js').translate
+const error = require('../http-error')
 
 const RDFs = require('../ldp').RDF_MIME_TYPES
 
 function handler (req, res, next) {
-  var ldp = req.app.locals.ldp
-  var includeBody = req.method === 'GET'
-  var negotiator = new Negotiator(req)
-  var baseUri = utils.getFullUri(req)
-  var path = res.locals.path || req.path
-  var requestedType = negotiator.mediaType()
-  var possibleRDFType = negotiator.mediaType(RDFs)
+  const ldp = req.app.locals.ldp
+  const includeBody = req.method === 'GET'
+  const negotiator = new Negotiator(req)
+  const baseUri = utils.getFullUri(req)
+  const path = res.locals.path || req.path
+  const requestedType = negotiator.mediaType()
+  let possibleRDFType = negotiator.mediaType(RDFs)
   // Fallback to text/turtle if content type is unknown
   possibleRDFType = (!possibleRDFType) ? 'text/turtle' : possibleRDFType
 
@@ -39,7 +39,7 @@ function handler (req, res, next) {
 
   debug(req.originalUrl + ' on ' + req.hostname)
 
-  var options = {
+  const options = {
     'hostname': req.hostname,
     'path': path,
     'baseUri': baseUri,
@@ -60,12 +60,18 @@ function handler (req, res, next) {
       return next(err)
     }
 
+    let stream
+    let contentType
+    let container
+    let contentRange
+    let chunksize
+
     if (ret) {
-      var stream = ret.stream
-      var contentType = ret.contentType
-      var container = ret.container
-      var contentRange = ret.contentRange
-      var chunksize = ret.chunksize
+      stream = ret.stream
+      contentType = ret.contentType
+      container = ret.container
+      contentRange = ret.contentRange
+      chunksize = ret.chunksize
     }
 
     // Till here it must exist
@@ -85,8 +91,8 @@ function handler (req, res, next) {
 
       if (useDataBrowser) {
         res.set('Content-Type', 'text/html')
-        var defaultDataBrowser = _path.join(__dirname, '../../static/databrowser.html')
-        var dataBrowserPath = ldp.dataBrowserPath === 'default' ? defaultDataBrowser : ldp.dataBrowserPath
+        const defaultDataBrowser = _path.join(__dirname, '../../static/databrowser.html')
+        const dataBrowserPath = ldp.dataBrowserPath === 'default' ? defaultDataBrowser : ldp.dataBrowserPath
         debug('   sending data browser file: ' + dataBrowserPath)
         res.sendFile(dataBrowserPath)
         return
@@ -100,7 +106,7 @@ function handler (req, res, next) {
     if (negotiator.mediaType([contentType])) {
       res.setHeader('Content-Type', contentType)
       if (contentRange) {
-        var headers = { 'Content-Range': contentRange, 'Accept-Ranges': 'bytes', 'Content-Length': chunksize }
+        const headers = { 'Content-Range': contentRange, 'Accept-Ranges': 'bytes', 'Content-Length': chunksize }
         res.writeHead(206, headers)
         return stream.pipe(res)
       } else {
@@ -129,13 +135,13 @@ function handler (req, res, next) {
 }
 
 function globHandler (req, res, next) {
-  var ldp = req.app.locals.ldp
-  var root = !ldp.multiuser ? ldp.root : ldp.root + req.hostname + '/'
-  var filename = utils.uriToFilename(req.path, root)
-  var uri = utils.getFullUri(req)
+  const ldp = req.app.locals.ldp
+  const root = !ldp.multiuser ? ldp.root : ldp.root + req.hostname + '/'
+  const filename = utils.uriToFilename(req.path, root)
+  const uri = utils.getFullUri(req)
   const requestUri = url.resolve(uri, req.path)
 
-  var globOptions = {
+  const globOptions = {
     noext: true,
     nobrace: true,
     nodir: true
@@ -148,13 +154,13 @@ function globHandler (req, res, next) {
     }
 
     // Matches found
-    var globGraph = $rdf.graph()
+    const globGraph = $rdf.graph()
 
     let reqOrigin = utils.getBaseUri(req)
 
     debugGlob('found matches ' + matches)
     Promise.all(matches.map(match => new Promise((resolve, reject) => {
-      var baseUri = utils.filenameToBaseUri(match, reqOrigin, root)
+      const baseUri = utils.filenameToBaseUri(match, reqOrigin, root)
       fs.readFile(match, {encoding: 'utf8'}, function (err, fileData) {
         if (err) {
           debugGlob('error ' + err)
@@ -174,7 +180,7 @@ function globHandler (req, res, next) {
       })
     })))
     .then(() => {
-      var data = $rdf.serialize(undefined, globGraph, requestUri, 'text/turtle')
+      const data = $rdf.serialize(undefined, globGraph, requestUri, 'text/turtle')
       // TODO this should be added as a middleware in the routes
       res.setHeader('Content-Type', 'text/turtle')
       debugGlob('returning turtle')
@@ -186,14 +192,14 @@ function globHandler (req, res, next) {
 }
 
 function aclAllow (match, req, res, callback) {
-  var ldp = req.app.locals.ldp
+  const ldp = req.app.locals.ldp
 
   if (!ldp.webid) {
     return callback(true)
   }
 
-  var root = ldp.multiuser ? ldp.root + req.hostname + '/' : ldp.root
-  var relativePath = '/' + _path.relative(root, match)
+  const root = ldp.multiuser ? ldp.root + req.hostname + '/' : ldp.root
+  const relativePath = '/' + _path.relative(root, match)
   res.locals.path = relativePath
   allow('Read', req, res, function (err) {
     callback(err)

lib/handlers/index.js

@@ -1,16 +1,16 @@
 module.exports = handler
 
-var path = require('path')
-var debug = require('debug')('solid:index')
-var utils = require('../utils')
-var Negotiator = require('negotiator')
+const path = require('path')
+const debug = require('debug')('solid:index')
+const utils = require('../utils')
+const Negotiator = require('negotiator')
 
 function handler (req, res, next) {
-  var indexFile = 'index.html'
-  var ldp = req.app.locals.ldp
-  var negotiator = new Negotiator(req)
-  var requestedType = negotiator.mediaType()
-  var filename = utils.reqToPath(req)
+  const indexFile = 'index.html'
+  const ldp = req.app.locals.ldp
+  const negotiator = new Negotiator(req)
+  const requestedType = negotiator.mediaType()
+  const filename = utils.reqToPath(req)
 
   ldp.stat(filename, function (err, stats) {
     if (err) return next()

lib/handlers/post.js

@@ -1,16 +1,16 @@
 module.exports = handler
 
-var Busboy = require('busboy')
-var debug = require('debug')('solid:post')
-var path = require('path')
-var header = require('../header')
-var patch = require('./patch')
-var error = require('../http-error')
-var { extensions } = require('mime-types')
+const Busboy = require('busboy')
+const debug = require('debug')('solid:post')
+const path = require('path')
+const header = require('../header')
+const patch = require('./patch')
+const error = require('../http-error')
+const { extensions } = require('mime-types')
 
 function handler (req, res, next) {
-  var ldp = req.app.locals.ldp
-  var contentType = req.get('content-type')
+  const ldp = req.app.locals.ldp
+  const contentType = req.get('content-type')
   debug('content-type is ', contentType)
   // Handle SPARQL(-update?) query
   if (contentType === 'application/sparql' ||
@@ -20,7 +20,7 @@ function handler (req, res, next) {
   }
 
   // Handle container path
-  var containerPath = req.path
+  let containerPath = req.path
   if (containerPath[containerPath.length - 1] !== '/') {
     containerPath += '/'
   }
@@ -31,8 +31,9 @@ function handler (req, res, next) {
       return next(error(err, 'Container not valid'))
     }
 
+    let stats
     if (ret) {
-      var stats = ret.stream
+      stats = ret.stream
     }
 
     // Check if container is a directory
@@ -52,7 +53,7 @@ function handler (req, res, next) {
   function multi () {
     debug('receving multiple files')
 
-    var busboy = new Busboy({ headers: req.headers })
+    const busboy = new Busboy({ headers: req.headers })
     busboy.on('file', function (fieldname, file, filename, encoding, mimetype) {
       debug('One file received via multipart: ' + filename)
       ldp.put(