fix downloadBuffer and standard formatting

index.js

@@ -13,7 +13,7 @@ function defaults (defaultOptions = { }) {
     }
   }
 
-  for (let method in methods) {
+  for (const method in methods) {
     const impl = methods[method]
     storage[method] = (...args) => {
       const resolvedArgs = args.map(opts => {

lib/methods/content-length.js

@@ -6,7 +6,7 @@ module.exports = async function contentLength (opts) {
   assertParam(opts, 'file')
   const { file } = opts
 
-  const [ metadata ] = await file.getMetadata().catch((err) => {
+  const [metadata] = await file.getMetadata().catch((err) => {
     if (err.code === 404) return [{ size: 0 }]
     throw err
   })

lib/methods/copy-file.test.js

@@ -22,6 +22,6 @@ describe('copy-file', () => {
       .file('test-key-1')
 
     await copyFile({ file: sourceFile }, { file: destFile })
-    assert.deepEqual(sourceFile.copy.args[0], [ destFile ])
+    assert.deepEqual(sourceFile.copy.args[0], [destFile])
   })
 })

lib/methods/download-buffer.js

@@ -6,5 +6,6 @@ module.exports = async function downloadBuffer (opts) {
   assertParam(opts, 'file')
   const { file } = opts
 
-  return file.download()
+  const result = await file.download()
+  return result[0]
 }

lib/methods/download-buffer.test.js

@@ -17,7 +17,7 @@ describe('download-buffer', () => {
       .bucket('test-bucket-0')
       .file('test-key-0')
 
-    assert.deepEqual(await downloadBuffer({ file }), 'download')
-    assert.deepEqual(file.download.args[0], [ ])
+    assert.deepEqual(await downloadBuffer({ file }), ['download'])
+    assert.deepEqual(file.download.args[0], [])
   })
 })

lib/methods/download-file.test.js

@@ -18,6 +18,6 @@ describe('download-file', () => {
       .file('test-key-0')
 
     assert.deepEqual(await downloadFile({ file, localPath: 'test-local-path' }), 'download')
-    assert.deepEqual(file.download.args[0], [ { destination: 'test-local-path' } ])
+    assert.deepEqual(file.download.args[0], [{ destination: 'test-local-path' }])
   })
 })

lib/methods/download-stream.test.js

@@ -18,6 +18,6 @@ describe('download-stream', () => {
       .file('test-key-0')
 
     assert.deepEqual(await downloadStream({ file }), 'read-stream')
-    assert.deepEqual(file.createReadStream.args[0], [ undefined ])
+    assert.deepEqual(file.createReadStream.args[0], [undefined])
   })
 })

lib/methods/move-file.test.js

@@ -22,6 +22,6 @@ describe('move-file', () => {
       .file('test-key-1')
 
     await moveFile({ file: sourceFile }, { file: destFile })
-    assert.deepEqual(sourceFile.move.args[0], [ destFile ])
+    assert.deepEqual(sourceFile.move.args[0], [destFile])
   })
 })

lib/mock-storage.js

@@ -26,10 +26,10 @@ module.exports = (sandbox) => {
       createReadStream: sandbox.stub().callsFake(() => 'read-stream'),
       createWriteStream: sandbox.stub().callsFake(() => through2()),
       copy: sandbox.stub().callsFake(async () => 'copy'),
-      download: sandbox.stub().callsFake(async () => 'download'),
+      download: sandbox.stub().callsFake(async () => ['download']),
       exists: sandbox.stub().callsFake(async () => 'exists'),
-      getSignedUrl: sandbox.stub().callsFake(async () => [ 'signed-url' ]),
-      getMetadata: sandbox.stub().callsFake(async () => [ { size: '-1' } ]),
+      getSignedUrl: sandbox.stub().callsFake(async () => ['signed-url']),
+      getMetadata: sandbox.stub().callsFake(async () => [{ size: '-1' }]),
       move: sandbox.stub().callsFake(async () => 'move'),
       save: sandbox.stub().callsFake(async () => 'save')
     }

lib/resolve-options.js

@@ -42,7 +42,7 @@ module.exports = (defaultOptions, options) => {
   const key = opts.key && normalizeKey(opts.key)
   const file = opts.file || (key && bucket && bucket.file(key))
 
-  const contextKeys = [ 'validate', 'url', 'key', 'bucket' ].concat(storageKeys)
+  const contextKeys = ['validate', 'url', 'key', 'bucket'].concat(storageKeys)
 
   const blacklistKeys = contextKeys.map(key => `!${key}`)
   const remainingOpts = filter(opts, ['*'].concat(blacklistKeys))

lib/resolve-options.test.js

@@ -27,9 +27,9 @@ describe('resolve-options', () => {
       extraFlag: { deep: true }
     })
 
-    assert.deepEqual(resolveOptions.Storage.args[0], [ { projectId: 'test-project-id-0' } ])
-    assert.deepEqual(res.storage.bucket.args[0], [ 'test-bucket-0' ])
-    assert.deepEqual(res.bucket.file.args[0], [ 'test-key-0' ])
+    assert.deepEqual(resolveOptions.Storage.args[0], [{ projectId: 'test-project-id-0' }])
+    assert.deepEqual(res.storage.bucket.args[0], ['test-bucket-0'])
+    assert.deepEqual(res.bucket.file.args[0], ['test-key-0'])
 
     assert.deepEqual(res.url, 'gs://test-bucket-0/test-key-0')
     assert.deepEqual(res.extraFlag, { deep: true })
@@ -46,9 +46,9 @@ describe('resolve-options', () => {
       url: 'gs://test-bucket-1/test-key-1.test'
     })
 
-    assert.deepEqual(resolveOptions.Storage.args[0], [ { } ])
-    assert.deepEqual(res.storage.bucket.args[0], [ 'test-bucket-1' ])
-    assert.deepEqual(res.bucket.file.args[0], [ 'test-key-1.test' ])
+    assert.deepEqual(resolveOptions.Storage.args[0], [{ }])
+    assert.deepEqual(res.storage.bucket.args[0], ['test-bucket-1'])
+    assert.deepEqual(res.bucket.file.args[0], ['test-key-1.test'])
 
     assert.deepEqual(res.url, 'gs://test-bucket-1/test-key-1.test')
 
@@ -61,8 +61,8 @@ describe('resolve-options', () => {
       bucket: 'test-bucket-2'
     })
 
-    assert.deepEqual(resolveOptions.Storage.args[0], [ { } ])
-    assert.deepEqual(res.storage.bucket.args[0], [ 'test-bucket-2' ])
+    assert.deepEqual(resolveOptions.Storage.args[0], [{ }])
+    assert.deepEqual(res.storage.bucket.args[0], ['test-bucket-2'])
     assert.deepEqual(res.bucket.file.callCount, 0)
 
     assert.ok(res.bucket)
@@ -78,7 +78,7 @@ describe('resolve-options', () => {
       throw new Error()
     } catch (err) {
       assert.deepEqual(err.message, 'missing required param "bucket"')
-      assert.deepEqual(resolveOptions.Storage.args[0], [ { } ])
+      assert.deepEqual(resolveOptions.Storage.args[0], [{ }])
     }
   })
 })

package.json

@@ -40,7 +40,7 @@
     "mocha-standard": "^1.0.0",
     "mock-fs": "^4.3.0",
     "sinon": "^4.5.0",
-    "standard": "^11.0.1"
+    "standard": "^14.3.0"
   },
   "standard": {
     "globals": [