cozy-pouch-link 48.25.0 → 49.0.0

package/dist/PouchManager.spec.js

@@ -19,10 +19,17 @@ jest.mock('./remote', () => ({
 
 import * as rep from './startReplication'
 import PouchDB from 'pouchdb-browser'
-import * as ls from './localStorage'
+import {
+  LOCALSTORAGE_SYNCED_KEY,
+  LOCALSTORAGE_WARMUPEDQUERIES_KEY,
+  PouchLocalStorage
+} from './localStorage'
+import { platformWeb } from './platformWeb'
 
 import { fetchRemoteLastSequence, fetchRemoteInstance } from './remote'
 
+const ls = new PouchLocalStorage(platformWeb.storage)
+
 const sleep = delay => {
   return new Promise(resolve => {
     setTimeout(resolve, delay)
@@ -63,7 +70,7 @@ describe('PouchManager', () => {
     getReplicationURL,
     onSync = jest.fn()
 
-  beforeEach(() => {
+  beforeEach(async () => {
     getReplicationURL = () => 'http://replicationURL.local'
     managerOptions = {
       replicationDelay: 16,
@@ -72,6 +79,7 @@ describe('PouchManager', () => {
       prefix: 'cozy.tools'
     }
     manager = new PouchManager(['io.cozy.todos'], managerOptions)
+    await manager.init()
     const pouch = manager.getPouch('io.cozy.todos')
     const replication = mocks.pouchReplication({
       direction: 'pull',
@@ -133,6 +141,7 @@ describe('PouchManager', () => {
         'io.cozy.readonly': { strategy: 'fromRemote' }
       }
     })
+    await manager.init()
     const normalPouch = manager.getPouch('io.cozy.todos')
     const readOnlyPouch = manager.getPouch('io.cozy.readonly')
     readOnlyPouch.replicate = {}
@@ -155,6 +164,7 @@ describe('PouchManager', () => {
         }
       }
     )
+    await manager.init()
     const normalPouch = manager.getPouch('io.cozy.todos')
     const readOnlyPouch = manager.getPouch('io.cozy.readonly')
     readOnlyPouch.replicate = {}
@@ -162,6 +172,9 @@ describe('PouchManager', () => {
     const writeOnlyPouch = manager.getPouch('io.cozy.writeonly')
     writeOnlyPouch.replicate = {}
     writeOnlyPouch.replicate.to = jest.fn()
+    manager.updateSyncInfo('io.cozy.todos')
+    manager.updateSyncInfo('io.cozy.readonly')
+    manager.updateSyncInfo('io.cozy.writeonly')
     manager.startReplicationLoop()
     await sleep(1000)
     expect(readOnlyPouch.replicate.from).toHaveBeenCalled()
@@ -214,6 +227,7 @@ describe('PouchManager', () => {
   it('should call on sync with doctype updates', async () => {
     jest.spyOn(manager, 'replicateOnce')
     onSync.mockReset()
+    manager.updateSyncInfo('io.cozy.todos')
     await manager.replicateOnce()
     expect(onSync).toHaveBeenCalledWith({
       'io.cozy.todos': [
@@ -231,14 +245,16 @@ describe('PouchManager', () => {
 
   it('should add pouch plugin', async () => {
     const options = { ...managerOptions, pouch: { plugins: ['myPlugin'] } }
-    new PouchManager(['io.cozy.todos'], options)
+    const manager = new PouchManager(['io.cozy.todos'], options)
+    await manager.init()
     expect(PouchDB.plugin).toHaveBeenCalledTimes(1)
   })
 
   it('should instanciate pouch with options', async () => {
     const pouchOptions = { adapter: 'cordova-sqlite', location: 'default' }
     const options = { ...managerOptions, pouch: { options: pouchOptions } }
-    new PouchManager(['io.cozy.todos'], options)
+    const manager = new PouchManager(['io.cozy.todos'], options)
+    await manager.init()
     expect(PouchDB).toHaveBeenCalledWith(
       'cozy.tools_io.cozy.todos',
       pouchOptions
@@ -246,33 +262,36 @@ describe('PouchManager', () => {
   })
 
   describe('getPersistedSyncedDoctypes', () => {
-    it('should return an empty array if local storage is empty', () => {
-      expect(ls.getPersistedSyncedDoctypes()).toEqual({})
+    it('should return an empty array if local storage is empty', async () => {
+      expect(await ls.getPersistedSyncedDoctypes()).toEqual({})
     })
 
-    it('should return an empty array if local storage contains something that is not an array', () => {
-      localStorage.__STORE__[ls.LOCALSTORAGE_SYNCED_KEY] = 'true'
-      expect(ls.getPersistedSyncedDoctypes()).toEqual({})
+    it('should return an empty array if local storage contains something that is not an array', async () => {
+      localStorage.__STORE__[LOCALSTORAGE_SYNCED_KEY] = 'true'
+      expect(await ls.getPersistedSyncedDoctypes()).toEqual({})
     })
 
-    it('should return the list of doctypes if local storage contains one', () => {
+    it('should return the list of doctypes if local storage contains one', async () => {
       const persistedSyncedDoctypes = {
         'io.cozy.todos': { date: '2021-08-11T13:48:06.085Z' }
       }
-      localStorage.__STORE__[ls.LOCALSTORAGE_SYNCED_KEY] = JSON.stringify(
+      localStorage.__STORE__[LOCALSTORAGE_SYNCED_KEY] = JSON.stringify(
+        persistedSyncedDoctypes
+      )
+      expect(await ls.getPersistedSyncedDoctypes()).toEqual(
         persistedSyncedDoctypes
       )
-      expect(ls.getPersistedSyncedDoctypes()).toEqual(persistedSyncedDoctypes)
     })
   })
 
   describe('persistSyncedDoctypes', () => {
-    it('should put the list of synced doctypes in localStorage', () => {
+    it('should put the list of synced doctypes in localStorage', async () => {
       const manager = new PouchManager(['io.cozy.todos'], managerOptions)
+      await manager.init()
       manager.syncedDoctypes = ['io.cozy.todos']
       ls.persistSyncedDoctypes(manager.syncedDoctypes)
 
-      expect(localStorage.__STORE__[ls.LOCALSTORAGE_SYNCED_KEY]).toEqual(
+      expect(localStorage.__STORE__[LOCALSTORAGE_SYNCED_KEY]).toEqual(
         JSON.stringify(manager.syncedDoctypes)
       )
     })
@@ -287,126 +306,139 @@ describe('PouchManager', () => {
       MockDate.reset()
     })
 
-    it('should add the doctype to synced doctypes', () => {
+    it('should add the doctype to synced doctypes', async () => {
       const manager = new PouchManager(['io.cozy.todos'], managerOptions)
-      manager.updateSyncInfo('io.cozy.todos')
+      await manager.init()
+      await manager.updateSyncInfo('io.cozy.todos')
       expect(Object.keys(manager.syncedDoctypes)).toEqual(['io.cozy.todos'])
     })
 
-    it('should persist the new synced doctypes list', () => {
+    it('should persist the new synced doctypes list', async () => {
       const manager = new PouchManager(['io.cozy.todos'], managerOptions)
+      await manager.init()
 
-      manager.updateSyncInfo('io.cozy.todos')
-      expect(localStorage.__STORE__[ls.LOCALSTORAGE_SYNCED_KEY]).toEqual(
+      await manager.updateSyncInfo('io.cozy.todos')
+      expect(localStorage.__STORE__[LOCALSTORAGE_SYNCED_KEY]).toEqual(
         JSON.stringify({
-          'io.cozy.todos': { date: '2021-08-01T00:00:00.000Z' }
+          'io.cozy.todos': {
+            date: '2021-08-01T00:00:00.000Z',
+            status: 'synced'
+          }
         })
       )
     })
   })
 
-  describe('isSynced', () => {
+  describe('getSyncStatus', () => {
     let manager
 
-    beforeEach(() => {
+    beforeEach(async () => {
       manager = new PouchManager(['io.cozy.todos'], managerOptions)
+      await manager.init()
     })
 
-    it('should return true if the doctype is synced', () => {
-      manager.updateSyncInfo('io.cozy.todos')
-      expect(manager.isSynced('io.cozy.todos')).toBe(true)
+    it(`should return 'synced' if the doctype is synced`, async () => {
+      await manager.updateSyncInfo('io.cozy.todos')
+      expect(manager.getSyncStatus('io.cozy.todos')).toBe('synced')
     })
 
-    it('should return false if the doctype is not synced', () => {
-      expect(manager.isSynced('io.cozy.todos')).toBe(false)
+    it(`should return 'not_synced' if the doctype is not synced`, () => {
+      expect(manager.getSyncStatus('io.cozy.todos')).toBe('not_synced')
+    })
+
+    it('should return status if updateSyncInfo was called with custom status', async () => {
+      await manager.updateSyncInfo('io.cozy.todos', 'not_complete')
+      expect(manager.getSyncStatus('io.cozy.todos')).toBe('not_complete')
     })
   })
 
   describe('destroySyncedDoctypes', () => {
-    it('should destroy the local storage item', () => {
-      ls.destroySyncedDoctypes()
+    it('should destroy the local storage item', async () => {
+      await ls.destroySyncedDoctypes()
 
       expect(localStorage.removeItem).toHaveBeenLastCalledWith(
-        ls.LOCALSTORAGE_SYNCED_KEY
+        LOCALSTORAGE_SYNCED_KEY
       )
     })
-    it('should reset syncedDoctypes', () => {
+    it('should reset syncedDoctypes', async () => {
       manager.syncedDoctypes = {
         'io.cozy.todos': { date: '2021-08-11T13:48:06.085Z' }
       }
-      manager.clearSyncedDoctypes()
+      await manager.clearSyncedDoctypes()
       expect(manager.syncedDoctypes).toEqual({})
     })
   })
 
   describe('getPersistedWarmedUpQueriess', () => {
-    it('should return an empty object if local storage is empty', () => {
-      expect(ls.getPersistedWarmedUpQueries()).toEqual({})
+    it('should return an empty object if local storage is empty', async () => {
+      expect(await ls.getPersistedWarmedUpQueries()).toEqual({})
     })
 
-    it('should return the list of queries if local storage contains ones', () => {
+    it('should return the list of queries if local storage contains ones', async () => {
       const persistedQueries = [query().options.as]
-      localStorage.__STORE__[
-        ls.LOCALSTORAGE_WARMUPEDQUERIES_KEY
-      ] = JSON.stringify(persistedQueries)
-      expect(ls.getPersistedWarmedUpQueries()).toEqual(persistedQueries)
+      localStorage.__STORE__[LOCALSTORAGE_WARMUPEDQUERIES_KEY] = JSON.stringify(
+        persistedQueries
+      )
+      expect(await ls.getPersistedWarmedUpQueries()).toEqual(persistedQueries)
     })
   })
 
   describe('persistWarmedUpQueries', () => {
-    it('should put the list of warmedUpQueries in localStorage', () => {
+    it('should put the list of warmedUpQueries in localStorage', async () => {
       const manager = new PouchManager(['io.cozy.todos'], managerOptions)
+      await manager.init()
       manager.warmedUpQueries = { 'io.cozy.todos': ['query1', 'query2'] }
-      ls.persistWarmedUpQueries(manager.warmedUpQueries)
+      await ls.persistWarmedUpQueries(manager.warmedUpQueries)
 
-      expect(
-        localStorage.__STORE__[ls.LOCALSTORAGE_WARMUPEDQUERIES_KEY]
-      ).toEqual(JSON.stringify(manager.warmedUpQueries))
+      expect(localStorage.__STORE__[LOCALSTORAGE_WARMUPEDQUERIES_KEY]).toEqual(
+        JSON.stringify(manager.warmedUpQueries)
+      )
     })
   })
 
   describe('areQueriesWarmedUp', () => {
     let manager
 
-    beforeEach(() => {
+    beforeEach(async () => {
       manager = new PouchManager(['io.cozy.todos'], managerOptions)
+      await manager.init()
     })
 
-    it('should return true if all the queries are warmuped', () => {
+    it('should return true if all the queries are warmuped', async () => {
       manager.warmedUpQueries = {
         'io.cozy.todos': [query1().options.as, query2().options.as]
       }
-      ls.persistWarmedUpQueries(manager.warmedUpQueries)
+      await ls.persistWarmedUpQueries(manager.warmedUpQueries)
 
       expect(
-        manager.areQueriesWarmedUp('io.cozy.todos', [query1(), query2()])
+        await manager.areQueriesWarmedUp('io.cozy.todos', [query1(), query2()])
       ).toBe(true)
     })
 
-    it('should return false if at least one query is not warmuped', () => {
+    it('should return false if at least one query is not warmuped', async () => {
       manager.warmedUpQueries = {
         'io.cozy.todos': [query2().options.as]
       }
-      ls.persistWarmedUpQueries()
+      await ls.persistWarmedUpQueries()
 
       expect(
-        manager.areQueriesWarmedUp('io.cozy.todos', [query1(), query2()])
+        await manager.areQueriesWarmedUp('io.cozy.todos', [query1(), query2()])
       ).toBe(false)
     })
 
-    it('should return false if the queries are not been done', () => {
+    it('should return false if the queries are not been done', async () => {
       expect(
-        manager.areQueriesWarmedUp('io.cozy.todos', [query1(), query2()])
+        await manager.areQueriesWarmedUp('io.cozy.todos', [query1(), query2()])
       ).toBe(false)
     })
   })
 
   describe('clearWarmedupQueries', () => {
-    it('should clear the local storage item', () => {
+    it('should clear the local storage item', async () => {
       manager.clearWarmedUpQueries()
 
       expect(localStorage.removeItem).toHaveBeenLastCalledWith(
-        ls.LOCALSTORAGE_WARMUPEDQUERIES_KEY
+        LOCALSTORAGE_WARMUPEDQUERIES_KEY
       )
     })
     it('should reset warmedupQueries', () => {
@@ -490,7 +522,7 @@ describe('PouchManager', () => {
   describe('warmupQueries', () => {
     let manager
     const executeMock = jest.fn()
-    beforeEach(() => {
+    beforeEach(async () => {
       let newManagerOptions = {
         ...managerOptions,
         executeQuery: executeMock,
@@ -502,6 +534,7 @@ describe('PouchManager', () => {
         }
       }
       manager = new PouchManager(['io.cozy.todos'], newManagerOptions)
+      await manager.init()
     })
 
     it('should executes warmeupQueries on the first replicationLoop only', async () => {
@@ -524,7 +557,7 @@ describe('PouchManager', () => {
           .definition()
           .toDefinition()
       )
-      expect(ls.getPersistedWarmedUpQueries()).toEqual({
+      expect(await ls.getPersistedWarmedUpQueries()).toEqual({
         'io.cozy.todos': ['query1', 'query2']
       })
       //Simulation of a loop. Let's replicate again
@@ -541,7 +574,7 @@ describe('PouchManager', () => {
 
       await manager.replicateOnce()
       await sleep(10)
-      expect(ls.getPersistedWarmedUpQueries()).toEqual({})
+      expect(await ls.getPersistedWarmedUpQueries()).toEqual({})
       expect(manager.warmedUpQueries['io.cozy.todos']).toBeUndefined()
     })
   })

package/dist/helpers.js

@@ -15,8 +15,18 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _merge = _interopRequireDefault(require("lodash/merge"));
+
 var _startsWith = _interopRequireDefault(require("lodash/startsWith"));
 
+var _logger = _interopRequireDefault(require("./logger"));
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -186,5 +196,74 @@ helpers.insertBulkDocs = /*#__PURE__*/function () {
   };
 }();
 
+helpers.normalizeFindSelector = function (_ref5) {
+  var selector = _ref5.selector,
+      sort = _ref5.sort,
+      indexedFields = _ref5.indexedFields,
+      partialFilter = _ref5.partialFilter;
+  var findSelector = selector || {};
+
+  if (indexedFields) {
+    var _iterator = _createForOfIteratorHelper(indexedFields),
+        _step;
+
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var indexedField = _step.value;
+
+        if (!Object.keys(findSelector).includes(indexedField)) {
+          var selectorJson = JSON.stringify(selector);
+
+          _logger.default.warn("".concat(indexedField, " was missing in selector, it has been automatically added from indexed fields. Please consider adding this field to your query's selector as required by PouchDB. The query's selector is: ").concat(selectorJson));
+
+          findSelector[indexedField] = {
+            $gt: null
+          };
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+  }
+
+  if (sort) {
+    var sortedFields = sort.flatMap(function (s) {
+      return Object.keys(s);
+    });
+
+    var _iterator2 = _createForOfIteratorHelper(sortedFields),
+        _step2;
+
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var sortedField = _step2.value;
+
+        if (!Object.keys(findSelector).includes(sortedField)) {
+          var _selectorJson = JSON.stringify(selector);
+
+          _logger.default.warn("".concat(sortedField, " was missing in selector, it has been automatically added from sorted fields. Please consider adding this field to your query's selector as required by PouchDB. The query's selector is: ").concat(_selectorJson));
+
+          findSelector[sortedField] = {
+            $gt: null
+          };
+        }
+      }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+  }
+
+  var mergedSelector = partialFilter ? (0, _merge.default)(_objectSpread({}, findSelector), partialFilter) : findSelector;
+  return Object.keys(mergedSelector).length > 0 ? mergedSelector : {
+    _id: {
+      $gt: null
+    }
+  }; // PouchDB does not accept empty selector
+};
+
 var _default = helpers;
 exports.default = _default;

package/dist/helpers.spec.js

@@ -1,5 +1,10 @@
 import helpers from './helpers'
-const { withoutDesignDocuments, isDeletedDocument, isDesignDocument } = helpers
+const {
+  withoutDesignDocuments,
+  isDeletedDocument,
+  isDesignDocument,
+  normalizeFindSelector
+} = helpers
 
 import PouchDB from 'pouchdb-browser'
 import PouchDBFind from 'pouchdb-find'
@@ -113,4 +118,83 @@ describe('Helpers', () => {
       expect(isDeletedDocument({ _id: 'notdeleted' })).toBeFalsy()
     })
   })
+
+  describe('normalizeFindSelector', () => {
+    it('should add indexed fields in the selector if they are missing', () => {
+      const selector = {
+        SOME_FIELD: { $gt: null }
+      }
+      const sort = undefined
+      const indexedFields = ['SOME_INDEXED_FIELD']
+
+      const findSelector = normalizeFindSelector({
+        selector,
+        sort,
+        indexedFields
+      })
+      expect(findSelector).toStrictEqual({
+        SOME_FIELD: { $gt: null },
+        SOME_INDEXED_FIELD: { $gt: null }
+      })
+    })
+
+    it('should add sorted fields in the selector if they are missing', () => {
+      const selector = {}
+      const sort = [{ SOME_SORTED_FIELD: 'asc' }]
+      const indexedFields = undefined
+
+      const findSelector = normalizeFindSelector({
+        selector,
+        sort,
+        indexedFields
+      })
+      expect(findSelector).toStrictEqual({
+        SOME_SORTED_FIELD: { $gt: null }
+      })
+    })
+
+    it('should add indexed fields AND sorted fields in the selector if they are missing', () => {
+      const selector = undefined
+      const sort = [{ SOME_SORTED_FIELD: 'asc' }]
+      const indexedFields = ['SOME_INDEXED_FIELD']
+
+      const findSelector = normalizeFindSelector({
+        selector,
+        sort,
+        indexedFields
+      })
+      expect(findSelector).toStrictEqual({
+        SOME_INDEXED_FIELD: { $gt: null },
+        SOME_SORTED_FIELD: { $gt: null }
+      })
+    })
+
+    it('should prevent empty selector by adding a selector on _id when no selector is provided', () => {
+      const selector = undefined
+      const sort = undefined
+      const indexedFields = undefined
+
+      const findSelector = normalizeFindSelector({
+        selector,
+        sort,
+        indexedFields
+      })
+      expect(findSelector).toStrictEqual({ _id: { $gt: null } })
+    })
+
+    it('should not add selector on _id when no selector is provided but there are some indexed fields', () => {
+      const selector = undefined
+      const sort = undefined
+      const indexedFields = ['SOME_INDEXED_FIELD']
+
+      const findSelector = normalizeFindSelector({
+        selector,
+        sort,
+        indexedFields
+      })
+      expect(findSelector).toStrictEqual({
+        SOME_INDEXED_FIELD: { $gt: null }
+      })
+    })
+  })
 })

package/dist/jsonapi.js

@@ -9,12 +9,16 @@ exports.fromPouchResult = exports.normalizeDoc = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _cozyClient = require("cozy-client");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-var normalizeDoc = function normalizeDoc(doc, doctype) {
-  var id = doc._id || doc.id; // PouchDB sends back .rev attribute but we do not want to
+var normalizeDoc = function normalizeDoc(doc, doctype, client) {
+  var id = doc._id || doc.id;
+  var relationships = doc.relationships,
+      referenced_by = doc.referenced_by; // PouchDB sends back .rev attribute but we do not want to
   // keep it on the server. It is potentially higher than the
   // _rev.
 
@@ -24,23 +28,66 @@ var normalizeDoc = function normalizeDoc(doc, doctype) {
     id: id,
     _id: id,
     _rev: _rev,
-    _type: doctype
+    _type: doctype,
+    relationships: _objectSpread(_objectSpread({}, relationships), {}, {
+      referenced_by: referenced_by
+    })
   });
 
   if (normalizedDoc.rev) {
     delete normalizedDoc.rev;
   }
 
+  normalizeAppsLinks(normalizedDoc, doctype, client);
   return normalizedDoc;
 };
 
 exports.normalizeDoc = normalizeDoc;
 
+var normalizeAppsLinks = function normalizeAppsLinks(docRef, doctype, client) {
+  if (doctype !== 'io.cozy.apps') {
+    return;
+  }
+
+  var webLink = (0, _cozyClient.generateWebLink)({
+    cozyUrl: client.getStackClient().uri,
+    slug: docRef.slug,
+    subDomainType: client.capabilities.flat_subdomains ? 'flat' : 'nested',
+    pathname: '',
+    hash: '',
+    searchParams: []
+  });
+  docRef.links = {
+    self: "/apps/".concat(docRef.slug),
+    related: webLink,
+    icon: "/apps/".concat(docRef.slug, "/icon/").concat(docRef.version)
+  };
+};
+
 var filterDeletedDocumentsFromRows = function filterDeletedDocumentsFromRows(doc) {
   return !!doc;
 };
 
-var fromPouchResult = function fromPouchResult(res, withRows, doctype) {
+var fromPouchResult = function fromPouchResult(_ref) {
+  var res = _ref.res,
+      withRows = _ref.withRows,
+      doctype = _ref.doctype,
+      client = _ref.client;
+
+  // Sometimes, queries are transformed by Collections and they call a dedicated
+  // cozy-stack route. When this is the case, we want to be able to replicate the same
+  // query from cozy-pouch-link. It is not possible as-is because the received data
+  // is not the same as the one stored in the Couch database
+  // To handle this, we store the received data in the Pouch with a dedicated id and
+  // we store the query result in a `cozyPouchData` attribute
+  // So when `cozyPouchData` attribute exists, we know that we want to return its content
+  // as the result of the query
+  if (res.cozyPouchData) {
+    return {
+      data: res.cozyPouchData
+    };
+  }
+
   if (withRows) {
     var docs = res.rows ? res.rows.map(function (row) {
       return row.doc;
@@ -48,7 +95,7 @@ var fromPouchResult = function fromPouchResult(res, withRows, doctype) {
     var offset = res.offset || 0;
     return {
       data: docs.map(function (doc) {
-        return normalizeDoc(doc, doctype);
+        return normalizeDoc(doc, doctype, client);
       }),
       meta: {
         count: docs.length
@@ -59,8 +106,8 @@ var fromPouchResult = function fromPouchResult(res, withRows, doctype) {
   } else {
     return {
       data: Array.isArray(res) ? res.map(function (doc) {
-        return normalizeDoc(doc, doctype);
-      }) : normalizeDoc(res, doctype)
+        return normalizeDoc(doc, doctype, client);
+      }) : normalizeDoc(res, doctype, client)
     };
   }
 };