Fix remove & other promise returning functions

src/data-migrator.js

@@ -150,11 +150,11 @@ class OldCollection {
     /**
      * @return {Promise}
      */
-    countAllUndeleted() {
+    async countAllUndeleted() {
         return PouchDB.countAllUndeleted(this.pouchdb);
     }
 
-    getBatch(batchSize) {
+    async getBatch(batchSize) {
         return PouchDB
             .getBatch(this.pouchdb, batchSize)
             .then(docs => docs
@@ -264,7 +264,7 @@ class OldCollection {
      * deletes this.pouchdb and removes it from the database.collectionsCollection
      * @return {Promise}
      */
-    delete() {
+    async delete() {
         return this
             .pouchdb.destroy()
             .then(() => this.database.removeCollectionDoc(this.dataMigrator.name, this.schema));
@@ -328,7 +328,7 @@ class OldCollection {
  * get an array with OldCollection-instances from all existing old pouchdb-instance
  * @return {Promise<OldCollection[]>}
  */
-export function _getOldCollections(dataMigrator) {
+export async function _getOldCollections(dataMigrator) {
     return Promise
         .all(
             dataMigrator.currentSchema.previousVersions
@@ -346,8 +346,8 @@ export function _getOldCollections(dataMigrator) {
  * returns true if a migration is needed
  * @return {Promise<boolean>}
  */
-export function mustMigrate(dataMigrator) {
-    if (dataMigrator.currentSchema.version === 0) return Promise.resolve(false);
+export async function mustMigrate(dataMigrator) {
+    if (dataMigrator.currentSchema.version === 0) return false;
     return _getOldCollections(dataMigrator)
         .then(oldCols => {
             if (oldCols.length === 0) return false;

src/hooks.js

@@ -66,7 +66,7 @@ export function runPluginHooks(hookKey, obj) {
 /**
  * @return {Promise}
  */
-export function runAsyncPluginHooks(hookKey, obj) {
+export async function runAsyncPluginHooks(hookKey, obj) {
     return Promise.all(
         HOOKS[hookKey].map(fun => fun(obj))
     );

src/plugins/attachments.js

@@ -19,7 +19,7 @@ function ensureSchemaSupportsAttachments(doc) {
     }
 }
 
-function resyncRxDocument(doc) {
+async function resyncRxDocument(doc) {
     return doc.collection.pouch.get(doc.primary).then(docData => {
         const data = doc.collection._handleFromPouch(docData);
         const changeEvent = RxChangeEvent.create(
@@ -65,7 +65,7 @@ export const blobBufferUtil = {
         }
         return blobBuffer;
     },
-    toString(blobBuffer) {
+    async toString(blobBuffer) {
         if (blobBuffer instanceof Buffer) {
             // node
             return nextTick()
@@ -165,7 +165,7 @@ function shouldEncrypt(doc) {
 /**
  * @return {Promise}
  */
-export function putAttachment({
+export async function putAttachment({
     id,
     data,
     type = 'text/plain'

src/plugins/in-memory.js

@@ -137,8 +137,8 @@ export class InMemoryRxCollection extends RxCollection.RxCollection {
      * in the parent collection
      * @return {Promise}
      */
-    awaitPersistence() {
-        if (this._nonPersistentRevisions.size === 0) return Promise.resolve();
+    async awaitPersistence() {
+        if (this._nonPersistentRevisions.size === 0) return;
         return this._nonPersistentRevisionsSubject.pipe(
             filter(() => this._nonPersistentRevisions.size === 0),
             first()
@@ -216,7 +216,7 @@ function toCleanSchema(rxSchema) {
  * @param  {RxCollection} toCollection
  * @return {Promise<{}[]>} Promise that resolves with an array of the docs data
  */
-export function replicateExistingDocuments(fromCollection, toCollection) {
+export async function replicateExistingDocuments(fromCollection, toCollection) {
     return fromCollection.pouch.allDocs({
         attachments: false,
         include_docs: true
@@ -247,7 +247,7 @@ export function replicateExistingDocuments(fromCollection, toCollection) {
  * @param {PouchDB} pouch
  * @return {Promise<void>}
  */
-export function setIndexes(schema, pouch) {
+export async function setIndexes(schema, pouch) {
     return Promise.all(
         schema.indexes
         .map(indexAr => {

src/plugins/json-dump.js

@@ -11,7 +11,7 @@ import RxChangeEvent from '../rx-change-event';
 /**
  * @return {Promise}
  */
-const dumpRxDatabase = function (decrypted = false, collections = null) {
+const dumpRxDatabase = async function (decrypted = false, collections = null) {
     const json = {
         name: this.name,
         instanceToken: this.token,
@@ -40,7 +40,7 @@ const dumpRxDatabase = function (decrypted = false, collections = null) {
     });
 };
 
-const importDumpRxDatabase = function (dump) {
+const importDumpRxDatabase = async function (dump) {
     /**
      * collections must be created before the import
      * because we do not know about the other collection-settings here
@@ -60,7 +60,7 @@ const importDumpRxDatabase = function (dump) {
     );
 };
 
-const dumpRxCollection = function (decrypted = false) {
+const dumpRxCollection = async function (decrypted = false) {
     const encrypted = !decrypted;
 
     const json = {
@@ -91,7 +91,7 @@ const dumpRxCollection = function (decrypted = false) {
 /**
  * @return {Promise}
  */
-const importDumpRxCollection = function (exportedJSON) {
+const importDumpRxCollection = async function (exportedJSON) {
     // check schemaHash
     if (exportedJSON.schemaHash !== this.schema.hash) {
         throw RxError.newRxError('JD2', {

src/plugins/leader-election.js

@@ -20,7 +20,7 @@ class LeaderElector {
     /**
      * @return {Promise} promise which resolve when the instance becomes leader
      */
-    waitForLeadership() {
+    async waitForLeadership() {
         return this.elector.awaitLeadership().then(() => {
             this.isLeader = true;
             return true;

src/plugins/local-documents.js

@@ -189,7 +189,7 @@ const RxLocalDocumentPrototype = {
     /**
      * @return {Promise}
      */
-    remove() {
+    async remove() {
         const removeId = LOCAL_PREFIX + this.id;
         return this.parentPouch.remove(removeId, this._data._rev)
             .then(() => {
@@ -263,7 +263,7 @@ const _getPouchByParent = parent => {
  * throws if already exists
  * @return {Promise<RxLocalDocument>}
  */
-const insertLocal = function (id, data) {
+const insertLocal = async function (id, data) {
     if (RxCollection.isInstanceOf(this) && this._isInMemory)
         return this._parentCollection.insertLocal(id, data);
 

src/plugins/watch-for-changes.js

@@ -55,8 +55,8 @@ export function watchForChanges() {
  * @param {*} change
  * @return {Promise<boolean>}
  */
-function _handleSingleChange(collection, change) {
-    if (change.id.charAt(0) === '_') return Promise.resolve(false); // do not handle changes of internal docs
+async function _handleSingleChange(collection, change) {
+    if (change.id.charAt(0) === '_') return false; // do not handle changes of internal docs
 
     // wait 2 ticks and 20 ms to give the internal event-handling time to run
     return promiseWait(20)
@@ -65,7 +65,7 @@ function _handleSingleChange(collection, change) {
         .then(() => {
             const docData = change.doc;
             // already handled by internal event-stream
-            if (collection._changeEventBuffer.hasChangeWithRevision(docData._rev)) return Promise.resolve(false);
+            if (collection._changeEventBuffer.hasChangeWithRevision(docData._rev)) return false;
 
             const cE = RxChangeEvent.fromPouchChange(docData, collection);
 

src/pouch-db.js

@@ -24,7 +24,7 @@ import RxError from './rx-error';
  * @param  {PouchDB}  pouchdb instance
  * @return {Promise<number>} number of documents
  */
-PouchDB.countAllUndeleted = function(pouchdb) {
+PouchDB.countAllUndeleted = async function(pouchdb) {
     return pouchdb
         .allDocs({
             include_docs: false,
@@ -43,7 +43,7 @@ PouchDB.countAllUndeleted = function(pouchdb) {
  * @param  {number}  limit
  * @return {Promise<{}[]>} array with documents
  */
-PouchDB.getBatch = function(pouchdb, limit) {
+PouchDB.getBatch = async function(pouchdb, limit) {
     if (limit <= 1) {
         throw RxError.newRxError('P1', {
             limit

src/rx-collection.js

@@ -67,7 +67,7 @@ export class RxCollection {
 
         _applyHookFunctions(this);
     }
-    prepare() {
+    async prepare() {
         this.pouch = this.database._spawnPouchDB(this.name, this.schema.version, this._pouchSettings);
 
         if (this.schema.doKeyCompression()) {
@@ -250,7 +250,7 @@ export class RxCollection {
      * @param  {[type]} key [description]
      * @return {[type]}     [description]
      */
-    _pouchGet(key) {
+    async _pouchGet(key) {
         return this
             .pouch
             .get(key)
@@ -264,7 +264,7 @@ export class RxCollection {
      * @param {?boolean} noDecrypt if true, decryption will not be made
      * @return {Object[]} array with documents-data
      */
-    _pouchFind(rxQuery, limit, noDecrypt = false) {
+    async _pouchFind(rxQuery, limit, noDecrypt = false) {
         const compressedQueryJSON = rxQuery.keyCompress();
         if (limit) compressedQueryJSON.limit = limit;
 
@@ -352,7 +352,7 @@ export class RxCollection {
      * @param {RxDocument} doc which was created
      * @return {Promise<RxDocument>}
      */
-    insert(json) {
+    async insert(json) {
         // inserting a temporary-document
         let tempDoc = null;
         if (RxDocument.isInstanceOf(json)) {
@@ -413,7 +413,7 @@ export class RxCollection {
      * same as insert but overwrites existing document with same primary
      * @return {Promise<RxDocument>}
      */
-    upsert(json) {
+    async upsert(json) {
         json = clone(json);
         const primary = json[this.schema.primaryPath];
         if (!primary) {
@@ -441,7 +441,7 @@ export class RxCollection {
      * @param  {object}  json
      * @return {Promise}
      */
-    atomicUpsert(json) {
+    async atomicUpsert(json) {
         json = clone(json);
         const primary = json[this.schema.primaryPath];
         if (!primary) {
@@ -606,9 +606,9 @@ export class RxCollection {
     /**
      * @return {Promise<void>}
      */
-    _runHooks(when, key, data, instance) {
+    async _runHooks(when, key, data, instance) {
         const hooks = this.getHooks(when, key);
-        if (!hooks) return Promise.resolve();
+        if (!hooks) return;
 
         // run parallel: false
         const tasks = hooks.series.map(hook => () => hook(data, instance));
@@ -798,7 +798,7 @@ const checkOrmMethods = function(statics) {
 /**
  * @return {Promise}
  */
-function _atomicUpsertUpdate(doc, json) {
+async function _atomicUpsertUpdate(doc, json) {
     return doc.atomicUpdate(innerDoc => {
         json._rev = innerDoc._rev;
         innerDoc._data = json;
@@ -812,7 +812,7 @@ function _atomicUpsertUpdate(doc, json) {
  * @param  {any}  json
  * @return {Promise<{ doc: RxDocument, inserted: boolean}>} promise that resolves with new doc and flag if inserted
  */
-function _atomicUpsertEnsureRxDocumentExists(rxCollection, primary, json) {
+async function _atomicUpsertEnsureRxDocumentExists(rxCollection, primary, json) {
     return rxCollection.findOne(primary).exec()
         .then(doc => {
             if (!doc) {
@@ -848,7 +848,7 @@ export function getDocumentOrmPrototype(rxCollection) {
 /**
  * creates the indexes in the pouchdb
  */
-function _prepareCreateIndexes(rxCollection, spawnedPouchPromise) {
+async function _prepareCreateIndexes(rxCollection, spawnedPouchPromise) {
     return Promise.all(
         rxCollection.schema.indexes
         .map(indexAr => {
@@ -881,7 +881,7 @@ function _prepareCreateIndexes(rxCollection, spawnedPouchPromise) {
  * @param  {?Object}  [migrationStrategies={}]
  * @return {Promise<RxCollection>} promise with collection
  */
-export function create({
+export async function create({
     database,
     name,
     schema,

src/rx-database.js

@@ -62,7 +62,7 @@ export class RxDatabase {
         );
     }
 
-    dangerousRemoveCollectionInfo() {
+    async dangerousRemoveCollectionInfo() {
         const colPouch = this._collectionsPouch;
         return colPouch.allDocs()
             .then(docsRes => {
@@ -102,8 +102,8 @@ export class RxDatabase {
     /**
      * @return {Promise}
      */
-    waitForLeadership() {
-        if (!this.multiInstance) return Promise.resolve(true);
+    async waitForLeadership() {
+        if (!this.multiInstance) return true;
         return this.leaderElector.waitForLeadership();
     }
 
@@ -135,9 +135,9 @@ export class RxDatabase {
 
     /**
      * removes the collection-doc from this._collectionsPouch
-     * @return {Promise}
+     * }
      */
-    removeCollectionDoc(name, schema) {
+    async removeCollectionDoc(name, schema) {
         const docId = _collectionNamePrimary(name, schema);
         return this
             ._collectionsPouch
@@ -351,7 +351,7 @@ export class RxDatabase {
      * deletes the database and its stored data
      * @return {Promise}
      */
-    remove() {
+    async remove() {
         return this
             .destroy()
             .then(() => removeDatabase(this.name, this.adapter));
@@ -472,7 +472,7 @@ export async function _ensureStorageTokenExists(rxDatabase) {
  * @param  {RxChangeEvent} changeEvent
  * @return {Promise<boolean>}
  */
-export function writeToSocket(rxDatabase, changeEvent) {
+export async function writeToSocket(rxDatabase, changeEvent) {
     if (
         rxDatabase.multiInstance &&
         !changeEvent.isIntern() &&
@@ -488,7 +488,7 @@ export function writeToSocket(rxDatabase, changeEvent) {
         };
         return rxDatabase.broadcastChannel.postMessage(sendOverChannel);
     } else
-        return Promise.resolve(false);
+        return false;
 }
 
 /**
@@ -506,7 +506,7 @@ export function _collectionNamePrimary(name, schema) {
  * @param  {string}  collectionName
  * @return {Promise<string[]>} resolves all known collection-versions
  */
-export function _removeAllOfCollection(rxDatabase, collectionName) {
+export async function _removeAllOfCollection(rxDatabase, collectionName) {
 
     return rxDatabase.lockedRun(
         () => rxDatabase._collectionsPouch.allDocs({
@@ -577,7 +577,7 @@ async function prepare(rxDatabase) {
 }
 
 
-export function create({
+export async function create({
     name,
     adapter,
     password,
@@ -720,7 +720,7 @@ export async function removeDatabase(databaseName, adapter) {
  * check is the given adapter can be used
  * @return {Promise}
  */
-export function checkAdapter(adapter) {
+export async function checkAdapter(adapter) {
     return overwritable.checkAdapter(adapter);
 }