@lvce-editor/explorer-view 2.41.0 → 2.43.0

package/dist/explorerViewWorkerMain.js

@@ -761,7 +761,7 @@ const send = (transport, method, ...params) => {
   const message = create$4(method, params);
   transport.send(message);
 };
-const invoke$1 = (ipc, method, ...params) => {
+const invoke$3 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
 const invokeAndTransfer = (ipc, method, ...params) => {
@@ -794,7 +794,7 @@ const createRpc = ipc => {
       send(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke$1(ipc, method, ...params);
+      return invoke$3(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
       return invokeAndTransfer(ipc, method, ...params);
@@ -891,10 +891,14 @@ const RendererWorker = {
 };
 
 const {
-  invoke,
+  invoke: invoke$1,
   set: set$1
 } = RendererWorker;
 
+const invoke = async (method, ...params) => {
+  return invoke$1(method, ...params);
+};
+
 const remove = async dirent => {
   return invoke('FileSystem.remove', dirent);
 };
@@ -1001,92 +1005,6 @@ const CreateFile = 1;
 const CreateFolder = 2;
 const Rename$1 = 3;
 
-const emptyObject = {};
-const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
-const i18nString = (key, placeholders = emptyObject) => {
-  if (placeholders === emptyObject) {
-    return key;
-  }
-  const replacer = (match, rest) => {
-    return placeholders[rest];
-  };
-  return key.replaceAll(RE_PLACEHOLDER, replacer);
-};
-
-const CollapseAllFoldersInExplorer = 'Collapse All Folders in Explorer';
-const Copy$1 = 'Copy';
-const CopyPath = 'Copy Path';
-const CopyRelativePath = 'Copy Relative Path';
-const Cut$1 = 'Cut';
-const Delete$1 = 'Delete';
-const FileOrFolderNameMustBeProvider = 'A file or folder name must be provided.';
-const FilesExplorer = 'Files Explorer';
-const NewFile$1 = 'New File...';
-const NewFolder$1 = 'New Folder...';
-const OpenContainingFolder = 'Open Containing Folder';
-const OpenFolder = 'Open folder';
-const OpenInIntegratedTerminal = 'Open in integrated Terminal';
-const Paste = 'Paste';
-const RefreshExplorer = 'Refresh Explorer';
-const Rename = 'Rename';
-const TypeAFileName = 'Type file name. Press Enter to confirm or Escape to cancel.'; // TODO use keybinding
-const YouHaveNotYetOpenedAFolder = 'You have not yet opened a folder';
-
-const newFile$1 = () => {
-  return i18nString(NewFile$1);
-};
-const newFolder$1 = () => {
-  return i18nString(NewFolder$1);
-};
-const openContainingFolder$1 = () => {
-  return i18nString(OpenContainingFolder);
-};
-const openInIntegratedTerminal = () => {
-  return i18nString(OpenInIntegratedTerminal);
-};
-const cut = () => {
-  return i18nString(Cut$1);
-};
-const copy = () => {
-  return i18nString(Copy$1);
-};
-const paste = () => {
-  return i18nString(Paste);
-};
-const copyPath$1 = () => {
-  return i18nString(CopyPath);
-};
-const copyRelativePath$1 = () => {
-  return i18nString(CopyRelativePath);
-};
-const rename = () => {
-  return i18nString(Rename);
-};
-const deleteItem = () => {
-  return i18nString(Delete$1);
-};
-const refresh$1 = () => {
-  return i18nString(RefreshExplorer);
-};
-const collapseAll$1 = () => {
-  return i18nString(CollapseAllFoldersInExplorer);
-};
-const filesExplorer = () => {
-  return i18nString(FilesExplorer);
-};
-const youHaveNotYetOpenedAFolder = () => {
-  return i18nString(YouHaveNotYetOpenedAFolder);
-};
-const openFolder$1 = () => {
-  return i18nString(OpenFolder);
-};
-const fileOrFolderNameMustBeProvided = () => {
-  return i18nString(FileOrFolderNameMustBeProvider);
-};
-const typeAFileName = () => {
-  return i18nString(TypeAFileName);
-};
-
 const List = 1;
 const Input$1 = 2;
 
@@ -1163,7 +1081,7 @@ const requestFileIcons = async requests => {
     return [];
   }
   const simpleRequests = requests.map(toSimpleIconRequest);
-  const icons = await invoke('IconTheme.getIcons', simpleRequests);
+  const icons = await invoke$1('IconTheme.getIcons', simpleRequests);
   return icons;
 };
 
@@ -1447,6 +1365,100 @@ const treeToArray = (map, root) => {
   return items;
 };
 
+const emptyObject = {};
+const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
+const i18nString = (key, placeholders = emptyObject) => {
+  if (placeholders === emptyObject) {
+    return key;
+  }
+  const replacer = (match, rest) => {
+    return placeholders[rest];
+  };
+  return key.replaceAll(RE_PLACEHOLDER, replacer);
+};
+
+const CollapseAllFoldersInExplorer = 'Collapse All Folders in Explorer';
+const Copy$1 = 'Copy';
+const CopyPath = 'Copy Path';
+const CopyRelativePath = 'Copy Relative Path';
+const Cut$1 = 'Cut';
+const Delete$1 = 'Delete';
+const FileOrFolderNameMustBeProvider = 'A file or folder name must be provided.';
+const FilesExplorer = 'Files Explorer';
+const NewFile$1 = 'New File...';
+const NewFolder$1 = 'New Folder...';
+const OpenContainingFolder = 'Open Containing Folder';
+const OpenFolder = 'Open folder';
+const OpenInIntegratedTerminal = 'Open in integrated Terminal';
+const Paste = 'Paste';
+const RefreshExplorer = 'Refresh Explorer';
+const Rename = 'Rename';
+const TypeAFileName = 'Type file name. Press Enter to confirm or Escape to cancel.'; // TODO use keybinding
+const YouHaveNotYetOpenedAFolder = 'You have not yet opened a folder';
+
+const newFile$1 = () => {
+  return i18nString(NewFile$1);
+};
+const newFolder$1 = () => {
+  return i18nString(NewFolder$1);
+};
+const openContainingFolder$1 = () => {
+  return i18nString(OpenContainingFolder);
+};
+const openInIntegratedTerminal = () => {
+  return i18nString(OpenInIntegratedTerminal);
+};
+const cut = () => {
+  return i18nString(Cut$1);
+};
+const copy = () => {
+  return i18nString(Copy$1);
+};
+const paste = () => {
+  return i18nString(Paste);
+};
+const copyPath$1 = () => {
+  return i18nString(CopyPath);
+};
+const copyRelativePath$1 = () => {
+  return i18nString(CopyRelativePath);
+};
+const rename = () => {
+  return i18nString(Rename);
+};
+const deleteItem = () => {
+  return i18nString(Delete$1);
+};
+const refresh$1 = () => {
+  return i18nString(RefreshExplorer);
+};
+const collapseAll$1 = () => {
+  return i18nString(CollapseAllFoldersInExplorer);
+};
+const filesExplorer = () => {
+  return i18nString(FilesExplorer);
+};
+const youHaveNotYetOpenedAFolder = () => {
+  return i18nString(YouHaveNotYetOpenedAFolder);
+};
+const openFolder$1 = () => {
+  return i18nString(OpenFolder);
+};
+const fileOrFolderNameMustBeProvided = () => {
+  return i18nString(FileOrFolderNameMustBeProvider);
+};
+const typeAFileName = () => {
+  return i18nString(TypeAFileName);
+};
+
+const validateFileName2 = name => {
+  if (!name) {
+    const editingErrorMessage = fileOrFolderNameMustBeProvided();
+    return editingErrorMessage;
+  }
+  return '';
+};
+
 const acceptCreate = async (state, newDirentType, createFn) => {
   const {
     editingValue,
@@ -1460,11 +1472,8 @@ const acceptCreate = async (state, newDirentType, createFn) => {
     items
   } = state;
   const newFileName = editingValue;
-  if (!newFileName) {
-    // TODO show error message that file name must not be empty
-    // below input box
-    // await ErrorHandling.showErrorDialog(new Error('file name must not be empty'))
-    const editingErrorMessage = fileOrFolderNameMustBeProvided();
+  const editingErrorMessage = validateFileName2(newFileName);
+  if (editingErrorMessage) {
     return {
       ...state,
       editingErrorMessage
@@ -1511,12 +1520,22 @@ const acceptCreateFolder = async state => {
   return acceptCreate(state, Directory, mkdir);
 };
 
-const computeExplorerRenamedDirentUpdate = async (root, parentPath, parentDepth) => {
-  const children = await getChildDirents('/', parentPath, parentDepth, []);
-  const relativeDirname = parentPath.slice(root.length);
-  return {
-    [relativeDirname]: children
-  };
+const computeExplorerRenamedDirentUpdate = (root, parentPath, oldUri, children, tree, newUri) => {
+  const rootLength = root.length;
+  const relativeDirname = parentPath.slice(rootLength);
+  const relativeOldPath = oldUri.slice(rootLength);
+  const relativeNewUri = newUri.slice(rootLength);
+  const update = Object.create(null);
+  update[relativeDirname] = children;
+  const oldItems = tree[relativeOldPath] || [];
+  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;
+    }
+  }
+  return update;
 };
 
 const createNewDirentsRename = async (renamedDirent, editingValue, pathSeparator) => {
@@ -1552,15 +1571,24 @@ const acceptRename = async state => {
     itemHeight,
     fileIconCache
   } = state;
+  const editingErrorMessage = validateFileName2(editingValue);
+  if (editingErrorMessage) {
+    return {
+      ...state,
+      editingErrorMessage
+    };
+  }
   const renamedDirent = items[editingIndex];
   const successful = await createNewDirentsRename(renamedDirent, editingValue);
   if (!successful) {
     return state;
   }
-  const dirname = dirname2(renamedDirent.path);
+  const oldUri = renamedDirent.path;
+  const dirname = dirname2(oldUri);
   const newUri = join2(dirname, editingValue);
-  const update = await computeExplorerRenamedDirentUpdate(root, dirname, renamedDirent.depth - 1);
+  const children = await getChildDirents('/', dirname, renamedDirent.depth - 1, []);
   const tree = createTree(items, root);
+  const update = computeExplorerRenamedDirentUpdate(root, dirname, oldUri, children, tree, newUri);
   const newTree = updateTree2(tree, update);
   const newDirents = treeToArray(newTree, root);
   const newFocusedIndex = getIndex(newDirents, newUri);
@@ -1581,7 +1609,9 @@ const acceptRename = async state => {
     focus: List,
     items: newDirents,
     icons,
-    fileIconCache: newFileIconCache
+    fileIconCache: newFileIconCache,
+    editingSelectionEnd: 0,
+    editingSelectionStart: 0
   };
 };
 
@@ -1656,7 +1686,9 @@ const cancelEditRename = (state, keepFocus) => {
     editingValue: '',
     editingType: None$5,
     editingErrorMessage: '',
-    focus: List
+    focus: List,
+    editingSelectionStart: 0,
+    editingSelectionEnd: 0
   };
 };
 
@@ -1691,14 +1723,27 @@ const toCollapsedDirent = dirent => {
   return dirent;
 };
 
-const collapseAll = state => {
+const collapseAll = async state => {
   const {
+    minLineY,
+    height,
+    itemHeight,
+    fileIconCache,
     items
   } = state;
   const newDirents = items.filter(isTopLevel).map(toCollapsedDirent);
+  const dirents = newDirents;
+  const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, dirents.length);
+  const visible = dirents.slice(minLineY, maxLineY);
+  const {
+    icons,
+    newFileIconCache
+  } = await getFileIcons(visible, fileIconCache);
   return {
     ...state,
-    items: newDirents
+    items: newDirents,
+    icons,
+    fileIconCache: newFileIconCache
   };
 };
 
@@ -1722,13 +1767,13 @@ const copyPath = async state => {
 };
 
 const writeText = async text => {
-  await invoke('ClipBoard.writeText', /* text */text);
+  await invoke$1('ClipBoard.writeText', /* text */text);
 };
 const readNativeFiles = async () => {
-  return invoke('ClipBoard.readNativeFiles');
+  return invoke$1('ClipBoard.readNativeFiles');
 };
 const writeNativeFiles = async (type, files) => {
-  return invoke('ClipBoard.writeNativeFiles', type, files);
+  return invoke$1('ClipBoard.writeNativeFiles', type, files);
 };
 
 const copyRelativePath = async state => {
@@ -1844,10 +1889,8 @@ const create2 = (uid, uri, x, y, width, height, args, parentUid, platform = 0) =
     focus: 0,
     editingErrorMessage: '',
     inputSource: 0,
-    editingSelection: {
-      start: 0,
-      end: 0
-    },
+    editingSelectionEnd: 0,
+    editingSelectionStart: 0,
     focusWord: '',
     focusWordTimeout: 800,
     finalDeltaY: 0,
@@ -1891,10 +1934,8 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     focus: 0,
     editingErrorMessage: '',
     inputSource: 0,
-    editingSelection: {
-      start: 0,
-      end: 0
-    },
+    editingSelectionStart: 0,
+    editingSelectionEnd: 0,
     focusWord: '',
     focusWordTimeout: 800,
     finalDeltaY: 0,
@@ -1924,7 +1965,7 @@ const isEqual$3 = (oldState, newState) => {
 
 const diffType$1 = RenderSelection;
 const isEqual$2 = (oldState, newState) => {
-  return oldState.editingSelection.start === newState.editingSelection.start && oldState.editingSelection.end === newState.editingSelection.end;
+  return oldState.editingSelectionStart === newState.editingSelectionStart && oldState.editingSelectionEnd === newState.editingSelectionEnd;
 };
 
 const diffType = RenderValue;
@@ -2615,7 +2656,7 @@ const handleArrowRightDirectoryExpanded = (state, dirent) => {
 };
 
 const setFocus = key => {
-  return invoke('Focus.setFocus', key);
+  return invoke$1('Focus.setFocus', key);
 };
 
 const handleClickDirectory = async (state, dirent, index, keepFocus) => {
@@ -2664,7 +2705,7 @@ const handleClickDirectory = async (state, dirent, index, keepFocus) => {
 };
 
 const openUri = async (uri, focus) => {
-  await invoke(/* Main.openAbsolutePath */'Main.openUri', /* absolutePath */uri, /* focus */focus);
+  await invoke$1(/* Main.openAbsolutePath */'Main.openUri', /* absolutePath */uri, /* focus */focus);
 };
 
 const handleClickFile = async (state, dirent, index, keepFocus = false) => {
@@ -2925,7 +2966,7 @@ const handleClickOpenFolder = async state => {
 };
 
 const show = async (x, y, id, ...args) => {
-  return invoke('ContextMenu.show', x, y, id, ...args);
+  return invoke$1('ContextMenu.show', x, y, id, ...args);
 };
 
 const Explorer$1 = 4;
@@ -3074,8 +3115,12 @@ const getExpandedDirents = items => {
 const getPathDirentsMap = async allPaths => {
   const pathToDirents = Object.create(null);
   await Promise.all(allPaths.map(async path => {
-    const dirents = await readDirWithFileTypes(path);
-    pathToDirents[path] = dirents;
+    try {
+      const dirents = await readDirWithFileTypes(path);
+      pathToDirents[path] = dirents;
+    } catch {
+      // ignore
+    }
   }));
   return pathToDirents;
 };
@@ -3431,12 +3476,12 @@ const getFileArray = fileList => {
 };
 
 const getFileHandles = async fileIds => {
-  const files = await invoke('FileSystemHandle.getFileHandles', fileIds);
+  const files = await invoke$1('FileSystemHandle.getFileHandles', fileIds);
   return files;
 };
 
 const getFilePathElectron = async file => {
-  return invoke('FileSystemHandle.getFilePathElectron', file);
+  return invoke$1('FileSystemHandle.getFilePathElectron', file);
 };
 
 const getFilepath = async file => {
@@ -3563,7 +3608,7 @@ const handleKeyDown = (state, key) => {
   // @ts-ignore
   // eslint-disable-next-line  @typescript-eslint/no-misused-promises
   timeout = setTimeout(async () => {
-    await invoke('Explorer.cancelTypeAhead');
+    await invoke$1('Explorer.cancelTypeAhead');
   }, focusWordTimeout);
   if (matchingIndex === -1) {
     return {
@@ -3758,11 +3803,11 @@ const handleWheel = (state, deltaMode, deltaY) => {
 };
 
 const getWorkspacePath = () => {
-  return invoke('Workspace.getPath');
+  return invoke$1('Workspace.getPath');
 };
 
 const getSettings = async () => {
-  const useChevronsRaw = await invoke('Preferences.get', 'explorer.useChevrons');
+  const useChevronsRaw = await invoke$1('Preferences.get', 'explorer.useChevrons');
   const useChevrons = useChevronsRaw === false ? false : true;
   return {
     useChevrons
@@ -4083,7 +4128,7 @@ const getContainingFolder = (root, dirents, focusedIndex, pathSeparator) => {
 };
 
 const openNativeFolder = async path => {
-  await invoke('OpenNativeFolder.openNativeFolder', /* path */path);
+  await invoke$1('OpenNativeFolder.openNativeFolder', /* path */path);
 };
 
 const openContainingFolder = async state => {
@@ -4127,10 +4172,18 @@ const removeDirent = async state => {
   return newState;
 };
 
+const getEditingType = direntType => {
+  if (direntType < DELTA_EDITING) {
+    return direntType + DELTA_EDITING;
+  }
+  return direntType;
+};
+
 const getNewDirentsForRename = (items, focusedIndex) => {
   const item = items[focusedIndex];
   const newItems = [...items];
-  const editingType = item.type === File ? EditingFile : EditingFolder;
+  const editingType = getEditingType(item.type);
+  // TODO avoid mutation
   newItems[focusedIndex] = {
     ...item,
     type: editingType
@@ -4138,6 +4191,20 @@ const getNewDirentsForRename = (items, focusedIndex) => {
   return newItems;
 };
 
+const getRenameSelectionRange = name => {
+  const dotIndex = name.lastIndexOf('.');
+  if (dotIndex === -1) {
+    return {
+      start: 0,
+      end: name.length
+    };
+  }
+  return {
+    start: 0,
+    end: dotIndex
+  };
+};
+
 const User = 1;
 const Script = 2;
 
@@ -4153,6 +4220,10 @@ const renameDirent = state => {
   }
   const item = items[focusedIndex];
   const newItems = getNewDirentsForRename(items, focusedIndex);
+  const {
+    start,
+    end
+  } = getRenameSelectionRange(item.name);
   return {
     ...state,
     items: newItems,
@@ -4160,21 +4231,24 @@ const renameDirent = state => {
     editingType: Rename$1,
     editingValue: item.name,
     editingIcon: icons[focusedIndex - minLineY],
-    editingSelection: {
-      start: 0,
-      end: item.name.length
-    },
+    editingSelectionStart: start,
+    editingSelectionEnd: end,
     focus: Input$1,
     inputSource: Script
   };
 };
 
+const ExplorerInput = 'ExplorerInput';
+
 const renderEditingSelection = (oldState, newState) => {
-  return ['Viewlet.setSelection', newState.editingSelection];
+  const {
+    editingSelectionStart,
+    editingSelectionEnd,
+    uid
+  } = newState;
+  return ['Viewlet.setSelectionByName', uid, ExplorerInput, editingSelectionStart, editingSelectionEnd];
 };
 
-const ExplorerInput = 'ExplorerInput';
-
 const renderFocus$1 = (oldState, newState) => {
   if (newState.inputSource === User) {
     return [];
@@ -4682,10 +4756,6 @@ const getRenderer = diffType => {
 const applyRender = (oldState, newState, diffResult) => {
   const commands = [];
   for (const item of diffResult) {
-    if (item === RenderSelection) {
-      // TODO support this in the future
-      continue;
-    }
     const fn = getRenderer(item);
     const result = fn(oldState, newState);
     if (result.length > 0) {
@@ -5114,24 +5184,24 @@ const terminate = () => {
 
 const getEditingIcon = async (editingType, value, direntType) => {
   if (editingType === CreateFile) {
-    return invoke('IconTheme.getFileIcon', {
+    return invoke$1('IconTheme.getFileIcon', {
       name: value
     });
   }
   if (editingType === Rename$1) {
     if (direntType === File || direntType === EditingFile) {
-      return invoke('IconTheme.getFileIcon', {
+      return invoke$1('IconTheme.getFileIcon', {
         name: value
       });
     }
-    if (direntType === Directory || direntType === EditingFolder) {
-      return invoke('IconTheme.getFolderIcon', {
+    if (direntType === Directory || direntType === EditingFolder || direntType === EditingDirectoryExpanded) {
+      return invoke$1('IconTheme.getFolderIcon', {
         name: value
       });
     }
   }
   if (editingType === CreateFolder) {
-    return invoke('IconTheme.getFolderIcon', {
+    return invoke$1('IconTheme.getFolderIcon', {
       name: value
     });
   }
@@ -5145,10 +5215,12 @@ const updateEditingValue = async (state, value, inputSource = User) => {
     editingIndex
   } = state;
   const editingIcon = await getEditingIcon(editingType, value, items[editingIndex]?.type);
+  const editingErrorMessage = validateFileName2(value);
   return {
     ...state,
     editingValue: value,
-    editingIcon
+    editingIcon,
+    editingErrorMessage
   };
 };
 

package/package.json

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