@lvce-editor/explorer-view 7.32.0 → 7.33.0

package/dist/explorerViewWorkerMain.js

@@ -1413,10 +1413,7 @@ const {
   invoke: invoke$6,
   set: set$9
 } = create$2(DragAndDropWorker);
-const getDroppedItems$1 = async (itemIds, isElectron) => {
-  return invoke$6('DragAndDrop.getDroppedItems', itemIds, isElectron);
-};
-const getDroppedItemsByDropId = async (dropId, isElectron) => {
+const getDroppedItemsByDropId$1 = async (dropId, isElectron) => {
   return invoke$6('DragAndDrop.getDroppedItemsByDropId', dropId, isElectron);
 };
 const discardDrop = async dropId => {
@@ -1459,6 +1456,9 @@ const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(y);
   await invoke$3('ContextMenu.show2', uid, menuId, x, y, args);
 };
+const getFileHandles = async fileIds => {
+  return invoke$3('FileHandles.get', fileIds);
+};
 const sendMessagePortToDialogWorker = async port => {
   const command = 'HandleMessagePort.handleMessagePort';
   await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToDialogWorker', port, command);
@@ -1780,9 +1780,6 @@ const readDirWithFileTypes = async uri => {
 const readFile = async uri => {
   return invoke$1('FileSystem.readFile', uri);
 };
-const getPathSeparator$1 = async root => {
-  return invoke$1('FileSystem.getPathSeparator', root);
-};
 const isReadonly = async root => {
   return invoke$1('FileSystem.isReadonly', root);
 };
@@ -5859,10 +5856,6 @@ const getFriendlyErrorMessage = (errorMessage, errorCode) => {
   }
 };
 
-const getPathSeparator = async root => {
-  return getPathSeparator$1(root);
-};
-
 const getRestoredDeltaY = savedState => {
   if (savedState && typeof savedState.deltaY === 'number') {
     return savedState.deltaY;
@@ -6054,10 +6047,8 @@ const loadContent = async (state, savedState) => {
   const root = getSavedRoot(savedState, workspacePath);
   const expandedPaths = getExpandedPaths(savedState, root, currentRoot, currentExpandedPaths, preserveExpandState);
   try {
-    // TODO path separator could be restored from saved state
-    const [pathSeparator, isReadonly$1] = await Promise.all([getPathSeparator(root),
-    // TODO only load path separator once
-    root === '' ? false : isReadonly(root)]);
+    const pathSeparator = Slash;
+    const isReadonly$1 = root === '' ? false : await isReadonly(root);
     const restoredDirents = await restoreExpandedState(expandedPaths, root, pathSeparator, excluded);
     const rawDeltaY = getRestoredDeltaY(savedState);
     const maxDeltaY = Math.max(restoredDirents.length * itemHeight - height, 0);
@@ -6170,30 +6161,11 @@ const getFileOperations = (root, uploadTree) => {
   return operations;
 };
 
-const isDroppedFile = item => {
-  return item.kind === 'file' && 'value' in item;
-};
-const getFileSystemHandle = item => {
-  if (isDroppedFile(item)) {
-    return item.value;
-  }
-  return item;
-};
-const getDroppedName = item => {
-  if (isDroppedFile(item)) {
-    return item.value.name;
-  }
-  return item.name;
-};
-const getFileSystemHandlesNormalized = fileSystemHandles => {
-  return Array.from(fileSystemHandles, getFileSystemHandle);
-};
 const uploadFileSystemHandles = async (root, pathSeparator, fileSystemHandles) => {
   if (fileSystemHandles.length === 0) {
     return true;
   }
-  const fileSystemHandlesNormalized = getFileSystemHandlesNormalized(fileSystemHandles);
-  const uploadTree = await createUploadTree(root, fileSystemHandlesNormalized);
+  const uploadTree = await createUploadTree(root, fileSystemHandles);
   const fileOperations = getFileOperations(root, uploadTree);
   await applyFileOperations(fileOperations);
 
@@ -6233,15 +6205,14 @@ const getFirstDroppedDirectory = (state, fileHandles) => {
   if (root !== '') {
     return undefined;
   }
-  for (const item of fileHandles) {
-    const fileHandle = getFileSystemHandle(item);
+  for (const fileHandle of fileHandles) {
     if (isDirectoryHandle(fileHandle)) {
       return fileHandle;
     }
   }
   return undefined;
 };
-const handleDrop$2 = async (state, fileHandles, files, paths) => {
+const handleDrop$2 = async (state, fileHandles, paths) => {
   const {
     excluded,
     items,
@@ -6278,7 +6249,9 @@ const getFileOperationsElectron = async (root, paths, fileHandles, pathSeparator
   const operations = [];
   for (let i = 0; i < paths.length; i++) {
     const fileHandle = fileHandles[i];
-    const name = getDroppedName(fileHandle);
+    const {
+      name
+    } = fileHandle;
     const path = paths[i];
     operations.push({
       from: path,
@@ -6290,9 +6263,8 @@ const getFileOperationsElectron = async (root, paths, fileHandles, pathSeparator
 };
 
 // TODO copy files in parallel
-const copyFilesElectron = async (root, fileHandles, files, paths) => {
-  const pathSeparator = await getPathSeparator$1(root);
-  const operations = await getFileOperationsElectron(root, paths, fileHandles, pathSeparator);
+const copyFilesElectron = async (root, fileHandles, paths) => {
+  const operations = await getFileOperationsElectron(root, paths, fileHandles, Slash);
   await applyFileOperations(operations);
 };
 
@@ -6320,14 +6292,14 @@ const getFirstDroppedDirectoryPath = (state, fileHandles, paths) => {
     return undefined;
   }
   for (let i = 0; i < fileHandles.length; i++) {
-    const fileHandle = getFileSystemHandle(fileHandles[i]);
+    const fileHandle = fileHandles[i];
     if (isDirectoryHandle(fileHandle)) {
       return paths[i];
     }
   }
   return undefined;
 };
-const handleDrop$1 = async (state, fileHandles, files, paths) => {
+const handleDrop$1 = async (state, fileHandles, paths) => {
   const {
     excluded,
     items,
@@ -6344,7 +6316,7 @@ const handleDrop$1 = async (state, fileHandles, files, paths) => {
       dropTargets: []
     };
   }
-  await copyFilesElectron(root, fileHandles, files, paths);
+  await copyFilesElectron(root, fileHandles, paths);
   const mergedDirents = await getMergedDirents$1(root, pathSeparator, items, excluded);
   return {
     ...state,
@@ -6480,7 +6452,7 @@ const getModule = isElectron => {
   }
   return handleDrop$2;
 };
-const handleDropRoot = async (state, fileHandles, files, paths) => {
+const handleDropRoot = async (state, fileHandles, paths) => {
   const {
     isReadonly,
     platform,
@@ -6494,7 +6466,7 @@ const handleDropRoot = async (state, fileHandles, files, paths) => {
   }
   const isElectron = platform === Electron;
   const fn = getModule(isElectron);
-  return fn(state, fileHandles, files, paths);
+  return fn(state, fileHandles, paths);
 };
 
 const getEndIndex = (items, index, dirent) => {
@@ -6514,7 +6486,7 @@ const getMergedDirents = (items, index, dirent, childDirents) => {
   }, ...childDirents, ...items.slice(endIndex)];
   return mergedDirents;
 };
-const handleDropIntoFolder = async (state, dirent, index, fileHandles, files, paths) => {
+const handleDropIntoFolder = async (state, dirent, index, fileHandles) => {
   const {
     excluded,
     items,
@@ -6531,17 +6503,17 @@ const handleDropIntoFolder = async (state, dirent, index, fileHandles, files, pa
     items: mergedDirents
   };
 };
-const handleDropIntoFile = (state, dirent, index, fileHandles, files, paths) => {
+const handleDropIntoFile = (state, dirent, index, fileHandles, paths) => {
   const {
     items
   } = state;
   const parentIndex = getParentStartIndex(items, index);
   if (parentIndex === -1) {
-    return handleDropRoot(state, fileHandles, files, paths);
+    return handleDropRoot(state, fileHandles, paths);
   }
-  return handleDropIndex(state, fileHandles, files, paths, parentIndex);
+  return handleDropIndex(state, fileHandles, paths, parentIndex);
 };
-const handleDropIndex = async (state, fileHandles, files, paths, index) => {
+const handleDropIndex = async (state, fileHandles, paths, index) => {
   const {
     isReadonly,
     items
@@ -6561,7 +6533,7 @@ const handleDropIndex = async (state, fileHandles, files, paths, index) => {
     case DirectoryExpanded:
       return handleDropIntoFolder(state, dirent, index, fileHandles);
     case File:
-      return handleDropIntoFile(state, dirent, index, fileHandles, files, paths);
+      return handleDropIntoFile(state, dirent, index, fileHandles, paths);
     default:
       return state;
   }
@@ -6576,10 +6548,9 @@ const getDropHandler = index => {
   }
 };
 
-const getDroppedItems = async (dropIdOrItemIds, isElectron) => {
-  const result = typeof dropIdOrItemIds === 'number' ? await getDroppedItemsByDropId(dropIdOrItemIds, isElectron) : await getDroppedItems$1(dropIdOrItemIds, isElectron);
+const toExplorerDroppedItems = (result, isElectron) => {
   const files = isElectron ? result.files : result.files.filter(file => file.handle);
-  const fileHandles = files.map(file => file.handle || {
+  const fileHandles = files.map(file => file.handle ?? {
     kind: file.kind,
     name: file.name
   });
@@ -6590,6 +6561,29 @@ const getDroppedItems = async (dropIdOrItemIds, isElectron) => {
     uris: result.uris
   };
 };
+const getDroppedItemsByDropId = async (dropId, isElectron) => {
+  const result = await getDroppedItemsByDropId$1(dropId, isElectron);
+  return toExplorerDroppedItems(result, isElectron);
+};
+const getClipboardItems = async (itemIds, isElectron) => {
+  const items = await getFileHandles(itemIds);
+  const files = items.filter(item => item.kind === 'file' || isElectron && item.kind === 'file-legacy');
+  const fileHandles = files.map(item => {
+    if (item.kind === 'file') {
+      return item.value;
+    }
+    return {
+      kind: 'file',
+      name: item.value.name
+    };
+  });
+  const paths = files.map(item => item.path ?? '');
+  return {
+    fileHandles,
+    paths,
+    uris: []
+  };
+};
 
 const directoryTypes$1 = new Set([Directory, DirectoryExpanded, DirectoryExpanding, EditingDirectoryExpanded, EditingFolder, SymLinkFolder]);
 const getDragUri = item => {
@@ -6616,7 +6610,7 @@ const getInternalDragPaths = (items, uris) => {
   return paths;
 };
 
-const handleDrop = async (state, x, y, dropIdOrFileIds) => {
+const handleDrop = async (state, x, y, dropId) => {
   const {
     isReadonly,
     items,
@@ -6624,9 +6618,7 @@ const handleDrop = async (state, x, y, dropIdOrFileIds) => {
     root
   } = state;
   if (isReadonly && root !== '') {
-    if (typeof dropIdOrFileIds === 'number') {
-      await discardDrop(dropIdOrFileIds);
-    }
+    await discardDrop(dropId);
     return state;
   }
   try {
@@ -6635,12 +6627,12 @@ const handleDrop = async (state, x, y, dropIdOrFileIds) => {
       fileHandles,
       paths,
       uris
-    } = await getDroppedItems(dropIdOrFileIds, isElectron);
+    } = await getDroppedItemsByDropId(dropId, isElectron);
     const internalPaths = getInternalDragPaths(items, uris);
     const droppedPaths = internalPaths.length > 0 ? internalPaths : paths;
     const index = getIndexFromPosition(state, x, y);
     const fn = getDropHandler(index);
-    const result = await fn(state, fileHandles, [], droppedPaths, index);
+    const result = await fn(state, fileHandles, droppedPaths, index);
     return result;
   } catch (error) {
     throw new VError(error, 'Failed to drop files');
@@ -7073,7 +7065,7 @@ const handleNativePaste = async (state, itemIds) => {
     const {
       fileHandles,
       paths
-    } = await getDroppedItems(itemIds, isElectron);
+    } = await getClipboardItems(itemIds, isElectron);
     if (isElectron) {
       const nativePaths = paths.filter(Boolean);
       if (nativePaths.length === 0) {
@@ -7086,7 +7078,7 @@ const handleNativePaste = async (state, itemIds) => {
       });
     }
     const handleDrop = getDropHandler(focusedIndex);
-    return handleDrop(state, fileHandles, [], paths, focusedIndex);
+    return handleDrop(state, fileHandles, paths, focusedIndex);
   } catch (error) {
     throw new VError(error, 'Failed to paste native files');
   }

package/package.json

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