cozy-client 60.24.0 → 60.26.1

package/dist/CozyClient.js

@@ -3126,7 +3126,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 = "60.24.0";
+CozyClient.version = "60.26.1";
 
 _microee.default.mixin(CozyClient);
 

package/dist/models/assistant.js

@@ -41,13 +41,14 @@ var ACCOUNT_DOCTYPE = 'io.cozy.accounts';
  *
  * @param {CozyClient} client - An instance of CozyClient
  * @param {Assistant} assistantData - Data for the new assistant
- * @returns {Promise<void>} - A promise that resolves when the assistant is created
+ * @returns {Promise<Assistant>} - A promise that resolves with the created assistant document
  * @throws {Error} - Throws an error if the creation fails
  */
 
 var createAssistant = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(client, assistantData) {
-    var createdAccountId, account, response, assistant;
+    var createdAccountId, account, response, assistant, _yield$client$save, savedAssistant;
+
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -108,43 +109,44 @@ var createAssistant = /*#__PURE__*/function () {
             return client.save(assistant);
 
           case 14:
-            _context.next = 28;
-            break;
+            _yield$client$save = _context.sent;
+            savedAssistant = _yield$client$save.data;
+            return _context.abrupt("return", savedAssistant);
 
-          case 16:
-            _context.prev = 16;
+          case 19:
+            _context.prev = 19;
             _context.t0 = _context["catch"](1);
 
             if (!createdAccountId) {
-              _context.next = 27;
+              _context.next = 30;
               break;
             }
 
-            _context.prev = 19;
-            _context.next = 22;
+            _context.prev = 22;
+            _context.next = 25;
             return client.stackClient.collection('io.cozy.accounts').destroy({
               _id: createdAccountId
             });
 
-          case 22:
-            _context.next = 27;
+          case 25:
+            _context.next = 30;
             break;
 
-          case 24:
-            _context.prev = 24;
-            _context.t1 = _context["catch"](19);
+          case 27:
+            _context.prev = 27;
+            _context.t1 = _context["catch"](22);
 
             _logger.default.warn('Failed to cleanup orphaned account:', _context.t1);
 
-          case 27:
+          case 30:
             throw new Error("Failed to create assistant: ".concat(_context.t0.message));
 
-          case 28:
+          case 31:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[1, 16], [19, 24]]);
+    }, _callee, null, [[1, 19], [22, 27]]);
   }));
 
   return function createAssistant(_x, _x2) {
@@ -165,7 +167,7 @@ exports.createAssistant = createAssistant;
 
 var deleteAssistant = /*#__PURE__*/function () {
   var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(client, assistantId) {
-    var _existedAssistant$inc, existedAssistant, assistantInstance, provider;
+    var _yield$client$query, assistantDoc, included, provider;
 
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) {
@@ -176,42 +178,38 @@ var deleteAssistant = /*#__PURE__*/function () {
             return client.query((0, _dsl.Q)(ASSISTANT_DOCTYPE).getById(assistantId).include(['provider']));
 
           case 3:
-            existedAssistant = _context2.sent;
-            assistantInstance = existedAssistant.data;
-            provider = (_existedAssistant$inc = existedAssistant.included) === null || _existedAssistant$inc === void 0 ? void 0 : _existedAssistant$inc[0];
+            _yield$client$query = _context2.sent;
+            assistantDoc = _yield$client$query.data;
+            included = _yield$client$query.included;
             _context2.next = 8;
-            return client.stackClient.collection(ASSISTANT_DOCTYPE).destroy({
-              _id: assistantId,
-              _rev: assistantInstance._rev
-            });
+            return client.destroy(assistantDoc);
 
           case 8:
-            if (!(provider !== null && provider !== void 0 && provider._id && provider !== null && provider !== void 0 && provider._rev)) {
-              _context2.next = 11;
+            provider = included === null || included === void 0 ? void 0 : included[0];
+
+            if (!provider) {
+              _context2.next = 12;
               break;
             }
 
-            _context2.next = 11;
-            return client.stackClient.collection(ACCOUNT_DOCTYPE).destroy({
-              _id: provider._id,
-              _rev: provider._rev
-            });
+            _context2.next = 12;
+            return client.destroy(provider);
 
-          case 11:
-            _context2.next = 16;
+          case 12:
+            _context2.next = 17;
             break;
 
-          case 13:
-            _context2.prev = 13;
+          case 14:
+            _context2.prev = 14;
             _context2.t0 = _context2["catch"](0);
             throw new Error("Failed to delete assistant: ".concat(_context2.t0.message));
 
-          case 16:
+          case 17:
           case "end":
             return _context2.stop();
         }
       }
-    }, _callee2, null, [[0, 13]]);
+    }, _callee2, null, [[0, 14]]);
   }));
 
   return function deleteAssistant(_x3, _x4) {
@@ -233,7 +231,7 @@ exports.deleteAssistant = deleteAssistant;
 
 var editAssistant = /*#__PURE__*/function () {
   var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(client, assistantId, assistantData) {
-    var _existedAssistant$inc2, _existedAssistantData, _existedAssistantData2, _existedAssistantData3, _existedAssistantData4, _existedAssistantData5, existedAssistant, existedAssistantData, provider, account, _account$data, _account$auth, response, assistant;
+    var _existedAssistant$inc, _existedAssistantData, _existedAssistantData2, _existedAssistantData3, _existedAssistantData4, _existedAssistantData5, existedAssistant, existedAssistantData, provider, account, _account$data, _account$auth, response, assistant;
 
     return _regenerator.default.wrap(function _callee3$(_context3) {
       while (1) {
@@ -255,7 +253,7 @@ var editAssistant = /*#__PURE__*/function () {
 
           case 6:
             existedAssistantData = existedAssistant.data;
-            provider = existedAssistant === null || existedAssistant === void 0 ? void 0 : (_existedAssistant$inc2 = existedAssistant.included) === null || _existedAssistant$inc2 === void 0 ? void 0 : _existedAssistant$inc2[0];
+            provider = existedAssistant === null || existedAssistant === void 0 ? void 0 : (_existedAssistant$inc = existedAssistant.included) === null || _existedAssistant$inc === void 0 ? void 0 : _existedAssistant$inc[0];
 
             if (provider) {
               _context3.next = 10;

package/dist/models/file.js

@@ -902,14 +902,24 @@ var overrideFileForPath = /*#__PURE__*/function () {
 exports.overrideFileForPath = overrideFileForPath;
 
 var generateNewFileNameOnConflict = function generateNewFileNameOnConflict(filenameWithoutExtension, conflictOptions) {
-  var delimiter = (conflictOptions === null || conflictOptions === void 0 ? void 0 : conflictOptions.delimiter) || '_'; //Check if the string ends by _1
+  var delimiter = conflictOptions === null || conflictOptions === void 0 ? void 0 : conflictOptions.delimiter;
+
+  if (!delimiter) {
+    var _matches = filenameWithoutExtension.match(/^(.*) \(([0-9]+)\)$/);
+
+    if (_matches) {
+      return "".concat(_matches[1], " (").concat(parseInt(_matches[2], 10) + 1, ")");
+    }
+
+    return "".concat(filenameWithoutExtension, " (1)");
+  } // Keep explicit delimiter support for callers that opted into the legacy format.
+
 
   var regex = new RegExp("(".concat(delimiter, ")([0-9]+)$"));
   var matches = filenameWithoutExtension.match(regex);
 
   if (matches) {
-    var versionNumber = parseInt(matches[2]); //increment versionNumber
-
+    var versionNumber = parseInt(matches[2], 10);
     versionNumber++;
     var newFilenameWithoutExtension = filenameWithoutExtension.replace(new RegExp("(".concat(delimiter, ")([0-9]+)$")), "".concat(delimiter).concat(versionNumber));
     return newFilenameWithoutExtension;

package/dist/models/file.spec.js

@@ -592,19 +592,59 @@ describe('File Model', () => {
   })
 
   describe('generateNewFileNameOnConflict', () => {
-    it('should generate the right file name with _X', () => {
+    it('should generate the default file name with parenthesized copy counters', () => {
       const filename1 = fileModel.generateNewFileNameOnConflict('test')
+      expect(filename1).toEqual('test (1)')
+      const filename2 = fileModel.generateNewFileNameOnConflict('test (1)')
+      expect(filename2).toEqual('test (2)')
+      const filename3 = fileModel.generateNewFileNameOnConflict('test_1_1_test')
+      expect(filename3).toEqual('test_1_1_test (1)')
+      const filename4 = fileModel.generateNewFileNameOnConflict(
+        'test_1_1_test (1)'
+      )
+      expect(filename4).toEqual('test_1_1_test (2)')
+      const filename5 = fileModel.generateNewFileNameOnConflict('test_')
+      expect(filename5).toEqual('test_ (1)')
+    })
+
+    it('should not increment numbers that are part of the file name', () => {
+      const filename1 = fileModel.generateNewFileNameOnConflict('IMG_4521')
+      expect(filename1).toEqual('IMG_4521 (1)')
+      const filename2 = fileModel.generateNewFileNameOnConflict('DSC_0001')
+      expect(filename2).toEqual('DSC_0001 (1)')
+      const filename3 = fileModel.generateNewFileNameOnConflict('report_2024')
+      expect(filename3).toEqual('report_2024 (1)')
+      const filename4 = fileModel.generateNewFileNameOnConflict(
+        'report (draft)'
+      )
+      expect(filename4).toEqual('report (draft) (1)')
+    })
+
+    it('should keep the legacy delimiter behavior when delimiter is passed', () => {
+      const conflictOptions = {
+        delimiter: '_'
+      }
+
+      const filename1 = fileModel.generateNewFileNameOnConflict(
+        'test',
+        conflictOptions
+      )
       expect(filename1).toEqual('test_1')
-      const filename2 = fileModel.generateNewFileNameOnConflict('test_1')
+      const filename2 = fileModel.generateNewFileNameOnConflict(
+        'test_1',
+        conflictOptions
+      )
       expect(filename2).toEqual('test_2')
-      const filename3 = fileModel.generateNewFileNameOnConflict('test_1_1_test')
+      const filename3 = fileModel.generateNewFileNameOnConflict(
+        'test_1_1_test',
+        conflictOptions
+      )
       expect(filename3).toEqual('test_1_1_test_1')
       const filename4 = fileModel.generateNewFileNameOnConflict(
-        'test_1_1_test_1'
+        'test_',
+        conflictOptions
       )
-      expect(filename4).toEqual('test_1_1_test_2')
-      const filename5 = fileModel.generateNewFileNameOnConflict('test_')
-      expect(filename5).toEqual('test__1')
+      expect(filename4).toEqual('test__1')
     })
 
     it('should generate the right file name with _cozyX', () => {
@@ -713,7 +753,33 @@ describe('File Model', () => {
       await fileModel.uploadFileWithConflictStrategy(cozyClient, '', opts)
       expect(createFileSpy).toHaveBeenCalledWith('', {
         ...opts,
-        name: 'filename_1'
+        name: 'filename (1)'
+      })
+    })
+
+    it('should keep real filename numbers when renaming a file with an extension', async () => {
+      const dirId = 'toto'
+      //first call we return an existing file => conflict
+      //second call, we reject as not found
+      statByPathSpy
+        .mockReturnValueOnce({
+          data: {
+            _id: 'file_id',
+            _type: 'io.cozy.files'
+          }
+        })
+        .mockRejectedValueOnce(new Error('Not Found'))
+
+      const opts = {
+        name: 'IMG_4521.jpg',
+        dirId,
+        conflictStrategy: 'rename',
+        contentType: 'image/jpeg'
+      }
+      await fileModel.uploadFileWithConflictStrategy(cozyClient, '', opts)
+      expect(createFileSpy).toHaveBeenCalledWith('', {
+        ...opts,
+        name: 'IMG_4521 (1).jpg'
       })
     })
 

package/dist/types.js

@@ -957,7 +957,7 @@ var _dsl = require("./queries/dsl");
  * Represents available options of generateNewFileNameOnConflict method
  *
  * @typedef {object} ConflictOptions
- * @property {string} [delimiter] - Delimiter before the incremented number. Default to '_'
+ * @property {string} [delimiter] - Custom delimiter before the incremented number. Defaults to parenthesized copy counters.
  */
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "60.24.0",
+  "version": "60.26.1",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -74,5 +74,5 @@
     "react-native-ios11-devicecheck": "^0.0.3"
   },
   "sideEffects": false,
-  "gitHead": "72de2e80e0d0ac89d71b7fca60c2352b07136151"
+  "gitHead": "60136387114f34ee7b9cd9d73541fb29922c2bd7"
 }

package/types/models/assistant.d.ts

@@ -1,4 +1,4 @@
-export function createAssistant(client: CozyClient, assistantData: Assistant): Promise<void>;
+export function createAssistant(client: CozyClient, assistantData: Assistant): Promise<Assistant>;
 export function deleteAssistant(client: CozyClient, assistantId: string): Promise<void>;
 export function editAssistant(client: CozyClient, assistantId: string, assistantData: Assistant): Promise<void>;
 export type Assistant = {

package/types/types.d.ts

@@ -1702,7 +1702,7 @@ export type RedirectLinkData = {
  */
 export type ConflictOptions = {
     /**
-     * - Delimiter before the incremented number. Default to '_'
+     * - Custom delimiter before the incremented number. Defaults to parenthesized copy counters.
      */
     delimiter?: string;
 };