chore: PouchDB-find adapters/http update (#8912)

* chore: refactor dbFetch to async function

* feat: dbFetch throw instance of PouchError

Author: SourceR85

packages/node_modules/pouchdb-find/src/adapters/http/index.js

@@ -1,61 +1,72 @@
-import { generateErrorFromResponse } from 'pouchdb-errors';
+import { createError, generateErrorFromResponse } from 'pouchdb-errors';
 import { Headers } from 'pouchdb-fetch';
 import massageCreateIndexRequest from '../../massageCreateIndexRequest';
 import validateSelector from '../../validateSelector';
 
-function dbFetch(db, path, opts, callback) {
-  var status, ok;
-  opts.headers = new Headers({'Content-type': 'application/json'});
-  db.fetch(path, opts).then(function (response) {
-    status = response.status;
-    ok = response.ok;
-    return response.json();
-  }).then(function (json) {
-    if (!ok) {
-      json.status = status;
-      var err = generateErrorFromResponse(json);
-      callback(err);
-    } else {
-      callback(null, json);
-    }
-  }).catch(callback);
+async function dbFetch(db, path, opts) {
+  if (opts.body) {
+    opts.body = JSON.stringify(opts.body);
+    opts.headers = new Headers({ 'Content-type': 'application/json' });
+  }
+
+  const response = await db.fetch(path, opts);
+  const json = await response.json();
+  if (!response.ok) {
+    json.status = response.status;
+    const pouchError = createError(json);
+    throw generateErrorFromResponse(pouchError);
+  }
+  return json;
 }
 
 function createIndex(db, requestDef, callback) {
-  requestDef = massageCreateIndexRequest(requestDef);
   dbFetch(db, '_index', {
     method: 'POST',
-    body: JSON.stringify(requestDef)
-  }, callback);
+    body: massageCreateIndexRequest(requestDef)
+  })
+    .then((result) => {
+      callback(null, result);
+    })
+    .catch(callback);
 }
 
 function find(db, requestDef, callback) {
   validateSelector(requestDef.selector, true);
   dbFetch(db, '_find', {
     method: 'POST',
-    body: JSON.stringify(requestDef)
-  }, callback);
+    body: requestDef
+  })
+    .then((result) => {
+      callback(null, result);
+    })
+    .catch(callback);
 }
 
 function explain(db, requestDef, callback) {
   dbFetch(db, '_explain', {
     method: 'POST',
-    body: JSON.stringify(requestDef)
-  }, callback);
+    body: requestDef
+  })
+    .then((result) => {
+      callback(null, result);
+    })
+    .catch(callback);
 }
 
 function getIndexes(db, callback) {
-  dbFetch(db, '_index', {
-    method: 'GET'
-  }, callback);
+  return dbFetch(db, '_index', {
+    method: 'GET',
+  })
+    .then((result) => {
+      callback(null, result);
+    })
+    .catch(callback);
 }
 
 function deleteIndex(db, indexDef, callback) {
-
-
-  var ddoc = indexDef.ddoc;
-  var type = indexDef.type || 'json';
-  var name = indexDef.name;
+  const ddoc = indexDef.ddoc;
+  const type = indexDef.type || 'json';
+  const name = indexDef.name;
 
   if (!ddoc) {
     return callback(new Error('you must provide an index\'s ddoc'));
@@ -65,9 +76,13 @@ function deleteIndex(db, indexDef, callback) {
     return callback(new Error('you must provide an index\'s name'));
   }
 
-  var url = '_index/' + [ddoc, type, name].map(encodeURIComponent).join('/');
+  const url = '_index/' + [ddoc, type, name].map(encodeURIComponent).join('/');
 
-  dbFetch(db, url, {method: 'DELETE'}, callback);
+  dbFetch(db, url, { method: 'DELETE' })
+    .then((result) => {
+      callback(null, result);
+    })
+    .catch(callback);
 }
 
 export {

tests/find/test-suite-1/test.errors.js

@@ -163,4 +163,52 @@ describe('test.errors.js', function () {
       });
     });
   });
+
+  it('should throw an instance of error if createIndex throws', async () => {
+    const db = context.db;
+
+    try {
+      await db.createIndex({});
+    } catch (exception) {
+      //! FIXME check for instance of PouchError if available
+      exception.should.be.instanceOf(Error);
+    }
+  });
+
+  it('should throw an instance of error if find throws', async () => {
+    const db = context.db;
+
+    try {
+      await db.find({ selector: [] });
+    } catch (exception) {
+      //! FIXME check for instance of PouchError if available
+      exception.should.be.instanceOf(Error);
+    }
+  });
+
+  it('should throw an instance of error if explain throws', async () => {
+    const db = context.db;
+
+    try {
+      await db.explain({});
+    } catch (exception) {
+      //! FIXME check for instance of PouchError if available
+      exception.should.be.instanceOf(Error);
+    }
+  });
+
+  it('should throw an instance of error if deleteIndex throws', async () => {
+    const db = context.db;
+
+    try {
+      await db.deleteIndex({
+        ddoc: "foo",
+        name: "bar"
+      });
+    }
+    catch (exception) {
+      //! FIXME check for instance of PouchError if available
+      exception.should.be.instanceOf(Error);
+    }
+  });
 });