@lvce-editor/explorer-view 7.21.3 → 7.23.0

package/dist/explorerViewWorkerMain.js

@@ -1074,7 +1074,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$9 = (id, rpc) => {
+const set$b = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1107,7 +1107,7 @@ const create$2 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$9(rpcId, mockRpc);
+      set$b(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove$1(rpcId);
@@ -1116,7 +1116,7 @@ const create$2 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$9(rpcId, rpc);
+      set$b(rpcId, rpc);
     }
   };
 };
@@ -1329,6 +1329,7 @@ const DialogWorker = 7014;
 const DragAndDropWorker = 3404;
 const FileSystemWorker$1 = 209;
 const IconThemeWorker = 7009;
+const RendererProcess = 1670;
 const RendererWorker = 1;
 const SourceControlWorker = 66;
 
@@ -1343,36 +1344,41 @@ const FocusExplorer = 13;
 const FocusExplorerEditBox = 14;
 
 const {
-  invoke: invoke$5,
-  set: set$8
+  invoke: invoke$7,
+  set: set$a
 } = create$2(DialogWorker);
 
 const {
-  invoke: invoke$4,
-  set: set$7
+  invoke: invoke$6,
+  set: set$9
 } = create$2(DragAndDropWorker);
 const getDroppedItems$1 = async (itemIds, isElectron) => {
-  return invoke$4('DragAndDrop.getDroppedItems', itemIds, isElectron);
+  return invoke$6('DragAndDrop.getDroppedItems', itemIds, isElectron);
 };
 
 const {
-  set: set$6
+  set: set$8
 } = create$2(FileSystemWorker$1);
 
 const FileSystemWorker = {
   __proto__: null,
-  set: set$6
+  set: set$8
 };
 
 const {
-  invoke: invoke$3,
-  set: set$5
+  invoke: invoke$5,
+  set: set$7
 } = create$2(IconThemeWorker);
 const getIcons = async iconRequests => {
   // @ts-ignore
-  return invoke$3('IconTheme.getIcons', iconRequests);
+  return invoke$5('IconTheme.getIcons', iconRequests);
 };
 
+const {
+  invoke: invoke$4,
+  set: set$6
+} = create$2(RendererProcess);
+
 class AssertionError extends Error {
   constructor(message) {
     super(message);
@@ -1435,16 +1441,16 @@ const string = value => {
 };
 
 const {
-  invoke: invoke$2,
+  invoke: invoke$3,
   invokeAndTransfer,
-  set: set$4
+  set: set$5
 } = create$2(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
   number(x);
   number(y);
-  await invoke$2('ContextMenu.show2', uid, menuId, x, y, args);
+  await invoke$3('ContextMenu.show2', uid, menuId, x, y, args);
 };
 const sendMessagePortToDragAndDropWorker = async port => {
   const command = 'DragAndDrop.handleMessagePort';
@@ -1463,18 +1469,18 @@ const sendMessagePortToFileSystemWorker$1 = async (port, rpcId) => {
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSystemWorker', port, command, rpcId);
 };
 const confirm$1 = async (message, options) => {
-  const result = await invoke$2('ConfirmPrompt.prompt', message, options);
+  const result = await invoke$3('ConfirmPrompt.prompt', message, options);
   return result;
 };
 const writeClipBoardText = async text => {
-  await invoke$2('ClipBoard.writeText', /* text */text);
+  await invoke$3('ClipBoard.writeText', /* text */text);
 };
 const sendMessagePortToSourceControlWorker = async port => {
   const command = 'SourceControl.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToSourceControlWorker', port, command, 0);
 };
 const openUri$1 = async (uri, focus, options) => {
-  await invoke$2('Main.openUri', {
+  await invoke$3('Main.openUri', {
     ...options,
     focus,
     uri
@@ -1482,8 +1488,8 @@ const openUri$1 = async (uri, focus, options) => {
 };
 
 const {
-  invoke: invoke$1,
-  set: set$3
+  invoke: invoke$2,
+  set: set$4
 } = create$2(SourceControlWorker);
 
 const toCommandId = key => {
@@ -1739,45 +1745,45 @@ const Rename$2 = 4;
 const Remove = 5;
 
 // TODO use direct connection
-const invoke = async (method, ...params) => {
-  return invoke$2(method, ...params);
+const invoke$1 = async (method, ...params) => {
+  return invoke$3(method, ...params);
 };
 const {
-  set: set$2
+  set: set$3
 } = FileSystemWorker;
 
 const remove = async dirent => {
-  return invoke('FileSystem.remove', dirent);
+  return invoke$1('FileSystem.remove', dirent);
 };
 const readDirWithFileTypes = async uri => {
-  return invoke('FileSystem.readDirWithFileTypes', uri);
+  return invoke$1('FileSystem.readDirWithFileTypes', uri);
 };
 const readFile = async uri => {
-  return invoke('FileSystem.readFile', uri);
+  return invoke$1('FileSystem.readFile', uri);
 };
 const getPathSeparator$1 = async root => {
-  return invoke('FileSystem.getPathSeparator', root);
+  return invoke$1('FileSystem.getPathSeparator', root);
 };
 const isReadonly = async root => {
-  return invoke('FileSystem.isReadonly', root);
+  return invoke$1('FileSystem.isReadonly', root);
 };
 const getRealPath = async path => {
-  return invoke('FileSystem.getRealPath', path);
+  return invoke$1('FileSystem.getRealPath', path);
 };
 const stat = async dirent => {
-  return invoke('FileSystem.stat', dirent);
+  return invoke$1('FileSystem.stat', dirent);
 };
 const writeFile = async (uri, content) => {
-  return invoke('FileSystem.writeFile', uri, content);
+  return invoke$1('FileSystem.writeFile', uri, content);
 };
 const mkdir = async uri => {
-  return invoke('FileSystem.mkdir', uri);
+  return invoke$1('FileSystem.mkdir', uri);
 };
 const rename$1 = async (oldUri, newUri) => {
-  return invoke('FileSystem.rename', oldUri, newUri);
+  return invoke$1('FileSystem.rename', oldUri, newUri);
 };
 const copy$1 = async (oldUri, newUri) => {
-  return invoke('FileSystem.copy', oldUri, newUri);
+  return invoke$1('FileSystem.copy', oldUri, newUri);
 };
 
 const applyOperation = operation => {
@@ -2268,7 +2274,7 @@ const mergeTrees = (a, b) => {
 
 const openUri = async (uri, focus, options) => {
   if (options) {
-    await invoke$2('Main.openInput', {
+    await invoke$3('Main.openInput', {
       editorInput: {
         type: 'editor',
         uri
@@ -2284,7 +2290,7 @@ const openUri = async (uri, focus, options) => {
 const refreshWorkspace = async () => {
   // TODO maybe pass an application id to this?
   try {
-    await invoke$2('Layout.handleWorkspaceRefresh');
+    await invoke$3('Layout.handleWorkspaceRefresh');
   } catch {
     // ignore
   }
@@ -2861,10 +2867,10 @@ const writeText = async text => {
   await writeClipBoardText(text);
 };
 const readNativeFiles = async () => {
-  return invoke$2('ClipBoard.readNativeFiles');
+  return invoke$3('ClipBoard.readNativeFiles');
 };
 const writeNativeFiles = async (type, files) => {
-  return invoke$2('ClipBoard.writeNativeFiles', type, files);
+  return invoke$3('ClipBoard.writeNativeFiles', type, files);
 };
 
 const getRelativePath = (root, pathSeparator, path) => {
@@ -2892,21 +2898,21 @@ const copyRelativePath = async state => {
 };
 
 const missingDialogWorkerRelay = 'Command "SendMessagePortToExtensionHostWorker.sendMessagePortToDialogWorker" not found';
-const state = {
+const state$1 = {
   isTest: false
 };
 const setIsTest = value => {
-  state.isTest = value;
+  state$1.isTest = value;
 };
 const confirm = async message => {
   const {
     isTest
-  } = state;
+  } = state$1;
   if (isTest) {
     return confirm$1(message);
   }
   try {
-    return await invoke$5('ConfirmPrompt.prompt', message, undefined);
+    return await invoke$7('ConfirmPrompt.prompt', message, undefined);
   } catch (error) {
     if (!String(error).includes(missingDialogWorkerRelay)) {
       throw error;
@@ -2916,7 +2922,7 @@ const confirm = async message => {
 };
 
 const commandCompletions = new WeakMap();
-const set$1 = (state, completion) => {
+const set$2 = (state, completion) => {
   commandCompletions.set(state, completion);
   return state;
 };
@@ -3709,7 +3715,7 @@ const {
   get,
   getCommandIds,
   registerCommands,
-  set,
+  set: set$1,
   wrapGetter
 } = create$1();
 const commandQueues = new Map();
@@ -3787,10 +3793,10 @@ const wrapListItemCommandInternal = (fn, queued) => {
       useChevrons
     } = updatedState;
     const intermediate = get(id);
-    set(id, intermediate.oldState, updatedState, intermediate.scheduledState);
+    set$1(id, intermediate.oldState, updatedState, intermediate.scheduledState);
     if (hasSameVisibleExplorerItemInputs(intermediate.newState, updatedState)) {
       if (updatedState.inputSource === User) {
-        set(id, intermediate.oldState, updatedState);
+        set$1(id, intermediate.oldState, updatedState);
       }
       return {
         completion
@@ -3811,7 +3817,7 @@ const wrapListItemCommandInternal = (fn, queued) => {
       visibleExplorerItems
     };
     const intermediate2 = get(id);
-    set(id, intermediate2.oldState, finalState);
+    set$1(id, intermediate2.oldState, finalState);
     return {
       completion
     };
@@ -3909,7 +3915,7 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0, ass
     x,
     y
   };
-  set(state.uid, state, state);
+  set$1(state.uid, state, state);
   return state;
 };
 
@@ -4656,7 +4662,7 @@ const handleClickFile = async (state, dirent, index, keepFocus = false) => {
     focused: keepFocus,
     focusedIndex: index
   };
-  return set$1(newState, completion);
+  return set$2(newState, completion);
 };
 
 const handleClickSymLink = async (state, dirent, index) => {
@@ -4867,24 +4873,24 @@ const newFile = state => {
 
 const getEditingIcon = async (editingType, value, direntType) => {
   if (editingType === CreateFile) {
-    return invoke$2('IconTheme.getFileIcon', {
+    return invoke$3('IconTheme.getFileIcon', {
       name: value
     });
   }
   if (editingType === Rename$1) {
     if (direntType === File || direntType === EditingFile) {
-      return invoke$2('IconTheme.getFileIcon', {
+      return invoke$3('IconTheme.getFileIcon', {
         name: value
       });
     }
     if (direntType !== undefined && [Directory, EditingFolder, EditingDirectoryExpanded].includes(direntType)) {
-      return invoke$2('IconTheme.getFolderIcon', {
+      return invoke$3('IconTheme.getFolderIcon', {
         name: value
       });
     }
   }
   if (editingType === CreateFolder) {
-    return invoke$2('IconTheme.getFolderIcon', {
+    return invoke$3('IconTheme.getFolderIcon', {
       name: value
     });
   }
@@ -5128,7 +5134,7 @@ const handleClick = async (state, index, keepFocus = false) => {
     ...newState,
     ...resetEditing
   };
-  return completion ? set$1(finalState, completion) : finalState;
+  return completion ? set$2(finalState, completion) : finalState;
 };
 
 // export const handleBlur=()=>{}
@@ -5243,7 +5249,7 @@ const handleClickCurrentButKeepFocus = state => {
 };
 
 const openFolder = async () => {
-  await invoke$2(`Dialog.openFolder`);
+  await invoke$3(`Dialog.openFolder`);
 };
 
 const handleClickOpenFolder = async state => {
@@ -5276,7 +5282,7 @@ const handleContextMenuAtIndex = async (state, index, x, y) => {
     focusedIndex: index,
     items: newItems
   };
-  set(uid, state, newState);
+  set$1(uid, state, newState);
   await show2(uid, Explorer, x, y, {
     menuId: Explorer
   });
@@ -5362,7 +5368,7 @@ const handleCut = async state => {
   }
   const files = dirents.map(dirent => dirent.path);
   await writeNativeFiles('cut', files);
-  await invoke$2('Focus.setFocus', FocusExplorer);
+  await invoke$3('Focus.setFocus', FocusExplorer);
   return {
     ...state,
     cutItems: files,
@@ -5380,7 +5386,7 @@ const handleDoubleClick = async (state, eventX, eventY) => {
   const item = state.items[index];
   const type = normalizeDirentType(item.type);
   if (type === File || type === SymLinkFile) {
-    return set$1(state, openUri(item.path, true));
+    return set$2(state, openUri(item.path, true));
   }
   return state;
 };
@@ -5533,14 +5539,14 @@ const getFileDecorations = async (scheme, root, maybeUris, decorationsEnabled, a
     if (!decorationsEnabled) {
       return [];
     }
-    const providerIds = await invoke$1('SourceControl.getEnabledProviderIds', scheme, root, assetDir, platform);
+    const providerIds = await invoke$2('SourceControl.getEnabledProviderIds', scheme, root, assetDir, platform);
     if (providerIds.length === 0) {
       return [];
     }
     // TODO how to handle multiple providers?
     const providerId = providerIds.at(-1);
     const uris = ensureUris(maybeUris);
-    const decorations = await invoke$1('SourceControl.getFileDecorations', providerId, uris, assetDir, platform);
+    const decorations = await invoke$2('SourceControl.getFileDecorations', providerId, uris, assetDir, platform);
     const normalized = normalizeDecorations(decorations);
     return normalized;
   } catch (error) {
@@ -5605,17 +5611,17 @@ const getExcluded = excludedObject => {
 const getSettings = async () => {
   // TODO don't return false always
   // TODO get all settings at once
-  const useChevronsRaw = await invoke$2('Preferences.get', 'explorer.useChevrons');
+  const useChevronsRaw = await invoke$3('Preferences.get', 'explorer.useChevrons');
   const useChevrons = useChevronsRaw === false ? false : true;
-  const confirmDeleteRaw = await invoke$2('Preferences.get', 'explorer.confirmdelete');
+  const confirmDeleteRaw = await invoke$3('Preferences.get', 'explorer.confirmdelete');
   const confirmDelete = confirmDeleteRaw === false ? false : true;
-  const confirmPasteRaw = await invoke$2('Preferences.get', 'explorer.confirmpaste');
+  const confirmPasteRaw = await invoke$3('Preferences.get', 'explorer.confirmpaste');
   const confirmPaste = confirmPasteRaw === false ? false : false;
-  const excludedRaw = await invoke$2('Preferences.get', 'files.exclude');
+  const excludedRaw = await invoke$3('Preferences.get', 'files.exclude');
   const excluded = getExcluded(excludedRaw);
-  const gitIgnoreDecorationsRaw = await invoke$2('Preferences.get', 'explorer.gitIgnoreDecorations');
+  const gitIgnoreDecorationsRaw = await invoke$3('Preferences.get', 'explorer.gitIgnoreDecorations');
   const gitIgnoreDecorations = gitIgnoreDecorationsRaw === false ? false : true;
-  const sourceControlDecorationsRaw = await invoke$2('Preferences.get', 'explorer.sourceControlDecorations');
+  const sourceControlDecorationsRaw = await invoke$3('Preferences.get', 'explorer.sourceControlDecorations');
   const sourceControlDecorations = sourceControlDecorationsRaw === false ? false : true;
   return {
     confirmDelete,
@@ -5628,7 +5634,7 @@ const getSettings = async () => {
 };
 
 const getWorkspacePath = () => {
-  return invoke$2('Workspace.getPath');
+  return invoke$3('Workspace.getPath');
 };
 
 const getSavedChildDirents = (map, path, depth, excluded, pathSeparator, root = path) => {
@@ -5902,8 +5908,8 @@ const getDroppedDirectoryWorkspacePath = fileHandle => {
 };
 const openDroppedDirectoryAsWorkspace$1 = async (state, fileHandle) => {
   const path = getDroppedDirectoryWorkspacePath(fileHandle);
-  await invoke$2('PersistentFileHandle.addHandle', fileHandle.name, fileHandle);
-  await invoke$2('Workspace.setPath', path);
+  await invoke$3('PersistentFileHandle.addHandle', fileHandle.name, fileHandle);
+  await invoke$3('Workspace.setPath', path);
   const updated = await loadContent(state, undefined);
   return {
     ...updated,
@@ -5986,7 +5992,7 @@ const getMergedDirents$1 = async (root, pathSeparator, dirents, excluded) => {
   return mergedDirents;
 };
 const openDroppedDirectoryAsWorkspace = async (state, path) => {
-  await invoke$2('Workspace.setPath', path);
+  await invoke$3('Workspace.setPath', path);
   const updated = await loadContent(state, undefined);
   return {
     ...updated,
@@ -6415,7 +6421,7 @@ const handleKeyDown = (state, defaultPrevented, key) => {
     clearTimeout(typeAheadTimeout.value);
   }
   typeAheadTimeout.value = setTimeout(() => {
-    void invoke$2('Explorer.cancelTypeAhead');
+    void invoke$3('Explorer.cancelTypeAhead');
   }, focusWordTimeout);
   if (matchingIndex === -1) {
     return {
@@ -6430,6 +6436,31 @@ const handleKeyDown = (state, defaultPrevented, key) => {
   };
 };
 
+const state = {
+  connected: false
+};
+const isConnected = () => {
+  const {
+    connected
+  } = state;
+  return connected;
+};
+const invoke = (method, ...params) => {
+  return invoke$4(method, ...params);
+};
+const set = rpc => {
+  set$6(rpc);
+  state.connected = true;
+};
+
+const handleMessagePort = async port => {
+  const rpc = await create$6({
+    commandMap: {},
+    messagePort: port
+  });
+  set(rpc);
+};
+
 const scrollInto = (index, minLineY, maxLineY) => {
   const diff = maxLineY - minLineY;
   const smallerHalf = Math.floor(diff / 2);
@@ -6955,7 +6986,7 @@ const getContainingFolder = (root, dirents, focusedIndex, pathSeparator) => {
 };
 
 const openNativeFolder = async path => {
-  await invoke$2('OpenNativeFolder.openNativeFolder', /* path */path);
+  await invoke$3('OpenNativeFolder.openNativeFolder', /* path */path);
 };
 
 const openContainingFolder = async state => {
@@ -6989,7 +7020,7 @@ const getIntegratedTerminalCwd = state => {
 
 const openInIntegratedTerminal = async state => {
   const cwd = getIntegratedTerminalCwd(state);
-  await invoke$2('Layout.openIntegratedTerminal', cwd);
+  await invoke$3('Layout.openIntegratedTerminal', cwd);
   return state;
 };
 
@@ -7227,6 +7258,7 @@ const getDragData = urls => {
 
 const renderDragData = (oldState, newState) => {
   const {
+    focusedIndex,
     isPointerDown,
     items,
     pointerDownIndex,
@@ -7235,9 +7267,16 @@ const renderDragData = (oldState, newState) => {
   if (!isPointerDown) {
     return [];
   }
-  const selected = items.filter((item, index) => item.selected || index === pointerDownIndex);
-  const urls = selected.map(item => item.path);
-  const dragData = getDragData(urls);
+  const pointerDownItem = items[pointerDownIndex];
+  let draggedItems;
+  if (pointerDownIndex === focusedIndex || pointerDownItem?.selected) {
+    draggedItems = getSelectedItems(items, focusedIndex);
+  } else if (pointerDownItem) {
+    draggedItems = [pointerDownItem];
+  } else {
+    draggedItems = [];
+  }
+  const dragData = getDragData(draggedItems.map(item => item.path));
   return ['Viewlet.setDragData', uid, dragData];
 };
 
@@ -7709,15 +7748,21 @@ const applyRender = (oldState, newState, diffResult) => {
   return commands;
 };
 
-const render2 = (uid, _diffResult) => {
+const render2 = async (uid, _diffResult) => {
   const {
     oldState,
     scheduledState
   } = get(uid);
   const diffResult = diff(oldState, scheduledState);
-  set(uid, scheduledState, scheduledState);
+  set$1(uid, scheduledState, scheduledState);
   const commands = applyRender(oldState, scheduledState, diffResult);
-  return commands;
+  if (!isConnected()) {
+    return commands;
+  }
+  const rendererWorkerCommands = commands.filter(command => command[0] === SetFocusContext);
+  const rendererProcessCommands = commands.filter(command => command[0] !== SetFocusContext);
+  const transactionId = await invoke('Viewlet.queueCommands', uid, rendererProcessCommands);
+  return [...rendererWorkerCommands, ['Viewlet.commitPending', uid, transactionId]];
 };
 
 const Button = 1;
@@ -8261,6 +8306,7 @@ const commandMap = {
   'Explorer.handleInputClick': wrapListItemCommand(handleInputClick),
   'Explorer.handleInputKeyDown': wrapListItemCommand(handleInputKeyDown),
   'Explorer.handleKeyDown': wrapListItemCommand(handleKeyDown),
+  'Explorer.handleMessagePort': handleMessagePort,
   'Explorer.handleNativePaste': wrapListItemCommand(handleNativePaste),
   'Explorer.handlePaste': wrapListItemCommand(handlePaste),
   'Explorer.handlePointerDown': wrapListItemCommand(handlePointerDown),
@@ -8313,7 +8359,7 @@ const createDragAndDropWorkerRpc = async () => {
 };
 
 const initializeDragAndDropWorker = async () => {
-  set$7(await createDragAndDropWorkerRpc());
+  set$9(await createDragAndDropWorkerRpc());
 };
 
 const sendMessagePortToFileSystemWorker = async port => {
@@ -8334,7 +8380,7 @@ const createFileSystemWorkerRpc = async () => {
 
 const initializeFileSystemWorker = async () => {
   const rpc = await createFileSystemWorkerRpc();
-  set$2(rpc);
+  set$3(rpc);
 };
 
 const send$1 = port => {
@@ -8354,14 +8400,14 @@ const createIconThemeWorkerRpc = async () => {
 
 const initializeIconThemeWorker = async () => {
   const rpc = await createIconThemeWorkerRpc();
-  set$5(rpc);
+  set$7(rpc);
 };
 
 const initializeRendererWorker = async () => {
   const rpc = await create$3({
     commandMap: commandMap
   });
-  set$4(rpc);
+  set$5(rpc);
 };
 
 const send = port => {
@@ -8384,7 +8430,7 @@ const initializeSourceControlWorker = async () => {
   try {
     const rpc = await createSourceControlWorkerRpc();
     // TODO
-    set$3(rpc);
+    set$4(rpc);
   } catch {
     // ignore
   }
@@ -8397,7 +8443,7 @@ const listen = async () => {
     commandMap: {},
     send: sendMessagePortToDialogWorker
   });
-  set$8(dialogRpc);
+  set$a(dialogRpc);
 };
 
 const main = async () => {

package/package.json

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