fix: Special characters being removed during collectio import

Instead of using a strict sanitization regex in the frontend
the importer will now sanitize the filename before writing
it to disk.

Should fix:
- usebruno#1779
- usebruno#1587
- usebruno#671
- usebruno#1274

packages/bruno-app/src/utils/common/index.js

@@ -70,18 +70,6 @@ export const safeParseXML = (str, options) => {
  }
 };
 
-// Remove any characters that are not alphanumeric, spaces, hyphens, or underscores
-export const normalizeFileName = (name) => {
- if (!name) {
- return name;
- }
-
- const validChars = /[^\w\s-]/g;
- const formattedName = name.replace(validChars, '-');
-
- return formattedName;
-};
-
 export const getContentType = (headers) => {
  const headersArray = typeof headers === 'object' ? Object.entries(headers) : [];
 

packages/bruno-app/src/utils/common/regex.js

@@ -1,5 +1,8 @@
 // See https://github.com/usebruno/bruno/pull/349 for more info
-// Scrict regex for validating directories. Covers most edge cases like windows device names
-export const dirnameRegex = /^(?!CON|PRN|AUX|NUL|COM\d|LPT\d|^ |^\-)[^<>:"/\\|?*\x00-\x1F]+[^\. ]$/;
+// Strict regex for validating directories. Covers most edge cases like windows device names
+export const dirnameRegex = /^(?!CON|PRN|AUX|NUL|COM\d|LPT\d|^ |^-)[^<>:"/\\|?*\x00-\x1F]+[^\. ]$/;
+// Not so strict Regex for filenames, because files normally get a extension e.g. ".bru" and are not affect by
+// windows special names e.g. CON, PRN
+export const filenameRegex = /[<>:"/\\|?*\x00-\x1F]/;
 
 export const variableNameRegex = /^[\w-.]*$/;

packages/bruno-app/src/utils/importers/common.js

@@ -2,7 +2,7 @@ import each from 'lodash/each';
 import get from 'lodash/get';
 
 import cloneDeep from 'lodash/cloneDeep';
-import { uuid, normalizeFileName } from 'utils/common';
+import { uuid } from 'utils/common';
 import { isItemARequest } from 'utils/collections';
 import { collectionSchema } from '@usebruno/schema';
 import { BrunoError } from 'utils/common/error';
@@ -62,8 +62,6 @@ export const updateUidsInCollection = (_collection) => {
 export const transformItemsInCollection = (collection) => {
  const transformItems = (items = []) => {
  each(items, (item) => {
- item.name = normalizeFileName(item.name);
-
  if (['http', 'graphql'].includes(item.type)) {
  item.type = `${item.type}-request`;
  if (item.request.query) {

packages/bruno-electron/src/ipc/collection.js

@@ -448,11 +448,13 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
  items.forEach((item) => {
  if (['http-request', 'graphql-request'].includes(item.type)) {
  const content = jsonToBru(item);
- const filePath = path.join(currentPath, `${item.name}.bru`);
+ const sanitizedFilename = sanitizeFilename(item.name);
+ const filePath = path.join(currentPath, `${sanitizedFilename}.bru`);
  fs.writeFileSync(filePath, content);
  }
  if (item.type === 'folder') {
- const folderPath = path.join(currentPath, item.name);
+ const sanitizedFolderName = sanitizeDirectoryName(item.name);
+ const folderPath = path.join(currentPath, sanitizedFolderName);
  fs.mkdirSync(folderPath);
 
  if (item.items && item.items.length) {