@lvce-editor/explorer-view 2.55.0 → 2.56.0

package/dist/explorerViewWorkerMain.js

@@ -995,6 +995,23 @@ const applyFileOperations = async operations => {
   }
 };
 
+const DELTA_EDITING = 100;
+
+const BlockDevice = 1;
+const CharacterDevice = 2;
+const Directory = 3;
+const DirectoryExpanded = 4;
+const DirectoryExpanding = 5;
+const File = 7;
+const Socket = 8;
+const Symlink = 9;
+const SymLinkFile = 10;
+const SymLinkFolder = 11;
+const Unknown = 12;
+const EditingFile = File + DELTA_EDITING;
+const EditingFolder = Directory + DELTA_EDITING;
+const EditingDirectoryExpanded = DirectoryExpanded + DELTA_EDITING;
+
 const dirname = (pathSeparator, path) => {
   const index = path.lastIndexOf(pathSeparator);
   if (index === -1) {
@@ -1015,16 +1032,32 @@ const join2 = (path, childPath) => {
   return `${path}/${childPath}`;
 };
 
+const getActualType = (type, expanded) => {
+  const actualType = type === Directory && expanded ? DirectoryExpanded : type;
+  return actualType;
+};
 const createTree = (items, root) => {
   const tree = Object.create(null);
   const rootLength = root.length;
-  for (const item of items) {
+  const paths = items.map(item => {
     const relativePath = item.path.slice(rootLength);
     const dirname = dirname2(relativePath);
+    return dirname;
+  });
+  for (const item of items) {
+    const {
+      type,
+      name,
+      path
+    } = item;
+    const relativePath = path.slice(rootLength);
+    const dirname = dirname2(relativePath);
+    const isExpanded = paths.includes(relativePath);
+    const actualType = getActualType(type, isExpanded);
     tree[dirname] ||= [];
     tree[dirname].push({
-      name: item.name,
-      type: item.type
+      name,
+      type: actualType
     });
   }
   return tree;
@@ -1076,23 +1109,6 @@ const getPaths = items => {
   return items.map(getPath);
 };
 
-const DELTA_EDITING = 100;
-
-const BlockDevice = 1;
-const CharacterDevice = 2;
-const Directory = 3;
-const DirectoryExpanded = 4;
-const DirectoryExpanding = 5;
-const File = 7;
-const Socket = 8;
-const Symlink = 9;
-const SymLinkFile = 10;
-const SymLinkFolder = 11;
-const Unknown = 12;
-const EditingFile = File + DELTA_EDITING;
-const EditingFolder = Directory + DELTA_EDITING;
-const EditingDirectoryExpanded = DirectoryExpanded + DELTA_EDITING;
-
 const getSimpleIconRequestType = direntType => {
   if (direntType === Directory || direntType === DirectoryExpanded || direntType === EditingDirectoryExpanded || direntType === EditingFolder) {
     return 2;
@@ -1197,13 +1213,14 @@ const getPathParts = (root, uri, pathSeparator) => {
   const parts = [];
   let index = root.length - 1;
   let depth = 0;
-  while ((index = uri.indexOf('/', index + 1)) !== -1) {
+  while ((index = uri.indexOf(pathSeparator, index + 1)) !== -1) {
     const partUri = uri.slice(0, index);
     parts.push({
       path: partUri,
       depth: depth++,
       root,
-      pathSeparator
+      pathSeparator,
+      expanded: true
     });
   }
   return parts;
@@ -1310,14 +1327,14 @@ const sortExplorerItems = rawDirents => {
 };
 
 // TODO figure out whether this uses too much memory (name,path -> redundant, depth could be computed on demand)
-const toDisplayDirent = (parentPath, parentDepth, rawDirent, index, length) => {
-  const path = join2(parentPath, rawDirent.name);
+const toDisplayDirent = (parentPath, parentDepth, rawDirentType, rawDirentName, index, length) => {
+  const path = join2(parentPath, rawDirentName);
   return {
-    name: rawDirent.name,
+    name: rawDirentName,
     posInSet: index + 1,
     setSize: length,
     depth: parentDepth + 1,
-    type: rawDirent.type,
+    type: rawDirentType,
     path,
     // TODO storing absolute path might be too costly, could also store relative path here
     icon: '',
@@ -1325,7 +1342,7 @@ const toDisplayDirent = (parentPath, parentDepth, rawDirent, index, length) => {
   };
 };
 
-const toDisplayDirents = (pathSeparator, rawDirents, parentDirentPath, parentDirentDepth, excluded) => {
+const toDisplayDirents = (pathSeparator, rawDirents, parentDirentPath, parentDirentDepth, excluded, expanded = false) => {
   rawDirents = sortExplorerItems(rawDirents);
   const result = [];
   const visibleItems = rawDirents.filter(item => {
@@ -1337,7 +1354,7 @@ const toDisplayDirents = (pathSeparator, rawDirents, parentDirentPath, parentDir
   const count = visibleItems.length;
   for (let i = 0; i < visibleItems.length; i++) {
     const rawDirent = visibleItems[i];
-    result.push(toDisplayDirent(parentDirentPath, parentDirentDepth, rawDirent, i, count));
+    result.push(toDisplayDirent(parentDirentPath, parentDirentDepth, rawDirent.type, rawDirent.name, i, count));
   }
   return result;
 };
@@ -1448,6 +1465,7 @@ const CopyPath = 'Copy Path';
 const CopyRelativePath = 'Copy Relative Path';
 const Cut$1 = 'Cut';
 const Delete$1 = 'Delete';
+const FileNameCannotStartWithSlash = 'A file or folder name cannot start with a slash.';
 const FileOrFolderNameMustBeProvider = 'A file or folder name must be provided.';
 const FilesExplorer = 'Files Explorer';
 const NewFile$1 = 'New File...';
@@ -1512,6 +1530,9 @@ const openFolder$1 = () => {
 const fileOrFolderNameMustBeProvided = () => {
   return i18nString(FileOrFolderNameMustBeProvider);
 };
+const fileCannotStartWithSlash = () => {
+  return i18nString(FileNameCannotStartWithSlash);
+};
 const typeAFileName = () => {
   return i18nString(TypeAFileName);
 };
@@ -1521,6 +1542,9 @@ const validateFileName2 = name => {
     const editingErrorMessage = fileOrFolderNameMustBeProvided();
     return editingErrorMessage;
   }
+  if (name.startsWith('/')) {
+    return fileCannotStartWithSlash();
+  }
   return '';
 };
 

package/package.json

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