eslint: add rule: object-shorthand; fix violations (#8794)

Author: alxndrsn

.eslintrc.json

@@ -39,6 +39,7 @@
     "no-tabs": "error",
     "no-trailing-spaces": "error",
     "no-undef-init": "error",
+    "object-shorthand": ["error", "properties"],
     "semi": ["error", "always"],
     "curly": ["error", "all"],
     "space-unary-ops": ["error", {"words": true}],

bin/build-module.js

@@ -83,7 +83,7 @@ function buildModule(filepath) {
           var file = (isBrowser ? 'lib/index-browser' : 'lib/index') +
             (format === 'es' ? '.es.js' : '.js');
           return bundle.write({
-            format: format,
+            format,
             file: path.resolve(filepath, file)
           }).then(function () {
             console.log('  \u2713' + ' wrote ' +

bin/build-pouchdb.js

@@ -74,15 +74,15 @@ function doRollup(input, browser, formatsToFiles) {
   var start = process.hrtime();
   return rollup.rollup({
     input: addPath('pouchdb', input),
-    external: external,
+    external,
     plugins: rollupPlugins({
       mainFields: ["module"],
-      browser: browser
+      browser
     })
   }).then(function (bundle) {
     return Promise.all(Object.keys(formatsToFiles).map(function (format) {
       var fileOut = formatsToFiles[format];
-      return bundle.generate({format: format}).then(function (bundle) {
+      return bundle.generate({format}).then(function (bundle) {
         if (DEV_MODE) {
           var ms = Math.round(process.hrtime(start)[1] / 1000000);
           console.log('    took ' + ms + ' ms to rollup ' +

packages/node_modules/pouchdb-abstract-mapreduce/src/createView.js

@@ -40,11 +40,11 @@ async function createView(sourceDB, viewName, mapFun, reduceFun, temporary, loca
     db.auto_compaction = true;
     const view = {
       name: depDbName,
-      db: db,
-      sourceDB: sourceDB,
+      db,
+      sourceDB,
       adapter: sourceDB.adapter,
-      mapFun: mapFun,
-      reduceFun: reduceFun
+      mapFun,
+      reduceFun
     };
 
     let lastSeqDoc;

packages/node_modules/pouchdb-abstract-mapreduce/src/index.js

@@ -95,7 +95,7 @@ function createAbstractMapReduce(localDocName, mapper, reducer, ddocValidator) {
     try {
       fun(doc);
     } catch (e) {
-      emitError(db, e, {fun: fun, doc: doc});
+      emitError(db, e, {fun, doc});
     }
   }
 
@@ -107,7 +107,7 @@ function createAbstractMapReduce(localDocName, mapper, reducer, ddocValidator) {
     try {
       return {output : fun(keys, values, rereduce)};
     } catch (e) {
-      emitError(db, e, {fun: fun, keys: keys, values: values, rereduce: rereduce});
+      emitError(db, e, {fun, keys, values, rereduce});
       return {error: e};
     }
   }
@@ -285,7 +285,7 @@ function createAbstractMapReduce(localDocName, mapper, reducer, ddocValidator) {
 
       const response = await db.fetch('_design/' + parts[0] + '/_view/' + parts[1] + params, {
         headers: new Headers({'Content-Type': 'application/json'}),
-        method: method,
+        method,
         body: JSON.stringify(body)
       });
       ok = response.ok;
@@ -555,7 +555,7 @@ function createAbstractMapReduce(localDocName, mapper, reducer, ddocValidator) {
     let indexed_docs = 0;
     const progress = {
       view: view.name,
-      indexed_docs: indexed_docs
+      indexed_docs
     };
     view.sourceDB.emit('indexing', progress);
 
@@ -651,7 +651,7 @@ function createAbstractMapReduce(localDocName, mapper, reducer, ddocValidator) {
         view: view.name,
         last_seq: response.last_seq,
         results_count: results.length,
-        indexed_docs: indexed_docs
+        indexed_docs
       };
       view.sourceDB.emit('indexing', progress);
       view.sourceDB.activeTasks.update(taskId, {completed_items: indexed_docs});
@@ -741,7 +741,7 @@ function createAbstractMapReduce(localDocName, mapper, reducer, ddocValidator) {
       groups.push({
         keys: [[e.key, e.id]],
         values: [e.value],
-        groupKey: groupKey
+        groupKey
       });
     });
     results = [];
@@ -816,7 +816,7 @@ function createAbstractMapReduce(localDocName, mapper, reducer, ddocValidator) {
         finalResults = {
           total_rows: totalRows,
           offset: skip,
-          rows: rows
+          rows
         };
       } else {
         // support limit, skip for keys query

packages/node_modules/pouchdb-adapter-http/src/index.js

@@ -831,7 +831,7 @@ function HttpPouch(opts, callback) {
 
     try {
       const result = await fetchJSON(genDBUrl(host, '_all_docs' + paramStr), {
-        method: method,
+        method,
         body: JSON.stringify(body)
       });
       if (opts.include_docs && opts.attachments && opts.binary) {
@@ -989,7 +989,7 @@ function HttpPouch(opts, callback) {
       const url = genDBUrl(host, '_changes' + paramsToStr(params));
       const fetchOpts = {
         signal: controller.signal,
-        method: method,
+        method,
         body: JSON.stringify(body)
       };
       lastFetchedSeq = since;

packages/node_modules/pouchdb-adapter-idb/src/allDocs.js

@@ -26,7 +26,7 @@ function allDocsKeys(keys, docStore, onBatch) {
       if (event.target.result) {
         valuesBatch[index] = event.target.result;
       } else {
-        valuesBatch[index] = {key: key, error: 'not_found'};
+        valuesBatch[index] = {key, error: 'not_found'};
       }
       count++;
       if (count === keys.length) {

packages/node_modules/pouchdb-adapter-idb/src/bulkDocs.js

@@ -361,7 +361,7 @@ function idbBulkDocs(dbOpts, req, opts, api, idb, callback) {
     function add(att) {
       var digest = docInfo.data._attachments[att].digest;
       var req = attachAndSeqStore.put({
-        seq: seq,
+        seq,
         digestSeq: digest + '::' + seq
       });
 
@@ -390,7 +390,7 @@ function idbBulkDocs(dbOpts, req, opts, api, idb, callback) {
         return callback(); // already exists
       }
       var newAtt = {
-        digest: digest,
+        digest,
         body: data
       };
       var putReq = attachStore.put(newAtt);

packages/node_modules/pouchdb-adapter-idb/src/changes.js

@@ -174,7 +174,7 @@ function changes(opts, api, dbName, idb) {
 
   function finish() {
     opts.complete(null, {
-      results: results,
+      results,
       last_seq: lastSeq
     });
   }

packages/node_modules/pouchdb-adapter-idb/src/index.js

@@ -219,7 +219,7 @@ function init(api, opts, callback) {
         for (j = 0; j < digests.length; j++) {
           var digest = digests[j];
           attAndSeqStore.put({
-            seq: seq,
+            seq,
             digestSeq: digest + '::' + seq
           });
         }
@@ -332,7 +332,7 @@ function init(api, opts, callback) {
     }
 
     function finish() {
-      callback(err, {doc: doc, metadata: metadata, ctx: txn});
+      callback(err, {doc, metadata, ctx: txn});
     }
 
     txn.objectStore(DOC_STORE).get(id).onsuccess = function (e) {
@@ -614,7 +614,7 @@ function init(api, opts, callback) {
         callback(createError(MISSING_DOC));
       } else {
         oStore.delete(id);
-        ret = {ok: true, id: id, rev: '0-0'};
+        ret = {ok: true, id, rev: '0-0'};
         if (opts.ctx) { // return immediately
           callback(null, ret);
         }
@@ -737,12 +737,12 @@ function init(api, opts, callback) {
       }
       api._meta = {
         name: dbName,
-        instanceId: instanceId,
-        blobSupport: blobSupport
+        instanceId,
+        blobSupport
       };
 
       cachedDBs.set(dbName, {
-        idb: idb,
+        idb,
         global: api._meta
       });
       callback(null, api);