cozy-pouch-link 60.28.0 → 60.28.2

package/dist/CozyPouchLink.js

@@ -1683,7 +1683,8 @@ var PouchLink = /*#__PURE__*/function (_CozyLink) {
     }()
     /**
      * Adds a new doctype to the list of managed doctypes, sets its replication options,
-     * adds it to the pouches, and starts replication.
+     * adds it to the pouches, and starts replication. Does nothing when the doctype is
+     * already managed, so the list stays free of duplicates.
      *
      * @param {string} doctype - The name of the doctype to add.
      * @param {Object} replicationOptions - The replication options for the doctype.
@@ -1699,23 +1700,37 @@ var PouchLink = /*#__PURE__*/function (_CozyLink) {
           while (1) {
             switch (_context23.prev = _context23.next) {
               case 0:
+                if (!this.doctypes.includes(doctype)) {
+                  _context23.next = 3;
+                  break;
+                }
+
+                _logger.default.debug("PouchLink: doctype ".concat(doctype, " already managed, skipping"));
+
+                return _context23.abrupt("return");
+
+              case 3:
                 this.doctypes.push(doctype);
 
                 if (!this.doctypesReplicationOptions) {
                   this.doctypesReplicationOptions = {};
                 }
 
-                this.doctypesReplicationOptions[doctype] = replicationOptions;
-                this.pouches.doctypes.push(doctype);
-                _context23.next = 6;
+                this.doctypesReplicationOptions[doctype] = replicationOptions; // sync onto pouches.doctypes, a separate array only after removeDoctype
+
+                if (!this.pouches.doctypes.includes(doctype)) {
+                  this.pouches.doctypes.push(doctype);
+                }
+
+                _context23.next = 9;
                 return this.pouches.addDoctype(doctype, replicationOptions);
 
-              case 6:
+              case 9:
                 if ((options === null || options === void 0 ? void 0 : options.shouldStartReplication) === true) {
                   this.startReplicationWithDebounce();
                 }
 
-              case 7:
+              case 10:
               case "end":
                 return _context23.stop();
             }

package/dist/CozyPouchLink.spec.js

@@ -574,6 +574,72 @@ describe('CozyPouchLink', () => {
     })
   })
 
+  describe('addDoctype', () => {
+    const OTHER_DOCTYPE = 'io.cozy.files'
+
+    it('should register a doctype only once, even though the link and pouch manager share the doctypes array', async () => {
+      await setup()
+      jest.spyOn(link.pouches, 'addDoctype').mockResolvedValue(undefined)
+      // The link and its pouch manager hold the same array, so a single
+      // registration must not land the doctype in it twice.
+      expect(link.doctypes).toBe(link.pouches.doctypes)
+
+      await link.addDoctype(OTHER_DOCTYPE, { strategy: 'fromRemote' })
+
+      expect(link.doctypes.filter(d => d === OTHER_DOCTYPE)).toHaveLength(1)
+      expect(
+        link.pouches.doctypes.filter(d => d === OTHER_DOCTYPE)
+      ).toHaveLength(1)
+      expect(link.pouches.addDoctype).toHaveBeenCalledTimes(1)
+    })
+
+    it('should not re-register, restart replication, or overwrite options for a managed doctype', async () => {
+      await setup()
+      jest.spyOn(link.pouches, 'addDoctype').mockResolvedValue(undefined)
+      jest
+        .spyOn(link, 'startReplicationWithDebounce')
+        .mockImplementation(() => {})
+
+      await link.addDoctype(
+        OTHER_DOCTYPE,
+        { strategy: 'fromRemote' },
+        { shouldStartReplication: true }
+      )
+      await link.addDoctype(
+        OTHER_DOCTYPE,
+        { strategy: 'sync' },
+        { shouldStartReplication: true }
+      )
+
+      expect(link.doctypes.filter(d => d === OTHER_DOCTYPE)).toHaveLength(1)
+      expect(
+        link.pouches.doctypes.filter(d => d === OTHER_DOCTYPE)
+      ).toHaveLength(1)
+      expect(link.pouches.addDoctype).toHaveBeenCalledTimes(1)
+      expect(link.startReplicationWithDebounce).toHaveBeenCalledTimes(1)
+      // The no-op re-add keeps the original options instead of overwriting them.
+      expect(link.doctypesReplicationOptions[OTHER_DOCTYPE]).toEqual({
+        strategy: 'fromRemote'
+      })
+    })
+
+    it('should register again a doctype that was previously removed', async () => {
+      await setup()
+      const addSpy = jest.spyOn(link.pouches, 'addDoctype')
+
+      await link.addDoctype(OTHER_DOCTYPE, { strategy: 'fromRemote' })
+      await link.removeDoctype(OTHER_DOCTYPE)
+      await link.addDoctype(OTHER_DOCTYPE, { strategy: 'fromRemote' })
+
+      expect(link.doctypes.filter(d => d === OTHER_DOCTYPE)).toHaveLength(1)
+      expect(
+        link.pouches.doctypes.filter(d => d === OTHER_DOCTYPE)
+      ).toHaveLength(1)
+      // The pouch is recreated on the second registration.
+      expect(addSpy).toHaveBeenCalledTimes(2)
+    })
+  })
+
   describe('immediate sync', () => {
     it('should not throw if pouches not there', async () => {
       await setup()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-pouch-link",
-  "version": "60.28.0",
+  "version": "60.28.2",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -13,7 +13,7 @@
     "url": "git+https://github.com/linagora/cozy-client.git"
   },
   "dependencies": {
-    "cozy-client": "^60.28.0",
+    "cozy-client": "^60.28.2",
     "pouchdb-browser": "^7.2.2",
     "pouchdb-find": "^7.2.2"
   },
@@ -41,5 +41,5 @@
     "typecheck": "tsc -p tsconfig.json"
   },
   "sideEffects": false,
-  "gitHead": "8eeb721eca10bdd9e48d537b82b5092a81dc2dd3"
+  "gitHead": "272fde3c9e8dc4a4472744513ace8b71a8b2c417"
 }

package/types/CozyPouchLink.d.ts

@@ -253,7 +253,8 @@ declare class PouchLink extends CozyLink {
     syncImmediately(): Promise<void>;
     /**
      * Adds a new doctype to the list of managed doctypes, sets its replication options,
-     * adds it to the pouches, and starts replication.
+     * adds it to the pouches, and starts replication. Does nothing when the doctype is
+     * already managed, so the list stays free of duplicates.
      *
      * @param {string} doctype - The name of the doctype to add.
      * @param {Object} replicationOptions - The replication options for the doctype.