@lvce-editor/explorer-view 1.4.0 → 1.5.0

package/README.md

@@ -1 +1,3 @@
 # Explorer View
+
+WebWorker for the explorer view functionality in Lvce Editor.

package/dist/explorerViewWorkerMain.js

@@ -847,6 +847,9 @@ const getFileIcon = ({
 const getIcon = dirent => {
   return '';
 };
+const getFolderIcon = dirent => {
+  return '';
+};
 
 // TODO use posInSet and setSize properties to compute more effectively
 const computeExplorerRenamedDirent = (dirents, index, newName) => {
@@ -948,15 +951,45 @@ const CreateFile = 1;
 const CreateFolder = 2;
 const Rename = 3;
 
-const remove = async diren => {};
-const readDirWithFileTypes = async uri => {};
-const getPathSeparator$1 = async root => {};
-const getRealPath = async path => {};
-const stat = async dirent => {};
-const createFile = async uri => {};
-const mkdir = async uri => {};
-const rename$1 = async (oldUri, newUri) => {};
-const copy$1 = async (oldUri, newUri) => {};
+const state = {
+  rpc: undefined
+};
+const invoke = (method, ...params) => {
+  const rpc = state.rpc;
+  // @ts-ignore
+  return rpc.invoke(method, ...params);
+};
+const setRpc = rpc => {
+  state.rpc = rpc;
+};
+
+const remove = async dirent => {
+  return invoke('FileSystem.remove', dirent);
+};
+const readDirWithFileTypes = async uri => {
+  return invoke('FileSystem.readDirWithFileTypes', uri);
+};
+const getPathSeparator$1 = async root => {
+  return invoke('FileSystem.getPathSeparator', root);
+};
+const getRealPath = async path => {
+  return invoke('FileSystem.getRealPath', path);
+};
+const stat = async dirent => {
+  return invoke('FileSystem.stat', dirent);
+};
+const createFile = async uri => {
+  return invoke('FileSystem.createFile', uri);
+};
+const mkdir = async uri => {
+  return invoke('FileSystem.mkdir', uri);
+};
+const rename$1 = async (oldUri, newUri) => {
+  return invoke('FileSystem.rename', oldUri, newUri);
+};
+const copy$1 = async (oldUri, newUri) => {
+  return invoke('FileSystem.copy', oldUri, newUri);
+};
 
 const dirname = (pathSeparator, path) => {
   const index = path.lastIndexOf(pathSeparator);
@@ -1121,18 +1154,6 @@ const copyPath$1 = async state => {
   return state;
 };
 
-const state = {
-  rpc: undefined
-};
-const invoke = (method, ...params) => {
-  const rpc = state.rpc;
-  // @ts-ignore
-  return rpc.invoke(method, ...params);
-};
-const setRpc = rpc => {
-  state.rpc = rpc;
-};
-
 const writeText = async text => {
   await invoke('ClipBoard.writeText', /* text */text);
 };
@@ -1292,7 +1313,7 @@ const hasSymbolicLinks = rawDirents => {
   return rawDirents.some(isSymbolicLink);
 };
 const getChildDirentsRaw = async uri => {
-  const rawDirents = await readDirWithFileTypes();
+  const rawDirents = await readDirWithFileTypes(uri);
   array(rawDirents);
   if (hasSymbolicLinks(rawDirents)) {
     return resolveSymbolicLinks(uri, rawDirents);
@@ -2208,8 +2229,8 @@ const handleClickDirectoryExpanded$1 = (state, dirent, index, keepFocus) => {
   };
 };
 const handleClickSymLink$1 = async (state, dirent, index) => {
-  await getRealPath();
-  const type = await stat();
+  const realPath = await getRealPath(dirent.path);
+  const type = await stat(realPath);
   switch (type) {
     case File:
       return handleClickFile$1(state, dirent, index);
@@ -2522,8 +2543,8 @@ const handleClickCurrentButKeepFocus = state => {
 // export const handleBlur=()=>{}
 
 const handleClickSymLink = async (state, dirent, index) => {
-  await getRealPath();
-  const type = await stat();
+  const realPath = await getRealPath(dirent.path);
+  const type = await stat(realPath);
   switch (type) {
     case File:
       return handleClickFile(state, dirent, index);
@@ -2661,10 +2682,10 @@ const mergeDirents$2 = (oldDirents, newDirents) => {
 // TODO copy files in parallel
 const copyFilesElectron = async (root, pathSeparator, files) => {
   for (const file of files) {
-    await getFilePathElectron(file);
+    const from = await getFilePathElectron(file);
     // const from = file.path
-    join(pathSeparator, root, file.name);
-    await copy$1();
+    const to = join(pathSeparator, root, file.name);
+    await copy$1(from, to);
   }
 };
 const getMergedDirents$2 = async (root, pathSeparator, dirents) => {
@@ -2757,7 +2778,10 @@ const handleDropIntoFolder = async (state, dirent, index, files) => {
     items
   } = state;
   for (const file of files) {
-    await copy$1();
+    // TODO path basename
+    const baseName = file;
+    const to = dirent.path + pathSeparator + baseName;
+    await copy$1(file, to);
   }
   const childDirents = await getChildDirents(pathSeparator, dirent);
   const mergedDirents = getMergedDirents(items, index, dirent, childDirents);
@@ -2915,8 +2939,8 @@ const handlePasteCopy = async (state, nativeFiles) => {
   // TODO handle pasting files into hardlink
   // TODO what if folder is big and it takes a long time
   for (const source of nativeFiles.files) {
-    join(state.pathSeperator, state.root, getBaseName(state.pathSeparator, source));
-    await copy$1();
+    const target = join(state.pathSeperator, state.root, getBaseName(state.pathSeparator, source));
+    await copy$1(source, target);
   }
   // TODO only update folder at which level it changed
   return updateRoot(state);
@@ -2924,8 +2948,8 @@ const handlePasteCopy = async (state, nativeFiles) => {
 
 const handlePasteCut = async (state, nativeFiles) => {
   for (const source of nativeFiles.files) {
-    `${state.root}${state.pathSeparator}${getBaseName(state.pathSeparator, source)}`;
-    await rename$1();
+    const target = `${state.root}${state.pathSeparator}${getBaseName(state.pathSeparator, source)}`;
+    await rename$1(source, target);
   }
   return state;
 };
@@ -2977,6 +3001,15 @@ const handlePointerDown = (state, button, x, y) => {
   return state;
 };
 
+const EmptyString = '';
+
+const Fulfilled = 'fulfilled';
+const Rejected = 'rejected';
+
+const getWorkspacePath = () => {
+  return invoke('Workspace.getPath');
+};
+
 // TODO viewlet should only have create and refresh functions
 // every thing else can be in a separate module <viewlet>.lazy.js
 // and  <viewlet>.ipc.js
@@ -2987,12 +3020,95 @@ const handlePointerDown = (state, button, x, y) => {
 // TODO instead of root string, there should be a root dirent
 
 const getPathSeparator = root => {
-  return getPathSeparator$1();
+  return getPathSeparator$1(root);
+};
+const getSavedChildDirents = (map, path, depth, excluded, pathSeparator) => {
+  const children = map[path];
+  if (!children) {
+    return [];
+  }
+  const dirents = [];
+  sortExplorerItems(children);
+  const visible = [];
+  const displayRoot = path.endsWith(pathSeparator) ? path : path + pathSeparator;
+  for (const child of children) {
+    if (excluded.includes(child.name)) {
+      continue;
+    }
+    visible.push(child);
+  }
+  const visibleLength = visible.length;
+  for (let i = 0; i < visibleLength; i++) {
+    const child = visible[i];
+    const {
+      name,
+      type
+    } = child;
+    const childPath = displayRoot + name;
+    if ((child.type === Directory || child.type === SymLinkFolder) && childPath in map) {
+      dirents.push({
+        depth,
+        posInSet: i + 1,
+        setSize: visibleLength,
+        icon: getFolderIcon(),
+        name,
+        path: childPath,
+        type: DirectoryExpanded
+      });
+      dirents.push(...getSavedChildDirents(map, childPath, depth + 1, excluded, pathSeparator));
+    } else {
+      dirents.push({
+        depth,
+        posInSet: i + 1,
+        setSize: visibleLength,
+        icon: getIcon(),
+        name,
+        path: childPath,
+        type
+      });
+    }
+  }
+  return dirents;
+};
+const createDirents = (root, expandedDirentPaths, expandedDirentChildren, excluded, pathSeparator) => {
+  const dirents = [];
+  const map = Object.create(null);
+  for (let i = 0; i < expandedDirentPaths.length; i++) {
+    const path = expandedDirentPaths[i];
+    const children = expandedDirentChildren[i];
+    if (children.status === Fulfilled) {
+      map[path] = children.value;
+    }
+  }
+  dirents.push(...getSavedChildDirents(map, root, 1, excluded, pathSeparator));
+  return dirents;
+};
+const getSavedExpandedPaths = (savedState, root) => {
+  if (savedState && savedState.root !== root) {
+    return [];
+  }
+  if (savedState && savedState.expandedPaths && Array.isArray(savedState.expandedPaths)) {
+    return savedState.expandedPaths;
+  }
+  return [];
 };
 const restoreExpandedState = async (savedState, root, pathSeparator, excluded) => {
-  {
+  // TODO read all opened folders in parallel
+  // ignore ENOENT errors
+  // ignore ENOTDIR errors
+  // merge all dirents
+  // restore scroll location
+  const expandedPaths = getSavedExpandedPaths(savedState, root);
+  if (root === EmptyString) {
     return [];
   }
+  const expandedDirentPaths = [root, ...expandedPaths];
+  const expandedDirentChildren = await Promise.allSettled(expandedDirentPaths.map(getChildDirentsRaw));
+  if (expandedDirentChildren[0].status === Rejected) {
+    throw expandedDirentChildren[0].reason;
+  }
+  const dirents = createDirents(root, expandedDirentPaths, expandedDirentChildren, excluded, pathSeparator);
+  return dirents;
 };
 const getExcluded = () => {
   const excludedObject = {};
@@ -3008,11 +3124,12 @@ const getSavedRoot$1 = (savedState, workspacePath) => {
   return workspacePath;
 };
 const loadContent = async (state, savedState) => {
-  const root = getSavedRoot$1(savedState, '');
+  const workspacePath = await getWorkspacePath();
+  const root = getSavedRoot$1(savedState, workspacePath);
   // TODO path separator could be restored from saved state
-  const pathSeparator = await getPathSeparator(); // TODO only load path separator once
+  const pathSeparator = await getPathSeparator(root); // TODO only load path separator once
   const excluded = getExcluded();
-  const restoredDirents = await restoreExpandedState();
+  const restoredDirents = await restoreExpandedState(savedState, root, pathSeparator, excluded);
   const {
     itemHeight,
     height
@@ -3309,12 +3426,14 @@ const revealItem = async (state, uri) => {
   return revealItemVisible(state, index);
 };
 
-const isExpandedDirectory = dirent => {
-  return dirent.type === DirectoryExpanded;
-};
 const getPath = dirent => {
   return dirent.path;
 };
+
+const isExpandedDirectory = dirent => {
+  return dirent.type === DirectoryExpanded;
+};
+
 const saveState = state => {
   const {
     items,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/explorer-view",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Explorer Worker",
   "main": "dist/explorerViewWorkerMain.js",
   "type": "module",