@lvce-editor/explorer-view 3.25.0 → 3.27.0

package/dist/explorerViewWorkerMain.js

@@ -533,7 +533,7 @@ const create$4$1 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$6 = (id, fn) => {
+const set$8 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$2 = id => {
@@ -552,7 +552,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$6(id, resolve);
+  set$8(id, resolve);
   return {
     id,
     promise
@@ -897,10 +897,10 @@ const send = (transport, method, ...params) => {
   const message = create$4$1(method, params);
   transport.send(message);
 };
-const invoke$4 = (ipc, method, ...params) => {
+const invoke$5 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
-const invokeAndTransfer$2 = (ipc, method, ...params) => {
+const invokeAndTransfer$3 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, true);
 };
 
@@ -936,10 +936,10 @@ const createRpc = ipc => {
       send(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke$4(ipc, method, ...params);
+      return invoke$5(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer$2(ipc, method, ...params);
+      return invokeAndTransfer$3(ipc, method, ...params);
     },
     async dispose() {
       await ipc?.dispose();
@@ -1169,6 +1169,7 @@ const Alt = 1 << 9 >>> 0;
 const DebugWorker = 55;
 const FileSystemWorker$1 = 209;
 const RendererWorker$1 = 1;
+const IconThemeWorker$1 = 7009;
 
 const FocusElementByName = 'Viewlet.focusElementByName';
 const FocusSelector = 'Viewlet.focusSelector';
@@ -1180,7 +1181,7 @@ const FocusExplorer = 13;
 const FocusExplorerEditBox = 14;
 
 const rpcs = Object.create(null);
-const set$5 = (id, rpc) => {
+const set$7 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1202,7 +1203,7 @@ const create$1 = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$5(rpcId, rpc);
+      set$7(rpcId, rpc);
     },
     async dispose() {
       const rpc = get$1(rpcId);
@@ -1212,60 +1213,60 @@ const create$1 = rpcId => {
 };
 
 const {
-  invoke: invoke$3,
-  invokeAndTransfer: invokeAndTransfer$1,
-  set: set$4,
-  dispose: dispose$1
+  invoke: invoke$4,
+  invokeAndTransfer: invokeAndTransfer$2,
+  set: set$6,
+  dispose: dispose$2
 } = create$1(FileSystemWorker$1);
 const remove$1 = async dirent => {
-  return invoke$3('FileSystem.remove', dirent);
+  return invoke$4('FileSystem.remove', dirent);
 };
 const readDirWithFileTypes$1 = async uri => {
-  return invoke$3('FileSystem.readDirWithFileTypes', uri);
+  return invoke$4('FileSystem.readDirWithFileTypes', uri);
 };
 const getPathSeparator$2 = async root => {
   // @ts-ignore
-  return invoke$3('FileSystem.getPathSeparator', root);
+  return invoke$4('FileSystem.getPathSeparator', root);
 };
 const getRealPath$1 = async path => {
-  return invoke$3('FileSystem.getRealPath', path);
+  return invoke$4('FileSystem.getRealPath', path);
 };
 const stat$1 = async dirent => {
-  return invoke$3('FileSystem.stat', dirent);
+  return invoke$4('FileSystem.stat', dirent);
 };
 const createFile = async uri => {
-  return invoke$3('FileSystem.writeFile', uri, '');
+  return invoke$4('FileSystem.writeFile', uri, '');
 };
 const readFile$1 = async uri => {
-  return invoke$3('FileSystem.readFile', uri);
+  return invoke$4('FileSystem.readFile', uri);
 };
 const writeFile$1 = async (uri, content) => {
-  return invoke$3('FileSystem.writeFile', uri, content);
+  return invoke$4('FileSystem.writeFile', uri, content);
 };
 const mkdir$1 = async uri => {
-  return invoke$3('FileSystem.mkdir', uri);
+  return invoke$4('FileSystem.mkdir', uri);
 };
 const rename$2 = async (oldUri, newUri) => {
-  return invoke$3('FileSystem.rename', oldUri, newUri);
+  return invoke$4('FileSystem.rename', oldUri, newUri);
 };
 const copy$2 = async (oldUri, newUri) => {
-  return invoke$3('FileSystem.copy', oldUri, newUri);
+  return invoke$4('FileSystem.copy', oldUri, newUri);
 };
 const exists = async uri => {
   // @ts-ignore
-  return invoke$3('FileSystem.exists', uri);
+  return invoke$4('FileSystem.exists', uri);
 };
 const getFolderSize$1 = async uri => {
   // @ts-ignore
-  return invoke$3('FileSystem.getFolderSize', uri);
+  return invoke$4('FileSystem.getFolderSize', uri);
 };
 const readFileAsBlob = async uri => {
   // @ts-ignore
-  return invoke$3('FileSystem.readFileAsBlob', uri);
+  return invoke$4('FileSystem.readFileAsBlob', uri);
 };
 const appendFile = async (uri, text) => {
   // @ts-ignore
-  return invoke$3('FileSystem.appendFile', uri, text);
+  return invoke$4('FileSystem.appendFile', uri, text);
 };
 
 const FileSystemWorker = {
@@ -1273,28 +1274,56 @@ const FileSystemWorker = {
   appendFile,
   copy: copy$2,
   createFile,
-  dispose: dispose$1,
+  dispose: dispose$2,
   exists,
   getFolderSize: getFolderSize$1,
   getPathSeparator: getPathSeparator$2,
   getRealPath: getRealPath$1,
-  invoke: invoke$3,
-  invokeAndTransfer: invokeAndTransfer$1,
+  invoke: invoke$4,
+  invokeAndTransfer: invokeAndTransfer$2,
   mkdir: mkdir$1,
   readDirWithFileTypes: readDirWithFileTypes$1,
   readFile: readFile$1,
   readFileAsBlob,
   remove: remove$1,
   rename: rename$2,
-  set: set$4,
+  set: set$6,
   stat: stat$1,
   writeFile: writeFile$1
 };
 
+const {
+  invoke: invoke$3,
+  invokeAndTransfer: invokeAndTransfer$1,
+  set: set$5,
+  dispose: dispose$1
+} = create$1(IconThemeWorker$1);
+const getIcons$1 = async iconRequests => {
+  // @ts-ignore
+  return invoke$3('IconTheme.getIcons', iconRequests);
+};
+const registerMockRpc$1 = commandMap => {
+  const mockRpc = createMockRpc({
+    commandMap
+  });
+  set$5(mockRpc);
+  return mockRpc;
+};
+
+const IconThemeWorker = {
+  __proto__: null,
+  dispose: dispose$1,
+  getIcons: getIcons$1,
+  invoke: invoke$3,
+  invokeAndTransfer: invokeAndTransfer$1,
+  registerMockRpc: registerMockRpc$1,
+  set: set$5
+};
+
 const {
   invoke: invoke$2,
   invokeAndTransfer,
-  set: set$3,
+  set: set$4,
   dispose
 } = create$1(RendererWorker$1);
 const searchFileHtml = async uri => {
@@ -1561,7 +1590,7 @@ const registerMockRpc = commandMap => {
   const mockRpc = createMockRpc({
     commandMap
   });
-  set$3(mockRpc);
+  set$4(mockRpc);
   return mockRpc;
 };
 
@@ -1629,7 +1658,7 @@ const RendererWorker = {
   sendMessagePortToRendererProcess,
   sendMessagePortToSearchProcess,
   sendMessagePortToSyntaxHighlightingWorker,
-  set: set$3,
+  set: set$4,
   setAdditionalFocus,
   setColorTheme,
   setExtensionsSearchValue,
@@ -1648,7 +1677,7 @@ const RendererWorker = {
 
 const {
   invoke: invoke$1,
-  set: set$2,
+  set: set$3,
   writeClipBoardText,
   confirm,
   showContextMenu,
@@ -1660,7 +1689,7 @@ const invoke = async (method, ...params) => {
   return invoke$1(method, ...params);
 };
 const {
-  set: set$1
+  set: set$2
 } = FileSystemWorker;
 
 const remove = async dirent => {
@@ -2527,18 +2556,26 @@ const getIconsCached = (dirents, fileIconCache) => {
   return dirents.map(dirent => fileIconCache[dirent]);
 };
 
-const getMissingIconRequests = (dirents, fileIconCache) => {
-  const missingRequests = [];
+const getMissingDirents = (dirents, fileIconCache) => {
+  const missingDirents = [];
   for (const dirent of dirents) {
     if (!(dirent.path in fileIconCache)) {
-      missingRequests.push({
-        type: dirent.type,
-        name: dirent.name,
-        path: dirent.path
-      });
+      missingDirents.push(dirent);
     }
   }
-  return missingRequests;
+  return missingDirents;
+};
+const toIconRequest = dirent => {
+  return {
+    type: dirent.type,
+    name: dirent.name,
+    path: dirent.path
+  };
+};
+const getMissingIconRequests = (dirents, fileIconCache) => {
+  const missingRequests = getMissingDirents(dirents, fileIconCache);
+  const iconRequests = missingRequests.map(toIconRequest);
+  return iconRequests;
 };
 
 const getPath = item => {
@@ -2778,7 +2815,7 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
 
 const {
   get,
-  set,
+  set: set$1,
   registerCommands,
   getCommandIds,
   wrapGetter
@@ -2807,9 +2844,9 @@ const wrapListItemCommand = fn => {
       fileIconCache
     } = updatedState;
     const intermediate = get(id);
-    set(id, intermediate.oldState, updatedState);
+    set$1(id, intermediate.oldState, updatedState);
     const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, items.length);
-    if (items === intermediate.newState.items && minLineY === intermediate.newState.minLineY && editingIcon === intermediate.newState.editingIcon && cutItems === intermediate.newState.cutItems && editingErrorMessage === intermediate.newState.editingErrorMessage) {
+    if (items === intermediate.newState.items && minLineY === intermediate.newState.minLineY && editingIcon === intermediate.newState.editingIcon && cutItems === intermediate.newState.cutItems && editingErrorMessage === intermediate.newState.editingErrorMessage && dropTargets === intermediate.newState.dropTargets) {
       return;
     }
     const visible = items.slice(minLineY, maxLineY);
@@ -2826,7 +2863,7 @@ const wrapListItemCommand = fn => {
       maxLineY
     };
     const intermediate2 = get(id);
-    set(id, intermediate2.oldState, finalState);
+    set$1(id, intermediate2.oldState, finalState);
   };
   return wrappedCommand;
 };
@@ -2888,7 +2925,7 @@ const create2 = (uid, uri, x, y, width, height, args, parentUid, platform = 0) =
     errorMessageTop: 0,
     visibleExplorerItems: []
   };
-  set(uid, state, state);
+  set$1(uid, state, state);
 };
 
 // TODO parentUid might ot be needed
@@ -2944,7 +2981,7 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     errorMessageTop: 0,
     visibleExplorerItems: []
   };
-  set(state.uid, state, state);
+  set$1(state.uid, state, state);
   return state;
 };
 
@@ -3079,8 +3116,9 @@ const getChildDirentsRecursively = async (dirent, pathSeparator) => {
 
 const getParentEndIndex = (dirents, index) => {
   const dirent = dirents[index];
+  const depth = dirent.depth;
   let endIndex = index + 1;
-  while (endIndex < dirents.length && dirents[endIndex].depth > dirent.depth) {
+  while (endIndex < dirents.length && dirents[endIndex].depth > depth) {
     endIndex++;
   }
   return endIndex;
@@ -3957,7 +3995,7 @@ const handleContextMenuMouseAt = async (state, x, y) => {
     focusedIndex,
     focused: false
   };
-  set(state.uid, state, newState);
+  set$1(state.uid, state, newState);
   await show(x, y, Explorer);
   return state;
 };
@@ -4041,7 +4079,7 @@ const canBeDroppedInto = dirent => {
 
 const countInRange = (start, end) => {
   const items = [];
-  for (let i = start; i < end; i++) {
+  for (let i = start; i <= end; i++) {
     items.push(i);
   }
   return items;
@@ -5094,11 +5132,31 @@ const createFileSystemWorkerRpc = async () => {
 
 const initializeFileSystemWorker = async () => {
   const rpc = await createFileSystemWorkerRpc();
-  set$1(rpc);
+  set$2(rpc);
+};
+
+const createIconThemeWorkerRpc = async () => {
+  try {
+    const rpc = await TransferMessagePortRpcParent.create({
+      commandMap: {},
+      send: sendMessagePortToFileSystemWorker
+    });
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create icon theme worker rpc`);
+  }
+};
+
+const {
+  set} = IconThemeWorker;
+
+const initializeIconThemeWorker = async () => {
+  const rpc = await createIconThemeWorkerRpc();
+  set(rpc);
 };
 
 const initialize = async () => {
-  await initializeFileSystemWorker();
+  await Promise.all([initializeFileSystemWorker(), initializeIconThemeWorker()]);
 };
 
 const getNewChildDirentsForNewDirent = async (items, depth, parentPath, direntType) => {
@@ -5814,7 +5872,7 @@ const render2 = (uid, diffResult) => {
     oldState,
     newState
   } = get(uid);
-  set(uid, newState, newState);
+  set$1(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -6255,8 +6313,6 @@ const commandMap = {
   'Explorer.focusFirst': wrapListItemCommand(focusFirst),
   'Explorer.focusIndex': wrapListItemCommand(focusIndex),
   'Explorer.focusLast': wrapListItemCommand(focusLast),
-  'Explorer.handleDragStart': wrapListItemCommand(handleDragStart),
-  'Explorer.handleDragOverIndex': wrapListItemCommand(handleDragOverIndex),
   'Explorer.focusNext': wrapListItemCommand(focusNext),
   'Explorer.focusNone': wrapListItemCommand(focusNone),
   'Explorer.focusPrevious': wrapListItemCommand(focusPrevious),
@@ -6265,7 +6321,6 @@ const commandMap = {
   'Explorer.getMouseActions': getMouseActions,
   'Explorer.handleArrowLeft': wrapListItemCommand(handleArrowLeft),
   'Explorer.handleArrowRight': wrapListItemCommand(handleArrowRight),
-  'Explorer.handleEscape': wrapListItemCommand(handleEscape),
   'Explorer.handleBlur': wrapListItemCommand(handleBlur),
   'Explorer.handleClick': wrapListItemCommand(handleClick),
   'Explorer.handleClickAt': wrapListItemCommand(handleClickAt),
@@ -6278,7 +6333,10 @@ const commandMap = {
   'Explorer.handleCut': wrapListItemCommand(handleCut),
   'Explorer.handleDragLeave': wrapListItemCommand(handleDragLeave),
   'Explorer.handleDragOver': wrapListItemCommand(handleDragOver),
+  'Explorer.handleDragOverIndex': wrapListItemCommand(handleDragOverIndex),
+  'Explorer.handleDragStart': wrapListItemCommand(handleDragStart),
   'Explorer.handleDrop': wrapListItemCommand(handleDrop),
+  'Explorer.handleEscape': wrapListItemCommand(handleEscape),
   'Explorer.handleFocus': wrapListItemCommand(handleFocus),
   'Explorer.handleIconThemeChange': wrapListItemCommand(handleIconThemeChange),
   'Explorer.handleInputBlur': wrapListItemCommand(handleInputBlur),
@@ -6328,7 +6386,7 @@ const listen = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
-  set$2(rpc);
+  set$3(rpc);
 };
 
 const main = async () => {

package/package.json

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