@lvce-editor/explorer-view 7.14.0 → 7.15.1

package/dist/explorerViewWorkerMain.js

@@ -1387,7 +1387,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$6 = (id, rpc) => {
+const set$7 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1420,7 +1420,7 @@ const create$1 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$6(rpcId, mockRpc);
+      set$7(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove$1(rpcId);
@@ -1429,7 +1429,7 @@ const create$1 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$6(rpcId, rpc);
+      set$7(rpcId, rpc);
     }
   };
 };
@@ -1656,17 +1656,17 @@ const FocusExplorer = 13;
 const FocusExplorerEditBox = 14;
 
 const {
-  set: set$5
+  set: set$6
 } = create$1(FileSystemWorker$1);
 
 const FileSystemWorker = {
   __proto__: null,
-  set: set$5
+  set: set$6
 };
 
 const {
   invoke: invoke$3,
-  set: set$4
+  set: set$5
 } = create$1(IconThemeWorker);
 const getIcons = async iconRequests => {
   // @ts-ignore
@@ -1676,7 +1676,7 @@ const getIcons = async iconRequests => {
 const {
   invoke: invoke$2,
   invokeAndTransfer,
-  set: set$3
+  set: set$4
 } = create$1(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
@@ -1714,7 +1714,7 @@ const openUri$1 = async (uri, focus, options) => {
 
 const {
   invoke: invoke$1,
-  set: set$2
+  set: set$3
 } = create$1(SourceControlWorker);
 
 // TODO use direct connection
@@ -1722,7 +1722,7 @@ const invoke = async (method, ...params) => {
   return invoke$2(method, ...params);
 };
 const {
-  set: set$1
+  set: set$2
 } = FileSystemWorker;
 
 const remove = async dirent => {
@@ -2864,6 +2864,17 @@ const copyRelativePath = async state => {
   return state;
 };
 
+const commandCompletions = new WeakMap();
+const set$1 = (state, completion) => {
+  commandCompletions.set(state, completion);
+  return state;
+};
+const take = state => {
+  const completion = commandCompletions.get(state);
+  commandCompletions.delete(state);
+  return completion;
+};
+
 const getIconCacheKey = (path, type) => {
   switch (type) {
     case DirectoryExpanded:
@@ -3650,23 +3661,29 @@ const {
 } = create$a();
 const commandQueues = new Map();
 const runQueuedCommand = async (previousCommand, command) => {
+  await previousCommand;
+  return command();
+};
+const waitForStateCommand = async command => {
   try {
-    await previousCommand;
+    await command;
   } catch {
     // Keep the queue usable after returning the error to the command caller
   }
-  await command();
 };
 const enqueueCommand = async (id, command) => {
-  const currentCommand = runQueuedCommand(commandQueues.get(id), command);
-  commandQueues.set(id, currentCommand);
+  const stateCommand = runQueuedCommand(commandQueues.get(id), command);
+  const queuedStateCommand = waitForStateCommand(stateCommand);
+  commandQueues.set(id, queuedStateCommand);
+  let result;
   try {
-    await currentCommand;
+    result = await stateCommand;
   } finally {
-    if (commandQueues.get(id) === currentCommand) {
+    if (commandQueues.get(id) === queuedStateCommand) {
       commandQueues.delete(id);
     }
   }
+  await result.completion;
 };
 const hasSameVisibleExplorerItemInputs = (oldState, newState) => {
   return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.height === newState.height && oldState.itemHeight === newState.itemHeight && oldState.focusedIndex === newState.focusedIndex && oldState.editingIndex === newState.editingIndex && oldState.editingSessionId === newState.editingSessionId && oldState.editingIcon === newState.editingIcon && oldState.cutItems === newState.cutItems && oldState.editingErrorMessage === newState.editingErrorMessage && oldState.dropTargets === newState.dropTargets && oldState.fileIconCache === newState.fileIconCache && oldState.decorations === newState.decorations && oldState.useChevrons === newState.useChevrons && oldState.sourceControlIgnoredUris === newState.sourceControlIgnoredUris;
@@ -3693,8 +3710,11 @@ const wrapListItemCommandInternal = (fn, queued) => {
       newState
     } = get(id);
     const rawUpdatedState = await fn(newState, ...args);
+    const completion = take(rawUpdatedState);
     if (newState === rawUpdatedState) {
-      return;
+      return {
+        completion
+      };
     }
     const updatedState = await maybeUpdateGitIgnoredUris(newState, rawUpdatedState);
     const {
@@ -3719,7 +3739,9 @@ const wrapListItemCommandInternal = (fn, queued) => {
       if (updatedState.inputSource === User) {
         set(id, intermediate.oldState, updatedState);
       }
-      return;
+      return {
+        completion
+      };
     }
     const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, items.length);
     const visible = items.slice(minLineY, maxLineY);
@@ -3737,14 +3759,18 @@ const wrapListItemCommandInternal = (fn, queued) => {
     };
     const intermediate2 = get(id);
     set(id, intermediate2.oldState, finalState);
+    return {
+      completion
+    };
   };
   if (!queued) {
-    return runCommand;
+    return async (id, ...args) => {
+      const result = await runCommand(id, ...args);
+      await result.completion;
+    };
   }
   const wrappedCommand = async (id, ...args) => {
-    await enqueueCommand(id, async () => {
-      await runCommand(id, ...args);
-    });
+    await enqueueCommand(id, () => runCommand(id, ...args));
   };
   return wrappedCommand;
 };
@@ -4576,14 +4602,15 @@ const handleClickDirectory = async (state, dirent, index, keepFocus) => {
 };
 
 const handleClickFile = async (state, dirent, index, keepFocus = false) => {
-  await openUri(dirent.path, !keepFocus, {
+  const completion = openUri(dirent.path, !keepFocus, {
     preview: true
   });
-  return {
+  const newState = {
     ...state,
     focused: keepFocus,
     focusedIndex: index
   };
+  return set$1(newState, completion);
 };
 
 const handleClickSymLink = async (state, dirent, index) => {
@@ -4785,7 +4812,7 @@ const newDirent = async (state, editingType, editingIcon = '') => {
 
 // TODO much shared logic with newFolder
 const newFile = state => {
-  if (state.isReadonly) {
+  if (state.root === '' || state.isReadonly) {
     return Promise.resolve(state);
   }
   return newDirent(state, CreateFile);
@@ -4818,7 +4845,7 @@ const getEditingIcon = async (editingType, value, direntType) => {
 };
 
 const newFolder = async state => {
-  if (state.isReadonly || state.editingIndex !== -1) {
+  if (state.root === '' || state.isReadonly || state.editingIndex !== -1) {
     return state;
   }
   const editingIcon = await getEditingIcon(CreateFolder, '');
@@ -5049,10 +5076,12 @@ const handleClick = async (state, index, keepFocus = false) => {
   if (newState.editingIndex === -1) {
     return newState;
   }
-  return {
+  const completion = take(newState);
+  const finalState = {
     ...newState,
     ...resetEditing
   };
+  return completion ? set$1(finalState, completion) : finalState;
 };
 
 // export const handleBlur=()=>{}
@@ -5300,7 +5329,7 @@ const handleDoubleClick = async (state, eventX, eventY) => {
   const item = state.items[index];
   const type = normalizeDirentType(item.type);
   if (type === File || type === SymLinkFile) {
-    await openUri(item.path, true);
+    return set$1(state, openUri(item.path, true));
   }
   return state;
 };
@@ -8004,7 +8033,7 @@ const createFileSystemWorkerRpc = async () => {
 
 const initializeFileSystemWorker = async () => {
   const rpc = await createFileSystemWorkerRpc();
-  set$1(rpc);
+  set$2(rpc);
 };
 
 const send$1 = port => {
@@ -8024,14 +8053,14 @@ const createIconThemeWorkerRpc = async () => {
 
 const initializeIconThemeWorker = async () => {
   const rpc = await createIconThemeWorkerRpc();
-  set$4(rpc);
+  set$5(rpc);
 };
 
 const initializeRendererWorker = async () => {
   const rpc = await create$2({
     commandMap: commandMap
   });
-  set$3(rpc);
+  set$4(rpc);
 };
 
 const send = port => {
@@ -8054,7 +8083,7 @@ const initializeSourceControlWorker = async () => {
   try {
     const rpc = await createSourceControlWorkerRpc();
     // TODO
-    set$2(rpc);
+    set$3(rpc);
   } catch {
     // ignore
   }

package/package.json

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