@lvce-editor/explorer-view 7.28.0 → 7.30.0

package/dist/explorerViewWorkerMain.js

@@ -1443,12 +1443,13 @@ const getIcons = async iconRequests => {
 
 const {
   invoke: invoke$4,
+  invokeAndTransfer: invokeAndTransfer$2,
   set: set$6
 } = create$2(RendererProcess);
 
 const {
   invoke: invoke$3,
-  invokeAndTransfer,
+  invokeAndTransfer: invokeAndTransfer$1,
   set: set$5
 } = create$2(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
@@ -1458,21 +1459,17 @@ const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(y);
   await invoke$3('ContextMenu.show2', uid, menuId, x, y, args);
 };
-const sendMessagePortToDragAndDropWorker = async port => {
-  const command = 'DragAndDrop.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToDragAndDropWorker', port, command);
-};
 const sendMessagePortToDialogWorker = async port => {
   const command = 'HandleMessagePort.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToDialogWorker', port, command);
+  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToDialogWorker', port, command);
 };
 const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
   const command = 'IconTheme.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToIconThemeWorker', port, command, rpcId);
+  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToIconThemeWorker', port, command, rpcId);
 };
 const sendMessagePortToFileSystemWorker$1 = async (port, rpcId) => {
   const command = 'FileSystem.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSystemWorker', port, command, rpcId);
+  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSystemWorker', port, command, rpcId);
 };
 const confirm$1 = async (message, options) => {
   const result = await invoke$3('ConfirmPrompt.prompt', message, options);
@@ -1483,7 +1480,7 @@ const writeClipBoardText = async text => {
 };
 const sendMessagePortToSourceControlWorker = async port => {
   const command = 'SourceControl.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToSourceControlWorker', port, command, 0);
+  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToSourceControlWorker', port, command, 0);
 };
 const openUri$1 = async (uri, focus, options) => {
   await invoke$3('Main.openUri', {
@@ -1506,7 +1503,8 @@ const create$1 = () => {
   const commandQueues = new Map();
   const generations = Object.create(null);
   const states = Object.create(null);
-  const commandMapRef = {};
+  const commandMapRef = Object.create(null);
+  const commandsById = Object.create(null);
   const getGeneration = uid => generations[uid] || 0;
   const isCurrentGeneration = (uid, generation) => {
     return states[uid] !== undefined && getGeneration(uid) === generation;
@@ -1568,6 +1566,18 @@ const create$1 = () => {
         delete states[key];
       }
     },
+    createDirectEventCommandMap(requestRender) {
+      return {
+        async 'Viewlet.executeViewletCommand'(uid, command, ...args) {
+          const fn = commandsById[command];
+          if (!fn) {
+            throw new Error(`Viewlet command not found: ${command}`);
+          }
+          await fn(uid, ...args);
+          await requestRender(uid);
+        }
+      };
+    },
     diff(uid, modules, numbers) {
       const {
         oldState,
@@ -1599,6 +1609,9 @@ const create$1 = () => {
     },
     registerCommands(commandMap) {
       Object.assign(commandMapRef, commandMap);
+      for (const [key, fn] of Object.entries(commandMap)) {
+        commandsById[toCommandId(key)] = fn;
+      }
     },
     set(uid, oldState, newState, scheduledState) {
       const current = states[uid];
@@ -2315,6 +2328,9 @@ const isConnected = () => {
 const invoke = (method, ...params) => {
   return invoke$4(method, ...params);
 };
+const invokeAndTransfer = (method, ...params) => {
+  return invokeAndTransfer$2(method, ...params);
+};
 const requestPostRenderFocus = uid => {
   postRenderFocusRequests.add(uid);
 };
@@ -2637,10 +2653,15 @@ const cancelEditRename = (state, keepFocus) => {
   };
 };
 
-const getUpdatedChildren = (children, oldItems, newUri) => {
+const getUpdatedChildren = (children, previousChildren, oldUri, newUri, renamedChildren) => {
   const setSize = children.length;
+  const previousTypes = new Map(previousChildren.map(child => [child.name, normalizeDirentType(child.type)]));
+  const oldName = getBaseName('/', oldUri);
   return children.toSorted(compareDirent).map((child, index) => {
-    if (oldItems.length > 0 && child.path === newUri && child.type === Directory) {
+    const previousName = child.path === newUri ? oldName : child.name;
+    const previousType = previousTypes.get(previousName);
+    const wasExpanded = previousType === DirectoryExpanded || child.path === newUri && renamedChildren.length > 0;
+    if (wasExpanded && child.type === Directory) {
       return {
         ...child,
         posInSet: index + 1,
@@ -2662,7 +2683,8 @@ const computeExplorerRenamedDirentUpdate = (root, parentPath, oldUri, children,
   const relativeNewUri = newUri.slice(rootLength);
   const update = Object.create(null);
   const oldItems = tree[relativeOldPath] || [];
-  update[relativeDirname] = getUpdatedChildren(children, oldItems, newUri);
+  const previousChildren = tree[relativeDirname] || [];
+  update[relativeDirname] = getUpdatedChildren(children, previousChildren, oldUri, newUri, oldItems);
   update[relativeNewUri] = oldItems;
   for (const [key, value] of Object.entries(tree)) {
     if (!key.startsWith(`${relativeOldPath}/`)) {
@@ -2855,11 +2877,15 @@ const toCollapsedDirent = dirent => {
 
 const collapseAll = async state => {
   const {
-    items
+    editingIndex
   } = state;
+  const stateWithoutEdit = editingIndex === -1 ? state : await cancelEditInternal(state, true);
+  const {
+    items
+  } = stateWithoutEdit;
   const newDirents = items.filter(isTopLevel).map(toCollapsedDirent);
   return {
-    ...state,
+    ...stateWithoutEdit,
     expandedPaths: [],
     focusedIndex: 0,
     items: newDirents
@@ -4946,13 +4972,13 @@ const NewFolder$1 = 'NewFolder';
 const OpenFolder = 'OpenFolder';
 const Refresh$1 = 'Refresh';
 
-const isFolder = direntType => {
+const isFolder$1 = direntType => {
   return [Directory, DirectoryExpanded, SymLinkFolder].includes(direntType);
 };
 const getFittingIndex = (dirents, startIndex) => {
   for (let i = startIndex; i >= 0; i--) {
     const dirent = dirents[i];
-    if (dirent && isFolder(dirent.type)) {
+    if (dirent && isFolder$1(dirent.type)) {
       return i;
     }
   }
@@ -4995,7 +5021,14 @@ const getNewChildDirentsForNewDirent = async (items, depth, parentPath, direntTy
   return allChildDirents;
 };
 
-const getNewDirentsForNewDirent = async (items, focusedIndex, type, root, excluded = []) => {
+const isFolder = type => {
+  return [Directory, DirectoryExpanded, DirectoryExpanding, SymLinkFolder].includes(type);
+};
+const getTopLevelFileIndex = items => {
+  const topLevelDepth = items[0]?.depth;
+  return items.findIndex(item => item.depth === topLevelDepth && !isFolder(item.type));
+};
+const getNewDirentsForNewDirent = async (items, focusedIndex, type, root, excluded = [], insertAtFolderBoundary = false) => {
   if (items.length === 0 || focusedIndex === -1) {
     const newDirent = {
       depth: 0,
@@ -5010,7 +5043,14 @@ const getNewDirentsForNewDirent = async (items, focusedIndex, type, root, exclud
     if (type === EditingFolder) {
       return [newDirent, ...items];
     }
-    return [...items, newDirent];
+    if (!insertAtFolderBoundary) {
+      return [...items, newDirent];
+    }
+    const fileIndex = getTopLevelFileIndex(items);
+    if (fileIndex === -1) {
+      return [...items, newDirent];
+    }
+    return [...items.slice(0, fileIndex), newDirent, ...items.slice(fileIndex)];
   }
   const focusedItem = items[focusedIndex];
   if (!focusedItem) {
@@ -5060,7 +5100,6 @@ const getNewDirentType = editingType => {
 };
 
 const newDirent = async (state, editingType, editingIcon = '') => {
-  // TODO do it like vscode, select position between folders and files
   const {
     editingIndex,
     editingSessionId,
@@ -5074,7 +5113,7 @@ const newDirent = async (state, editingType, editingIcon = '') => {
   }
   const index = getFittingIndex(items, focusedIndex);
   const direntType = getNewDirentType(editingType);
-  const newDirents = await getNewDirentsForNewDirent(items, index, direntType, root, excluded);
+  const newDirents = await getNewDirentsForNewDirent(items, index, direntType, root, excluded, focusedIndex === -1);
   const newEditingIndex = newDirents.findIndex(item => item.type === EditingFile || item.type === EditingFolder);
   return {
     ...state,
@@ -8570,7 +8609,7 @@ const commandMap = {
 };
 
 const send$2 = async port => {
-  await sendMessagePortToDragAndDropWorker(port);
+  await invokeAndTransfer('DragAndDrop.handleMessagePort', port);
 };
 const createDragAndDropWorkerRpc = async () => {
   return create$4({

package/package.json

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