cozy-client 40.5.0 → 40.6.0

package/dist/CozyClient.js

@@ -2695,7 +2695,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 = "40.5.0";
+CozyClient.version = "40.6.0";
 
 _microee.default.mixin(CozyClient);
 

package/dist/models/file.js

@@ -659,18 +659,26 @@ var overrideFileForPath = /*#__PURE__*/function () {
  * Method to generate a new filename if there is a conflict
  *
  * @param {string} filenameWithoutExtension - A filename without the extension
+ * @param {RegExp} [originalNameFormatRegex] - A regex to check if the name is still in his original format
  * @returns {string} A filename with the right suffix
  */
 
 
 exports.overrideFileForPath = overrideFileForPath;
 
-var generateNewFileNameOnConflict = function generateNewFileNameOnConflict(filenameWithoutExtension) {
-  //Check if the string ends by _1
+var generateNewFileNameOnConflict = function generateNewFileNameOnConflict(filenameWithoutExtension, originalNameFormatRegex) {
+  var isOriginalNameFormat = false;
+
+  if (originalNameFormatRegex && originalNameFormatRegex.test(filenameWithoutExtension)) {
+    isOriginalNameFormat = true;
+  } //Check if the string ends by _1
+
+
   var regex = new RegExp('(_)([0-9]+)$');
   var matches = filenameWithoutExtension.match(regex);
+  var shouldIncrement = matches && !isOriginalNameFormat;
 
-  if (matches) {
+  if (shouldIncrement) {
     var versionNumber = parseInt(matches[2]); //increment versionNumber
 
     versionNumber++;

package/dist/models/file.spec.js

@@ -571,6 +571,29 @@ describe('File Model', () => {
       expect(filename3).toEqual('test_1_1_test_1')
       const filename4 = fileModel.generateNewFileNameOnConflict('test_')
       expect(filename4).toEqual('test__1')
+      const filename5 = fileModel.generateNewFileNameOnConflict('test_1_1')
+      expect(filename5).toEqual('test_1_2')
+    })
+
+    it('should generate the right file name with _X when passing a format', () => {
+      const regex = new RegExp('^([a-z]+)(_)([0-9]+)$') // test_1
+
+      const filename1 = fileModel.generateNewFileNameOnConflict('test', regex)
+      expect(filename1).toEqual('test_1')
+      const filename2 = fileModel.generateNewFileNameOnConflict('test_1', regex)
+      expect(filename2).toEqual('test_1_1')
+      const filename3 = fileModel.generateNewFileNameOnConflict(
+        'test_1_1_test',
+        regex
+      )
+      expect(filename3).toEqual('test_1_1_test_1')
+      const filename4 = fileModel.generateNewFileNameOnConflict('test_', regex)
+      expect(filename4).toEqual('test__1')
+      const filename5 = fileModel.generateNewFileNameOnConflict(
+        'test_1_1',
+        regex
+      )
+      expect(filename5).toEqual('test_1_2')
     })
   })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "40.5.0",
+  "version": "40.6.0",
   "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": "c05e32361f5bb6f3303d591a454b47a03bbb8217"
+  "gitHead": "b63d9b7ca8b6216ab035fa58a92ba909c22837cf"
 }

package/types/models/file.d.ts

@@ -52,7 +52,7 @@ export function move(client: CozyClient, fileId: string, destination: {
     path: string;
 }, force?: boolean): Promise<any>;
 export function overrideFileForPath(client: CozyClient, dirPath: string, file: object, metadata: object): Promise<import("../types").IOCozyFile>;
-export function generateNewFileNameOnConflict(filenameWithoutExtension: string): string;
+export function generateNewFileNameOnConflict(filenameWithoutExtension: string, originalNameFormatRegex?: RegExp): string;
 export function generateFileNameForRevision(file: import("../types").IOCozyFile, revision: object, f: Function): string;
 export function uploadFileWithConflictStrategy(client: CozyClient, file: string | ArrayBuffer, options: FileUploadOptions): any;
 export function readMobileFile(fileURL: string): Promise<any>;