@lvce-editor/explorer-view 2.39.0 → 2.41.0

package/dist/explorerViewWorkerMain.js

@@ -441,11 +441,11 @@ const remove$1 = id => {
   delete callbacks[id];
 };
 let id = 0;
-const create$3 = () => {
+const create$3$1 = () => {
   return ++id;
 };
 const registerPromise = () => {
-  const id = create$3();
+  const id = create$3$1();
   const {
     resolve,
     promise
@@ -835,7 +835,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$2 = async ({
+const create$3 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -847,25 +847,43 @@ const create$2 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$2
+  create: create$3
 };
 
 const rpcs = Object.create(null);
-const set$5 = (id, rpc) => {
+const set$7 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
   return rpcs[id];
 };
-const RendererWorker$1 = 1;
-const invoke$2 = (method, ...params) => {
-  const rpc = get$1(RendererWorker$1);
-  // @ts-ignore
-  return rpc.invoke(method, ...params);
-};
-const set$2 = rpc => {
-  set$5(RendererWorker$1, rpc);
+
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
+
+const create$2 = rpcId => {
+  return {
+    // @ts-ignore
+    invoke(method, ...params) {
+      const rpc = get$1(rpcId);
+      // @ts-ignore
+      return rpc.invoke(method, ...params);
+    },
+    // @ts-ignore
+    invokeAndTransfer(method, ...params) {
+      const rpc = get$1(rpcId);
+      // @ts-ignore
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    set(rpc) {
+      set$7(rpcId, rpc);
+    }
+  };
 };
+const RendererWorker$1 = 1;
+const {
+  invoke: invoke$2,
+  set: set$2
+} = create$2(RendererWorker$1);
 const RendererWorker = {
   __proto__: null,
   invoke: invoke$2,
@@ -1176,6 +1194,16 @@ const getFileIcons = async (dirents, fileIconCache) => {
   };
 };
 
+const getIndex = (dirents, uri) => {
+  for (let i = 0; i < dirents.length; i++) {
+    const dirent = dirents[i];
+    if (dirent.path === uri) {
+      return i;
+    }
+  }
+  return -1;
+};
+
 const getParentFolder = (dirents, index, root) => {
   if (index < 0) {
     return root;
@@ -1291,13 +1319,13 @@ const sortExplorerItems = rawDirents => {
 };
 
 // TODO figure out whether this uses too much memory (name,path -> redundant, depth could be computed on demand)
-const toDisplayDirent = (parentDirent, rawDirent, index, length) => {
-  const path = join2(parentDirent.path, rawDirent.name);
+const toDisplayDirent = (parentPath, parentDepth, rawDirent, index, length) => {
+  const path = join2(parentPath, rawDirent.name);
   return {
     name: rawDirent.name,
     posInSet: index + 1,
     setSize: length,
-    depth: parentDirent.depth + 1,
+    depth: parentDepth + 1,
     type: rawDirent.type,
     path,
     // TODO storing absolute path might be too costly, could also store relative path here
@@ -1306,7 +1334,7 @@ const toDisplayDirent = (parentDirent, rawDirent, index, length) => {
   };
 };
 
-const toDisplayDirents = (pathSeparator, rawDirents, parentDirent, excluded) => {
+const toDisplayDirents = (pathSeparator, rawDirents, parentDirentPath, parentDirentDepth, excluded) => {
   rawDirents = sortExplorerItems(rawDirents);
   const result = [];
   const visibleItems = rawDirents.filter(item => {
@@ -1318,7 +1346,7 @@ const toDisplayDirents = (pathSeparator, rawDirents, parentDirent, excluded) =>
   const count = visibleItems.length;
   for (let i = 0; i < visibleItems.length; i++) {
     const rawDirent = visibleItems[i];
-    result.push(toDisplayDirent(parentDirent, rawDirent, i, count));
+    result.push(toDisplayDirent(parentDirentPath, parentDirentDepth, rawDirent, i, count));
   }
   return result;
 };
@@ -1331,18 +1359,16 @@ const getChildDirentsRaw = async uri => {
   }
   return rawDirents;
 };
-const getChildDirents = async (pathSeparator, parentDirent, excluded = []) => {
+const getChildDirents = async (pathSeparator, parentDirentPath, parentDirentDepth, excluded = []) => {
   string(pathSeparator);
-  object(parentDirent);
   // TODO use event/actor based code instead, this is impossible to cancel right now
   // also cancel updating when opening new folder
   // const dispose = state => state.pendingRequests.forEach(cancelRequest)
   // TODO should use FileSystem directly in this case because it is globally available anyway
   // and more typesafe than Command.execute
   // and more performant
-  const uri = parentDirent.path;
-  const rawDirents = await getChildDirentsRaw(uri);
-  const displayDirents = toDisplayDirents(pathSeparator, rawDirents, parentDirent, excluded);
+  const rawDirents = await getChildDirentsRaw(parentDirentPath);
+  const displayDirents = toDisplayDirents(pathSeparator, rawDirents, parentDirentPath, parentDirentDepth, excluded);
   return displayDirents;
 };
 
@@ -1374,7 +1400,7 @@ const orderDirents = dirents => {
 };
 
 const getPathPartChildren = async pathPart => {
-  const children = await getChildDirents(pathPart.pathSeparator, pathPart);
+  const children = await getChildDirents(pathPart.pathSeparator, pathPart.path, pathPart.depth);
   return children;
 };
 const getPathPartsChildren = async pathparts => {
@@ -1391,32 +1417,33 @@ const mergeTrees = (a, b) => {
   };
 };
 
+const treeToArrayInternal = (map, root, items, path, depth) => {
+  const children = map[path];
+  if (!children) {
+    return;
+  }
+  const count = children.length;
+  for (let i = 0; i < count; i++) {
+    const child = children[i];
+    const childPath = join2(path, child.name);
+    const absolutePath = `${root}${childPath}`;
+    items.push({
+      depth,
+      posInSet: i + 1,
+      setSize: count,
+      icon: '',
+      path: absolutePath,
+      selected: false,
+      name: child.name,
+      type: child.type
+    });
+    treeToArrayInternal(map, root, items, childPath, depth + 1);
+  }
+};
+
 const treeToArray = (map, root) => {
   const items = [];
-  const processChildren = (path, depth) => {
-    const children = map[path];
-    if (!children) {
-      return;
-    }
-    const count = children.length;
-    for (let i = 0; i < count; i++) {
-      const child = children[i];
-      const childPath = join2(path, child.name);
-      const absolutePath = `${root}${childPath}`;
-      items.push({
-        depth,
-        posInSet: i + 1,
-        setSize: count,
-        icon: '',
-        path: absolutePath,
-        selected: false,
-        name: child.name,
-        type: child.type
-      });
-      processChildren(childPath, depth + 1);
-    }
-  };
-  processChildren('', 0);
+  treeToArrayInternal(map, root, items, '', 1);
   return items;
 };
 
@@ -1456,7 +1483,7 @@ const acceptCreate = async (state, newDirentType, createFn) => {
   const merged = mergeTrees(tree, childTree);
   const newItems = treeToArray(merged, root);
   const dirents = newItems;
-  const newFocusedIndex = newItems.findIndex(dirent => dirent.path === absolutePath);
+  const newFocusedIndex = getIndex(newItems, absolutePath);
   const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, dirents.length);
   const visible = dirents.slice(minLineY, maxLineY);
   const {
@@ -1484,98 +1511,11 @@ const acceptCreateFolder = async state => {
   return acceptCreate(state, Directory, mkdir);
 };
 
-// TODO use posInSet and setSize properties to compute more effectively
-const computeExplorerRenamedDirent = (dirents, index, newName) => {
-  let startIndex = index;
-  let innerEndIndex = index + 1;
-  let insertIndex = -1;
-  let posInSet = -1;
-  const oldDirent = dirents[index];
-  const newDirent = {
-    ...oldDirent,
-    name: newName,
-    path: oldDirent.path.slice(0, -oldDirent.name.length) + newName,
-    icon: ''
-  };
-  const {
-    depth
-  } = newDirent;
-  // TODO
-  for (; startIndex >= 0; startIndex--) {
-    const dirent = dirents[startIndex];
-    if (dirent.depth > depth) {
-      continue;
-    }
-    if (dirent.depth < depth) {
-      break;
-    }
-    if (compareDirent(dirent, newDirent) === 1) {
-      insertIndex = startIndex;
-      posInSet = dirent.posInSet;
-      // dirent.posInSet++
-    }
-  }
-  startIndex++;
-  for (; innerEndIndex < dirents.length; innerEndIndex++) {
-    const dirent = dirents[innerEndIndex];
-    if (dirent.depth <= depth) {
-      break;
-    }
-    dirent.path = newDirent.path + dirent.path.slice(oldDirent.path.length);
-  }
-  innerEndIndex--;
-  let endIndex = innerEndIndex + 1;
-  for (; endIndex < dirents.length; endIndex++) {
-    const dirent = dirents[endIndex];
-    if (dirent.depth > depth) {
-      continue;
-    }
-    if (dirent.depth < depth) {
-      break;
-    }
-    if (insertIndex === -1 && compareDirent(dirent, newDirent) === -1) {
-      for (; endIndex < dirents.length; endIndex++) {
-      }
-      insertIndex = endIndex;
-      posInSet = dirent.posInSet + 1;
-    }
-  }
-  endIndex--;
-  for (let j = startIndex; j < index; j++) {
-    const dirent = dirents[j];
-    if (dirent.depth === depth) {
-      dirent.posInSet++;
-    }
-  }
-  for (let j = index; j < endIndex; j++) {
-    const dirent = dirents[j];
-    if (dirent.depth === depth) {
-      dirent.posInSet--;
-    }
-  }
-
-  // for (let j = startIndex; j < index; j++) {
-  //   const dirent = dirents[j]
-  //   dirent.posInSet++
-  // }
-
-  if (insertIndex === -1) {
-    insertIndex = index;
-    return {
-      focusedIndex: index,
-      newDirents: [...dirents.slice(0, index), newDirent, ...dirents.slice(index + 1)]
-    };
-  }
-  newDirent.posInSet = posInSet;
-  const newDirents = [...dirents];
-  if (index < insertIndex) {
-    insertIndex--;
-  }
-  newDirents.splice(index, 1);
-  newDirents.splice(insertIndex, 0, newDirent);
+const computeExplorerRenamedDirentUpdate = async (root, parentPath, parentDepth) => {
+  const children = await getChildDirents('/', parentPath, parentDepth, []);
+  const relativeDirname = parentPath.slice(root.length);
   return {
-    newDirents,
-    focusedIndex: insertIndex
+    [relativeDirname]: children
   };
 };
 
@@ -1593,30 +1533,55 @@ const createNewDirentsRename = async (renamedDirent, editingValue, pathSeparator
   return true;
 };
 
+const updateTree2 = (tree, update) => {
+  const updatedTree = {
+    ...tree,
+    ...update
+  };
+  return updatedTree;
+};
+
 const acceptRename = async state => {
   const {
     editingIndex,
     editingValue,
-    items} = state;
+    items,
+    root,
+    minLineY,
+    height,
+    itemHeight,
+    fileIconCache
+  } = state;
   const renamedDirent = items[editingIndex];
   const successful = await createNewDirentsRename(renamedDirent, editingValue);
   if (!successful) {
     return state;
   }
+  const dirname = dirname2(renamedDirent.path);
+  const newUri = join2(dirname, editingValue);
+  const update = await computeExplorerRenamedDirentUpdate(root, dirname, renamedDirent.depth - 1);
+  const tree = createTree(items, root);
+  const newTree = updateTree2(tree, update);
+  const newDirents = treeToArray(newTree, root);
+  const newFocusedIndex = getIndex(newDirents, newUri);
+  const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, newDirents.length);
+  const visible = newDirents.slice(minLineY, maxLineY);
   const {
-    newDirents,
-    focusedIndex
-  } = computeExplorerRenamedDirent(items, editingIndex, editingValue);
+    icons,
+    newFileIconCache
+  } = await getFileIcons(visible, fileIconCache);
   return {
     ...state,
     editingIndex: -1,
     editingValue: '',
     editingType: None$5,
     editingIcon: '',
-    focusedIndex,
+    focusedIndex: newFocusedIndex,
     focused: true,
     focus: List,
-    items: newDirents
+    items: newDirents,
+    icons,
+    fileIconCache: newFileIconCache
   };
 };
 
@@ -2019,7 +1984,7 @@ const expandAll = async state => {
       dirent.type = DirectoryExpanding;
       // TODO handle error
       // TODO race condition
-      const childDirents = await getChildDirents(pathSeparator, dirent);
+      const childDirents = await getChildDirents(pathSeparator, dirent.path, dirent.depth);
       const newIndex = newDirents.indexOf(dirent);
       if (newIndex === -1) {
         continue;
@@ -2064,7 +2029,7 @@ const getChildDirentsRecursively = async (dirent, pathSeparator) => {
     case Directory:
     case DirectoryExpanding:
     case DirectoryExpanded:
-      const childDirents = await getChildDirents(pathSeparator, dirent);
+      const childDirents = await getChildDirents(pathSeparator, dirent.path, dirent.depth);
       const all = [makeExpanded(dirent)];
       for (const childDirent of childDirents) {
         const childAll = await getChildDirentsRecursively(childDirent, pathSeparator);
@@ -2657,7 +2622,7 @@ const handleClickDirectory = async (state, dirent, index, keepFocus) => {
   // @ts-ignore
   dirent.type = DirectoryExpanding;
   // TODO handle error
-  const dirents = await getChildDirents(state.pathSeparator, dirent);
+  const dirents = await getChildDirents(state.pathSeparator, dirent.path, dirent.depth);
   const state2 = state;
   if (!state2) {
     return state;
@@ -2919,7 +2884,10 @@ const handleRangeSelection = (state, startIndex, endIndex) => {
 };
 
 const handleClickAtRangeSelection = async (state, index) => {
-  const firstSelectedIndex = state.items.findIndex(item => item.selected);
+  const {
+    items
+  } = state;
+  const firstSelectedIndex = items.findIndex(item => item.selected);
   if (firstSelectedIndex === -1) {
     return handleRangeSelection(state, index, index);
   }
@@ -2929,10 +2897,7 @@ const handleClickAtRangeSelection = async (state, index) => {
 };
 
 const handleClickAt = async (state, defaultPrevented, button, ctrlKey, shiftKey, x, y) => {
-  if (defaultPrevented) {
-    return state;
-  }
-  if (button !== LeftClick) {
+  if (defaultPrevented || button !== LeftClick) {
     return state;
   }
   const index = getIndexFromPosition(state, x, y);
@@ -3294,10 +3259,7 @@ const mergeDirents$2 = (oldDirents, newDirents) => {
   return newDirents;
 };
 const getMergedDirents$2 = async (root, pathSeparator, dirents) => {
-  const childDirents = await getChildDirents(pathSeparator, {
-    path: root,
-    depth: 0
-  });
+  const childDirents = await getChildDirents(pathSeparator, root, 0);
   const mergedDirents = mergeDirents$2(dirents, childDirents);
   return mergedDirents;
 };
@@ -3351,10 +3313,7 @@ const mergeDirents$1 = (oldDirents, newDirents) => {
   return newDirents;
 };
 const getMergedDirents$1 = async (root, pathSeparator, dirents) => {
-  const childDirents = await getChildDirents(pathSeparator, {
-    path: root,
-    depth: 0
-  });
+  const childDirents = await getChildDirents(pathSeparator, root, 0);
   const mergedDirents = mergeDirents$1(dirents, childDirents);
   return mergedDirents;
 };
@@ -3417,7 +3376,7 @@ const handleDropIntoFolder = async (state, dirent, index, fileHandles, files, pa
     // @ts-ignore
     await copy$1(file, to);
   }
-  const childDirents = await getChildDirents(pathSeparator, dirent);
+  const childDirents = await getChildDirents(pathSeparator, dirent.path, dirent.depth);
   const mergedDirents = getMergedDirents(items, index, dirent, childDirents);
   // TODO update maxlineY
   return {
@@ -3623,11 +3582,7 @@ const getTopLevelDirents = (root, pathSeparator, excluded) => {
   if (!root) {
     return [];
   }
-  return getChildDirents(pathSeparator, {
-    depth: 0,
-    path: root,
-    type: Directory
-  }, excluded);
+  return getChildDirents(pathSeparator, root, 0, excluded);
 };
 
 const mergeDirents = (oldDirents, newDirents) => {
@@ -4933,16 +4888,6 @@ const restoreState = savedState => {
   };
 };
 
-const getIndex = (dirents, uri) => {
-  for (let i = 0; i < dirents.length; i++) {
-    const dirent = dirents[i];
-    if (dirent.path === uri) {
-      return i;
-    }
-  }
-  return -1;
-};
-
 const getPathPartsToReveal = (root, pathParts, dirents) => {
   for (let i = 0; i < pathParts.length; i++) {
     const pathPart = pathParts[i];

package/package.json

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