cozy-client 60.26.0 → 60.27.0

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.26.0";
+CozyClient.version = "60.27.0";
 
 _microee.default.mixin(CozyClient);
 

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.26.0",
+  "version": "60.27.0",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -19,7 +19,7 @@
     "@types/jest": "^26.0.20",
     "@types/lodash": "^4.14.170",
     "btoa": "^1.2.1",
-    "cozy-stack-client": "^60.24.0",
+    "cozy-stack-client": "^60.27.0",
     "date-fns": "^2.30.0",
     "fast-deep-equal": "^3.1.3",
     "json-stable-stringify": "^1.0.1",
@@ -74,5 +74,5 @@
     "react-native-ios11-devicecheck": "^0.0.3"
   },
   "sideEffects": false,
-  "gitHead": "364d348ff17d2e0683b7bfec9f03ab5a680f9c29"
+  "gitHead": "d25894f5658bdea0d20bfd491cc86d18f8559679"
 }

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;
 };