@lvce-editor/explorer-view 2.45.0 → 2.47.0

package/dist/explorerViewWorkerMain.js

@@ -431,7 +431,7 @@ const create$4 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$2 = (id, fn) => {
+const set$3 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$2 = id => {
@@ -450,7 +450,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$2(id, resolve);
+  set$3(id, resolve);
   return {
     id,
     promise
@@ -523,6 +523,16 @@ const constructError = (message, type, name) => {
   }
   return new ErrorConstructor(message);
 };
+const joinLines = lines => {
+  return lines.join(NewLine);
+};
+const splitLines = lines => {
+  return lines.split(NewLine);
+};
+const getCurrentStack = () => {
+  const currentStack = joinLines(splitLines(new Error().stack || '').slice(2));
+  return currentStack;
+};
 const getNewLineIndex = (string, startIndex = undefined) => {
   return string.indexOf(NewLine, startIndex);
 };
@@ -533,19 +543,16 @@ const getParentStack = error => {
   }
   return parentStack;
 };
-const joinLines = lines => {
-  return lines.join(NewLine);
-};
 const MethodNotFound = -32601;
 const Custom = -32001;
-const splitLines = lines => {
-  return lines.split(NewLine);
-};
 const restoreJsonRpcError = error => {
+  const currentStack = getCurrentStack();
   if (error && error instanceof Error) {
+    if (typeof error.stack === 'string') {
+      error.stack = error.stack + NewLine + currentStack;
+    }
     return error;
   }
-  const currentStack = joinLines(splitLines(new Error().stack || '').slice(1));
   if (error && error.code && error.code === MethodNotFound) {
     const restoredError = new JsonRpcError(error.message);
     const parentStack = getParentStack(error);
@@ -626,6 +633,17 @@ const getErrorType = prettyError => {
   }
   return undefined;
 };
+const isAlreadyStack = line => {
+  return line.trim().startsWith('at ');
+};
+const getStack = prettyError => {
+  const stackString = prettyError.stack || '';
+  const newLineIndex = stackString.indexOf('\n');
+  if (newLineIndex !== -1 && !isAlreadyStack(stackString.slice(0, newLineIndex))) {
+    return stackString.slice(newLineIndex + 1);
+  }
+  return stackString;
+};
 const getErrorProperty = (error, prettyError) => {
   if (error && error.code === E_COMMAND_NOT_FOUND) {
     return {
@@ -638,7 +656,7 @@ const getErrorProperty = (error, prettyError) => {
     code: Custom,
     message: prettyError.message,
     data: {
-      stack: prettyError.stack,
+      stack: getStack(prettyError),
       codeFrame: prettyError.codeFrame,
       type: getErrorType(prettyError),
       code: prettyError.code,
@@ -761,7 +779,7 @@ const send = (transport, method, ...params) => {
   const message = create$4(method, params);
   transport.send(message);
 };
-const invoke$2 = (ipc, method, ...params) => {
+const invoke$3 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
 const invokeAndTransfer = (ipc, method, ...params) => {
@@ -794,7 +812,7 @@ const createRpc = ipc => {
       send(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke$2(ipc, method, ...params);
+      return invoke$3(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
       return invokeAndTransfer(ipc, method, ...params);
@@ -850,8 +868,13 @@ 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 rpcs = Object.create(null);
-const set$9 = (id, rpc) => {
+const set$b = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -875,19 +898,19 @@ const create$2 = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$9(rpcId, rpc);
+      set$b(rpcId, rpc);
     }
   };
 };
 const RendererWorker$1 = 1;
 const {
-  invoke: invoke$4,
-  set: set$4
+  invoke: invoke$2,
+  set: set$2
 } = create$2(RendererWorker$1);
 const RendererWorker = {
   __proto__: null,
-  invoke: invoke$4,
-  set: set$4
+  invoke: invoke$2,
+  set: set$2
 };
 
 const {
@@ -914,9 +937,6 @@ const getRealPath = async 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);
 };
@@ -930,20 +950,29 @@ 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 applyOperation = operation => {
+  if (operation.type === CreateFolder$1) {
+    return mkdir(operation.path);
+  }
+  if (operation.type === Copy$2) {
+    return copy$1(operation.from || '', operation.path);
+  }
+  if (operation.type === Rename$2) {
+    return rename$1(operation.from || '', operation.path);
+  }
+  return writeFile(operation.path, operation.text);
+};
+
+const applyFileOperations = async operations => {
+  try {
+    // TODO run operations in parallel if possible
+    for (const operation of operations) {
+      await applyOperation(operation);
     }
+    return '';
+  } catch (error) {
+    console.error(new VError(error, `Failed to apply file operations`));
+    return `${error}`;
   }
 };
 
@@ -970,21 +999,6 @@ const join2 = (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 '';
-  } catch (error) {
-    console.error(new VError(error, `Failed to create file`));
-    return `${error}`;
-  }
-};
-
 const createTree = (items, root) => {
   const tree = Object.create(null);
   const rootLength = root.length;
@@ -1112,6 +1126,41 @@ const getFileIcons = async (dirents, fileIconCache) => {
   };
 };
 
+const getFileOperationsNestedPath = (path, root, pathSeparator) => {
+  const parts = path.slice(root.length).split(pathSeparator);
+  const operations = [];
+  let currentPath = '';
+  for (const part of parts) {
+    if (!part) continue;
+    currentPath = currentPath ? `${currentPath}${pathSeparator}${part}` : part;
+    operations.push({
+      type: CreateFolder$1,
+      path: `${root}${currentPath}`,
+      text: ''
+    });
+  }
+  return operations;
+};
+const getFileOperationsCreate = (newFileName, newDirentType, pathSeparator, absolutePath, root) => {
+  const operations = [];
+  const parentPath = dirname(pathSeparator, absolutePath);
+  operations.push(...getFileOperationsNestedPath(parentPath, root, pathSeparator));
+  if (newDirentType === File) {
+    operations.push({
+      type: CreateFile$1,
+      path: absolutePath,
+      text: ''
+    });
+  } else if (newDirentType === Directory) {
+    operations.push({
+      type: CreateFolder$1,
+      path: absolutePath,
+      text: ''
+    });
+  }
+  return operations;
+};
+
 const getIndex = (dirents, uri) => {
   for (let i = 0; i < dirents.length; i++) {
     const dirent = dirents[i];
@@ -1481,7 +1530,8 @@ const acceptCreate = async (state, newDirentType, createFn) => {
   }
   const parentFolder = getParentFolder(items, focusedIndex, root);
   const absolutePath = join2(parentFolder, newFileName);
-  const createErrorMessage = await createNewDirentsAccept(newFileName, pathSeparator, absolutePath, root, createFn);
+  const operations = getFileOperationsCreate(editingValue, newDirentType, pathSeparator, absolutePath, root);
+  const createErrorMessage = await applyFileOperations(operations);
   if (createErrorMessage) {
     return {
       ...state,
@@ -1516,11 +1566,11 @@ const acceptCreate = async (state, newDirentType, createFn) => {
 };
 
 const acceptCreateFile = async state => {
-  return acceptCreate(state, File, createFile);
+  return acceptCreate(state, File);
 };
 
 const acceptCreateFolder = async state => {
-  return acceptCreate(state, Directory, mkdir);
+  return acceptCreate(state, Directory);
 };
 
 const computeExplorerRenamedDirentUpdate = (root, parentPath, oldUri, children, tree, newUri) => {
@@ -1550,9 +1600,9 @@ const createNewDirentsRename = async (renamedDirent, editingValue, pathSeparator
     await rename$1(oldAbsolutePath, newAbsolutePath);
   } catch (error) {
     console.error(new VError(error, `Failed to rename file`));
-    return false;
+    return `${error}`;
   }
-  return true;
+  return '';
 };
 
 const updateTree2 = (tree, update) => {
@@ -1582,9 +1632,12 @@ const acceptRename = async state => {
     };
   }
   const renamedDirent = items[editingIndex];
-  const successful = await createNewDirentsRename(renamedDirent, editingValue);
-  if (!successful) {
-    return state;
+  const renameErrorMessage = await createNewDirentsRename(renamedDirent, editingValue);
+  if (renameErrorMessage) {
+    return {
+      ...state,
+      editingErrorMessage: renameErrorMessage
+    };
   }
   const oldUri = renamedDirent.path;
   const dirname = dirname2(oldUri);
@@ -3209,23 +3262,6 @@ const refresh = async state => {
   };
 };
 
-const applyOperation = operation => {
-  if (operation.type === 'createFolder') {
-    return mkdir(operation.path);
-  }
-  if (operation.type === 'copy') {
-    return copy$1(operation.from || '', operation.path);
-  }
-  return writeFile(operation.path, operation.text);
-};
-
-const applyFileOperations = async operations => {
-  // TODO run operations in parallel if possible
-  for (const operation of operations) {
-    await applyOperation(operation);
-  }
-};
-
 const getChildHandles = async fileHandle => {
   // @ts-ignore
   const values = fileHandle.values();
@@ -3272,14 +3308,14 @@ const getFileOperations = (root, uploadTree) => {
       const fullPath = currentPath ? join2(currentPath, path) : path;
       if (typeof value === 'object') {
         operations.push({
-          type: 'createFolder',
+          type: CreateFolder$1,
           path: join2(root, fullPath),
           text: ''
         });
         processTree(value, fullPath);
       } else if (typeof value === 'string') {
         operations.push({
-          type: 'createFile',
+          type: CreateFile$1,
           path: join2(root, fullPath),
           text: value
         });
@@ -4300,6 +4336,11 @@ const getErrorMessagePosition = (itemHeight, focusedIndex, minLineY, depth, inde
   };
 };
 
+const None$2 = 'none';
+const ToolBar = 'toolbar';
+const Tree = 'tree';
+const TreeItem$1 = 'treeitem';
+
 const Actions = 'Actions';
 const Button$2 = 'Button';
 const ButtonNarrow = 'ButtonNarrow';
@@ -4322,7 +4363,7 @@ const MaskIconChevronRight = 'MaskIconChevronRight';
 const ScrollBar = 'ScrollBar';
 const ScrollBarSmall = 'ScrollBarSmall';
 const ScrollBarThumb = 'ScrollBarThumb';
-const TreeItem$1 = 'TreeItem';
+const TreeItem = 'TreeItem';
 const TreeItemActive = 'TreeItemActive';
 const Viewlet = 'Viewlet';
 const Welcome = 'Welcome';
@@ -4413,11 +4454,6 @@ const getExplorerWelcomeVirtualDom = isWide => {
   }, text(openFolder$1())];
 };
 
-const None$2 = 'none';
-const ToolBar = 'toolbar';
-const Tree = 'tree';
-const TreeItem = 'treeitem';
-
 const chevronDownVirtualDom = {
   type: Div,
   className: mergeClassNames(Chevron, MaskIconChevronDown),
@@ -4505,7 +4541,7 @@ const getExplorerItemVirtualDom = item => {
   const chevronDom = getChevronVirtualDom(chevron);
   return [{
     type: Div,
-    role: TreeItem,
+    role: TreeItem$1,
     className,
     draggable: true,
     title: path,
@@ -4563,6 +4599,11 @@ const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
   return Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize);
 };
 
+const getScrollBarTop = (height, contentHeight, scrollTop) => {
+  const scrollBarTop = Math.round(scrollTop / contentHeight * height);
+  return scrollBarTop;
+};
+
 const getScrollBarVirtualDom = (scrollBarHeight, scrollBarTop) => {
   const shouldShowScrollbar = scrollBarHeight > 0;
   if (!shouldShowScrollbar) {
@@ -4598,7 +4639,7 @@ const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused
     return getExplorerWelcomeVirtualDom(isWide);
   }
   const scrollBarHeight = getScrollBarSize(height, contentHeight, 20);
-  const scrollBarTop = Math.round(scrollTop / contentHeight * height);
+  const scrollBarTop = getScrollBarTop(height, contentHeight, scrollTop);
   const scrollBarDom = getScrollBarVirtualDom(scrollBarHeight, scrollBarTop);
   const errorDom = getErrorMessageDom(errorMessage, errorMessageLeft, errorMessageTop);
   const childCount = getChildCount(scrollBarDom.length, errorDom.length);
@@ -4606,7 +4647,7 @@ const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused
     type: Div,
     childCount,
     className: mergeClassNames(Viewlet, Explorer),
-    role: 'none'
+    role: None$2
   };
   const dom = [parentNode, ...getListItemsVirtualDom(visibleItems, focusedIndex, focused, dropTargets), ...scrollBarDom, ...errorDom];
   return dom;
@@ -4647,8 +4688,8 @@ const getExpandedType = type => {
   }
 };
 
-const focused = mergeClassNames(TreeItem$1, TreeItemActive);
-const selected = mergeClassNames(TreeItem$1, TreeItemActive);
+const focused = mergeClassNames(TreeItem, TreeItemActive);
+const selected = mergeClassNames(TreeItem, TreeItemActive);
 const getTreeItemClassName = (isSelected, isFocused) => {
   if (isFocused) {
     return focused;
@@ -4656,7 +4697,7 @@ const getTreeItemClassName = (isSelected, isFocused) => {
   if (isSelected) {
     return selected;
   }
-  return TreeItem$1;
+  return TreeItem;
 };
 
 const defaultIndent$1 = 1;
@@ -5151,7 +5192,7 @@ const selectDown = state => {
   }
   const newItems = items.map((item, i) => ({
     ...item,
-    selected: i === targetIndex + 1 ? true : item.selected
+    selected: i === targetIndex + 1 ? true : item.selected || i === focusedIndex
   }));
   return {
     ...state,

package/package.json

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