chore(PouchDB-find): minor cleanup (#8920)

* whitespace cleanup
* return of query-planner/planQuery

Author: SourceR85

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

@@ -1,6 +1,6 @@
-import {clone} from 'pouchdb-utils';
+import { clone } from 'pouchdb-utils';
 import getIndexes from '../get-indexes';
-import {collate} from 'pouchdb-collate';
+import { collate } from 'pouchdb-collate';
 import abstractMapper from '../abstract-mapper';
 import planQuery from './query-planner';
 import {
@@ -16,7 +16,7 @@ import {
   filterInclusiveStart,
   massageUseIndex
 } from '../utils';
-import {pick} from '../../../utils';
+import { pick } from '../../../utils';
 import validateSelector from '../../../validateSelector';
 
 function indexToSignature(index) {
@@ -112,10 +112,10 @@ async function find(db, requestDef, explain) {
   }, queryPlan.queryOpts);
 
   if ('startkey' in opts && 'endkey' in opts &&
-      collate(opts.startkey, opts.endkey) > 0) {
+    collate(opts.startkey, opts.endkey) > 0) {
     // can't possibly return any results, startkey > endkey
     /* istanbul ignore next */
-    return {docs: []};
+    return { docs: [] };
   }
 
   const isDescending = requestDef.sort &&

packages/node_modules/pouchdb-find/src/adapters/local/find/query-planner.js

@@ -67,7 +67,6 @@ function sortFieldsByIndex(userFields, index) {
 
 // first pass to try to find fields that will need to be sorted in-memory
 function getBasicInMemoryFields(index, selector, userFields) {
-
   userFields = sortFieldsByIndex(userFields, index);
 
   // check if any of the user selectors lose precision
@@ -152,9 +151,7 @@ function checkFieldsLogicallySound(indexFields, selector) {
 }
 
 function checkIndexMatches(index, sortOrder, fields, selector) {
-
   const indexFields = index.def.fields.map(getKey);
-
   const fieldsMatch = checkIndexFieldsMatch(indexFields, sortOrder, fields);
 
   if (!fieldsMatch) {
@@ -170,7 +167,6 @@ function checkIndexMatches(index, sortOrder, fields, selector) {
 // are a strict subset of the fields in some index,
 // then use that index
 //
-//
 function findMatchingIndexes(selector, userFields, sortOrder, indexes) {
   return indexes.filter(function (index) {
     return checkIndexMatches(index, sortOrder, userFields, selector);
@@ -180,7 +176,6 @@ function findMatchingIndexes(selector, userFields, sortOrder, indexes) {
 // find the best index, i.e. the one that matches the most fields
 // in the user's query
 function findBestMatchingIndex(selector, userFields, sortOrder, indexes, useIndex) {
-
   const matchingIndexes = findMatchingIndexes(selector, userFields, sortOrder, indexes);
 
   if (matchingIndexes.length === 0) {
@@ -190,8 +185,8 @@ function findBestMatchingIndex(selector, userFields, sortOrder, indexes, useInde
         message: "There is no index available for this selector."
       };
     }
-    //return `all_docs` as a default index;
-    //I'm assuming that _all_docs is always first
+    // return `all_docs` as a default index;
+    // I'm assuming that _all_docs is always first
     const defaultIndex = indexes[0];
     defaultIndex.defaultUsed = true;
     return defaultIndex;
@@ -244,11 +239,11 @@ function findBestMatchingIndex(selector, userFields, sortOrder, indexes, useInde
 function getSingleFieldQueryOptsFor(userOperator, userValue) {
   switch (userOperator) {
     case '$eq':
-      return {key: userValue};
+      return { key: userValue };
     case '$lte':
-      return {endkey: userValue};
+      return { endkey: userValue };
     case '$gte':
-      return {startkey: userValue};
+      return { startkey: userValue };
     case '$lt':
       return {
         endkey: userValue,
@@ -272,7 +267,6 @@ function getSingleFieldCoreQueryPlan(selector, index) {
   /* istanbul ignore next */
   const matcher = selector[field] || {};
   const inMemoryFields = [];
-
   const userOperators = Object.keys(matcher);
 
   let combinedOpts;
@@ -283,7 +277,6 @@ function getSingleFieldCoreQueryPlan(selector, index) {
     }
 
     const userValue = matcher[userOperator];
-
     const newQueryOpts = getSingleFieldQueryOptsFor(userOperator, userValue);
 
     if (combinedOpts) {
@@ -328,7 +321,6 @@ function getMultiFieldCoreQueryPlan(userOperator, userValue) {
 }
 
 function getMultiFieldQueryOpts(selector, index) {
-
   const indexFields = index.def.fields.map(getKey);
 
   let inMemoryFields = [];
@@ -337,7 +329,6 @@ function getMultiFieldQueryOpts(selector, index) {
   let inclusiveStart;
   let inclusiveEnd;
 
-
   function finish(i) {
 
     if (inclusiveStart !== false) {
@@ -353,7 +344,6 @@ function getMultiFieldQueryOpts(selector, index) {
 
   for (let i = 0, len = indexFields.length; i < len; i++) {
     const indexField = indexFields[i];
-
     const matcher = selector[indexField];
 
     if (!matcher || !Object.keys(matcher).length) { // fewer fields in user query than in index
@@ -377,12 +367,10 @@ function getMultiFieldQueryOpts(selector, index) {
     }
 
     const userOperators = Object.keys(matcher);
-
     let combinedOpts = null;
 
     for (const userOperator of userOperators) {
       const userValue = matcher[userOperator];
-
       const newOpts = getMultiFieldCoreQueryPlan(userOperator, userValue);
 
       if (combinedOpts) {
@@ -432,13 +420,13 @@ function shouldShortCircuit(selector) {
   });
   return values.some(function (val) {
     return typeof val === 'object' && Object.keys(val).length === 0;
-});
+  });
 }
 
 function getDefaultQueryPlan(selector) {
   //using default index, so all fields need to be done in memory
   return {
-    queryOpts: {startkey: null},
+    queryOpts: { startkey: null },
     inMemoryFields: [Object.keys(selector)]
   };
 }
@@ -457,7 +445,6 @@ function getCoreQueryPlan(selector, index) {
 }
 
 function planQuery(request, indexes) {
-
   const selector = request.selector;
   const sort = request.sort;
 
@@ -477,12 +464,11 @@ function planQuery(request, indexes) {
 
   const inMemoryFields = getInMemoryFields(coreInMemoryFields, index, selector, userFields);
 
-  const res = {
+  return {
     queryOpts,
     index,
     inMemoryFields
   };
-  return res;
 }
 
 export default planQuery;

packages/node_modules/pouchdb-find/src/adapters/local/get-indexes/index.js

@@ -16,7 +16,7 @@ async function getIndexes(db) {
       name: '_all_docs',
       type: 'special',
       def: {
-        fields: [{_id: 'asc'}]
+        fields: [{ _id: 'asc' }]
       }
     }]
   };

packages/node_modules/pouchdb-find/src/utils.js

@@ -128,7 +128,6 @@ function pick(obj, arr) {
 
 // e.g. ['a'], ['a', 'b'] is true, but ['b'], ['a', 'b'] is false
 function oneArrayIsSubArrayOfOther(left, right) {
-
   for (let i = 0, len = Math.min(left.length, right.length); i < len; i++) {
     if (left[i] !== right[i]) {
       return false;
@@ -139,7 +138,6 @@ function oneArrayIsSubArrayOfOther(left, right) {
 
 // e.g.['a', 'b', 'c'], ['a', 'b'] is false
 function oneArrayIsStrictSubArrayOfOther(left, right) {
-
   if (left.length > right.length) {
     return false;
   }