@lvce-editor/explorer-view 7.5.0 → 7.6.0

package/dist/explorerViewWorkerMain.js

@@ -1671,6 +1671,85 @@ const getChildDirentsRaw = async uri => {
   return rawDirents;
 };
 
+const dotSlashRegex = /^\.\//;
+const leadingSlashRegex$1 = /^\//;
+const regexCharacterRegex = /[\\^$.*+?()[\]{}|]/;
+const trailingSlashRegex$1 = /\/$/;
+const escapeRegexCharacter = character => {
+  return regexCharacterRegex.test(character) ? `\\${character}` : character;
+};
+const globToRegexSource = glob => {
+  let source = '';
+  for (let i = 0; i < glob.length; i++) {
+    const character = glob[i];
+    if (character === '*') {
+      if (glob[i + 1] === '*') {
+        i++;
+        if (glob[i + 1] === '/') {
+          i++;
+          source += '(?:.*/)?';
+        } else {
+          source += '.*';
+        }
+      } else {
+        source += '[^/]*';
+      }
+      continue;
+    }
+    if (character === '?') {
+      source += '[^/]';
+      continue;
+    }
+    source += escapeRegexCharacter(character);
+  }
+  return source;
+};
+const regexCache = new Map();
+const getRegex = glob => {
+  const cached = regexCache.get(glob);
+  if (cached) {
+    return cached;
+  }
+  const regex = new RegExp(`^${globToRegexSource(glob)}$`);
+  regexCache.set(glob, regex);
+  return regex;
+};
+const matchesGlob = (glob, relativePath) => {
+  const normalizedGlob = glob.replaceAll('\\', '/').replace(dotSlashRegex, '').replace(leadingSlashRegex$1, '').replace(trailingSlashRegex$1, '');
+  if (!normalizedGlob) {
+    return false;
+  }
+  const normalizedPath = relativePath.replaceAll('\\', '/').replace(dotSlashRegex, '').replace(leadingSlashRegex$1, '').replace(trailingSlashRegex$1, '');
+  const candidate = normalizedGlob.includes('/') ? normalizedPath : normalizedPath.slice(normalizedPath.lastIndexOf('/') + 1);
+  const regex = getRegex(normalizedGlob);
+  return regex.test(candidate);
+};
+
+const leadingSlashRegex = /^\//;
+const trailingSlashRegex = /\/$/;
+const getRelativePath$1 = (root, path) => {
+  const normalizedRoot = root.replaceAll('\\', '/').replace(trailingSlashRegex, '');
+  const normalizedPath = path.replaceAll('\\', '/');
+  if (normalizedPath === normalizedRoot) {
+    return '';
+  }
+  if (normalizedPath.startsWith(`${normalizedRoot}/`)) {
+    return normalizedPath.slice(normalizedRoot.length + 1);
+  }
+  return normalizedPath.replace(leadingSlashRegex, '');
+};
+const isExcluded = (root, path, excluded) => {
+  const relativePath = getRelativePath$1(root, path);
+  const pathParts = relativePath.split('/');
+  for (let i = 1; i <= pathParts.length; i++) {
+    const candidate = pathParts.slice(0, i).join('/');
+    if (excluded.some(pattern => matchesGlob(pattern, candidate))) {
+      return true;
+    }
+  }
+  return false;
+};
+
 const RE_CHARACTERS = /^[a-zA-Z.-]+$/;
 const RE_LEADING_DIGITS = /^\d+/;
 const RE_LEADING_ZEROES = /^0+/;
@@ -1740,10 +1819,10 @@ const toDisplayDirent = (parentPath, parentDepth, rawDirentType, rawDirentName,
   };
 };
 
-const toDisplayDirents = (pathSeparator, rawDirents, parentDirentPath, parentDirentDepth, excluded, expanded = false) => {
+const toDisplayDirents = (pathSeparator, rawDirents, parentDirentPath, parentDirentDepth, excluded, expanded = false, root = parentDirentPath) => {
   rawDirents = sortExplorerItems(rawDirents);
   const result = [];
-  const visibleItems = rawDirents.filter(item => !excluded.includes(item.name));
+  const visibleItems = rawDirents.filter(item => !isExcluded(root, join2(parentDirentPath, item.name), excluded));
   const count = visibleItems.length;
   for (let i = 0; i < visibleItems.length; i++) {
     const rawDirent = visibleItems[i];
@@ -1752,7 +1831,7 @@ const toDisplayDirents = (pathSeparator, rawDirents, parentDirentPath, parentDir
   return result;
 };
 
-const getChildDirents = async (pathSeparator, parentDirentPath, parentDirentDepth, excluded = []) => {
+const getChildDirents = async (pathSeparator, parentDirentPath, parentDirentDepth, excluded = [], root = parentDirentPath) => {
   string(pathSeparator);
   // TODO use event/actor based code instead, this is impossible to cancel right now
   // also cancel updating when opening new folder
@@ -1761,7 +1840,7 @@ const getChildDirents = async (pathSeparator, parentDirentPath, parentDirentDept
   // and more typesafe than Command.execute
   // and more performant
   const rawDirents = await getChildDirentsRaw(parentDirentPath);
-  const displayDirents = toDisplayDirents(pathSeparator, rawDirents, parentDirentPath, parentDirentDepth, excluded);
+  const displayDirents = toDisplayDirents(pathSeparator, rawDirents, parentDirentPath, parentDirentDepth, excluded, false, root);
   return displayDirents;
 };
 
@@ -1789,12 +1868,12 @@ const orderDirents = dirents => {
   return ordered;
 };
 
-const getPathPartChildren = async pathPart => {
-  const children = await getChildDirents(pathPart.pathSeparator, pathPart.path, pathPart.depth);
+const getPathPartChildren = async (pathPart, excluded, root) => {
+  const children = await getChildDirents(pathPart.pathSeparator, pathPart.path, pathPart.depth, excluded, root);
   return children;
 };
-const getPathPartsChildren = async pathparts => {
-  const pathPartsChildren = await Promise.all(pathparts.map(getPathPartChildren));
+const getPathPartsChildren = async (pathparts, excluded = [], root = pathparts[0]?.path || '') => {
+  const pathPartsChildren = await Promise.all(pathparts.map(pathPart => getPathPartChildren(pathPart, excluded, root)));
   const pathPartsChildrenFlat = pathPartsChildren.flat();
   const orderedPathParts = orderDirents(pathPartsChildrenFlat);
   return orderedPathParts;
@@ -2023,6 +2102,7 @@ const validateFileName2 = (name, siblingFileNames = []) => {
 const acceptCreate = async (state, newDirentType) => {
   const {
     editingValue,
+    excluded,
     focusedIndex,
     items,
     pathSeparator,
@@ -2048,7 +2128,7 @@ const acceptCreate = async (state, newDirentType) => {
     };
   }
   const pathPaths = getPathParts(root, absolutePath, pathSeparator);
-  const children = await getPathPartsChildren(pathPaths);
+  const children = await getPathPartsChildren(pathPaths, excluded, root);
   const tree = createTree(items, root);
   const childTree = createTree(children, root);
   const merged = mergeTrees(tree, childTree);
@@ -2138,7 +2218,9 @@ const acceptRename = async state => {
   const {
     editingIndex,
     editingValue,
+    excluded,
     items,
+    pathSeparator,
     root
   } = state;
   const editingErrorMessage = validateFileName2(editingValue);
@@ -2160,7 +2242,7 @@ const acceptRename = async state => {
   const oldUri = renamedDirent.path;
   const dirname = dirname2(oldUri);
   const newUri = join2(dirname, editingValue);
-  const children = await getChildDirents('/', dirname, renamedDirent.depth - 1, []);
+  const children = await getChildDirents(pathSeparator, dirname, renamedDirent.depth - 1, excluded, root);
   const tree = createTree(items, root);
   const update = computeExplorerRenamedDirentUpdate(root, dirname, oldUri, children, tree, newUri);
   const newTree = updateTree2(tree, update);
@@ -3169,9 +3251,11 @@ const diff2 = uid => {
 
 const expandAll = async state => {
   const {
+    excluded,
     focusedIndex,
     items,
-    pathSeparator
+    pathSeparator,
+    root
   } = state;
   if (focusedIndex === -1) {
     return state;
@@ -3192,7 +3276,7 @@ const expandAll = async state => {
     dirent.type = DirectoryExpanding;
     // TODO handle error
     // TODO race condition
-    const childDirents = await getChildDirents(pathSeparator, dirent.path, dirent.depth);
+    const childDirents = await getChildDirents(pathSeparator, dirent.path, dirent.depth, excluded, root);
     const newIndex = newDirents.indexOf(dirent);
     if (newIndex === -1) {
       continue;
@@ -3220,15 +3304,15 @@ const makeExpanded = dirent => {
 };
 
 // TODO this is very inefficient
-const getChildDirentsRecursively = async (dirent, pathSeparator) => {
+const getChildDirentsRecursively = async (dirent, pathSeparator, excluded = [], root = dirent.path) => {
   switch (dirent.type) {
     case Directory:
     case DirectoryExpanded:
     case DirectoryExpanding:
-      const childDirents = await getChildDirents(pathSeparator, dirent.path, dirent.depth);
+      const childDirents = await getChildDirents(pathSeparator, dirent.path, dirent.depth, excluded, root);
       const all = [makeExpanded(dirent)];
       for (const childDirent of childDirents) {
-        const childAll = await getChildDirentsRecursively(childDirent, pathSeparator);
+        const childAll = await getChildDirentsRecursively(childDirent, pathSeparator, excluded, root);
         all.push(...childAll);
       }
       return all;
@@ -3253,6 +3337,7 @@ const getParentEndIndex = (dirents, index) => {
 
 const expandRecursively = async state => {
   const {
+    excluded,
     focusedIndex,
     items,
     pathSeparator,
@@ -3270,7 +3355,7 @@ const expandRecursively = async state => {
   // TODO race condition: what if folder is being deleted while it is recursively expanding?
   // TODO race condition: what if a new file/folder is created while the folder is recursively expanding?
   // @ts-ignore
-  const childDirents = await getChildDirentsRecursively(dirent, pathSeparator);
+  const childDirents = await getChildDirentsRecursively(dirent, pathSeparator, excluded, root);
   const startIndex = focusedIndex;
   if (focusedIndex >= 0) {
     const endIndex = getParentEndIndex(items, focusedIndex);
@@ -3806,7 +3891,7 @@ const handleClickDirectory = async (state, dirent, index, keepFocus) => {
   // @ts-ignore
   dirent.type = DirectoryExpanding;
   // TODO handle error
-  const dirents = await getChildDirents(state.pathSeparator, dirent.path, dirent.depth);
+  const dirents = await getChildDirents(state.pathSeparator, dirent.path, dirent.depth, state.excluded, state.root);
   const state2 = state;
   if (!state2) {
     return state;
@@ -3919,19 +4004,20 @@ const getFittingIndex = (dirents, startIndex) => {
   return -1;
 };
 
-const getNewChildDirentsForNewDirent = async (items, depth, parentPath, direntType) => {
+const getNewChildDirentsForNewDirent = async (items, depth, parentPath, direntType, excluded = [], root = parentPath) => {
   // Get existing children or query them if they don't exist
   let existingChildren = items.filter(item => item.depth === depth && item.path.startsWith(parentPath));
   if (existingChildren.length === 0) {
     const childDirents = await readDirWithFileTypes(parentPath);
-    existingChildren = childDirents.map((dirent, index) => ({
+    const visibleChildDirents = childDirents.filter(dirent => !isExcluded(root, join2(parentPath, dirent.name), excluded));
+    existingChildren = visibleChildDirents.map((dirent, index) => ({
       depth,
       icon: '',
       name: dirent.name,
       path: join2(parentPath, dirent.name),
       posInSet: index + 1,
       selected: false,
-      setSize: childDirents.length,
+      setSize: visibleChildDirents.length,
       type: dirent.type
     }));
   }
@@ -3954,7 +4040,7 @@ const getNewChildDirentsForNewDirent = async (items, depth, parentPath, direntTy
   return allChildDirents;
 };
 
-const getNewDirentsForNewDirent = async (items, focusedIndex, type, root) => {
+const getNewDirentsForNewDirent = async (items, focusedIndex, type, root, excluded = []) => {
   if (items.length === 0 || focusedIndex === -1) {
     const newDirent = {
       depth: 0,
@@ -3977,7 +4063,7 @@ const getNewDirentsForNewDirent = async (items, focusedIndex, type, root) => {
   }
   const parentPath = focusedItem.path;
   const depth = focusedItem.depth + 1;
-  const updatedChildren = await getNewChildDirentsForNewDirent(items, depth, parentPath, type);
+  const updatedChildren = await getNewChildDirentsForNewDirent(items, depth, parentPath, type, excluded, root);
 
   // Create new array with updated items
   const parentIndex = focusedIndex;
@@ -4013,6 +4099,7 @@ const newDirent = async (state, editingType, editingIcon = '') => {
   // TODO do it like vscode, select position between folders and files
   const {
     editingIndex,
+    excluded,
     focusedIndex,
     items,
     root
@@ -4022,7 +4109,7 @@ const newDirent = async (state, editingType, editingIcon = '') => {
   }
   const index = getFittingIndex(items, focusedIndex);
   const direntType = getNewDirentType(editingType);
-  const newDirents = await getNewDirentsForNewDirent(items, index, direntType, root);
+  const newDirents = await getNewDirentsForNewDirent(items, index, direntType, root, excluded);
   const newEditingIndex = newDirents.findIndex(item => item.type === EditingFile || item.type === EditingFolder);
   return {
     ...state,
@@ -4111,11 +4198,11 @@ const restoreDirentType = (rawDirentType, path, expandedPaths) => {
   return rawDirentType;
 };
 
-const getProtoMapInternal = (root, pathToDirents, expandedPaths, depth) => {
+const getProtoMapInternal = (root, pathToDirents, expandedPaths, depth, excluded = [], workspaceRoot = root) => {
   if (!(root in pathToDirents)) {
     return [];
   }
-  const items = pathToDirents[root] || [];
+  const items = (pathToDirents[root] || []).filter(item => !isExcluded(workspaceRoot, join2(root, item.name), excluded));
   const protoMap = [];
   for (let i = 0; i < items.length; i++) {
     const item = items[i];
@@ -4130,14 +4217,14 @@ const getProtoMapInternal = (root, pathToDirents, expandedPaths, depth) => {
       setSize: items.length,
       type: restoreDirentType(item.type, path, expandedPaths)
     };
-    const children = getProtoMapInternal(path, pathToDirents, expandedPaths, depth + 1);
+    const children = getProtoMapInternal(path, pathToDirents, expandedPaths, depth + 1, excluded, workspaceRoot);
     protoMap.push(displayDirent, ...children);
   }
   return protoMap;
 };
 
-const getProtoMap = (root, pathToDirents, expandedPaths) => {
-  return getProtoMapInternal(root, pathToDirents, expandedPaths, 1);
+const getProtoMap = (root, pathToDirents, expandedPaths, excluded = []) => {
+  return getProtoMapInternal(root, pathToDirents, expandedPaths, 1, excluded, root);
 };
 
 const sortPathDirentsMap = map => {
@@ -4151,6 +4238,7 @@ const sortPathDirentsMap = map => {
 
 const refresh = async state => {
   const {
+    excluded,
     focusedIndex,
     items,
     root
@@ -4160,7 +4248,7 @@ const refresh = async state => {
   const allPaths = [root, ...expandedPaths];
   const pathToDirents = await getPathDirentsMap(allPaths);
   const sortedPathDirents = sortPathDirentsMap(pathToDirents);
-  const newItems = getProtoMap(root, sortedPathDirents, expandedPaths);
+  const newItems = getProtoMap(root, sortedPathDirents, expandedPaths, excluded);
   let newFocusedIndex = focusedIndex;
   if (focusedIndex >= newItems.length) {
     newFocusedIndex = newItems.length - 1;
@@ -4652,17 +4740,6 @@ const getErrorMessage = error => {
   return 'Unknown error';
 };
 
-const getExcluded = () => {
-  const excludedObject = {};
-  const excluded = [];
-  for (const [key, value] of Object.entries(excludedObject)) {
-    if (value) {
-      excluded.push(key);
-    }
-  }
-  return excluded;
-};
-
 const isValid = decoration => {
   return decoration && typeof decoration.decoration === 'string' && typeof decoration.uri === 'string';
 };
@@ -4734,6 +4811,19 @@ const getScheme = uri => {
   return match[0];
 };
 
+const getExcluded = excludedObject => {
+  if (!excludedObject || typeof excludedObject !== 'object' || Array.isArray(excludedObject)) {
+    return [];
+  }
+  const excluded = [];
+  for (const [key, value] of Object.entries(excludedObject)) {
+    if (value === true) {
+      excluded.push(key);
+    }
+  }
+  return excluded;
+};
+
 const getSettings = async () => {
   // TODO don't return false always
   // TODO get all settings at once
@@ -4743,11 +4833,14 @@ const getSettings = async () => {
   const confirmDelete = confirmDeleteRaw === false ? false : false;
   const confirmPasteRaw = await invoke$2('Preferences.get', 'explorer.confirmpaste');
   const confirmPaste = confirmPasteRaw === false ? false : false;
+  const excludedRaw = await invoke$2('Preferences.get', 'files.exclude');
+  const excluded = getExcluded(excludedRaw);
   const sourceControlDecorationsRaw = await invoke$2('Preferences.get', 'explorer.sourceControlDecorations');
   const sourceControlDecorations = sourceControlDecorationsRaw === false ? false : true;
   return {
     confirmDelete,
     confirmPaste,
+    excluded,
     sourceControlDecorations,
     useChevrons
   };
@@ -4757,7 +4850,7 @@ const getWorkspacePath = () => {
   return invoke$2('Workspace.getPath');
 };
 
-const getSavedChildDirents = (map, path, depth, excluded, pathSeparator) => {
+const getSavedChildDirents = (map, path, depth, excluded, pathSeparator, root = path) => {
   let children = map[path];
   if (!children) {
     return [];
@@ -4767,7 +4860,8 @@ const getSavedChildDirents = (map, path, depth, excluded, pathSeparator) => {
   const visible = [];
   const displayRoot = path.endsWith(pathSeparator) ? path : path + pathSeparator;
   for (const child of children) {
-    if (excluded.includes(child.name)) {
+    const childPath = displayRoot + child.name;
+    if (isExcluded(root, childPath, excluded)) {
       continue;
     }
     visible.push(child);
@@ -4790,7 +4884,7 @@ const getSavedChildDirents = (map, path, depth, excluded, pathSeparator) => {
         setSize: visibleLength,
         type: DirectoryExpanded
       });
-      dirents.push(...getSavedChildDirents(map, childPath, depth + 1, excluded, pathSeparator));
+      dirents.push(...getSavedChildDirents(map, childPath, depth + 1, excluded, pathSeparator, root));
     } else {
       dirents.push({
         depth,
@@ -4819,7 +4913,7 @@ const createDirents = (root, expandedDirentPaths, expandedDirentChildren, exclud
       map[path] = children.value;
     }
   }
-  dirents.push(...getSavedChildDirents(map, root, 1, excluded, pathSeparator));
+  dirents.push(...getSavedChildDirents(map, root, 1, excluded, pathSeparator, root));
   return dirents;
 };
 const getSavedExpandedPaths = (savedState, root) => {
@@ -4859,6 +4953,7 @@ const loadContent = async (state, savedState) => {
   } = state;
   const {
     confirmDelete,
+    excluded,
     sourceControlDecorations,
     useChevrons
   } = await getSettings();
@@ -4869,7 +4964,6 @@ const loadContent = async (state, savedState) => {
     const [pathSeparator, isReadonly$1] = await Promise.all([getPathSeparator(root),
     // TODO only load path separator once
     isReadonly(root)]);
-    const excluded = getExcluded();
     const restoredDirents = await restoreExpandedState(savedState, root, pathSeparator, excluded);
     const rawDeltaY = getRestoredDeltaY(savedState);
     const maxDeltaY = Math.max(restoredDirents.length * itemHeight - height, 0);
@@ -5012,8 +5106,8 @@ const uploadFileSystemHandles = async (root, pathSeparator, fileSystemHandles) =
 const mergeDirents$1 = (oldDirents, newDirents) => {
   return newDirents;
 };
-const getMergedDirents$2 = async (root, pathSeparator, dirents) => {
-  const childDirents = await getChildDirents(pathSeparator, root, 0);
+const getMergedDirents$2 = async (root, pathSeparator, dirents, excluded) => {
+  const childDirents = await getChildDirents(pathSeparator, root, 0, excluded, root);
   const mergedDirents = mergeDirents$1(dirents, childDirents);
   return mergedDirents;
 };
@@ -5044,6 +5138,7 @@ const getFirstDroppedDirectory = (state, fileHandles) => {
 };
 const handleDrop$2 = async (state, fileHandles, files, paths) => {
   const {
+    excluded,
     items,
     pathSeparator,
     root
@@ -5066,7 +5161,7 @@ const handleDrop$2 = async (state, fileHandles, files, paths) => {
       dropTargets: []
     };
   }
-  const mergedDirents = await getMergedDirents$2(root, pathSeparator, items);
+  const mergedDirents = await getMergedDirents$2(root, pathSeparator, items, excluded);
   return {
     ...state,
     dropTargets: [],
@@ -5099,8 +5194,8 @@ const copyFilesElectron = async (root, fileHandles, files, paths) => {
 const mergeDirents = (oldDirents, newDirents) => {
   return newDirents;
 };
-const getMergedDirents$1 = async (root, pathSeparator, dirents) => {
-  const childDirents = await getChildDirents(pathSeparator, root, 0);
+const getMergedDirents$1 = async (root, pathSeparator, dirents, excluded) => {
+  const childDirents = await getChildDirents(pathSeparator, root, 0, excluded, root);
   const mergedDirents = mergeDirents(dirents, childDirents);
   return mergedDirents;
 };
@@ -5126,6 +5221,7 @@ const getFirstDroppedDirectoryPath = (state, fileHandles, paths) => {
 };
 const handleDrop$1 = async (state, fileHandles, files, paths) => {
   const {
+    excluded,
     items,
     pathSeparator,
     root
@@ -5141,7 +5237,7 @@ const handleDrop$1 = async (state, fileHandles, files, paths) => {
     };
   }
   await copyFilesElectron(root, fileHandles, files, paths);
-  const mergedDirents = await getMergedDirents$1(root, pathSeparator, items);
+  const mergedDirents = await getMergedDirents$1(root, pathSeparator, items, excluded);
   return {
     ...state,
     dropTargets: [],
@@ -5182,11 +5278,13 @@ const getMergedDirents = (items, index, dirent, childDirents) => {
 };
 const handleDropIntoFolder = async (state, dirent, index, fileHandles, files, paths) => {
   const {
+    excluded,
     items,
-    pathSeparator
+    pathSeparator,
+    root
   } = state;
   await uploadFileSystemHandles(dirent.path, '/', fileHandles);
-  const childDirents = await getChildDirents(pathSeparator, dirent.path, dirent.depth);
+  const childDirents = await getChildDirents(pathSeparator, dirent.path, dirent.depth, excluded, root);
   const mergedDirents = getMergedDirents(items, index, dirent, childDirents);
   // TODO update maxlineY
   return {
@@ -6738,6 +6836,7 @@ const mergeVisibleWithHiddenItems = (visibleItems, hiddenItems) => {
 // TODO maybe just insert items into explorer and refresh whole explorer
 const revealItemHidden = async (state, uri) => {
   const {
+    excluded,
     items,
     maxLineY,
     minLineY,
@@ -6749,7 +6848,7 @@ const revealItemHidden = async (state, uri) => {
     return state;
   }
   const pathPartsToReveal = getPathPartsToReveal(root, pathParts, items);
-  const pathPartsChildren = await getPathPartsChildren(pathPartsToReveal);
+  const pathPartsChildren = await getPathPartsChildren(pathPartsToReveal, excluded, root);
   const pathPartsChildrenFlat = pathPartsChildren.flat();
   const orderedPathParts = orderDirents(pathPartsChildrenFlat);
   const mergedDirents = mergeVisibleWithHiddenItems(items, orderedPathParts);
@@ -6803,6 +6902,7 @@ const revealItem = async (state, uri) => {
   object(state);
   string(uri);
   const {
+    excluded,
     items,
     pathSeparator,
     root
@@ -6810,6 +6910,9 @@ const revealItem = async (state, uri) => {
   if (!isUriWithinRoot(root, uri, pathSeparator)) {
     return state;
   }
+  if (isExcluded(root, uri, excluded)) {
+    return state;
+  }
   const index = getIndex(items, uri);
   if (index === -1) {
     return revealItemHidden(state, uri);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/explorer-view",
-  "version": "7.5.0",
+  "version": "7.6.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",