@lvce-editor/explorer-view 2.55.0 → 2.57.0

package/dist/explorerViewWorkerMain.js

@@ -885,7 +885,7 @@ const WebWorkerRpcClient = {
 
 const CreateFolder$1 = 1;
 const CreateFile$1 = 2;
-const Copy$2 = 3;
+const Copy$1 = 3;
 const Rename$2 = 4;
 
 const rpcs = Object.create(null);
@@ -973,7 +973,7 @@ const applyOperation = operation => {
   if (operation.type === CreateFolder$1) {
     return mkdir(operation.path);
   }
-  if (operation.type === Copy$2) {
+  if (operation.type === Copy$1) {
     return copy$1(operation.from || '', operation.path);
   }
   if (operation.type === Rename$2) {
@@ -995,6 +995,23 @@ const applyFileOperations = async operations => {
   }
 };
 
+const DELTA_EDITING = 100;
+
+const BlockDevice = 1;
+const CharacterDevice = 2;
+const Directory = 3;
+const DirectoryExpanded = 4;
+const DirectoryExpanding = 5;
+const File = 7;
+const Socket = 8;
+const Symlink = 9;
+const SymLinkFile = 10;
+const SymLinkFolder = 11;
+const Unknown = 12;
+const EditingFile = File + DELTA_EDITING;
+const EditingFolder = Directory + DELTA_EDITING;
+const EditingDirectoryExpanded = DirectoryExpanded + DELTA_EDITING;
+
 const dirname = (pathSeparator, path) => {
   const index = path.lastIndexOf(pathSeparator);
   if (index === -1) {
@@ -1015,16 +1032,32 @@ const join2 = (path, childPath) => {
   return `${path}/${childPath}`;
 };
 
+const getActualType = (type, expanded) => {
+  const actualType = type === Directory && expanded ? DirectoryExpanded : type;
+  return actualType;
+};
 const createTree = (items, root) => {
   const tree = Object.create(null);
   const rootLength = root.length;
-  for (const item of items) {
+  const paths = items.map(item => {
     const relativePath = item.path.slice(rootLength);
     const dirname = dirname2(relativePath);
+    return dirname;
+  });
+  for (const item of items) {
+    const {
+      type,
+      name,
+      path
+    } = item;
+    const relativePath = path.slice(rootLength);
+    const dirname = dirname2(relativePath);
+    const isExpanded = paths.includes(relativePath);
+    const actualType = getActualType(type, isExpanded);
     tree[dirname] ||= [];
     tree[dirname].push({
-      name: item.name,
-      type: item.type
+      name,
+      type: actualType
     });
   }
   return tree;
@@ -1076,23 +1109,6 @@ const getPaths = items => {
   return items.map(getPath);
 };
 
-const DELTA_EDITING = 100;
-
-const BlockDevice = 1;
-const CharacterDevice = 2;
-const Directory = 3;
-const DirectoryExpanded = 4;
-const DirectoryExpanding = 5;
-const File = 7;
-const Socket = 8;
-const Symlink = 9;
-const SymLinkFile = 10;
-const SymLinkFolder = 11;
-const Unknown = 12;
-const EditingFile = File + DELTA_EDITING;
-const EditingFolder = Directory + DELTA_EDITING;
-const EditingDirectoryExpanded = DirectoryExpanded + DELTA_EDITING;
-
 const getSimpleIconRequestType = direntType => {
   if (direntType === Directory || direntType === DirectoryExpanded || direntType === EditingDirectoryExpanded || direntType === EditingFolder) {
     return 2;
@@ -1197,13 +1213,14 @@ const getPathParts = (root, uri, pathSeparator) => {
   const parts = [];
   let index = root.length - 1;
   let depth = 0;
-  while ((index = uri.indexOf('/', index + 1)) !== -1) {
+  while ((index = uri.indexOf(pathSeparator, index + 1)) !== -1) {
     const partUri = uri.slice(0, index);
     parts.push({
       path: partUri,
       depth: depth++,
       root,
-      pathSeparator
+      pathSeparator,
+      expanded: true
     });
   }
   return parts;
@@ -1310,14 +1327,14 @@ const sortExplorerItems = rawDirents => {
 };
 
 // TODO figure out whether this uses too much memory (name,path -> redundant, depth could be computed on demand)
-const toDisplayDirent = (parentPath, parentDepth, rawDirent, index, length) => {
-  const path = join2(parentPath, rawDirent.name);
+const toDisplayDirent = (parentPath, parentDepth, rawDirentType, rawDirentName, index, length) => {
+  const path = join2(parentPath, rawDirentName);
   return {
-    name: rawDirent.name,
+    name: rawDirentName,
     posInSet: index + 1,
     setSize: length,
     depth: parentDepth + 1,
-    type: rawDirent.type,
+    type: rawDirentType,
     path,
     // TODO storing absolute path might be too costly, could also store relative path here
     icon: '',
@@ -1325,7 +1342,7 @@ const toDisplayDirent = (parentPath, parentDepth, rawDirent, index, length) => {
   };
 };
 
-const toDisplayDirents = (pathSeparator, rawDirents, parentDirentPath, parentDirentDepth, excluded) => {
+const toDisplayDirents = (pathSeparator, rawDirents, parentDirentPath, parentDirentDepth, excluded, expanded = false) => {
   rawDirents = sortExplorerItems(rawDirents);
   const result = [];
   const visibleItems = rawDirents.filter(item => {
@@ -1337,7 +1354,7 @@ const toDisplayDirents = (pathSeparator, rawDirents, parentDirentPath, parentDir
   const count = visibleItems.length;
   for (let i = 0; i < visibleItems.length; i++) {
     const rawDirent = visibleItems[i];
-    result.push(toDisplayDirent(parentDirentPath, parentDirentDepth, rawDirent, i, count));
+    result.push(toDisplayDirent(parentDirentPath, parentDirentDepth, rawDirent.type, rawDirent.name, i, count));
   }
   return result;
 };
@@ -1443,11 +1460,12 @@ const i18nString = (key, placeholders = emptyObject) => {
 };
 
 const CollapseAllFoldersInExplorer = 'Collapse All Folders in Explorer';
-const Copy$1 = 'Copy';
+const Copy = 'Copy';
 const CopyPath = 'Copy Path';
 const CopyRelativePath = 'Copy Relative Path';
-const Cut$1 = 'Cut';
+const Cut = 'Cut';
 const Delete$1 = 'Delete';
+const FileNameCannotStartWithSlash = 'A file or folder name cannot start with a slash.';
 const FileOrFolderNameMustBeProvider = 'A file or folder name must be provided.';
 const FilesExplorer = 'Files Explorer';
 const NewFile$1 = 'New File...';
@@ -1474,10 +1492,10 @@ const openInIntegratedTerminal = () => {
   return i18nString(OpenInIntegratedTerminal);
 };
 const cut = () => {
-  return i18nString(Cut$1);
+  return i18nString(Cut);
 };
 const copy = () => {
-  return i18nString(Copy$1);
+  return i18nString(Copy);
 };
 const paste = () => {
   return i18nString(Paste);
@@ -1512,6 +1530,9 @@ const openFolder$1 = () => {
 const fileOrFolderNameMustBeProvided = () => {
   return i18nString(FileOrFolderNameMustBeProvider);
 };
+const fileCannotStartWithSlash = () => {
+  return i18nString(FileNameCannotStartWithSlash);
+};
 const typeAFileName = () => {
   return i18nString(TypeAFileName);
 };
@@ -1521,6 +1542,9 @@ const validateFileName2 = name => {
     const editingErrorMessage = fileOrFolderNameMustBeProvided();
     return editingErrorMessage;
   }
+  if (name.startsWith('/')) {
+    return fileCannotStartWithSlash();
+  }
   return '';
 };
 
@@ -1970,7 +1994,8 @@ const create2 = (uid, uri, x, y, width, height, args, parentUid, platform = 0) =
     handleOffset: 0,
     scrollBarActive: false,
     scrollBarHeight: 0,
-    confirmPaste: false
+    confirmPaste: false,
+    pasteShouldMove: false
   };
   set(uid, state, state);
 };
@@ -2017,7 +2042,8 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     handleOffset: 0,
     scrollBarActive: false,
     scrollBarHeight: 0,
-    confirmPaste: false
+    confirmPaste: false,
+    pasteShouldMove: false
   };
   set(state.uid, state, state);
   return state;
@@ -2355,7 +2381,7 @@ const focusPrevious = state => {
   }
 };
 
-const commandIds = ['acceptEdit', 'cancelEdit', 'cancelTypeAhead', 'collapseAll', 'copyPath', 'copyRelativePath', 'dispose', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'getMenuEntries2', 'getMouseActions', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleContextMenuKeyboard', 'handleCopy', 'handleDragLeave', 'handleDragOver', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleInputBlur', 'handleInputClick', 'handleInputKeyDown', 'handleKeyDown', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'removeDirent', 'rename', 'renameDirent', 'renderEventListeners', 'revealItem', 'revealItem', 'scrollDown', 'scrollUp', 'selectAll', 'selectDown', 'selectUp', 'setDeltaY', 'setSelectedIndices', 'updateEditingValue', 'updateIcons'];
+const commandIds = ['acceptEdit', 'cancelEdit', 'cancelTypeAhead', 'collapseAll', 'copyPath', 'copyRelativePath', 'dispose', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'handleCut', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'getMenuEntries2', 'getMouseActions', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleContextMenuKeyboard', 'handleCopy', 'handleDragLeave', 'handleDragOver', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleInputBlur', 'handleInputClick', 'handleInputKeyDown', 'handleKeyDown', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'removeDirent', 'rename', 'renameDirent', 'renderEventListeners', 'revealItem', 'revealItem', 'scrollDown', 'scrollUp', 'selectAll', 'selectDown', 'selectUp', 'setDeltaY', 'setSelectedIndices', 'updateEditingValue', 'updateIcons'];
 
 const getCommandIds = () => {
   return commandIds;
@@ -2511,7 +2537,7 @@ const menuEntryCut = {
   id: 'cut',
   label: cut(),
   flags: RestoreFocus,
-  command: /* TODO */'-1'
+  command: 'Explorer.handleCut'
 };
 const menuEntryCopy = {
   id: 'copy',
@@ -3102,7 +3128,28 @@ const handleCopy = async state => {
   // TODO handle copy error gracefully
   const files = [absolutePath];
   await writeNativeFiles('copy', files);
-  return state;
+  return {
+    ...state,
+    pasteShouldMove: false
+  };
+};
+
+const handleCut = async state => {
+  // TODO handle multiple files
+  // TODO if not file is selected, what happens?
+  const dirent = getFocusedDirent$1(state);
+  if (!dirent) {
+    console.error('[ViewletExplorer/handleCut] no dirent selected');
+    return state;
+  }
+  const absolutePath = dirent.path;
+  // TODO handle cut error gracefully
+  const files = [absolutePath];
+  await writeNativeFiles('cut', files);
+  return {
+    ...state,
+    pasteShouldMove: true
+  };
 };
 
 const handleDragLeave = state => {
@@ -3398,7 +3445,7 @@ const getFileOperationsElectron = async (root, paths, fileHandles) => {
     } = fileHandle;
     const path = paths[i];
     operations.push({
-      type: Copy$2,
+      type: Copy$1,
       path: join2(root, name),
       from: path
     });
@@ -3769,7 +3816,7 @@ const getFileOperationsCopy = (root, existingUris, files) => {
     const uniqueName = generateUniqueName(baseName, existingUris, root);
     const newUri = join2(root, uniqueName);
     operations.push({
-      type: Copy$2,
+      type: Copy$1,
       from: file,
       // TODO ensure file is uri
       path: newUri
@@ -3805,24 +3852,57 @@ const handlePasteCopy = async (state, nativeFiles) => {
     const firstNewFilePath = newFilePaths[0];
     const newFileIndex = getIndex(latestState.items, firstNewFilePath);
     if (newFileIndex !== -1) {
-      return adjustScrollAfterPaste(latestState, newFileIndex);
+      const adjustedState = adjustScrollAfterPaste(latestState, newFileIndex);
+      return {
+        ...adjustedState,
+        pasteShouldMove: false
+      };
     }
   }
   // If there are no items, ensure focusedIndex is 0
   if (latestState.items.length === 0) {
     return {
       ...latestState,
-      focusedIndex: 0
+      focusedIndex: 0,
+      pasteShouldMove: false
     };
   }
-  return latestState;
+  return {
+    ...latestState,
+    pasteShouldMove: false
+  };
 };
 
-const handlePasteCut = async (state, nativeFiles) => {
-  for (const source of nativeFiles.files) {
-    const target = `${state.root}${state.pathSeparator}${getBaseName(state.pathSeparator, source)}`;
-    await rename$1(source, target);
+const getOperations = (toUri, files) => {
+  const operations = [];
+  for (const file of files) {
+    const baseName = getBaseName('/', file);
+    const newUri = join2(toUri, baseName);
+    operations.push({
+      type: Rename$2,
+      from: file,
+      path: newUri
+    });
+  }
+  return operations;
+};
+const getTargetUri = (root, items, index) => {
+  if (index === -1) {
+    return root;
   }
+  return items[index].path;
+};
+const handlePasteCut = async (state, nativeFiles) => {
+  const {
+    root,
+    pathSeparator,
+    items,
+    focusedIndex
+  } = state;
+  // TODO root is not necessrily target uri
+  const targetUri = getTargetUri(root, items, focusedIndex);
+  const operations = getOperations(targetUri, nativeFiles.files);
+  await applyFileOperations(operations);
 
   // Refresh the state after cut operations
   const latestState = await refresh(state);
@@ -3830,36 +3910,23 @@ const handlePasteCut = async (state, nativeFiles) => {
   // Focus on the first pasted file and adjust scroll position
   if (nativeFiles.files.length > 0) {
     const firstPastedFile = nativeFiles.files[0];
-    const targetPath = `${state.root}${state.pathSeparator}${getBaseName(state.pathSeparator, firstPastedFile)}`;
+    const targetPath = `${root}${pathSeparator}${getBaseName(pathSeparator, firstPastedFile)}`;
     const pastedFileIndex = getIndex(latestState.items, targetPath);
     if (pastedFileIndex !== -1) {
-      return adjustScrollAfterPaste(latestState, pastedFileIndex);
+      const adjustedState = adjustScrollAfterPaste(latestState, pastedFileIndex);
+      return {
+        ...adjustedState,
+        pasteShouldMove: false
+      };
     }
   }
-  return latestState;
-};
-
-const handlePasteNone = async (state, nativeFiles) => {
-  console.error('[ViewletExplorer/handlePaste] no paths detected');
-  return state;
+  return {
+    ...latestState,
+    pasteShouldMove: false
+  };
 };
 
 const None$3 = 'none';
-const Copy = 'copy';
-const Cut = 'cut';
-
-const getPasteHandler = type => {
-  switch (type) {
-    case None$3:
-      return handlePasteNone;
-    case Copy:
-      return handlePasteCopy;
-    case Cut:
-      return handlePasteCut;
-    default:
-      throw new Error(`unexpected native paste type: ${type}`);
-  }
-};
 
 const handlePaste = async state => {
   const nativeFiles = await readNativeFiles();
@@ -3878,8 +3945,18 @@ const handlePaste = async state => {
   // TODO but what if a file is currently selected? Then maybe the parent folder
   // TODO but will it work if the folder is a symlink?
   // TODO handle error gracefully when copy fails
-  const fn = getPasteHandler(nativeFiles.type);
-  return fn(state, nativeFiles);
+
+  // If no files to paste, return original state unchanged
+  if (nativeFiles.type === None$3) {
+    return state;
+  }
+
+  // Use the pasteShouldMove flag to determine whether to cut or copy
+  if (state.pasteShouldMove) {
+    return handlePasteCut(state, nativeFiles);
+  } else {
+    return handlePasteCopy(state, nativeFiles);
+  }
 };
 
 const handlePointerDown = (state, button, x, y) => {
@@ -5427,6 +5504,7 @@ const commandMap = {
   'Explorer.handleContextMenu': wrapCommand(handleContextMenu),
   'Explorer.handleContextMenuKeyboard': wrapCommand(handleContextMenuKeyboard),
   'Explorer.handleCopy': wrapCommand(handleCopy),
+  'Explorer.handleCut': wrapCommand(handleCut),
   'Explorer.handleDragLeave': wrapCommand(handleDragLeave),
   'Explorer.handleDragOver': wrapCommand(handleDragOver),
   'Explorer.handleDrop': wrapCommand(handleDrop),

package/package.json

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