@lvce-editor/explorer-view 2.47.0 → 2.49.0

package/dist/explorerViewWorkerMain.js

@@ -868,10 +868,10 @@ const WebWorkerRpcClient = {
   create: create$3
 };
 
-const CreateFolder$1 = 'createFolder'; // TODO use number
-const CreateFile$1 = 'createFile'; // TODO use number
-const Copy$2 = 'copy'; // TODO use number
-const Rename$2 = 'rename'; // TODO use number
+const CreateFolder$1 = 1;
+const CreateFile$1 = 2;
+const Copy$2 = 3;
+const Rename$2 = 4;
 
 const rpcs = Object.create(null);
 const set$b = (id, rpc) => {
@@ -993,7 +993,7 @@ const getBaseName = (pathSeparator, path) => {
   return path.slice(path.lastIndexOf(pathSeparator) + 1);
 };
 const join2 = (path, childPath) => {
-  if (path.endsWith('/')) {
+  if (path.endsWith('/') || childPath.startsWith('/')) {
     return `${path}${childPath}`;
   }
   return `${path}/${childPath}`;
@@ -1077,16 +1077,17 @@ const EditingFile = File + DELTA_EDITING;
 const EditingFolder = Directory + DELTA_EDITING;
 const EditingDirectoryExpanded = DirectoryExpanded + DELTA_EDITING;
 
-const getSimpleType = direntType => {
+const getSimpleIconRequestType = direntType => {
   if (direntType === Directory || direntType === DirectoryExpanded || direntType === EditingDirectoryExpanded || direntType === EditingFolder) {
     return 2;
   }
   return 1;
 };
+
 const toSimpleIconRequest = request => {
   return {
     name: request.name,
-    type: getSimpleType(request.type)
+    type: getSimpleIconRequestType(request.type)
   };
 };
 
@@ -1132,11 +1133,10 @@ const getFileOperationsNestedPath = (path, root, pathSeparator) => {
   let currentPath = '';
   for (const part of parts) {
     if (!part) continue;
-    currentPath = currentPath ? `${currentPath}${pathSeparator}${part}` : part;
+    currentPath = join2(currentPath, part);
     operations.push({
       type: CreateFolder$1,
-      path: `${root}${currentPath}`,
-      text: ''
+      path: join2(root, currentPath)
     });
   }
   return operations;
@@ -1154,8 +1154,7 @@ const getFileOperationsCreate = (newFileName, newDirentType, pathSeparator, abso
   } else if (newDirentType === Directory) {
     operations.push({
       type: CreateFolder$1,
-      path: absolutePath,
-      text: ''
+      path: absolutePath
     });
   }
   return operations;
@@ -1393,7 +1392,7 @@ const treeToArrayInternal = (map, root, items, path, depth) => {
   for (let i = 0; i < count; i++) {
     const child = children[i];
     const childPath = join2(path, child.name);
-    const absolutePath = `${root}${childPath}`;
+    const absolutePath = join2(root, childPath);
     items.push({
       depth,
       posInSet: i + 1,
@@ -1508,7 +1507,7 @@ const validateFileName2 = name => {
   return '';
 };
 
-const acceptCreate = async (state, newDirentType, createFn) => {
+const acceptCreate = async (state, newDirentType) => {
   const {
     editingValue,
     minLineY,
@@ -1591,18 +1590,16 @@ const computeExplorerRenamedDirentUpdate = (root, parentPath, oldUri, children,
   return update;
 };
 
-const createNewDirentsRename = async (renamedDirent, editingValue, pathSeparator) => {
-  try {
-    // TODO this does not work with rename of nested file
-    const oldAbsolutePath = renamedDirent.path;
-    const oldParentPath = dirname2(oldAbsolutePath);
-    const newAbsolutePath = join2(oldParentPath, editingValue);
-    await rename$1(oldAbsolutePath, newAbsolutePath);
-  } catch (error) {
-    console.error(new VError(error, `Failed to rename file`));
-    return `${error}`;
-  }
-  return '';
+const getFileOperationsRename = (oldAbsolutePath, newFileName) => {
+  const operations = [];
+  const oldParentPath = dirname2(oldAbsolutePath);
+  const newAbsolutePath = join2(oldParentPath, newFileName);
+  operations.push({
+    type: Rename$2,
+    path: newAbsolutePath,
+    from: oldAbsolutePath
+  });
+  return operations;
 };
 
 const updateTree2 = (tree, update) => {
@@ -1632,7 +1629,8 @@ const acceptRename = async state => {
     };
   }
   const renamedDirent = items[editingIndex];
-  const renameErrorMessage = await createNewDirentsRename(renamedDirent, editingValue);
+  const operations = getFileOperationsRename(renamedDirent.path, editingValue);
+  const renameErrorMessage = await applyFileOperations(operations);
   if (renameErrorMessage) {
     return {
       ...state,
@@ -3309,8 +3307,7 @@ const getFileOperations = (root, uploadTree) => {
       if (typeof value === 'object') {
         operations.push({
           type: CreateFolder$1,
-          path: join2(root, fullPath),
-          text: ''
+          path: join2(root, fullPath)
         });
         processTree(value, fullPath);
       } else if (typeof value === 'string') {
@@ -3378,9 +3375,8 @@ const getFileOperationsElectron = async (root, paths, fileHandles) => {
     } = fileHandle;
     const path = paths[i];
     operations.push({
-      type: 'copy',
+      type: Copy$2,
       path: join2(root, name),
-      text: '',
       from: path
     });
   }

package/package.json

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