@lvce-editor/explorer-view 5.27.0 → 6.0.0

package/dist/explorerViewWorkerMain.js

@@ -2920,6 +2920,8 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0, ass
     editingSelectionStart: 0,
     editingType: None$5,
     editingValue: '',
+    errorCode: '',
+    errorMessage: '',
     errorMessageLeft: 0,
     errorMessageTop: 0,
     errorMessageWidth: 0,
@@ -2932,6 +2934,7 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0, ass
     focusWord: '',
     focusWordTimeout: 800,
     handleOffset: 0,
+    hasError: false,
     height,
     hoverIndex: -1,
     icons: [],
@@ -2974,7 +2977,7 @@ const isEqual$6 = (oldState, newState) => {
   // TODO compute css more optimized
   // maybe only when items change, and even then not
   // always, but only when it affects the css
-  return oldState.deltaY === newState.deltaY && oldState.editingErrorMessage === newState.editingErrorMessage && oldState.errorMessageLeft === newState.errorMessageLeft && oldState.errorMessageTop === newState.errorMessageTop && oldState.maxIndent === newState.maxIndent && oldState.scrollBarActive === newState.scrollBarActive && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.visibleExplorerItems === newState.visibleExplorerItems && oldState.width === newState.width;
+  return oldState.deltaY === newState.deltaY && oldState.editingErrorMessage === newState.editingErrorMessage && oldState.hasError === newState.hasError && oldState.errorMessage === newState.errorMessage && oldState.errorCode === newState.errorCode && oldState.errorMessageLeft === newState.errorMessageLeft && oldState.errorMessageTop === newState.errorMessageTop && oldState.maxIndent === newState.maxIndent && oldState.scrollBarActive === newState.scrollBarActive && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.visibleExplorerItems === newState.visibleExplorerItems && oldState.width === newState.width;
 };
 
 const isEqual$5 = (oldState, newState) => {
@@ -2986,7 +2989,7 @@ const isEqual$4 = (oldState, newState) => {
 };
 
 const isEqual$3 = (oldState, newState) => {
-  return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.focusedIndex === newState.focusedIndex && oldState.editingIndex === newState.editingIndex && oldState.editingType === newState.editingType && oldState.editingValue === newState.editingValue && oldState.editingErrorMessage === newState.editingErrorMessage && oldState.width === newState.width && oldState.focused === newState.focused && oldState.dropTargets === newState.dropTargets && oldState.icons === newState.icons && oldState.cutItems === newState.cutItems && oldState.visibleExplorerItems === newState.visibleExplorerItems;
+  return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.focusedIndex === newState.focusedIndex && oldState.editingIndex === newState.editingIndex && oldState.editingType === newState.editingType && oldState.editingValue === newState.editingValue && oldState.editingErrorMessage === newState.editingErrorMessage && oldState.hasError === newState.hasError && oldState.errorMessage === newState.errorMessage && oldState.errorCode === newState.errorCode && oldState.width === newState.width && oldState.focused === newState.focused && oldState.dropTargets === newState.dropTargets && oldState.icons === newState.icons && oldState.cutItems === newState.cutItems && oldState.visibleExplorerItems === newState.visibleExplorerItems;
 };
 
 const isEqual$2 = (oldState, newState) => {
@@ -5327,6 +5330,36 @@ const getExcluded = () => {
 const getSavedRoot = (savedState, workspacePath) => {
   return workspacePath;
 };
+const getErrorCode = error => {
+  if (error && typeof error === 'object' && 'code' in error && typeof error.code === 'string') {
+    return error.code;
+  }
+  return '';
+};
+const getErrorMessage = error => {
+  if (error instanceof Error) {
+    return error.message;
+  }
+  if (typeof error === 'string') {
+    return error;
+  }
+  return 'Unknown error';
+};
+const getFriendlyErrorMessage = (errorMessage, errorCode) => {
+  switch (errorCode) {
+    case 'EACCES':
+    case 'EPERM':
+      return 'permission was denied';
+    case 'EBUSY':
+      return 'the folder is currently in use';
+    case 'ENOENT':
+      return 'the folder does not exist';
+    case 'ENOTDIR':
+      return 'the path is not a folder';
+    default:
+      return errorMessage || 'an unexpected error occurred';
+  }
+};
 const loadContent = async (state, savedState) => {
   const {
     assetDir,
@@ -5339,34 +5372,53 @@ const loadContent = async (state, savedState) => {
   } = await getSettings();
   const workspacePath = await getWorkspacePath();
   const root = getSavedRoot(savedState, workspacePath);
-  // TODO path separator could be restored from saved state
-  const pathSeparator = await getPathSeparator(root); // TODO only load path separator once
-  const excluded = getExcluded();
-  const restoredDirents = await restoreExpandedState(savedState, root, pathSeparator, excluded);
-  let minLineY = 0;
-  if (savedState && typeof savedState.minLineY === 'number') {
-    minLineY = savedState.minLineY;
-  }
-  let deltaY = 0;
-  if (savedState && typeof savedState.deltaY === 'number') {
-    deltaY = savedState.deltaY;
-  }
-  const scheme = getScheme(root);
-  const decorations = await getFileDecorations(scheme, root, restoredDirents.filter(item => item.depth === 1).map(item => item.path), sourceControlDecorations, assetDir, platform);
-  return {
-    ...state,
-    confirmDelete,
-    decorations,
-    deltaY,
-    excluded,
-    initial: true,
-    items: restoredDirents,
-    maxIndent: 10,
-    minLineY,
-    pathSeparator,
-    root,
-    useChevrons
-  };
+  try {
+    // TODO path separator could be restored from saved state
+    const pathSeparator = await getPathSeparator(root); // TODO only load path separator once
+    const excluded = getExcluded();
+    const restoredDirents = await restoreExpandedState(savedState, root, pathSeparator, excluded);
+    let minLineY = 0;
+    if (savedState && typeof savedState.minLineY === 'number') {
+      minLineY = savedState.minLineY;
+    }
+    let deltaY = 0;
+    if (savedState && typeof savedState.deltaY === 'number') {
+      deltaY = savedState.deltaY;
+    }
+    const scheme = getScheme(root);
+    const decorations = await getFileDecorations(scheme, root, restoredDirents.filter(item => item.depth === 1).map(item => item.path), sourceControlDecorations, assetDir, platform);
+    return {
+      ...state,
+      confirmDelete,
+      decorations,
+      deltaY,
+      errorCode: '',
+      errorMessage: '',
+      excluded,
+      hasError: false,
+      initial: true,
+      items: restoredDirents,
+      maxIndent: 10,
+      minLineY,
+      pathSeparator,
+      root,
+      useChevrons
+    };
+  } catch (error) {
+    const errorCode = getErrorCode(error);
+    const errorMessage = getFriendlyErrorMessage(getErrorMessage(error), errorCode);
+    return {
+      ...state,
+      confirmDelete,
+      errorCode,
+      errorMessage,
+      hasError: true,
+      initial: true,
+      items: [],
+      root,
+      useChevrons
+    };
+  }
 };
 
 const handleWorkspaceChange = async state => {
@@ -5593,7 +5645,6 @@ const renderCss = (oldState, newState) => {
     itemHeight,
     items,
     minLineY,
-    scrollBarHeight,
     uid,
     visibleExplorerItems,
     width
@@ -5601,6 +5652,7 @@ const renderCss = (oldState, newState) => {
   const uniqueIndents = getUniqueIndents(visibleExplorerItems);
   const contentHeight = items.length * itemHeight;
   const scrollBarTop = getScrollBarTop(height, contentHeight, deltaY);
+  const scrollBarHeight = getScrollBarSize(height, contentHeight, 20);
   const indent = 8;
   const padding = 10;
   const fileIconWidth = 16;
@@ -5907,6 +5959,23 @@ const getListItemsVirtualDom = (visibleItems, focusedIndex, focused, dropTargets
   return dom;
 };
 
+const getParentNode$1 = childCount => {
+  return {
+    childCount,
+    className: mergeClassNames(Viewlet, Explorer$1),
+    role: None,
+    type: Div
+  };
+};
+const getLoadErrorVirtualDom = loadErrorMessage => {
+  const errorDom = [{
+    childCount: 1,
+    type: Div
+  }, text(loadErrorMessage)];
+  const parentNode = getParentNode$1(1);
+  return [parentNode, ...errorDom];
+};
+
 const getScrollBarVirtualDom = scrollBarHeight => {
   const shouldShowScrollbar = scrollBarHeight > 0;
   if (!shouldShowScrollbar) {
@@ -5923,6 +5992,14 @@ const getScrollBarVirtualDom = scrollBarHeight => {
   }];
 };
 
+const getParentNode = childCount => {
+  return {
+    childCount,
+    className: mergeClassNames(Viewlet, Explorer$1),
+    role: None,
+    type: Div
+  };
+};
 const getChildCount = (scrollBarDomLength, errorDomLength) => {
   let childCount = 1;
   if (scrollBarDomLength > 0) {
@@ -5933,24 +6010,31 @@ const getChildCount = (scrollBarDomLength, errorDomLength) => {
   }
   return childCount;
 };
-const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused, dropTargets, height, contentHeight, errorMessage) => {
+const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused, dropTargets, height, contentHeight, editingErrorMessage, loadErrorMessage) => {
   if (!root) {
     return getExplorerWelcomeVirtualDom(isWide);
   }
+  if (loadErrorMessage) {
+    return getLoadErrorVirtualDom(loadErrorMessage);
+  }
   const scrollBarHeight = getScrollBarSize(height, contentHeight, 20);
   const scrollBarDom = getScrollBarVirtualDom(scrollBarHeight);
-  const errorDom = getErrorMessageDom(errorMessage);
+  const errorDom = getErrorMessageDom(editingErrorMessage);
   const childCount = getChildCount(scrollBarDom.length, errorDom.length);
-  const parentNode = {
-    childCount,
-    className: mergeClassNames(Viewlet, Explorer$1),
-    role: None,
-    type: Div
-  };
+  const parentNode = getParentNode(childCount);
   const dom = [parentNode, ...getListItemsVirtualDom(visibleItems, focusedIndex, focused, dropTargets), ...scrollBarDom, ...errorDom];
   return dom;
 };
 
+const getLoadErrorMessage = state => {
+  if (state.hasError) {
+    const code = state.errorCode ? ` (error code: ${state.errorCode})` : '';
+    const reason = state.errorMessage || 'an unexpected error occurred';
+    return `Could not open folder due to ${reason}${code}.`;
+  }
+  return '';
+};
+
 const renderItems = (oldState, newState) => {
   const {
     dropTargets,
@@ -5966,7 +6050,8 @@ const renderItems = (oldState, newState) => {
   const visibleDirents = newState.visibleExplorerItems;
   const isWide = width > 450;
   const contentHeight = items.length * itemHeight;
-  const dom = getExplorerVirtualDom(visibleDirents, focusedIndex, root, isWide, focused, dropTargets, height, contentHeight, editingErrorMessage);
+  const loadErrorMessage = getLoadErrorMessage(newState);
+  const dom = getExplorerVirtualDom(visibleDirents, focusedIndex, root, isWide, focused, dropTargets, height, contentHeight, editingErrorMessage, loadErrorMessage);
   return [SetDom2, newState.uid, dom];
 };
 

package/package.json

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