cozy-pouch-link 49.0.0 → 49.1.1

package/dist/CozyPouchLink.js

@@ -1002,6 +1002,17 @@ var PouchLink = /*#__PURE__*/function (_CozyLink) {
 
                 if (!indexedFields) {
                   indexedFields = (0, _mango.getIndexFields)(options);
+                } else if (partialFilter) {
+                  // Some pouch adapters does not support partialIndex, e.g. with websql in react-native
+                  // Therefore, we need to force the indexing the partialIndex fields to ensure they will be
+                  // included in the actual index. Thanks to this, docs with missing fields will be excluded
+                  // from the index.
+                  // Note the $exists: false case should be handled in-memory.
+                  indexedFields = Array.from(new Set([].concat((0, _toConsumableArray2.default)(indexedFields), (0, _toConsumableArray2.default)(Object.keys(partialFilter))))); // FIXME: should properly handle n-level attributes
+
+                  indexedFields = indexedFields.filter(function (field) {
+                    return field !== '$and' && field !== '$or';
+                  });
                 }
 
                 indexName = (0, _mango.getIndexNameFromFields)(indexedFields, partialFilter);

package/dist/CozyPouchLink.spec.js

@@ -608,9 +608,10 @@ describe('CozyPouchLink', () => {
       expect(spy).toHaveBeenCalled()
       expect(spy).toHaveBeenCalledWith({
         index: {
-          ddoc: 'by_myIndex_filter_(SOME_FIELD_$exists_true)',
-          fields: ['myIndex'],
-          indexName: 'by_myIndex_filter_(SOME_FIELD_$exists_true)',
+          ddoc: 'by_myIndex_and_SOME_FIELD_filter_(SOME_FIELD_$exists_true)',
+          fields: ['myIndex', 'SOME_FIELD'],
+          indexName:
+            'by_myIndex_and_SOME_FIELD_filter_(SOME_FIELD_$exists_true)',
           partial_filter_selector: {
             SOME_FIELD: {
               $exists: true
@@ -620,6 +621,38 @@ describe('CozyPouchLink', () => {
       })
     })
 
+    it('should exclude $and and $or operators from fields with partialIndex', async () => {
+      spy = jest.spyOn(PouchDB.prototype, 'createIndex').mockReturnValue({})
+      await setup()
+      await link.ensureIndex(TODO_DOCTYPE, {
+        indexedFields: ['myIndex'],
+        partialFilter: {
+          $and: [
+            { SOME_FIELD: { $exists: true } },
+            { SOME_FIELD: { $gt: null } }
+          ],
+          $or: [{ SOME_FIELD: { $eq: '1' } }, { SOME_FIELD: { $eq: '2' } }]
+        }
+      })
+      expect(spy).toHaveBeenCalled()
+      expect(spy).toHaveBeenCalledWith({
+        index: {
+          ddoc:
+            'by_myIndex_filter_((SOME_FIELD_$exists_true)_$and_(SOME_FIELD_$gt_null))_and_((SOME_FIELD_$eq_1)_$or_(SOME_FIELD_$eq_2))',
+          fields: ['myIndex'],
+          indexName:
+            'by_myIndex_filter_((SOME_FIELD_$exists_true)_$and_(SOME_FIELD_$gt_null))_and_((SOME_FIELD_$eq_1)_$or_(SOME_FIELD_$eq_2))',
+          partial_filter_selector: {
+            $and: [
+              { SOME_FIELD: { $exists: true } },
+              { SOME_FIELD: { $gt: null } }
+            ],
+            $or: [{ SOME_FIELD: { $eq: '1' } }, { SOME_FIELD: { $eq: '2' } }]
+          }
+        }
+      })
+    })
+
     it('uses the specified index', async () => {
       let spyIndex = jest
         .spyOn(CozyPouchLink.prototype, 'ensureIndex')

package/dist/PouchManager.js

@@ -35,7 +35,10 @@ var _replicateOnce3 = require("./replicateOnce");
 
 var _utils = require("./utils");
 
-var DEFAULT_DELAY = 30 * 1000;
+var DEFAULT_DELAY = 30 * 1000; // See view_update_changes_batch_size in https://pouchdb.com/api.html#create_database
+// PouchDB default is 50, which badly hurt performances for large databases
+
+var DEFAULT_VIEW_UPDATE_BATCH = 1000;
 /**
  * @param {import('cozy-client/types/types').Query} query The query definition whose name we're getting
  *
@@ -79,6 +82,11 @@ var PouchManager = /*#__PURE__*/function () {
               case 0:
                 pouchPlugins = (0, _get.default)(this.options, 'pouch.plugins', []);
                 pouchOptions = (0, _get.default)(this.options, 'pouch.options', {});
+
+                if (!pouchOptions.view_update_changes_batch_size) {
+                  pouchOptions.view_update_changes_batch_size = DEFAULT_VIEW_UPDATE_BATCH;
+                }
+
                 (0, _forEach.default)(pouchPlugins, function (plugin) {
                   return _this.PouchDB.plugin(plugin);
                 });
@@ -87,15 +95,15 @@ var PouchManager = /*#__PURE__*/function () {
                 }));
                 /** @type {Record<string, import('./types').SyncInfo>} - Stores synchronization info per doctype */
 
-                _context.next = 6;
+                _context.next = 7;
                 return this.storage.getPersistedSyncedDoctypes();
 
-              case 6:
+              case 7:
                 this.syncedDoctypes = _context.sent;
-                _context.next = 9;
+                _context.next = 10;
                 return this.storage.getPersistedWarmedUpQueries();
 
-              case 9:
+              case 10:
                 this.warmedUpQueries = _context.sent;
                 this.getReplicationURL = this.options.getReplicationURL;
                 this.doctypesReplicationOptions = this.options.doctypesReplicationOptions || {};
@@ -111,7 +119,7 @@ var PouchManager = /*#__PURE__*/function () {
 
                 this.replications = undefined;
 
-              case 19:
+              case 20:
               case "end":
                 return _context.stop();
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-pouch-link",
-  "version": "49.0.0",
+  "version": "49.1.1",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -13,7 +13,7 @@
     "url": "git+https://github.com/cozy/cozy-client.git"
   },
   "dependencies": {
-    "cozy-client": "^49.0.0",
+    "cozy-client": "^49.1.1",
     "pouchdb-browser": "^7.2.2",
     "pouchdb-find": "^7.2.2"
   },
@@ -39,5 +39,5 @@
     "typecheck": "tsc -p tsconfig.json"
   },
   "sideEffects": false,
-  "gitHead": "ddf825045c0640e383b7cf89f9937ef7d44e501d"
+  "gitHead": "1743f0008b06d89bacda019231dd2292748c68d5"
 }