cozy-client 32.2.1 → 32.2.2

package/dist/CozyClient.js

@@ -2550,7 +2550,7 @@ var CozyClient = /*#__PURE__*/function () {
 CozyClient.hooks = CozyClient.hooks || {};
 CozyClient.fetchPolicies = _policies.default; //COZY_CLIENT_VERSION_PACKAGE in replaced by babel. See babel config
 
-CozyClient.version = "32.2.1";
+CozyClient.version = "32.2.2";
 
 _microee.default.mixin(CozyClient);
 

package/dist/store/queries.js

@@ -120,8 +120,20 @@ var sortAndLimitDocsIds = function sortAndLimitDocsIds(queryState, documents, id
     evaluatedIds = sorter(docs).map(_helpers.properId);
   }
 
-  if (queryState.definition.limit) {
-    evaluatedIds = queryState.definition.limit ? evaluatedIds.slice(0, count * fetchedPagesCount) : evaluatedIds;
+  var limit = queryState.definition.limit;
+
+  if (limit) {
+    var sliceCount;
+
+    if (count < limit) {
+      // When there are less results than the limit, this is either the first
+      // or last paginated query.
+      sliceCount = fetchedPagesCount > 1 ? limit * (fetchedPagesCount - 1) + count : count;
+    } else {
+      sliceCount = limit * fetchedPagesCount;
+    }
+
+    evaluatedIds = evaluatedIds.slice(0, sliceCount);
   }
 
   return evaluatedIds;

package/dist/store/queries.spec.js

@@ -427,4 +427,36 @@ describe('sortAndLimitDocsIds', () => {
     )
     expect(ids2).toEqual(['doc2', 'doc1'])
   })
+
+  it('should correctly handle count inferior to limit', () => {
+    const query1 = Q('io.cozy.files')
+      .sortBy([{ name: 'asc' }])
+      .limitBy(2)
+
+    const ids1 = sortAndLimitDocsIds(
+      { definition: query1.toDefinition() },
+      docs,
+      ['doc1', 'doc2'],
+      {
+        count: 1,
+        fetchedPagesCount: 1
+      }
+    )
+    expect(ids1.length).toEqual(1)
+
+    const query2 = Q('io.cozy.files')
+      .sortBy([{ name: 'asc' }])
+      .limitBy(2)
+
+    const ids2 = sortAndLimitDocsIds(
+      { definition: query2.toDefinition() },
+      docs,
+      ['doc1', 'doc2', 'doc3'],
+      {
+        count: 1,
+        fetchedPagesCount: 2
+      }
+    )
+    expect(ids2.length).toEqual(3)
+  })
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "32.2.1",
+  "version": "32.2.2",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -73,5 +73,5 @@
     "react-native-ios11-devicecheck": "https://github.com/cozy/react-native-devicecheck#app-attest-v0.1"
   },
   "sideEffects": false,
-  "gitHead": "b6bd07dbec672e74ca16f7fff56b09c9611d841a"
+  "gitHead": "0c955a3e9132d1b811aaeb1c868427258209c74a"
 }