@lvce-editor/explorer-view 1.19.0 → 1.21.0

package/dist/explorerViewWorkerMain.js

@@ -779,12 +779,12 @@ const invokeAndTransfer = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, true);
 };
 
-const commands = Object.create(null);
+const commands$1 = Object.create(null);
 const register = commandMap => {
-  Object.assign(commands, commandMap);
+  Object.assign(commands$1, commandMap);
 };
 const getCommand = key => {
-  return commands[key];
+  return commands$1[key];
 };
 const execute = (command, ...args) => {
   const fn = getCommand(command);
@@ -1100,9 +1100,7 @@ const acceptCreate = async (state, newDirentType, createFn) => {
     return state;
   }
   const parentDirent = focusedIndex >= 0 ? state.items[focusedIndex] : {
-    depth: 0,
-    path: state.root
-  };
+    depth: 0};
   const depth = parentDirent.depth + 1;
   const newDirent = {
     path: absolutePath,
@@ -1300,6 +1298,7 @@ const ListItem = 22;
 
 const Slash = '/';
 
+// TODO parentUid might ot be needed
 const create = (id, uri, x, y, width, height, args, parentUid) => {
   const state = {
     uid: id,
@@ -1852,6 +1851,11 @@ const getActions = root => {
   }];
 };
 
+const commands = ['acceptEdit', 'cancelEdit', 'collapseAll', 'copyPath', 'copyRelativePath', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleCopy', 'handleDragOver', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'refresh', 'relealItem', 'removeDirent', 'rename', 'renameDirent', 'revealItem', 'scrollDown', 'scrollUp', 'setDeltaY', 'updateEditingValue', 'updateIcons'];
+const getCommandIds = () => {
+  return commands;
+};
+
 const None$4 = 'none';
 const ToolBar = 'toolbar';
 const Tree = 'tree';
@@ -2354,19 +2358,59 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
   return visible;
 };
 
-const handleBlur = state => {
-  // TODO when blur event occurs because of context menu, focused index should stay the same
-  // but focus outline should be removed
+const getParentStartIndex = (dirents, index) => {
+  const dirent = dirents[index];
+  let startIndex = index - 1;
+  while (startIndex >= 0 && dirents[startIndex].depth >= dirent.depth) {
+    startIndex--;
+  }
+  return startIndex;
+};
+
+const focusParentFolder = state => {
+  const parentStartIndex = getParentStartIndex(state.items, state.focusedIndex);
+  if (parentStartIndex === -1) {
+    return state;
+  }
+  return focusIndex(state, parentStartIndex);
+};
+
+const handleArrowLeft = state => {
   const {
-    editingType
+    items,
+    focusedIndex
   } = state;
-  if (editingType !== None$5) {
+  if (focusedIndex === -1) {
     return state;
   }
-  return {
-    ...state,
-    focused: false
-  };
+  const dirent = items[focusedIndex];
+  switch (dirent.type) {
+    case Directory:
+    case File:
+    case SymLinkFile:
+      return focusParentFolder(state);
+    case DirectoryExpanded:
+      // @ts-ignore
+      return handleClickDirectoryExpanded(state, dirent, focusedIndex);
+    default:
+      // TODO handle expanding directory and cancel file system call to read child dirents
+      return state;
+  }
+};
+
+const handleArrowRightDirectoryExpanded = (state, dirent) => {
+  const {
+    items,
+    focusedIndex
+  } = state;
+  if (focusedIndex === items.length - 1) {
+    return state;
+  }
+  const nextDirent = items[focusedIndex + 1];
+  if (nextDirent.depth === dirent.depth + 1) {
+    return focusIndex(state, focusedIndex + 1);
+  }
+  return state;
 };
 
 const handleClickDirectory = async (state, dirent, index, keepFocus) => {
@@ -2413,6 +2457,71 @@ const handleClickDirectory = async (state, dirent, index, keepFocus) => {
   };
 };
 
+const openUri = async (uri, focus) => {
+  await invoke(/* Main.openAbsolutePath */'Main.openUri', /* absolutePath */uri, /* focus */focus);
+};
+
+const handleClickFile = async (state, dirent, index, keepFocus = false) => {
+  await openUri(dirent.path, !keepFocus);
+  return {
+    ...state,
+    focusedIndex: index,
+    focused: keepFocus
+  };
+};
+
+const handleClickSymLink = async (state, dirent, index) => {
+  const realPath = await getRealPath(dirent.path);
+  const type = await stat(realPath);
+  switch (type) {
+    case File:
+      return handleClickFile(state, dirent, index);
+    default:
+      throw new Error(`unsupported file type ${type}`);
+  }
+};
+
+const handleArrowRight = async state => {
+  const {
+    items,
+    focusedIndex
+  } = state;
+  if (focusedIndex === -1) {
+    return state;
+  }
+  const dirent = items[focusedIndex];
+  switch (dirent.type) {
+    case File:
+    case SymLinkFile:
+      return state;
+    case Directory:
+    case SymLinkFolder:
+      // @ts-ignore
+      return handleClickDirectory(state, dirent);
+    case DirectoryExpanded:
+      return handleArrowRightDirectoryExpanded(state, dirent);
+    case Symlink:
+      return handleClickSymLink(state, dirent, focusedIndex);
+    default:
+      throw new Error(`unsupported file type ${dirent.type}`);
+  }
+};
+
+const handleBlur = state => {
+  // TODO when blur event occurs because of context menu, focused index should stay the same
+  // but focus outline should be removed
+  const {
+    editingType
+  } = state;
+  if (editingType !== None$5) {
+    return state;
+  }
+  return {
+    ...state,
+    focused: false
+  };
+};
+
 const handleClickDirectoryExpanded$1 = async (state, dirent, index, keepFocus) => {
   const {
     minLineY,
@@ -2479,30 +2588,6 @@ const handleClickDirectoryExpanding = async (state, dirent, index, keepFocus) =>
   };
 };
 
-const openUri = async (uri, focus) => {
-  await invoke(/* Main.openAbsolutePath */'Main.openUri', /* absolutePath */uri, /* focus */focus);
-};
-
-const handleClickFile$1 = async (state, dirent, index, keepFocus = false) => {
-  await openUri(dirent.path, !keepFocus);
-  return {
-    ...state,
-    focusedIndex: index,
-    focused: keepFocus
-  };
-};
-
-const handleClickSymLink$1 = async (state, dirent, index) => {
-  const realPath = await getRealPath(dirent.path);
-  const type = await stat(realPath);
-  switch (type) {
-    case File:
-      return handleClickFile$1(state, dirent, index);
-    default:
-      throw new Error(`unsupported file type ${type}`);
-  }
-};
-
 // 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
@@ -2524,7 +2609,7 @@ const getClickFn = direntType => {
   switch (direntType) {
     case File:
     case SymLinkFile:
-      return handleClickFile$1;
+      return handleClickFile;
     case Directory:
     case SymLinkFolder:
       return handleClickDirectory;
@@ -2533,7 +2618,7 @@ const getClickFn = direntType => {
     case DirectoryExpanded:
       return handleClickDirectoryExpanded$1;
     case Symlink:
-      return handleClickSymLink$1;
+      return handleClickSymLink;
     case CharacterDevice:
       throw new Error('Cannot open character device files');
     case BlockDevice:
@@ -2545,34 +2630,6 @@ const getClickFn = direntType => {
   }
 };
 
-const getIndexFromPosition = (state, eventX, eventY) => {
-  const {
-    y,
-    itemHeight,
-    items
-  } = state;
-  const index = Math.floor((eventY - y) / itemHeight);
-  if (index < 0) {
-    return 0;
-  }
-  if (index >= items.length) {
-    return -1;
-  }
-  return index;
-};
-
-const getParentStartIndex = (dirents, index) => {
-  const dirent = dirents[index];
-  let startIndex = index - 1;
-  while (startIndex >= 0 && dirents[startIndex].depth >= dirent.depth) {
-    startIndex--;
-  }
-  return startIndex;
-};
-
-const Keyboard = -1;
-const LeftClick = 0;
-
 // 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
@@ -2583,81 +2640,11 @@ const LeftClick = 0;
 // TODO instead of root string, there should be a root dirent
 
 // TODO rename dirents to items, then can use virtual list component directly
-const setDeltaY$1 = (state, deltaY) => {
-  const {
-    itemHeight,
-    height,
-    items
-  } = state;
-  if (deltaY < 0) {
-    deltaY = 0;
-  } else if (deltaY > items.length * itemHeight - height) {
-    deltaY = Math.max(items.length * itemHeight - height, 0);
-  }
-  if (state.deltaY === deltaY) {
-    return state;
-  }
-  const minLineY = Math.round(deltaY / itemHeight);
-  const maxLineY = minLineY + Math.round(height / itemHeight);
-  return {
-    ...state,
-    deltaY,
-    minLineY,
-    maxLineY
-  };
-};
-const handleWheel = (state, deltaMode, deltaY) => {
-  return setDeltaY$1(state, state.deltaY + deltaY);
-};
 
 // TODO use posInSet and setSize properties to compute more effectively
 
 // TODO much shared logic with newFolder
 
-const handleClickFile = async (state, dirent, index, keepFocus = false) => {
-  // await Command.execute(/* Main.openAbsolutePath */ 'Main.openUri', /* absolutePath */ dirent.path, /* focus */ !keepFocus)
-  return {
-    ...state,
-    focusedIndex: index,
-    focused: keepFocus
-  };
-};
-const handleClickDirectoryExpanded = (state, dirent, index, keepFocus) => {
-  const {
-    minLineY,
-    maxLineY,
-    itemHeight
-  } = state;
-  dirent.type = Directory;
-  dirent.icon = getIcon();
-  const endIndex = getParentEndIndex(state.items, index);
-  const removeCount = endIndex - index - 1;
-  // TODO race conditions and side effects are everywhere
-  const newDirents = [...state.items];
-  newDirents.splice(index + 1, removeCount);
-  const newTotal = newDirents.length;
-  if (newTotal < maxLineY) {
-    const visibleItems = Math.min(maxLineY - minLineY, newTotal);
-    const newMaxLineY = Math.min(maxLineY, newTotal);
-    const newMinLineY = newMaxLineY - visibleItems;
-    const deltaY = newMinLineY * itemHeight;
-    return {
-      ...state,
-      items: newDirents,
-      focusedIndex: index,
-      focused: keepFocus,
-      minLineY: newMinLineY,
-      maxLineY: newMaxLineY,
-      deltaY
-    };
-  }
-  return {
-    ...state,
-    items: newDirents,
-    focusedIndex: index,
-    focused: keepFocus
-  };
-};
 const handleClick = async (state, index, keepFocus = false) => {
   const {
     items,
@@ -2675,102 +2662,44 @@ const handleClick = async (state, index, keepFocus = false) => {
   const clickFn = getClickFn(dirent.type);
   return clickFn(state, dirent, actualIndex, keepFocus);
 };
-const handleClickAt = (state, button, x, y) => {
-  if (button !== LeftClick) {
-    return state;
-  }
-  const index = getIndexFromPosition(state, x, y);
-  return handleClick(state, index);
-};
-const handleClickCurrentButKeepFocus = state => {
-  return handleClick(state, state.focusedIndex - state.minLineY, /* keepFocus */true);
-};
 
 // export const handleBlur=()=>{}
 
-const handleClickSymLink = async (state, dirent, index) => {
-  const realPath = await getRealPath(dirent.path);
-  const type = await stat(realPath);
-  switch (type) {
-    case File:
-      return handleClickFile(state, dirent, index);
-    default:
-      throw new Error(`unsupported file type ${type}`);
-  }
-};
-const handleArrowRightDirectoryExpanded = (state, dirent) => {
-  const {
-    items,
-    focusedIndex
-  } = state;
-  if (focusedIndex === items.length - 1) {
-    return state;
-  }
-  const nextDirent = items[focusedIndex + 1];
-  if (nextDirent.depth === dirent.depth + 1) {
-    return focusIndex(state, focusedIndex + 1);
-  }
-  return state;
-};
-const handleArrowRight = async state => {
+// TODO what happens when mouse leave and anther mouse enter event occur?
+// should update preview instead of closing and reopening
+
+// TODO maybe just insert items into explorer and refresh whole explorer
+
+const getIndexFromPosition = (state, eventX, eventY) => {
   const {
-    items,
-    focusedIndex
+    y,
+    itemHeight,
+    items
   } = state;
-  if (focusedIndex === -1) {
-    return state;
-  }
-  const dirent = items[focusedIndex];
-  switch (dirent.type) {
-    case File:
-    case SymLinkFile:
-      return state;
-    case Directory:
-    case SymLinkFolder:
-      // @ts-ignore
-      return handleClickDirectory(state, dirent);
-    case DirectoryExpanded:
-      return handleArrowRightDirectoryExpanded(state, dirent);
-    case Symlink:
-      return handleClickSymLink(state, dirent, focusedIndex);
-    default:
-      throw new Error(`unsupported file type ${dirent.type}`);
+  const index = Math.floor((eventY - y) / itemHeight);
+  if (index < 0) {
+    return 0;
   }
-};
-const focusParentFolder = state => {
-  const parentStartIndex = getParentStartIndex(state.items, state.focusedIndex);
-  if (parentStartIndex === -1) {
-    return state;
+  if (index >= items.length) {
+    return -1;
   }
-  return focusIndex(state, parentStartIndex);
+  return index;
 };
-const handleArrowLeft = state => {
-  const {
-    items,
-    focusedIndex
-  } = state;
-  if (focusedIndex === -1) {
+
+const Keyboard = -1;
+const LeftClick = 0;
+
+const handleClickAt = (state, button, x, y) => {
+  if (button !== LeftClick) {
     return state;
   }
-  const dirent = items[focusedIndex];
-  switch (dirent.type) {
-    case Directory:
-    case File:
-    case SymLinkFile:
-      return focusParentFolder(state);
-    case DirectoryExpanded:
-      // @ts-ignore
-      return handleClickDirectoryExpanded(state, dirent, focusedIndex);
-    default:
-      // TODO handle expanding directory and cancel file system call to read child dirents
-      return state;
-  }
+  const index = getIndexFromPosition(state, x, y);
+  return handleClick(state, index);
 };
 
-// TODO what happens when mouse leave and anther mouse enter event occur?
-// should update preview instead of closing and reopening
-
-// TODO maybe just insert items into explorer and refresh whole explorer
+const handleClickCurrentButKeepFocus = state => {
+  return handleClick(state, state.focusedIndex - state.minLineY, /* keepFocus */true);
+};
 
 const openFolder = async () => {
   // TODO
@@ -3238,27 +3167,51 @@ const handleUpload = async (state, dirents) => {
   }
 };
 
+const setDeltaY = (state, deltaY) => {
+  const {
+    itemHeight,
+    height,
+    items
+  } = state;
+  if (deltaY < 0) {
+    deltaY = 0;
+  } else if (deltaY > items.length * itemHeight - height) {
+    deltaY = Math.max(items.length * itemHeight - height, 0);
+  }
+  if (state.deltaY === deltaY) {
+    return state;
+  }
+  const minLineY = Math.round(deltaY / itemHeight);
+  const maxLineY = minLineY + Math.round(height / itemHeight);
+  return {
+    ...state,
+    deltaY,
+    minLineY,
+    maxLineY
+  };
+};
+
+const handleWheel = (state, deltaMode, deltaY) => {
+  return setDeltaY(state, state.deltaY + deltaY);
+};
+
 const getWorkspacePath = () => {
   return invoke('Workspace.getPath');
 };
 
+const getSettings = async () => {
+  const useChevronsRaw = await invoke('Preferences.get', 'explorer.useChevrons');
+  const useChevrons = useChevronsRaw === false ? false : true;
+  return {
+    useChevrons
+  };
+};
+
 const EmptyString = '';
 
 const Fulfilled = 'fulfilled';
 const Rejected = 'rejected';
 
-// 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
-
-// viewlet: creating | refreshing | done | disposed
-// TODO recycle viewlets (maybe)
-
-// TODO instead of root string, there should be a root dirent
-
-const getPathSeparator = root => {
-  return getPathSeparator$1(root);
-};
 const getSavedChildDirents = (map, path, depth, excluded, pathSeparator) => {
   const children = map[path];
   if (!children) {
@@ -3347,6 +3300,19 @@ const restoreExpandedState = async (savedState, root, pathSeparator, excluded) =
   const dirents = createDirents(root, expandedDirentPaths, expandedDirentChildren, excluded, pathSeparator);
   return dirents;
 };
+
+// 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
+
+// viewlet: creating | refreshing | done | disposed
+// TODO recycle viewlets (maybe)
+
+// TODO instead of root string, there should be a root dirent
+
+const getPathSeparator = root => {
+  return getPathSeparator$1(root);
+};
 const getExcluded = () => {
   const excludedObject = {};
   const excluded = [];
@@ -3361,8 +3327,9 @@ const getSavedRoot$1 = (savedState, workspacePath) => {
   return workspacePath;
 };
 const loadContent = async (state, savedState) => {
-  const useChevronsRaw = await invoke('Preferences.get', 'explorer.useChevrons');
-  const useChevrons = Boolean(useChevronsRaw);
+  const {
+    useChevrons
+  } = await getSettings();
   const workspacePath = await getWorkspacePath();
   const root = getSavedRoot$1(savedState, workspacePath);
   // TODO path separator could be restored from saved state
@@ -3460,9 +3427,7 @@ const openContainingFolder = async state => {
   const {
     focusedIndex,
     root,
-    items,
-    pathSeparator
-  } = state;
+    items} = state;
   const path = getContaingingFolder(root, items, focusedIndex);
   await invoke('OpenNativeFolder.openNativeFolder', /* path */path);
   return state;
@@ -3946,30 +3911,6 @@ const saveState = uid => {
   };
 };
 
-const setDeltaY = (state, deltaY) => {
-  const {
-    itemHeight,
-    height,
-    items
-  } = state;
-  if (deltaY < 0) {
-    deltaY = 0;
-  } else if (deltaY > items.length * itemHeight - height) {
-    deltaY = Math.max(items.length * itemHeight - height, 0);
-  }
-  if (state.deltaY === deltaY) {
-    return state;
-  }
-  const minLineY = Math.round(deltaY / itemHeight);
-  const maxLineY = minLineY + Math.round(height / itemHeight);
-  return {
-    ...state,
-    deltaY,
-    minLineY,
-    maxLineY
-  };
-};
-
 const terminate = () => {
   globalThis.close();
 };
@@ -4019,6 +3960,7 @@ const commandMap = {
   'Explorer.getKeyBindings': wrapCommand(getKeyBindings),
   'Explorer.getMenuEntries': wrapCommand(getMenuEntries),
   'Explorer.getVirtualDom': wrapCommand(getExplorerVirtualDom),
+  'Explorer.getCommandIds': getCommandIds,
   'Explorer.getVisibleItems': wrapCommand(getVisibleExplorerItems),
   'Explorer.handleArrowLeft': wrapCommand(handleArrowLeft),
   'Explorer.handleArrowRight': wrapCommand(handleArrowRight),

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@lvce-editor/explorer-view",
-  "version": "1.19.0",
+  "version": "1.21.0",
   "description": "Explorer Worker",
-  "keywords": [],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lvce-editor/explorer-view.git"