Run stricter linter to cleanup problems and force ES6 usage (#566)

Also shorten fs.write() promise code

Author: RyanZim

lib/copy-sync/copy-sync.js

@@ -191,8 +191,8 @@ function checkDest (dest) {
 // return true if dest is a subdir of src, otherwise false.
 // extract dest base dir and check if that is the same as src basename.
 function isSrcSubdir (src, dest) {
-  let srcArray = path.resolve(src).split(path.sep)
-  let destArray = path.resolve(dest).split(path.sep)
+  const srcArray = path.resolve(src).split(path.sep)
+  const destArray = path.resolve(dest).split(path.sep)
 
   return srcArray.reduce((acc, current, i) => {
     return acc && destArray[i] === current

lib/copy-sync/index.js

@@ -1,3 +1,5 @@
+'use strict'
+
 module.exports = {
   copySync: require('./copy-sync')
 }

lib/copy/__tests__/ncp/broken-symlink.test.js

@@ -9,7 +9,7 @@ const assert = require('assert')
 
 /* global afterEach, beforeEach, describe, it */
 
-describe('ncp broken symlink', function () {
+describe('ncp broken symlink', () => {
   const TEST_DIR = path.join(os.tmpdir(), 'fs-extra', 'ncp-broken-symlinks')
   const src = path.join(TEST_DIR, 'src')
   const out = path.join(TEST_DIR, 'out')

lib/copy/__tests__/ncp/ncp.test.js

@@ -41,7 +41,7 @@ describe('ncp', () => {
       it('files are copied correctly', cb => {
         readDirFiles(src, 'utf8', (srcErr, srcFiles) => {
           function filter (files) {
-            for (let fileName in files) {
+            for (const fileName in files) {
               const curFile = files[fileName]
               if (curFile instanceof Object) {
                 return filter(curFile)
@@ -143,7 +143,7 @@ describe('ncp', () => {
   })
 
   // see https://github.com/AvianFlu/ncp/issues/71
-  describe('Issue 71: Odd Async Behaviors', cb => {
+  describe('Issue 71: Odd Async Behaviors', () => {
     const fixtures = path.join(__dirname, 'fixtures', 'regular-fixtures')
     const src = path.join(fixtures, 'src')
     const out = path.join(fixtures, 'out')

lib/copy/copy.js

@@ -245,8 +245,8 @@ function checkDest (dest, cb) {
 // return true if dest is a subdir of src, otherwise false.
 // extract dest base dir and check if that is the same as src basename.
 function isSrcSubdir (src, dest) {
-  let srcArray = path.resolve(src).split(path.sep)
-  let destArray = path.resolve(dest).split(path.sep)
+  const srcArray = path.resolve(src).split(path.sep)
+  const destArray = path.resolve(dest).split(path.sep)
 
   return srcArray.reduce((acc, current, i) => {
     return acc && destArray[i] === current

lib/copy/index.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const u = require('universalify').fromCallback
 module.exports = {
   copy: u(require('./copy'))

lib/ensure/__tests__/link.test.js

@@ -85,7 +85,7 @@ describe('fse-ensure-link', () => {
         return done()
       }
       args.push(callback)
-      return fn.apply(null, args)
+      return fn(...args)
     })
   }
 
@@ -103,7 +103,7 @@ describe('fse-ensure-link', () => {
         return done()
       }
       args.push(callback)
-      return fn.apply(null, args)
+      return fn(...args)
     })
   }
 
@@ -120,7 +120,7 @@ describe('fse-ensure-link', () => {
         return done()
       }
       args.push(callback)
-      return fn.apply(null, args)
+      return fn(...args)
     })
   }
 
@@ -129,7 +129,7 @@ describe('fse-ensure-link', () => {
     const dstpath = args[1]
 
     it(`should create link file using src ${srcpath} and dst ${dstpath}`, () => {
-      fn.apply(null, args)
+      fn(...args)
       const srcContent = fs.readFileSync(srcpath, 'utf8')
       const dstDir = path.dirname(dstpath)
       const dstBasename = path.basename(dstpath)
@@ -151,7 +151,7 @@ describe('fse-ensure-link', () => {
       const dstdirExistsBefore = fs.existsSync(path.dirname(dstpath))
       let err = null
       try {
-        fn.apply(null, args)
+        fn(...args)
       } catch (e) {
         err = e
       }
@@ -167,7 +167,7 @@ describe('fse-ensure-link', () => {
 
     it(`should do nothing using src ${srcpath} and dst ${dstpath}`, () => {
       const destinationContentBefore = fs.readFileSync(dstpath, 'utf8')
-      fn.apply(null, args)
+      fn(...args)
       const destinationContentAfter = fs.readFileSync(dstpath, 'utf8')
       assert.equal(destinationContentBefore, destinationContentAfter)
     })

lib/ensure/__tests__/symlink-paths.test.js

@@ -71,7 +71,7 @@ describe('symlink-type', () => {
           done()
         }
         args.push(callback)
-        return symlinkPaths.apply(null, args)
+        return symlinkPaths(...args)
       })
     })
   })
@@ -81,7 +81,7 @@ describe('symlink-type', () => {
       const args = test[0].slice(0)
       const expectedRelativePaths = test[1]
       it(`should return '${JSON.stringify(expectedRelativePaths)}' when src '${args[0]}' and dst is '${args[1]}'`, () => {
-        const relativePaths = symlinkPathsSync.apply(null, args)
+        const relativePaths = symlinkPathsSync(...args)
         assert.deepEqual(relativePaths, expectedRelativePaths)
       })
     })

lib/ensure/__tests__/symlink-type.test.js

@@ -102,7 +102,7 @@ describe('symlink-type', () => {
           done()
         }
         args.push(callback)
-        return symlinkType.apply(null, args)
+        return symlinkType(...args)
       })
     })
   })
@@ -112,7 +112,7 @@ describe('symlink-type', () => {
       const args = test[0]
       const expectedType = test[1]
       it(`should return '${expectedType}' when src '${args[0]}'`, () => {
-        const type = symlinkTypeSync.apply(null, args)
+        const type = symlinkTypeSync(...args)
         assert.equal(type, expectedType)
       })
     })

lib/ensure/__tests__/symlink.test.js

@@ -97,7 +97,7 @@ describe('fse-ensure-symlink', () => {
         return done()
       }
       args.push(callback)
-      return fn.apply(null, args)
+      return fn(...args)
     })
   }
 
@@ -117,7 +117,7 @@ describe('fse-ensure-symlink', () => {
         return done()
       }
       args.push(callback)
-      return fn.apply(null, args)
+      return fn(...args)
     })
   }
 
@@ -134,7 +134,7 @@ describe('fse-ensure-symlink', () => {
         return done()
       }
       args.push(callback)
-      return fn.apply(null, args)
+      return fn(...args)
     })
   }
 
@@ -150,7 +150,7 @@ describe('fse-ensure-symlink', () => {
         return done()
       }
       args.push(callback)
-      return fn.apply(null, args)
+      return fn(...args)
     })
   }
 
@@ -173,7 +173,7 @@ describe('fse-ensure-symlink', () => {
         return done()
       }
       args.push(callback)
-      return fn.apply(null, args)
+      return fn(...args)
     })
   }
 
@@ -193,7 +193,7 @@ describe('fse-ensure-symlink', () => {
         return done()
       }
       args.push(callback)
-      return fn.apply(null, args)
+      return fn(...args)
     })
   }
 
@@ -210,7 +210,7 @@ describe('fse-ensure-symlink', () => {
         return done()
       }
       args.push(callback)
-      return fn.apply(null, args)
+      return fn(...args)
     })
   }
 
@@ -226,15 +226,15 @@ describe('fse-ensure-symlink', () => {
         return done()
       }
       args.push(callback)
-      return fn.apply(null, args)
+      return fn(...args)
     })
   }
 
   function fileSuccessSync (args, fn) {
     const srcpath = args[0]
     const dstpath = args[1]
     it(`should create symlink file using src ${srcpath} and dst ${dstpath}`, () => {
-      fn.apply(null, args)
+      fn(...args)
       const relative = symlinkPathsSync(srcpath, dstpath)
       const srcContent = fs.readFileSync(relative.toCwd, 'utf8')
       const dstDir = path.dirname(dstpath)
@@ -252,7 +252,7 @@ describe('fse-ensure-symlink', () => {
     const srcpath = args[0]
     const dstpath = args[1]
     it(`should create broken symlink file using src ${srcpath} and dst ${dstpath}`, () => {
-      fn.apply(null, args)
+      fn(...args)
       const dstDir = path.dirname(dstpath)
       const dstBasename = path.basename(dstpath)
       const isSymlink = fs.lstatSync(dstpath).isSymbolicLink()
@@ -270,7 +270,7 @@ describe('fse-ensure-symlink', () => {
       const dstdirExistsBefore = fs.existsSync(path.dirname(dstpath))
       let err = null
       try {
-        fn.apply(null, args)
+        fn(...args)
       } catch (e) {
         err = e
       }
@@ -285,7 +285,7 @@ describe('fse-ensure-symlink', () => {
     const dstpath = args[1]
     it(`should do nothing using src ${srcpath} and dst ${dstpath}`, () => {
       const destinationContentBefore = fs.readFileSync(dstpath, 'utf8')
-      fn.apply(null, args)
+      fn(...args)
       const destinationContentAfter = fs.readFileSync(dstpath, 'utf8')
       assert.equal(destinationContentBefore, destinationContentAfter)
     })
@@ -295,7 +295,7 @@ describe('fse-ensure-symlink', () => {
     const srcpath = args[0]
     const dstpath = args[1]
     it(`should create symlink dir using src ${srcpath} and dst ${dstpath}`, () => {
-      fn.apply(null, args)
+      fn(...args)
       const relative = symlinkPathsSync(srcpath, dstpath)
       const srcContents = fs.readdirSync(relative.toCwd)
       const dstDir = path.dirname(dstpath)
@@ -313,7 +313,7 @@ describe('fse-ensure-symlink', () => {
     const srcpath = args[0]
     const dstpath = args[1]
     it(`should create broken symlink dir using src ${srcpath} and dst ${dstpath}`, () => {
-      fn.apply(null, args)
+      fn(...args)
       const dstDir = path.dirname(dstpath)
       const dstBasename = path.basename(dstpath)
       const isSymlink = fs.lstatSync(dstpath).isSymbolicLink()
@@ -331,7 +331,7 @@ describe('fse-ensure-symlink', () => {
       const dstdirExistsBefore = fs.existsSync(path.dirname(dstpath))
       let err = null
       try {
-        fn.apply(null, args)
+        fn(...args)
       } catch (e) {
         err = e
       }
@@ -346,7 +346,7 @@ describe('fse-ensure-symlink', () => {
     const dstpath = args[1]
     it(`should do nothing using src ${srcpath} and dst ${dstpath}`, () => {
       const destinationContentBefore = fs.readdirSync(dstpath)
-      fn.apply(null, args)
+      fn(...args)
       const destinationContentAfter = fs.readdirSync(dstpath)
       assert.deepEqual(destinationContentBefore, destinationContentAfter)
     })