@lvce-editor/explorer-view 6.10.0 → 6.13.0

package/dist/explorerViewWorkerMain.js

@@ -189,7 +189,7 @@ class AssertionError extends Error {
 const Object$1 = 1;
 const Number$1 = 2;
 const Array$1 = 3;
-const String = 4;
+const String$1 = 4;
 const Boolean$1 = 5;
 const Function = 6;
 const Null = 7;
@@ -201,7 +201,7 @@ const getType = value => {
     case 'function':
       return Function;
     case 'string':
-      return String;
+      return String$1;
     case 'object':
       if (value === null) {
         return Null;
@@ -236,7 +236,7 @@ const array = value => {
 };
 const string = value => {
   const type = getType(value);
-  if (type !== String) {
+  if (type !== String$1) {
     throw new AssertionError('expected value to be of type string');
   }
 };
@@ -1436,8 +1436,8 @@ const applyFileOperations = async operations => {
     }
     return '';
   } catch (error) {
-    console.error(new VError(error, `Failed to apply file operations`));
-    return `${error}`;
+    console.error(new VError(error, 'Failed to apply file operations'));
+    return String(error);
   }
 };
 
@@ -1717,12 +1717,7 @@ const toDisplayDirent = (parentPath, parentDepth, rawDirentType, rawDirentName,
 const toDisplayDirents = (pathSeparator, rawDirents, parentDirentPath, parentDirentDepth, excluded, expanded = false) => {
   rawDirents = sortExplorerItems(rawDirents);
   const result = [];
-  const visibleItems = rawDirents.filter(item => {
-    if (excluded.includes(item.name)) {
-      return false;
-    }
-    return true;
-  });
+  const visibleItems = rawDirents.filter(item => !excluded.includes(item.name));
   const count = visibleItems.length;
   for (let i = 0; i < visibleItems.length; i++) {
     const rawDirent = visibleItems[i];
@@ -1986,7 +1981,7 @@ const validateFileName2 = (name, siblingFileNames = []) => {
   }
 
   // Disallow reserved directory names
-  if (name === '.' || name === '..' || name === '...') {
+  if (['.', '..', '...'].includes(name)) {
     return theNameIsNotValid();
   }
 
@@ -2070,7 +2065,7 @@ const computeExplorerRenamedDirentUpdate = (root, parentPath, oldUri, children,
   update[relativeNewUri] = oldItems;
   for (const [key, value] of Object.entries(tree)) {
     if (key.startsWith(`${relativeOldPath}/`)) {
-      const newKey = `${relativeNewUri}` + key.slice(relativeOldPath.length);
+      const newKey = relativeNewUri + key.slice(relativeOldPath.length);
       update[newKey] = value;
     }
   }
@@ -2389,7 +2384,7 @@ const getPaths = items => {
 };
 
 const getSimpleIconRequestType = direntType => {
-  if (direntType === Directory || direntType === DirectoryExpanded || direntType === EditingDirectoryExpanded || direntType === EditingFolder) {
+  if ([Directory, DirectoryExpanded, EditingDirectoryExpanded, EditingFolder].includes(direntType)) {
     return 2;
   }
   return 1;
@@ -2630,12 +2625,12 @@ const getChildrenWithCount = (nodes, startIndex, childCount) => {
 };
 
 const compareNodes = (oldNode, newNode) => {
-  const patches = [];
   // Check if node type changed - return null to signal incompatible nodes
   // (caller should handle this with a Replace operation)
   if (oldNode.type !== newNode.type) {
     return null;
   }
+  const patches = [];
   // Handle reference nodes - special handling for uid changes
   if (oldNode.type === Reference) {
     if (oldNode.uid !== newNode.uid) {
@@ -2671,7 +2666,7 @@ const compareNodes = (oldNode, newNode) => {
   }
   // Check for removed attributes
   for (const key of oldKeys) {
-    if (!(key in newNode)) {
+    if (!Object.hasOwn(newNode, key)) {
       patches.push({
         type: RemoveAttribute,
         key
@@ -2689,11 +2684,78 @@ const treeToArray = node => {
   return result;
 };
 
+const navigateToChild = (patches, currentChildIndex, index) => {
+  if (currentChildIndex === -1) {
+    patches.push({
+      type: NavigateChild,
+      index
+    });
+    return index;
+  }
+  if (currentChildIndex !== index) {
+    patches.push({
+      type: NavigateSibling,
+      index
+    });
+  }
+  return index;
+};
+const navigateToParent = (patches, currentChildIndex) => {
+  if (currentChildIndex >= 0) {
+    patches.push({
+      type: NavigateParent
+    });
+  }
+  return -1;
+};
+const addTree = (newNode, patches) => {
+  patches.push({
+    type: Add,
+    nodes: treeToArray(newNode)
+  });
+};
+const replaceTree = (newNode, patches) => {
+  patches.push({
+    type: Replace,
+    nodes: treeToArray(newNode)
+  });
+};
+const diffExistingChild = (oldNode, newNode, patches, currentChildIndex, index) => {
+  const nodePatches = compareNodes(oldNode.node, newNode.node);
+  if (nodePatches === null) {
+    const nextChildIndex = navigateToChild(patches, currentChildIndex, index);
+    replaceTree(newNode, patches);
+    return nextChildIndex;
+  }
+  const hasChildrenToCompare = oldNode.children.length > 0 || newNode.children.length > 0;
+  if (nodePatches.length === 0 && !hasChildrenToCompare) {
+    return currentChildIndex;
+  }
+  const nextChildIndex = navigateToChild(patches, currentChildIndex, index);
+  if (nodePatches.length > 0) {
+    patches.push(...nodePatches);
+  }
+  if (hasChildrenToCompare) {
+    diffChildren(oldNode.children, newNode.children, patches);
+  }
+  return nextChildIndex;
+};
+const diffRootNode = (oldNode, newNode, patches) => {
+  const nodePatches = compareNodes(oldNode.node, newNode.node);
+  if (nodePatches === null) {
+    replaceTree(newNode, patches);
+    return;
+  }
+  if (nodePatches.length > 0) {
+    patches.push(...nodePatches);
+  }
+  if (oldNode.children.length > 0 || newNode.children.length > 0) {
+    diffChildren(oldNode.children, newNode.children, patches);
+  }
+};
 const diffChildren = (oldChildren, newChildren, patches) => {
   const maxLength = Math.max(oldChildren.length, newChildren.length);
-  // Track where we are: -1 means at parent, >= 0 means at child index
   let currentChildIndex = -1;
-  // Collect indices of children to remove (we'll add these patches at the end in reverse order)
   const indicesToRemove = [];
   for (let i = 0; i < maxLength; i++) {
     const oldNode = oldChildren[i];
@@ -2702,88 +2764,17 @@ const diffChildren = (oldChildren, newChildren, patches) => {
       continue;
     }
     if (!oldNode) {
-      // Add new node - we should be at the parent
-      if (currentChildIndex >= 0) {
-        // Navigate back to parent
-        patches.push({
-          type: NavigateParent
-        });
-        currentChildIndex = -1;
-      }
-      // Flatten the entire subtree so renderInternal can handle it
-      const flatNodes = treeToArray(newNode);
-      patches.push({
-        type: Add,
-        nodes: flatNodes
-      });
-    } else if (newNode) {
-      // Compare nodes to see if we need any patches
-      const nodePatches = compareNodes(oldNode.node, newNode.node);
-      // If nodePatches is null, the node types are incompatible - need to replace
-      if (nodePatches === null) {
-        // Navigate to this child
-        if (currentChildIndex === -1) {
-          patches.push({
-            type: NavigateChild,
-            index: i
-          });
-          currentChildIndex = i;
-        } else if (currentChildIndex !== i) {
-          patches.push({
-            type: NavigateSibling,
-            index: i
-          });
-          currentChildIndex = i;
-        }
-        // Replace the entire subtree
-        const flatNodes = treeToArray(newNode);
-        patches.push({
-          type: Replace,
-          nodes: flatNodes
-        });
-        // After replace, we're at the new element (same position)
-        continue;
-      }
-      // Check if we need to recurse into children
-      const hasChildrenToCompare = oldNode.children.length > 0 || newNode.children.length > 0;
-      // Only navigate to this element if we need to do something
-      if (nodePatches.length > 0 || hasChildrenToCompare) {
-        // Navigate to this child if not already there
-        if (currentChildIndex === -1) {
-          patches.push({
-            type: NavigateChild,
-            index: i
-          });
-          currentChildIndex = i;
-        } else if (currentChildIndex !== i) {
-          patches.push({
-            type: NavigateSibling,
-            index: i
-          });
-          currentChildIndex = i;
-        }
-        // Apply node patches (these apply to the current element, not children)
-        if (nodePatches.length > 0) {
-          patches.push(...nodePatches);
-        }
-        // Compare children recursively
-        if (hasChildrenToCompare) {
-          diffChildren(oldNode.children, newNode.children, patches);
-        }
-      }
-    } else {
-      // Remove old node - collect the index for later removal
+      currentChildIndex = navigateToParent(patches, currentChildIndex);
+      addTree(newNode, patches);
+      continue;
+    }
+    if (!newNode) {
       indicesToRemove.push(i);
+      continue;
     }
+    currentChildIndex = diffExistingChild(oldNode, newNode, patches, currentChildIndex, i);
   }
-  // Navigate back to parent if we ended at a child
-  if (currentChildIndex >= 0) {
-    patches.push({
-      type: NavigateParent
-    });
-  }
-  // Add remove patches in reverse order (highest index first)
-  // This ensures indices remain valid as we remove
+  navigateToParent(patches, currentChildIndex);
   for (let j = indicesToRemove.length - 1; j >= 0; j--) {
     patches.push({
       type: RemoveChild,
@@ -2792,33 +2783,11 @@ const diffChildren = (oldChildren, newChildren, patches) => {
   }
 };
 const diffTrees = (oldTree, newTree, patches, path) => {
-  // At the root level (path.length === 0), we're already AT the element
-  // So we compare the root node directly, then compare its children
   if (path.length === 0 && oldTree.length === 1 && newTree.length === 1) {
-    const oldNode = oldTree[0];
-    const newNode = newTree[0];
-    // Compare root nodes
-    const nodePatches = compareNodes(oldNode.node, newNode.node);
-    // If nodePatches is null, the root node types are incompatible - need to replace
-    if (nodePatches === null) {
-      const flatNodes = treeToArray(newNode);
-      patches.push({
-        type: Replace,
-        nodes: flatNodes
-      });
-      return;
-    }
-    if (nodePatches.length > 0) {
-      patches.push(...nodePatches);
-    }
-    // Compare children
-    if (oldNode.children.length > 0 || newNode.children.length > 0) {
-      diffChildren(oldNode.children, newNode.children, patches);
-    }
-  } else {
-    // Non-root level or multiple root elements - use the regular comparison
-    diffChildren(oldTree, newTree, patches);
+    diffRootNode(oldTree[0], newTree[0], patches);
+    return;
   }
+  diffChildren(oldTree, newTree, patches);
 };
 
 const removeTrailingNavigationPatches = patches => {
@@ -2897,6 +2866,12 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
   for (let i = minLineY; i < Math.min(maxLineY, items.length); i++) {
     const item = items[i];
     let chevron = getChevronType(item.type, useChevrons);
+    const isEditing = i === editingIndex;
+    let icon = icons[iconIndex++];
+    if (isEditing) {
+      icon = editingIcon;
+      chevron = getEditingChevron(item.type);
+    }
     const isFocused = i === focusedIndex;
     const id = isFocused ? 'TreeItemActive' : undefined;
     const isSelected = item.selected;
@@ -2908,12 +2883,6 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
     const className = getTreeItemClassName(isSelected, isFocused, isDropping, useChevrons, indent, decoration);
     const expanded = getExpandedType(item.type);
     const ariaExpanded = ariaExpandedValues[expanded];
-    const isEditing = i === editingIndex;
-    let icon = icons[iconIndex++];
-    if (isEditing) {
-      icon = editingIcon;
-      chevron = getEditingChevron(item.type);
-    }
     visible.push({
       ...item,
       ariaExpanded,
@@ -3850,7 +3819,7 @@ const OpenFolder = 'OpenFolder';
 const Refresh$1 = 'Refresh';
 
 const isFolder = direntType => {
-  return direntType === Directory || direntType === DirectoryExpanded || direntType === SymLinkFolder;
+  return [Directory, DirectoryExpanded, SymLinkFolder].includes(direntType);
 };
 const getFittingIndex = (dirents, startIndex) => {
   for (let i = startIndex; i >= 0; i--) {
@@ -4287,12 +4256,7 @@ const handleClickAt = async (state, defaultPrevented, button, ctrlKey, shiftKey,
   }
   const index = getIndexFromPosition(state, eventX, eventY);
   if (index === -1 || index >= state.items.length) {
-    return {
-      ...state,
-      focused: true,
-      focusedIndex: -1
-      // TODO mark all items as not selected
-    };
+    return focusIndex(state, -1);
   }
   if (shiftKey) {
     return handleClickAtRangeSelection(state, index);
@@ -4396,6 +4360,7 @@ const handleCopy = async state => {
   await writeNativeFiles('copy', files);
   return {
     ...state,
+    cutItems: [],
     pasteShouldMove: false
   };
 };
@@ -4884,11 +4849,7 @@ const getDroppedName = item => {
   return item.name;
 };
 const getFileSystemHandlesNormalized = fileSystemHandles => {
-  const normalized = [];
-  for (const item of fileSystemHandles) {
-    normalized.push(getFileSystemHandle(item));
-  }
-  return normalized;
+  return Array.from(fileSystemHandles, getFileSystemHandle);
 };
 const uploadFileSystemHandles = async (root, pathSeparator, fileSystemHandles) => {
   if (fileSystemHandles.length === 0) {
@@ -5186,6 +5147,9 @@ const handleEscape = async state => {
 };
 
 const handleFocus = async state => {
+  if (state.editingIndex !== -1) {
+    return state;
+  }
   return {
     ...state,
     focus: List
@@ -5265,7 +5229,7 @@ const isAscii = key => {
   return RE_ASCII.test(key);
 };
 
-let timeout;
+const typeAheadTimeout = {};
 const handleKeyDown = (state, key) => {
   const {
     focusedIndex,
@@ -5282,10 +5246,10 @@ const handleKeyDown = (state, key) => {
   const newFocusWord = focusWord + key.toLowerCase();
   const itemNames = items.map(item => item.name);
   const matchingIndex = filterByFocusWord(itemNames, focusedIndex, newFocusWord);
-  if (timeout) {
-    clearTimeout(timeout);
+  if (typeAheadTimeout.value) {
+    clearTimeout(typeAheadTimeout.value);
   }
-  timeout = setTimeout(async () => {
+  typeAheadTimeout.value = setTimeout(async () => {
     await invoke$2('Explorer.cancelTypeAhead');
   }, focusWordTimeout);
   if (matchingIndex === -1) {
@@ -5674,7 +5638,7 @@ const getContainingFolder = (root, dirents, focusedIndex, pathSeparator) => {
   const dirent = dirents[focusedIndex];
   const direntPath = dirent.path;
   const direntParentPath = direntPath.slice(0, -(dirent.name.length + 1));
-  const path = `${direntParentPath}`;
+  const path = direntParentPath;
   return path;
 };
 
@@ -5900,7 +5864,7 @@ const getDragLabel = urls => {
   if (urls.length === 1) {
     return getBaseName('/', urls[0]);
   }
-  return `${urls.length}`;
+  return String(urls.length);
 };
 
 const toUri = path => {
@@ -6716,6 +6680,8 @@ const saveState = state => {
   };
 };
 
+// TODO select all should only select all items in the current folder
+// and when calling it next item, expand selection to its parent folder
 const selectAll = state => {
   const {
     items
@@ -6817,7 +6783,7 @@ const getEditingIcon = async (editingType, value, direntType) => {
         name: value
       });
     }
-    if (direntType === Directory || direntType === EditingFolder || direntType === EditingDirectoryExpanded) {
+    if (direntType !== undefined && [Directory, EditingFolder, EditingDirectoryExpanded].includes(direntType)) {
       return invoke$2('IconTheme.getFolderIcon', {
         name: value
       });

package/package.json

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