@lvce-editor/explorer-view 2.34.0 → 2.36.0

package/dist/explorerViewWorkerMain.js

@@ -850,6 +850,116 @@ const WebWorkerRpcClient = {
   create: create$2
 };
 
+const rpcs = Object.create(null);
+const set$5 = (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);
+};
+const RendererWorker = {
+  __proto__: null,
+  invoke: invoke$2,
+  set: set$2
+};
+
+const {
+  invoke,
+  set: set$1
+} = RendererWorker;
+
+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.writeFile', uri, '');
+};
+const writeFile = async (uri, content) => {
+  return invoke('FileSystem.writeFile', uri, content);
+};
+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 createNestedPath = async (root, path, pathSeparator) => {
+  const parts = path.slice(root.length).split(pathSeparator);
+  let currentPath = '';
+  for (const part of parts) {
+    if (!part) continue;
+    currentPath = currentPath ? `${currentPath}${pathSeparator}${part}` : part;
+    try {
+      await mkdir(`${root}${currentPath}`);
+    } catch (error) {
+      // Ignore error if directory already exists
+      if (!(error instanceof Error && error.message.includes('already exists'))) {
+        throw error;
+      }
+    }
+  }
+};
+
+const dirname = (pathSeparator, path) => {
+  const index = path.lastIndexOf(pathSeparator);
+  if (index === -1) {
+    return path;
+  }
+  return path.slice(0, index);
+};
+const join = (pathSeparator, ...parts) => {
+  return parts.join(pathSeparator);
+};
+const getBaseName = (pathSeparator, path) => {
+  return path.slice(path.lastIndexOf(pathSeparator) + 1);
+};
+const join2 = (path, childPath) => {
+  if (path.endsWith('/')) {
+    return `${path}${childPath}`;
+  }
+  return `${path}/${childPath}`;
+};
+
+const createNewDirentsAccept = async (newFileName, pathSeparator, absolutePath, root, createFn) => {
+  try {
+    // Create parent directories if they don't exist
+    if (newFileName.includes(pathSeparator)) {
+      const parentPath = dirname(pathSeparator, absolutePath);
+      await createNestedPath(root, parentPath, pathSeparator);
+    }
+    await createFn(absolutePath);
+    return true;
+  } catch (error) {
+    console.error(new VError(error, `Failed to create file`));
+    return false;
+  }
+};
+
 const None$5 = 0;
 const CreateFile = 1;
 const CreateFolder = 2;
@@ -901,7 +1011,7 @@ const openInIntegratedTerminal = () => {
 const cut = () => {
   return i18nString(Cut$1);
 };
-const copy$1 = () => {
+const copy = () => {
   return i18nString(Copy$1);
 };
 const paste = () => {
@@ -913,7 +1023,7 @@ const copyPath$1 = () => {
 const copyRelativePath$1 = () => {
   return i18nString(CopyRelativePath);
 };
-const rename$1 = () => {
+const rename = () => {
   return i18nString(Rename);
 };
 const deleteItem = () => {
@@ -982,33 +1092,6 @@ const getPaths = items => {
   return items.map(getPath);
 };
 
-const rpcs = Object.create(null);
-const set$5 = (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);
-};
-const RendererWorker = {
-  __proto__: null,
-  invoke: invoke$2,
-  set: set$2
-};
-
-const {
-  invoke,
-  set: set$1
-} = RendererWorker;
-
 const DELTA_EDITING = 100;
 
 const BlockDevice = 1;
@@ -1109,26 +1192,12 @@ const getParentFolder = (dirents, index, root) => {
   }
   return dirents[index].path;
 };
-const getNewDirentsAccept = async (state, newDirentType, createFn) => {
-  const {
-    focusedIndex,
-    editingValue
-  } = state;
+
+const getNewDirentsAccept = (items, focusedIndex, editingValue, root, pathSeparator, newDirentType) => {
   const newFileName = editingValue;
-  const parentFolder = getParentFolder(state.items, focusedIndex, state.root);
-  const absolutePath = [parentFolder, newFileName].join(state.pathSeparator);
-  // TODO better handle error
-  try {
-    await createFn(absolutePath);
-  } catch (error) {
-    console.error(new VError(error, `Failed to create file`));
-    // TODO display error
-    return {
-      dirents: state.items,
-      newFocusedIndex: state.focusedIndex
-    };
-  }
-  const parentDirent = focusedIndex >= 0 ? state.items[focusedIndex] : {
+  const parentFolder = getParentFolder(items, focusedIndex, root);
+  const absolutePath = [parentFolder, newFileName].join(pathSeparator);
+  const parentDirent = focusedIndex >= 0 ? items[focusedIndex] : {
     depth: 0};
   const depth = parentDirent.depth + 1;
   const newDirent = {
@@ -1144,14 +1213,11 @@ const getNewDirentsAccept = async (state, newDirentType, createFn) => {
   };
   // @ts-ignore
   newDirent.icon = '';
-  let insertIndex = state.focusedIndex;
+  let insertIndex = focusedIndex;
   let deltaPosInSet = 0;
   let posInSet = 1;
   let setSize = 1;
-  let i = Math.max(state.focusedIndex, -1) + 1;
-  const {
-    items
-  } = state;
+  let i = Math.max(focusedIndex, -1) + 1;
   // TODO update posinset and setsize of all affected dirents
   for (; i < items.length; i++) {
     const dirent = items[i];
@@ -1180,11 +1246,10 @@ const getNewDirentsAccept = async (state, newDirentType, createFn) => {
   newDirent.setSize = setSize;
   // @ts-ignore
   newDirent.posInSet = posInSet;
-  // @ts-ignore
-  items.splice(insertIndex + 1, 0, newDirent);
-  const newDirents = [...items].filter(item => item.type !== EditingFile && item.type !== EditingFolder);
+  const newItems = [...items];
+  newItems.splice(insertIndex + 1, 0, newDirent);
   return {
-    dirents: newDirents,
+    dirents: newItems,
     newFocusedIndex: insertIndex + 1
   };
 };
@@ -1195,7 +1260,11 @@ const acceptCreate = async (state, newDirentType, createFn) => {
     minLineY,
     height,
     itemHeight,
-    fileIconCache
+    fileIconCache,
+    pathSeparator,
+    root,
+    focusedIndex,
+    items
   } = state;
   const newFileName = editingValue;
   if (!newFileName) {
@@ -1208,10 +1277,16 @@ const acceptCreate = async (state, newDirentType, createFn) => {
       editingErrorMessage
     };
   }
+  const parentFolder = getParentFolder(items, focusedIndex, root);
+  const absolutePath = join2(parentFolder, newFileName);
+  const successful = await createNewDirentsAccept(newFileName, pathSeparator, absolutePath, root, createFn);
+  if (!successful) {
+    return state;
+  }
   const {
     dirents,
     newFocusedIndex
-  } = await getNewDirentsAccept(state, newDirentType, createFn);
+  } = getNewDirentsAccept(items, focusedIndex, editingValue, root, pathSeparator, newDirentType);
   const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, dirents.length);
   const visible = dirents.slice(minLineY, maxLineY);
   const {
@@ -1231,37 +1306,6 @@ const acceptCreate = async (state, newDirentType, createFn) => {
   };
 };
 
-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.writeFile', uri, '');
-};
-const writeFile = async (uri, content) => {
-  return invoke('FileSystem.writeFile', uri, content);
-};
-const mkdir = async uri => {
-  return invoke('FileSystem.mkdir', uri);
-};
-const rename = async (oldUri, newUri) => {
-  return invoke('FileSystem.rename', oldUri, newUri);
-};
-const copy = async (oldUri, newUri) => {
-  return invoke('FileSystem.copy', oldUri, newUri);
-};
-
 const acceptCreateFile = async state => {
   return acceptCreate(state, File, createFile);
 };
@@ -1365,24 +1409,18 @@ const computeExplorerRenamedDirent = (dirents, index, newName) => {
   };
 };
 
-const dirname = (pathSeparator, path) => {
-  const index = path.lastIndexOf(pathSeparator);
-  if (index === -1) {
-    return path;
-  }
-  return path.slice(0, index);
-};
-const join = (pathSeparator, ...parts) => {
-  return parts.join(pathSeparator);
-};
-const getBaseName = (pathSeparator, path) => {
-  return path.slice(path.lastIndexOf(pathSeparator) + 1);
-};
-const join2 = (path, childPath) => {
-  if (path.endsWith('/')) {
-    return `${path}${childPath}`;
+const createNewDirentsRename = async (renamedDirent, editingValue, pathSeparator) => {
+  try {
+    // TODO this does not work with rename of nested file
+    const oldAbsolutePath = renamedDirent.path;
+    const oldParentPath = dirname(pathSeparator, oldAbsolutePath);
+    const newAbsolutePath = join2(oldParentPath, editingValue);
+    await rename$1(oldAbsolutePath, newAbsolutePath);
+  } catch (error) {
+    console.error(new VError(error, `Failed to rename file`));
+    return false;
   }
-  return `${path}/${childPath}`;
+  return true;
 };
 
 const acceptRename = async state => {
@@ -1393,23 +1431,14 @@ const acceptRename = async state => {
     pathSeparator
   } = state;
   const renamedDirent = items[editingIndex];
-  try {
-    // TODO this does not work with rename of nested file
-    const oldAbsolutePath = renamedDirent.path;
-    const oldParentPath = dirname(pathSeparator, oldAbsolutePath);
-    const newAbsolutePath = [oldParentPath, editingValue].join(pathSeparator);
-    await rename(oldAbsolutePath, newAbsolutePath);
-  } catch (error) {
-    console.error(new VError(error, `Failed to rename file`));
+  const successful = await createNewDirentsRename(renamedDirent, editingValue, pathSeparator);
+  if (!successful) {
     return state;
   }
   const {
     newDirents,
     focusedIndex
   } = computeExplorerRenamedDirent(items, editingIndex, editingValue);
-  //  TODO move focused index
-  // @ts-ignore
-  state.items = newDirents;
   return {
     ...state,
     editingIndex: -1,
@@ -1418,7 +1447,8 @@ const acceptRename = async state => {
     editingIcon: '',
     focusedIndex,
     focused: true,
-    focus: List
+    focus: List,
+    items: newDirents
   };
 };
 
@@ -1438,6 +1468,28 @@ const acceptEdit = async state => {
   }
 };
 
+const isNormalItem = item => {
+  return item.type !== EditingFile && item.type !== EditingFolder;
+};
+
+const cancelEditCreate = (state, keepFocus) => {
+  const {
+    editingIndex,
+    items
+  } = state;
+  const filteredItems = items.filter(isNormalItem);
+  return {
+    ...state,
+    items: filteredItems,
+    focusedIndex: editingIndex,
+    focused: keepFocus,
+    editingIndex: -1,
+    editingValue: '',
+    editingType: None$5,
+    focus: List
+  };
+};
+
 const normalizeDirentType = direntType => {
   if (direntType > DELTA_EDITING) {
     return direntType - DELTA_EDITING;
@@ -1455,33 +1507,17 @@ const getNewDirentsForCancelRename = (items, editingIndex) => {
   return newItems;
 };
 
-const isNormalItem = item => {
-  return item.type !== EditingFile && item.type !== EditingFolder;
-};
-const cancelEdit = state => {
+const cancelEditRename = (state, keepFocus) => {
   const {
     editingIndex,
-    editingType
+    items
   } = state;
-  if (editingType === Rename$1) {
-    const newItems = getNewDirentsForCancelRename(state.items, editingIndex);
-    return {
-      ...state,
-      items: newItems,
-      focusedIndex: editingIndex,
-      focused: true,
-      editingIndex: -1,
-      editingValue: '',
-      editingType: None$5,
-      focus: List
-    };
-  }
-  const filteredItems = state.items.filter(isNormalItem);
+  const newItems = getNewDirentsForCancelRename(items, editingIndex);
   return {
     ...state,
-    items: filteredItems,
+    items: newItems,
     focusedIndex: editingIndex,
-    focused: true,
+    focused: keepFocus,
     editingIndex: -1,
     editingValue: '',
     editingType: None$5,
@@ -1489,6 +1525,20 @@ const cancelEdit = state => {
   };
 };
 
+const cancelEditInternal = (state, keepFocus) => {
+  const {
+    editingType
+  } = state;
+  if (editingType === Rename$1) {
+    return cancelEditRename(state, keepFocus);
+  }
+  return cancelEditCreate(state, keepFocus);
+};
+
+const cancelEdit = state => {
+  return cancelEditInternal(state, true);
+};
+
 const cancelTypeAhead = state => {
   return {
     ...state,
@@ -1496,7 +1546,7 @@ const cancelTypeAhead = state => {
   };
 };
 
-const isTopLevel$1 = dirent => {
+const isTopLevel = dirent => {
   return dirent.depth === 1;
 };
 
@@ -1514,7 +1564,7 @@ const collapseAll = state => {
   const {
     items
   } = state;
-  const newDirents = items.filter(isTopLevel$1).map(toCollapsedDirent);
+  const newDirents = items.filter(isTopLevel).map(toCollapsedDirent);
   return {
     ...state,
     items: newDirents
@@ -1781,6 +1831,10 @@ const isSymbolicLink = dirent => {
   return dirent.type === Symlink;
 };
 
+const hasSymbolicLinks = rawDirents => {
+  return rawDirents.some(isSymbolicLink);
+};
+
 const ENOENT = 'ENOENT';
 
 const getSymlinkType = type => {
@@ -1864,9 +1918,6 @@ const toDisplayDirents = (pathSeparator, rawDirents, parentDirent, excluded) =>
   return result;
 };
 
-const hasSymbolicLinks = rawDirents => {
-  return rawDirents.some(isSymbolicLink);
-};
 const getChildDirentsRaw = async uri => {
   const rawDirents = await readDirWithFileTypes(uri);
   array(rawDirents);
@@ -2330,7 +2381,7 @@ const menuEntryCut = {
 };
 const menuEntryCopy = {
   id: 'copy',
-  label: copy$1(),
+  label: copy(),
   flags: RestoreFocus,
   command: 'Explorer.handleCopy'
 };
@@ -2354,7 +2405,7 @@ const menuEntryCopyRelativePath = {
 };
 const menuEntryRename = {
   id: 'rename',
-  label: rename$1(),
+  label: rename(),
   flags: None$4,
   command: 'Explorer.renameDirent'
 };
@@ -2645,15 +2696,9 @@ const handleArrowRight = async state => {
   }
 };
 
-const handleBlur = state => {
+const handleBlur = async 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
@@ -3104,7 +3149,7 @@ const applyOperation = operation => {
     return mkdir(operation.path);
   }
   if (operation.type === 'copy') {
-    return copy(operation.from || '', operation.path);
+    return copy$1(operation.from || '', operation.path);
   }
   return writeFile(operation.path, operation.text);
 };
@@ -3318,7 +3363,7 @@ const handleDropIntoFolder = async (state, dirent, index, fileHandles, files, pa
     const baseName = file.name;
     const to = dirent.path + pathSeparator + baseName;
     // @ts-ignore
-    await copy(file, to);
+    await copy$1(file, to);
   }
   const childDirents = await getChildDirents(pathSeparator, dirent);
   const mergedDirents = getMergedDirents(items, index, dirent, childDirents);
@@ -3436,8 +3481,15 @@ const handleIconThemeChange = state => {
   return updateIcons(state);
 };
 
-const handleInputBlur = state => {
-  return cancelEdit(state);
+const handleInputBlur = async state => {
+  const {
+    editingErrorMessage,
+    editingValue
+  } = state;
+  if (editingErrorMessage || !editingValue) {
+    return cancelEditInternal(state, false);
+  }
+  return acceptEdit(state);
 };
 
 const handleInputClick = state => {
@@ -3565,7 +3617,7 @@ const handlePasteCopy = async (state, nativeFiles) => {
   for (const source of nativeFiles.files) {
     // @ts-ignore
     const target = join(state.pathSeperator, state.root, getBaseName(state.pathSeparator, source));
-    await copy(source, target);
+    await copy$1(source, target);
   }
   // TODO only update folder at which level it changed
   return updateRoot(state);
@@ -3574,7 +3626,7 @@ const handlePasteCopy = async (state, nativeFiles) => {
 const handlePasteCut = async (state, nativeFiles) => {
   for (const source of nativeFiles.files) {
     const target = `${state.root}${state.pathSeparator}${getBaseName(state.pathSeparator, source)}`;
-    await rename(source, target);
+    await rename$1(source, target);
   }
   return state;
 };
@@ -4193,7 +4245,6 @@ const HandleInputBlur = 'handleInputBlur';
 const HandleInputClick = 'handleInputClick';
 const HandleListBlur = 'handleListBlur';
 const HandleListFocus = 'handleListFocus';
-const HandleListKeyDown = 'handleListKeyDown';
 const HandlePointerDown = 'handlePointerDown';
 const HandleWheel = 'handleWheel';
 
@@ -4380,8 +4431,8 @@ const getListItemsVirtualDom = (visibleItems, focusedIndex, focused, dropTargets
     onDrop: HandleDrop,
     onFocus: HandleListFocus,
     onPointerDown: HandlePointerDown,
-    onWheel: HandleWheel,
-    onKeyDown: HandleListKeyDown
+    onWheel: HandleWheel
+    // onKeyDown: DomEventListenerFunctions.HandleListKeyDown,
   }, ...visibleItems.flatMap(getExplorerItemVirtualDom)];
   return dom;
 };
@@ -4824,9 +4875,20 @@ const getPathPartsToReveal = (root, pathParts, dirents) => {
   return pathParts;
 };
 
-const isTopLevel = dirent => {
-  return dirent.depth === 1;
+const mergeVisibleWithHiddenItems = (visibleItems, hiddenItems) => {
+  const merged = [...visibleItems, ...hiddenItems];
+  const seen = Object.create(null);
+  const unique = [];
+  for (const item of merged) {
+    if (seen[item.path]) {
+      continue;
+    }
+    seen[item.path] = true;
+    unique.push(item);
+  }
+  return unique;
 };
+
 const orderDirents = dirents => {
   if (dirents.length === 0) {
     return dirents;
@@ -4876,19 +4938,6 @@ const getPathPartChildren = async pathPart => {
   const children = await getChildDirents(pathPart.pathSeparator, pathPart);
   return children;
 };
-const mergeVisibleWithHiddenItems = (visibleItems, hiddenItems) => {
-  const merged = [...visibleItems, ...hiddenItems];
-  const seen = Object.create(null);
-  const unique = [];
-  for (const item of merged) {
-    if (seen[item.path]) {
-      continue;
-    }
-    seen[item.path] = true;
-    unique.push(item);
-  }
-  return unique;
-};
 
 // TODO maybe just insert items into explorer and refresh whole explorer
 const revealItemHidden = async (state, uri) => {
@@ -5093,7 +5142,12 @@ const getEditingIcon = async (editingType, value, direntType) => {
 };
 
 const updateEditingValue = async (state, value, inputSource = User) => {
-  const editingIcon = await getEditingIcon(state.editingType, value, state.items[state.editingIndex]?.type);
+  const {
+    editingType,
+    items,
+    editingIndex
+  } = state;
+  const editingIcon = await getEditingIcon(editingType, value, items[editingIndex]?.type);
   return {
     ...state,
     editingValue: value,

package/package.json

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