@lvce-editor/explorer-view 2.44.0 → 2.46.0

package/dist/explorerViewWorkerMain.js

@@ -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,
@@ -851,7 +869,7 @@ const WebWorkerRpcClient = {
 };
 
 const rpcs = Object.create(null);
-const set$9 = (id, rpc) => {
+const set$a = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -875,19 +893,19 @@ const create$2 = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$9(rpcId, rpc);
+      set$a(rpcId, rpc);
     }
   };
 };
 const RendererWorker$1 = 1;
 const {
-  invoke: invoke$4,
-  set: set$4
+  invoke: invoke$5,
+  set: set$5
 } = create$2(RendererWorker$1);
 const RendererWorker = {
   __proto__: null,
-  invoke: invoke$4,
-  set: set$4
+  invoke: invoke$5,
+  set: set$5
 };
 
 const {
@@ -978,10 +996,10 @@ const createNewDirentsAccept = async (newFileName, pathSeparator, absolutePath,
       await createNestedPath(root, parentPath, pathSeparator);
     }
     await createFn(absolutePath);
-    return true;
+    return '';
   } catch (error) {
     console.error(new VError(error, `Failed to create file`));
-    return false;
+    return `${error}`;
   }
 };
 
@@ -1481,9 +1499,12 @@ const acceptCreate = async (state, newDirentType, createFn) => {
   }
   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 createErrorMessage = await createNewDirentsAccept(newFileName, pathSeparator, absolutePath, root, createFn);
+  if (createErrorMessage) {
+    return {
+      ...state,
+      editingErrorMessage: createErrorMessage
+    };
   }
   const pathPaths = getPathParts(root, absolutePath, pathSeparator);
   const children = await getPathPartsChildren(pathPaths);
@@ -4297,6 +4318,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';
@@ -4319,7 +4345,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';
@@ -4410,11 +4436,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),
@@ -4502,7 +4523,7 @@ const getExplorerItemVirtualDom = item => {
   const chevronDom = getChevronVirtualDom(chevron);
   return [{
     type: Div,
-    role: TreeItem,
+    role: TreeItem$1,
     className,
     draggable: true,
     title: path,
@@ -4560,6 +4581,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) {
@@ -4595,7 +4621,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);
@@ -4603,7 +4629,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;
@@ -4644,8 +4670,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;
@@ -4653,7 +4679,7 @@ const getTreeItemClassName = (isSelected, isFocused) => {
   if (isSelected) {
     return selected;
   }
-  return TreeItem$1;
+  return TreeItem;
 };
 
 const defaultIndent$1 = 1;

package/package.json

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