@lvce-editor/explorer-view 2.40.0 → 2.42.0

package/dist/explorerViewWorkerMain.js

@@ -1001,92 +1001,6 @@ const CreateFile = 1;
 const CreateFolder = 2;
 const Rename$1 = 3;
 
-const emptyObject = {};
-const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
-const i18nString = (key, placeholders = emptyObject) => {
-  if (placeholders === emptyObject) {
-    return key;
-  }
-  const replacer = (match, rest) => {
-    return placeholders[rest];
-  };
-  return key.replaceAll(RE_PLACEHOLDER, replacer);
-};
-
-const CollapseAllFoldersInExplorer = 'Collapse All Folders in Explorer';
-const Copy$1 = 'Copy';
-const CopyPath = 'Copy Path';
-const CopyRelativePath = 'Copy Relative Path';
-const Cut$1 = 'Cut';
-const Delete$1 = 'Delete';
-const FileOrFolderNameMustBeProvider = 'A file or folder name must be provided.';
-const FilesExplorer = 'Files Explorer';
-const NewFile$1 = 'New File...';
-const NewFolder$1 = 'New Folder...';
-const OpenContainingFolder = 'Open Containing Folder';
-const OpenFolder = 'Open folder';
-const OpenInIntegratedTerminal = 'Open in integrated Terminal';
-const Paste = 'Paste';
-const RefreshExplorer = 'Refresh Explorer';
-const Rename = 'Rename';
-const TypeAFileName = 'Type file name. Press Enter to confirm or Escape to cancel.'; // TODO use keybinding
-const YouHaveNotYetOpenedAFolder = 'You have not yet opened a folder';
-
-const newFile$1 = () => {
-  return i18nString(NewFile$1);
-};
-const newFolder$1 = () => {
-  return i18nString(NewFolder$1);
-};
-const openContainingFolder$1 = () => {
-  return i18nString(OpenContainingFolder);
-};
-const openInIntegratedTerminal = () => {
-  return i18nString(OpenInIntegratedTerminal);
-};
-const cut = () => {
-  return i18nString(Cut$1);
-};
-const copy = () => {
-  return i18nString(Copy$1);
-};
-const paste = () => {
-  return i18nString(Paste);
-};
-const copyPath$1 = () => {
-  return i18nString(CopyPath);
-};
-const copyRelativePath$1 = () => {
-  return i18nString(CopyRelativePath);
-};
-const rename = () => {
-  return i18nString(Rename);
-};
-const deleteItem = () => {
-  return i18nString(Delete$1);
-};
-const refresh$1 = () => {
-  return i18nString(RefreshExplorer);
-};
-const collapseAll$1 = () => {
-  return i18nString(CollapseAllFoldersInExplorer);
-};
-const filesExplorer = () => {
-  return i18nString(FilesExplorer);
-};
-const youHaveNotYetOpenedAFolder = () => {
-  return i18nString(YouHaveNotYetOpenedAFolder);
-};
-const openFolder$1 = () => {
-  return i18nString(OpenFolder);
-};
-const fileOrFolderNameMustBeProvided = () => {
-  return i18nString(FileOrFolderNameMustBeProvider);
-};
-const typeAFileName = () => {
-  return i18nString(TypeAFileName);
-};
-
 const List = 1;
 const Input$1 = 2;
 
@@ -1194,6 +1108,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;
@@ -1407,35 +1331,130 @@ 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;
 };
 
+const emptyObject = {};
+const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
+const i18nString = (key, placeholders = emptyObject) => {
+  if (placeholders === emptyObject) {
+    return key;
+  }
+  const replacer = (match, rest) => {
+    return placeholders[rest];
+  };
+  return key.replaceAll(RE_PLACEHOLDER, replacer);
+};
+
+const CollapseAllFoldersInExplorer = 'Collapse All Folders in Explorer';
+const Copy$1 = 'Copy';
+const CopyPath = 'Copy Path';
+const CopyRelativePath = 'Copy Relative Path';
+const Cut$1 = 'Cut';
+const Delete$1 = 'Delete';
+const FileOrFolderNameMustBeProvider = 'A file or folder name must be provided.';
+const FilesExplorer = 'Files Explorer';
+const NewFile$1 = 'New File...';
+const NewFolder$1 = 'New Folder...';
+const OpenContainingFolder = 'Open Containing Folder';
+const OpenFolder = 'Open folder';
+const OpenInIntegratedTerminal = 'Open in integrated Terminal';
+const Paste = 'Paste';
+const RefreshExplorer = 'Refresh Explorer';
+const Rename = 'Rename';
+const TypeAFileName = 'Type file name. Press Enter to confirm or Escape to cancel.'; // TODO use keybinding
+const YouHaveNotYetOpenedAFolder = 'You have not yet opened a folder';
+
+const newFile$1 = () => {
+  return i18nString(NewFile$1);
+};
+const newFolder$1 = () => {
+  return i18nString(NewFolder$1);
+};
+const openContainingFolder$1 = () => {
+  return i18nString(OpenContainingFolder);
+};
+const openInIntegratedTerminal = () => {
+  return i18nString(OpenInIntegratedTerminal);
+};
+const cut = () => {
+  return i18nString(Cut$1);
+};
+const copy = () => {
+  return i18nString(Copy$1);
+};
+const paste = () => {
+  return i18nString(Paste);
+};
+const copyPath$1 = () => {
+  return i18nString(CopyPath);
+};
+const copyRelativePath$1 = () => {
+  return i18nString(CopyRelativePath);
+};
+const rename = () => {
+  return i18nString(Rename);
+};
+const deleteItem = () => {
+  return i18nString(Delete$1);
+};
+const refresh$1 = () => {
+  return i18nString(RefreshExplorer);
+};
+const collapseAll$1 = () => {
+  return i18nString(CollapseAllFoldersInExplorer);
+};
+const filesExplorer = () => {
+  return i18nString(FilesExplorer);
+};
+const youHaveNotYetOpenedAFolder = () => {
+  return i18nString(YouHaveNotYetOpenedAFolder);
+};
+const openFolder$1 = () => {
+  return i18nString(OpenFolder);
+};
+const fileOrFolderNameMustBeProvided = () => {
+  return i18nString(FileOrFolderNameMustBeProvider);
+};
+const typeAFileName = () => {
+  return i18nString(TypeAFileName);
+};
+
+const validateFileName2 = name => {
+  if (!name) {
+    const editingErrorMessage = fileOrFolderNameMustBeProvided();
+    return editingErrorMessage;
+  }
+  return '';
+};
+
 const acceptCreate = async (state, newDirentType, createFn) => {
   const {
     editingValue,
@@ -1449,11 +1468,8 @@ const acceptCreate = async (state, newDirentType, createFn) => {
     items
   } = state;
   const newFileName = editingValue;
-  if (!newFileName) {
-    // TODO show error message that file name must not be empty
-    // below input box
-    // await ErrorHandling.showErrorDialog(new Error('file name must not be empty'))
-    const editingErrorMessage = fileOrFolderNameMustBeProvided();
+  const editingErrorMessage = validateFileName2(newFileName);
+  if (editingErrorMessage) {
     return {
       ...state,
       editingErrorMessage
@@ -1472,7 +1488,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 {
@@ -1522,16 +1538,6 @@ const createNewDirentsRename = async (renamedDirent, editingValue, pathSeparator
   return true;
 };
 
-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 updateTree2 = (tree, update) => {
   const updatedTree = {
     ...tree,
@@ -1551,6 +1557,13 @@ const acceptRename = async state => {
     itemHeight,
     fileIconCache
   } = state;
+  const editingErrorMessage = validateFileName2(editingValue);
+  if (editingErrorMessage) {
+    return {
+      ...state,
+      editingErrorMessage
+    };
+  }
   const renamedDirent = items[editingIndex];
   const successful = await createNewDirentsRename(renamedDirent, editingValue);
   if (!successful) {
@@ -1580,7 +1593,9 @@ const acceptRename = async state => {
     focus: List,
     items: newDirents,
     icons,
-    fileIconCache: newFileIconCache
+    fileIconCache: newFileIconCache,
+    editingSelectionEnd: 0,
+    editingSelectionStart: 0
   };
 };
 
@@ -1655,7 +1670,9 @@ const cancelEditRename = (state, keepFocus) => {
     editingValue: '',
     editingType: None$5,
     editingErrorMessage: '',
-    focus: List
+    focus: List,
+    editingSelectionStart: 0,
+    editingSelectionEnd: 0
   };
 };
 
@@ -1843,10 +1860,8 @@ const create2 = (uid, uri, x, y, width, height, args, parentUid, platform = 0) =
     focus: 0,
     editingErrorMessage: '',
     inputSource: 0,
-    editingSelection: {
-      start: 0,
-      end: 0
-    },
+    editingSelectionEnd: 0,
+    editingSelectionStart: 0,
     focusWord: '',
     focusWordTimeout: 800,
     finalDeltaY: 0,
@@ -1890,10 +1905,8 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     focus: 0,
     editingErrorMessage: '',
     inputSource: 0,
-    editingSelection: {
-      start: 0,
-      end: 0
-    },
+    editingSelectionStart: 0,
+    editingSelectionEnd: 0,
     focusWord: '',
     focusWordTimeout: 800,
     finalDeltaY: 0,
@@ -1923,7 +1936,7 @@ const isEqual$3 = (oldState, newState) => {
 
 const diffType$1 = RenderSelection;
 const isEqual$2 = (oldState, newState) => {
-  return oldState.editingSelection.start === newState.editingSelection.start && oldState.editingSelection.end === newState.editingSelection.end;
+  return oldState.editingSelectionStart === newState.editingSelectionStart && oldState.editingSelectionEnd === newState.editingSelectionEnd;
 };
 
 const diffType = RenderValue;
@@ -4130,6 +4143,7 @@ const getNewDirentsForRename = (items, focusedIndex) => {
   const item = items[focusedIndex];
   const newItems = [...items];
   const editingType = item.type === File ? EditingFile : EditingFolder;
+  // TODO avoid mutation
   newItems[focusedIndex] = {
     ...item,
     type: editingType
@@ -4137,6 +4151,20 @@ const getNewDirentsForRename = (items, focusedIndex) => {
   return newItems;
 };
 
+const getRenameSelectionRange = name => {
+  const dotIndex = name.lastIndexOf('.');
+  if (dotIndex === -1) {
+    return {
+      start: 0,
+      end: name.length
+    };
+  }
+  return {
+    start: 0,
+    end: dotIndex
+  };
+};
+
 const User = 1;
 const Script = 2;
 
@@ -4152,6 +4180,10 @@ const renameDirent = state => {
   }
   const item = items[focusedIndex];
   const newItems = getNewDirentsForRename(items, focusedIndex);
+  const {
+    start,
+    end
+  } = getRenameSelectionRange(item.name);
   return {
     ...state,
     items: newItems,
@@ -4159,21 +4191,24 @@ const renameDirent = state => {
     editingType: Rename$1,
     editingValue: item.name,
     editingIcon: icons[focusedIndex - minLineY],
-    editingSelection: {
-      start: 0,
-      end: item.name.length
-    },
+    editingSelectionStart: start,
+    editingSelectionEnd: end,
     focus: Input$1,
     inputSource: Script
   };
 };
 
+const ExplorerInput = 'ExplorerInput';
+
 const renderEditingSelection = (oldState, newState) => {
-  return ['Viewlet.setSelection', newState.editingSelection];
+  const {
+    editingSelectionStart,
+    editingSelectionEnd,
+    uid
+  } = newState;
+  return ['Viewlet.setSelectionByName', uid, ExplorerInput, editingSelectionStart, editingSelectionEnd];
 };
 
-const ExplorerInput = 'ExplorerInput';
-
 const renderFocus$1 = (oldState, newState) => {
   if (newState.inputSource === User) {
     return [];
@@ -4681,10 +4716,6 @@ const getRenderer = diffType => {
 const applyRender = (oldState, newState, diffResult) => {
   const commands = [];
   for (const item of diffResult) {
-    if (item === RenderSelection) {
-      // TODO support this in the future
-      continue;
-    }
     const fn = getRenderer(item);
     const result = fn(oldState, newState);
     if (result.length > 0) {
@@ -5144,10 +5175,12 @@ const updateEditingValue = async (state, value, inputSource = User) => {
     editingIndex
   } = state;
   const editingIcon = await getEditingIcon(editingType, value, items[editingIndex]?.type);
+  const editingErrorMessage = validateFileName2(value);
   return {
     ...state,
     editingValue: value,
-    editingIcon
+    editingIcon,
+    editingErrorMessage
   };
 };
 

package/package.json

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