@lvce-editor/explorer-view 6.13.0 → 6.15.0

package/dist/explorerViewWorkerMain.js

@@ -1667,11 +1667,32 @@ const getChildDirentsRaw = async uri => {
 };
 
 const RE_CHARACTERS = /^[a-zA-Z.-]+$/;
+const RE_LEADING_DIGITS = /^\d+/;
+const RE_LEADING_ZEROES = /^0+/;
+const compareLeadingDigits = (a, b) => {
+  const normalizedA = a.replace(RE_LEADING_ZEROES, '') || '0';
+  const normalizedB = b.replace(RE_LEADING_ZEROES, '') || '0';
+  if (normalizedA.length !== normalizedB.length) {
+    return normalizedA.length - normalizedB.length;
+  }
+  if (normalizedA !== normalizedB) {
+    return normalizedA < normalizedB ? -1 : 1;
+  }
+  return a.length - b.length;
+};
+const compareLeadingNumbers = (a, b) => {
+  const leadingDigitsA = a.match(RE_LEADING_DIGITS)?.[0];
+  const leadingDigitsB = b.match(RE_LEADING_DIGITS)?.[0];
+  if (leadingDigitsA && leadingDigitsB) {
+    return compareLeadingDigits(leadingDigitsA, leadingDigitsB);
+  }
+  return 0;
+};
 const compareStringNumeric = (a, b) => {
   if (RE_CHARACTERS.test(a) && RE_CHARACTERS.test(b)) {
     return a < b ? -1 : 1;
   }
-  return a.localeCompare(b, 'en', {
+  return compareLeadingNumbers(a, b) || a.localeCompare(b, 'en', {
     numeric: true
   });
 };
@@ -1739,14 +1760,11 @@ const getChildDirents = async (pathSeparator, parentDirentPath, parentDirentDept
   return displayDirents;
 };
 
-const isTopLevel = dirent => {
-  return dirent.depth === 1;
-};
-
 const orderDirents = dirents => {
   if (dirents.length === 0) {
     return dirents;
   }
+  const minDepth = Math.min(...dirents.map(dirent => dirent.depth));
   const withDeepChildren = (parent, processed) => {
     if (processed.has(parent.path)) {
       return [];
@@ -1760,7 +1778,7 @@ const orderDirents = dirents => {
     }
     return [parent, ...children];
   };
-  const topLevelDirents = dirents.filter(isTopLevel);
+  const topLevelDirents = dirents.filter(dirent => dirent.depth === minDepth);
   const processed = new Set();
   const ordered = topLevelDirents.flatMap(dirent => withDeepChildren(dirent, processed));
   return ordered;
@@ -2060,14 +2078,23 @@ const computeExplorerRenamedDirentUpdate = (root, parentPath, oldUri, children,
   const relativeOldPath = oldUri.slice(rootLength);
   const relativeNewUri = newUri.slice(rootLength);
   const update = Object.create(null);
-  update[relativeDirname] = children;
   const oldItems = tree[relativeOldPath] || [];
+  update[relativeDirname] = children.map(child => {
+    if (oldItems.length > 0 && child.path === newUri && child.type === Directory) {
+      return {
+        ...child,
+        type: DirectoryExpanded
+      };
+    }
+    return child;
+  });
   update[relativeNewUri] = oldItems;
   for (const [key, value] of Object.entries(tree)) {
-    if (key.startsWith(`${relativeOldPath}/`)) {
-      const newKey = relativeNewUri + key.slice(relativeOldPath.length);
-      update[newKey] = value;
+    if (!key.startsWith(`${relativeOldPath}/`)) {
+      continue;
     }
+    const newKey = relativeNewUri + key.slice(relativeOldPath.length);
+    update[newKey] = value;
   }
   return update;
 };
@@ -2244,6 +2271,10 @@ const cancelTypeAhead = state => {
   };
 };
 
+const isTopLevel = dirent => {
+  return dirent.depth === 1;
+};
+
 const toCollapsedDirent = dirent => {
   if (dirent.type === DirectoryExpanded) {
     return {
@@ -2911,6 +2942,9 @@ const {
   set,
   wrapGetter
 } = create$a();
+const hasSameVisibleExplorerItemInputs = (oldState, newState) => {
+  return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.height === newState.height && oldState.itemHeight === newState.itemHeight && oldState.focusedIndex === newState.focusedIndex && oldState.editingIndex === newState.editingIndex && oldState.editingIcon === newState.editingIcon && oldState.cutItems === newState.cutItems && oldState.editingErrorMessage === newState.editingErrorMessage && oldState.dropTargets === newState.dropTargets && oldState.fileIconCache === newState.fileIconCache && oldState.decorations === newState.decorations && oldState.useChevrons === newState.useChevrons && oldState.sourceControlIgnoredUris === newState.sourceControlIgnoredUris;
+};
 const wrapListItemCommand = fn => {
   const wrappedCommand = async (id, ...args) => {
     const {
@@ -2938,10 +2972,10 @@ const wrapListItemCommand = fn => {
     } = updatedState;
     const intermediate = get(id);
     set(id, intermediate.oldState, updatedState);
-    const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, items.length);
-    if (items === intermediate.newState.items && minLineY === intermediate.newState.minLineY && height === intermediate.newState.height && itemHeight === intermediate.newState.itemHeight && editingIcon === intermediate.newState.editingIcon && cutItems === intermediate.newState.cutItems && editingErrorMessage === intermediate.newState.editingErrorMessage && dropTargets === intermediate.newState.dropTargets && fileIconCache === intermediate.newState.fileIconCache && decorations === intermediate.newState.decorations) {
+    if (hasSameVisibleExplorerItemInputs(intermediate.newState, updatedState)) {
       return;
     }
+    const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, items.length);
     const visible = items.slice(minLineY, maxLineY);
     const {
       icons,
@@ -3113,25 +3147,26 @@ const expandAll = async state => {
   } = dirent;
   const newDirents = [...items];
   // TODO fetch child dirents in parallel
-  for (const dirent of newDirents) {
-    if (dirent.depth === depth && dirent.type === Directory) {
-      // TODO expand
-      // TODO avoid mutating state here
-      // @ts-ignore
-      dirent.type = DirectoryExpanding;
-      // TODO handle error
-      // TODO race condition
-      const childDirents = await getChildDirents(pathSeparator, dirent.path, dirent.depth);
-      const newIndex = newDirents.indexOf(dirent);
-      if (newIndex === -1) {
-        continue;
-      }
-      newDirents.splice(newIndex + 1, 0, ...childDirents);
-      // TODO avoid mutating state here
-      // @ts-ignore
-      dirent.type = DirectoryExpanded;
-      // await expand(state, dirent.index)
+  for (const dirent of items) {
+    if (dirent.depth !== depth || dirent.type !== Directory) {
+      continue;
+    }
+    // TODO expand
+    // TODO avoid mutating state here
+    // @ts-ignore
+    dirent.type = DirectoryExpanding;
+    // TODO handle error
+    // TODO race condition
+    const childDirents = await getChildDirents(pathSeparator, dirent.path, dirent.depth);
+    const newIndex = newDirents.indexOf(dirent);
+    if (newIndex === -1) {
+      continue;
     }
+    newDirents.splice(newIndex + 1, 0, ...childDirents);
+    // TODO avoid mutating state here
+    // @ts-ignore
+    dirent.type = DirectoryExpanded;
+    // await expand(state, dirent.index)
   }
   return {
     ...state,
@@ -3290,11 +3325,7 @@ const lastIndex = array => {
   return array.length - 1;
 };
 const fromAsync = async asyncIterable => {
-  const children = [];
-  for await (const value of asyncIterable) {
-    children.push(value);
-  }
-  return children;
+  return Array.fromAsync(asyncIterable);
 };
 
 const focusLast = state => {
@@ -4294,12 +4325,19 @@ const handleContextMenuAtIndex = async (state, index, x, y) => {
   number(x);
   number(y);
   const {
+    items,
     uid
   } = state;
+  const contextMenuItem = items[index];
+  const newItems = contextMenuItem && !contextMenuItem.selected ? items.map(item => ({
+    ...item,
+    selected: false
+  })) : items;
   const newState = {
     ...state,
     focused: false,
-    focusedIndex: index
+    focusedIndex: index,
+    items: newItems
   };
   set(uid, state, newState);
   await show2(uid, Explorer, x, y, {
@@ -5249,8 +5287,8 @@ const handleKeyDown = (state, key) => {
   if (typeAheadTimeout.value) {
     clearTimeout(typeAheadTimeout.value);
   }
-  typeAheadTimeout.value = setTimeout(async () => {
-    await invoke$2('Explorer.cancelTypeAhead');
+  typeAheadTimeout.value = setTimeout(() => {
+    void invoke$2('Explorer.cancelTypeAhead');
   }, focusWordTimeout);
   if (matchingIndex === -1) {
     return {
@@ -5572,13 +5610,14 @@ const handleUpload = async (state, dirents) => {
     // TODO switch
     // TODO symlink might not be possible to be copied
     // TODO create folder if type is 2
-    if (dirent.type === /* File */1) {
-      // TODO reading text might be inefficient for binary files
-      // but not sure how else to send them via jsonrpc
-      const content = await dirent.file.text();
-      const absolutePath = [root, dirent.file.name].join(pathSeparator);
-      await writeFile(absolutePath, content);
+    if (dirent.type !== /* File */1) {
+      continue;
     }
+    // TODO reading text might be inefficient for binary files
+    // but not sure how else to send them via jsonrpc
+    const content = await dirent.file.text();
+    const absolutePath = [root, dirent.file.name].join(pathSeparator);
+    await writeFile(absolutePath, content);
   }
 };
 
@@ -5661,7 +5700,7 @@ const confirmDelete = async paths => {
   // TODO use i18n string
   const message = paths.length === 1 ? `Are you sure you want to delete "${paths[0]}"?` : `Are you sure you want to delete ${paths.length} items?`;
   const result = await confirm(message);
-  return result === true;
+  return result;
 };
 
 const showErrorAlert = async errorMessage => {
@@ -6604,7 +6643,17 @@ const revealItemHidden = async (state, uri) => {
   const pathPartsChildrenFlat = pathPartsChildren.flat();
   const orderedPathParts = orderDirents(pathPartsChildrenFlat);
   const mergedDirents = mergeVisibleWithHiddenItems(items, orderedPathParts);
-  const index = getIndex(mergedDirents, uri);
+  const expandedPaths = new Set(pathPartsToReveal.map(pathPart => pathPart.path));
+  const newDirents = mergedDirents.map(item => {
+    if (expandedPaths.has(item.path) && item.type === Directory) {
+      return {
+        ...item,
+        type: DirectoryExpanded
+      };
+    }
+    return item;
+  });
+  const index = getIndex(newDirents, uri);
   if (index === -1) {
     throw new Error(`File not found in explorer ${uri}`);
   }
@@ -6616,7 +6665,7 @@ const revealItemHidden = async (state, uri) => {
     ...state,
     focused: true,
     focusedIndex: index,
-    items: mergedDirents,
+    items: newDirents,
     maxLineY: newMaxLineY,
     minLineY: newMinLineY
   };

package/package.json

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