cozy-client 43.6.0 → 44.0.0

package/dist/CozyClient.js

@@ -2703,7 +2703,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 = "43.6.0";
+CozyClient.version = "44.0.0";
 
 _microee.default.mixin(CozyClient);
 

package/dist/models/file.js

@@ -659,33 +659,27 @@ 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
+ * @param {import('../types').ConflictOptions} [conflictOptions] - Conflict options
  * @returns {string} A filename with the right suffix
  */
 
 
 exports.overrideFileForPath = overrideFileForPath;
 
-var generateNewFileNameOnConflict = function generateNewFileNameOnConflict(filenameWithoutExtension, originalNameFormatRegex) {
-  var isOriginalNameFormat = false;
+var generateNewFileNameOnConflict = function generateNewFileNameOnConflict(filenameWithoutExtension, conflictOptions) {
+  var delimiter = (conflictOptions === null || conflictOptions === void 0 ? void 0 : conflictOptions.delimiter) || '_'; //Check if the string ends by _1
 
-  if (originalNameFormatRegex && originalNameFormatRegex.test(filenameWithoutExtension)) {
-    isOriginalNameFormat = true;
-  } //Check if the string ends by _1
-
-
-  var regex = new RegExp('(_)([0-9]+)$');
+  var regex = new RegExp("(".concat(delimiter, ")([0-9]+)$"));
   var matches = filenameWithoutExtension.match(regex);
-  var shouldIncrement = matches && !isOriginalNameFormat;
 
-  if (shouldIncrement) {
+  if (matches) {
     var versionNumber = parseInt(matches[2]); //increment versionNumber
 
     versionNumber++;
-    var newFilenameWithoutExtension = filenameWithoutExtension.replace(new RegExp('(_)([0-9]+)$'), "_".concat(versionNumber));
+    var newFilenameWithoutExtension = filenameWithoutExtension.replace(new RegExp("(".concat(delimiter, ")([0-9]+)$")), "".concat(delimiter).concat(versionNumber));
     return newFilenameWithoutExtension;
   } else {
-    return "".concat(filenameWithoutExtension, "_1");
+    return "".concat(filenameWithoutExtension).concat(delimiter, "1");
   }
 };
 /**

package/dist/models/file.spec.js

@@ -569,31 +569,44 @@ describe('File Model', () => {
       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_')
-      expect(filename4).toEqual('test__1')
-      const filename5 = fileModel.generateNewFileNameOnConflict('test_1_1')
-      expect(filename5).toEqual('test_1_2')
+      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 generate the right file name with _X when passing a format', () => {
-      const regex = new RegExp('^([a-z]+)(_)([0-9]+)$') // test_1
+    it('should generate the right file name with _cozyX', () => {
+      const conflictOptions = {
+        delimiter: '_cozy'
+      }
 
-      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 filename1 = fileModel.generateNewFileNameOnConflict(
+        'test',
+        conflictOptions
+      )
+      expect(filename1).toEqual('test_cozy1')
+      const filename2 = fileModel.generateNewFileNameOnConflict(
+        'test_cozy1',
+        conflictOptions
+      )
+      expect(filename2).toEqual('test_cozy2')
       const filename3 = fileModel.generateNewFileNameOnConflict(
-        'test_1_1_test',
-        regex
+        'test_cozy1_test',
+        conflictOptions
       )
-      expect(filename3).toEqual('test_1_1_test_1')
-      const filename4 = fileModel.generateNewFileNameOnConflict('test_', regex)
-      expect(filename4).toEqual('test__1')
+      expect(filename3).toEqual('test_cozy1_test_cozy1')
+      const filename4 = fileModel.generateNewFileNameOnConflict(
+        'test_cozy1_test_cozy1',
+        conflictOptions
+      )
+      expect(filename4).toEqual('test_cozy1_test_cozy2')
       const filename5 = fileModel.generateNewFileNameOnConflict(
-        'test_1_1',
-        regex
+        'test_',
+        conflictOptions
       )
-      expect(filename5).toEqual('test_1_2')
+      expect(filename5).toEqual('test__cozy1')
     })
   })
 

package/dist/types.js

@@ -652,6 +652,13 @@ var _dsl = require("./queries/dsl");
  * @property {string} hash - The redirect link's path (i.e. '/folder/SOME_FOLDER_ID')
  */
 
+/**
+ * Represents available options of generateNewFileNameOnConflict method
+ *
+ * @typedef {object} ConflictOptions
+ * @property {string} [delimiter] - Delimiter before the incremented number. Default to '_'
+ */
+
 /**
  * Template to type useState
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "43.6.0",
+  "version": "44.0.0",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -18,7 +18,7 @@
     "@types/jest": "^26.0.20",
     "@types/lodash": "^4.14.170",
     "btoa": "^1.2.1",
-    "cozy-stack-client": "^43.0.0",
+    "cozy-stack-client": "^44.0.0",
     "date-fns": "2.29.3",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.13",
@@ -75,5 +75,5 @@
     "react-native-ios11-devicecheck": "https://github.com/cozy/react-native-devicecheck#app-attest-v0.1"
   },
   "sideEffects": false,
-  "gitHead": "c9eaf3d5a902d852ac4c8ec6b2c72698833bf865"
+  "gitHead": "852539500a548a92416af09279398e6ded88bd7f"
 }

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, originalNameFormatRegex?: RegExp): string;
+export function generateNewFileNameOnConflict(filenameWithoutExtension: string, conflictOptions?: import('../types').ConflictOptions): 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>;

package/types/types.d.ts

@@ -1092,6 +1092,15 @@ export type RedirectLinkData = {
      */
     hash: string;
 };
+/**
+ * Represents available options of generateNewFileNameOnConflict method
+ */
+export type ConflictOptions = {
+    /**
+     * - Delimiter before the incremented number. Default to '_'
+     */
+    delimiter?: string;
+};
 /**
  * Template to type useState
  */