@lvce-editor/explorer-view 7.9.0 → 7.9.2

package/dist/explorerViewWorkerMain.js

@@ -856,7 +856,10 @@ const constructError = (message, type, name) => {
   if (ErrorConstructor === Error) {
     const error = new Error(message);
     if (name && name !== 'VError') {
-      error.name = name;
+      Object.defineProperty(error, 'name', {
+        configurable: true,
+        value: name
+      });
     }
     return error;
   }
@@ -887,31 +890,45 @@ const getParentStack = error => {
 };
 const MethodNotFound = -32601;
 const Custom = -32001;
+const setStack = (error, stack) => {
+  const descriptor = Object.getOwnPropertyDescriptor(error, 'stack');
+  if (descriptor) {
+    if (!descriptor.configurable && !descriptor.writable) {
+      return;
+    }
+    if (!descriptor.configurable && descriptor.writable) {
+      error.stack = stack;
+      return;
+    }
+  }
+  Object.defineProperty(error, 'stack', {
+    configurable: true,
+    value: stack,
+    writable: true
+  });
+};
 const restoreExistingError = (error, currentStack) => {
   if (typeof error.stack === 'string') {
-    error.stack = error.stack + NewLine + currentStack;
+    setStack(error, `${error.stack}${NewLine}${currentStack}`);
   }
   return error;
 };
 const restoreMethodNotFoundError = (error, currentStack) => {
   const restoredError = new JsonRpcError(error.message);
   const parentStack = getParentStack(error);
-  restoredError.stack = parentStack + NewLine + currentStack;
+  setStack(restoredError, `${parentStack}${NewLine}${currentStack}`);
   return restoredError;
 };
 const restoreStackFromData = (restoredError, error, currentStack) => {
   if (error.data.stack && error.data.type && error.message) {
-    restoredError.stack = error.data.type + ': ' + error.message + NewLine + error.data.stack + NewLine + currentStack;
+    setStack(restoredError, `${error.data.type}: ${error.message}${NewLine}${error.data.stack}${NewLine}${currentStack}`);
     return;
   }
   if (error.data.stack) {
-    restoredError.stack = error.data.stack;
+    setStack(restoredError, error.data.stack);
   }
 };
 const applyDataProperties = (restoredError, error) => {
-  if (!error.data) {
-    return;
-  }
   restoreStackFromData(restoredError, error, getCurrentStack());
   if (error.data.codeFrame) {
     // @ts-ignore
@@ -932,7 +949,7 @@ const applyDirectProperties = (restoredError, error) => {
     const indexNewLine = getNewLineIndex(lowerStack);
     const parentStack = getParentStack(error);
     // @ts-ignore
-    restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
+    setStack(restoredError, `${parentStack}${lowerStack.slice(indexNewLine)}`);
   }
   if (error.codeFrame) {
     // @ts-ignore
@@ -2227,7 +2244,18 @@ const mergeTrees = (a, b) => {
   };
 };
 
-const openUri = async (uri, focus) => {
+const openUri = async (uri, focus, options) => {
+  if (options) {
+    await invoke$2('Main.openInput', {
+      editorInput: {
+        type: 'editor',
+        uri
+      },
+      focu: focus,
+      preview: options.preview ?? false
+    });
+    return;
+  }
   await openUri$1(uri, /* focus */focus);
 };
 
@@ -2530,6 +2558,15 @@ const getFileOperationsRename = (oldAbsolutePath, newFileName) => {
   return operations;
 };
 
+const getRenameSiblingFileNames = (items, editingIndex, pathSeparator) => {
+  const editingItem = items[editingIndex];
+  if (!editingItem) {
+    return [];
+  }
+  const parentPath = dirname(pathSeparator, editingItem.path);
+  return items.filter((item, index) => index !== editingIndex && dirname(pathSeparator, item.path) === parentPath).map(item => item.name);
+};
+
 const updateTree2 = (tree, update) => {
   const updatedTree = {
     ...tree,
@@ -2547,7 +2584,8 @@ const acceptRename = async state => {
     pathSeparator,
     root
   } = state;
-  const editingErrorMessage = validateFileName2(editingValue);
+  const siblingFileNames = getRenameSiblingFileNames(items, editingIndex, pathSeparator);
+  const editingErrorMessage = validateFileName2(editingValue, siblingFileNames);
   if (editingErrorMessage) {
     return {
       ...state,
@@ -2555,6 +2593,9 @@ const acceptRename = async state => {
     };
   }
   const renamedDirent = items[editingIndex];
+  const oldUri = renamedDirent.path;
+  const dirname = dirname2(oldUri);
+  const newUri = join2(dirname, editingValue);
   const operations = getFileOperationsRename(renamedDirent.path, editingValue);
   const renameErrorMessage = await applyFileOperations(operations);
   if (renameErrorMessage) {
@@ -2563,9 +2604,7 @@ const acceptRename = async state => {
       editingErrorMessage: renameErrorMessage
     };
   }
-  const oldUri = renamedDirent.path;
-  const dirname = dirname2(oldUri);
-  const newUri = join2(dirname, editingValue);
+  await invoke$2('Main.handleUriChange', oldUri, newUri);
   const children = await getChildDirents(pathSeparator, dirname, renamedDirent.depth - 1, excluded, root);
   const tree = createTree(items, root);
   const update = computeExplorerRenamedDirentUpdate(root, dirname, oldUri, children, tree, newUri);
@@ -2588,6 +2627,9 @@ const acceptRename = async state => {
 };
 
 const acceptEdit = async state => {
+  if (state.isReadonly) {
+    return state;
+  }
   const {
     editingType
   } = state;
@@ -4266,16 +4308,24 @@ const menuEntryRename = {
   id: 'rename',
   label: rename()
 };
-const menuEntryRenameDisabled = {
-  ...menuEntryRename,
-  flags: Disabled
-};
 const menuEntryDelete = {
   command: 'Explorer.removeDirent',
   flags: None$2,
   id: 'delete',
   label: deleteItem()
 };
+const disable = entry => {
+  return {
+    ...entry,
+    flags: Disabled
+  };
+};
+const getWritableEntry = (state, entry) => {
+  if (state.isReadonly) {
+    return disable(entry);
+  }
+  return entry;
+};
 const menuEntryRemoveFolderFromWorkspace = {
   command: 'Workspace.close',
   flags: None$2,
@@ -4292,26 +4342,23 @@ const getFocusedDirent = explorerState => {
   }
   return explorerState.items[explorerState.focusedIndex];
 };
-const getMenuEntryRename = state => {
-  if (state.isReadonly) {
-    return menuEntryRenameDisabled;
-  }
-  return menuEntryRename;
-};
 const getMenuEntriesDirectory = state => {
-  return [menuEntryNewFile, menuEntryNewFolder, menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, menuEntryCut, menuEntryCopy, menuEntryPaste, menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath, menuEntrySeparator, getMenuEntryRename(state), menuEntryDelete];
+  return [getWritableEntry(state, menuEntryNewFile), getWritableEntry(state, menuEntryNewFolder), menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, getWritableEntry(state, menuEntryCut), menuEntryCopy, getWritableEntry(state, menuEntryPaste), menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath, menuEntrySeparator, getWritableEntry(state, menuEntryRename), getWritableEntry(state, menuEntryDelete)];
 };
 const getMenuEntriesFile = state => {
-  return [menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, menuEntryCut, menuEntryCopy, menuEntryPaste, menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath, menuEntrySeparator, menuEntrySelectForCompare, menuEntrySeparator, getMenuEntryRename(state), menuEntryDelete];
+  return [menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, getWritableEntry(state, menuEntryCut), menuEntryCopy, getWritableEntry(state, menuEntryPaste), menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath, menuEntrySeparator, menuEntrySelectForCompare, menuEntrySeparator, getWritableEntry(state, menuEntryRename), getWritableEntry(state, menuEntryDelete)];
 };
 const getMenuEntriesFileCompareWithSelected = state => {
-  return [menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, menuEntryCut, menuEntryCopy, menuEntryPaste, menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath, menuEntrySeparator, menuEntryCompareWithSelected, menuEntrySeparator, getMenuEntryRename(state), menuEntryDelete];
+  return [menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, getWritableEntry(state, menuEntryCut), menuEntryCopy, getWritableEntry(state, menuEntryPaste), menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath, menuEntrySeparator, menuEntryCompareWithSelected, menuEntrySeparator, getWritableEntry(state, menuEntryRename), getWritableEntry(state, menuEntryDelete)];
 };
 const getMenuEntriesDefault = state => {
   return getMenuEntriesDirectory(state);
 };
-const getMenuEntriesRoot = root => {
-  const entries = [menuEntryNewFile, menuEntryNewFolder, menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, menuEntryPaste, menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath];
+const getMenuEntriesRoot = state => {
+  const {
+    root
+  } = state;
+  const entries = [getWritableEntry(state, menuEntryNewFile), getWritableEntry(state, menuEntryNewFolder), menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, getWritableEntry(state, menuEntryPaste), menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath];
   if (root) {
     entries.push(menuEntrySeparator, menuEntryRemoveFolderFromWorkspace);
   }
@@ -4320,7 +4367,7 @@ const getMenuEntriesRoot = root => {
 const getMenuEntries = state => {
   const focusedDirent = getFocusedDirent(state);
   if (!focusedDirent) {
-    return getMenuEntriesRoot(state.root);
+    return getMenuEntriesRoot(state);
   }
   switch (focusedDirent.type) {
     case Directory:
@@ -4507,7 +4554,9 @@ const handleClickDirectory = async (state, dirent, index, keepFocus) => {
 };
 
 const handleClickFile = async (state, dirent, index, keepFocus = false) => {
-  await openUri(dirent.path, !keepFocus);
+  await openUri(dirent.path, !keepFocus, {
+    preview: true
+  });
   return {
     ...state,
     focused: keepFocus,
@@ -4712,6 +4761,9 @@ const newDirent = async (state, editingType, editingIcon = '') => {
 
 // TODO much shared logic with newFolder
 const newFile = state => {
+  if (state.isReadonly) {
+    return Promise.resolve(state);
+  }
   return newDirent(state, CreateFile);
 };
 
@@ -4742,7 +4794,7 @@ const getEditingIcon = async (editingType, value, direntType) => {
 };
 
 const newFolder = async state => {
-  if (state.editingIndex !== -1) {
+  if (state.isReadonly || state.editingIndex !== -1) {
     return state;
   }
   const editingIcon = await getEditingIcon(CreateFolder, '');
@@ -5194,6 +5246,9 @@ const getSelectedItems = (items, focusedIndex) => {
 };
 
 const handleCut = async state => {
+  if (state.isReadonly) {
+    return state;
+  }
   // TODO handle multiple files
   // TODO if not file is selected, what happens?
   const {
@@ -5292,6 +5347,9 @@ const isEqual = (a, b) => {
 };
 
 const handleDragOverIndex = (state, index) => {
+  if (state.isReadonly) {
+    return state;
+  }
   const {
     dropTargets
   } = state;
@@ -5308,6 +5366,9 @@ const handleDragOverIndex = (state, index) => {
 const handleDragOver = (state, x, y) => {
   number(x);
   number(y);
+  if (state.isReadonly) {
+    return state;
+  }
   const index = getIndexFromPosition(state, x, y);
   return handleDragOverIndex(state, index);
 };
@@ -5427,7 +5488,7 @@ const getSettings = async () => {
   const useChevronsRaw = await invoke$2('Preferences.get', 'explorer.useChevrons');
   const useChevrons = useChevronsRaw === false ? false : true;
   const confirmDeleteRaw = await invoke$2('Preferences.get', 'explorer.confirmdelete');
-  const confirmDelete = confirmDeleteRaw === false ? false : false;
+  const confirmDelete = confirmDeleteRaw === false ? false : true;
   const confirmPasteRaw = await invoke$2('Preferences.get', 'explorer.confirmpaste');
   const confirmPaste = confirmPasteRaw === false ? false : false;
   const excludedRaw = await invoke$2('Preferences.get', 'files.exclude');
@@ -5859,6 +5920,9 @@ const getModule = isElectron => {
   return handleDrop$2;
 };
 const handleDropRoot = async (state, fileHandles, files, paths) => {
+  if (state.isReadonly) {
+    return state;
+  }
   const isElectron = state.platform === Electron;
   const fn = getModule(isElectron);
   return fn(state, fileHandles, files, paths);
@@ -5909,6 +5973,9 @@ const handleDropIntoFile = (state, dirent, index, fileHandles, files, paths) =>
   return handleDropIndex(state, fileHandles, files, paths, parentIndex);
 };
 const handleDropIndex = async (state, fileHandles, files, paths, index) => {
+  if (state.isReadonly) {
+    return state;
+  }
   const {
     items
   } = state;
@@ -5967,6 +6034,9 @@ const getFilePaths = async (files, platform) => {
 };
 
 const handleDrop = async (state, x, y, fileIds, fileList) => {
+  if (state.isReadonly) {
+    return state;
+  }
   try {
     const {
       platform
@@ -6194,26 +6264,19 @@ const generateUniqueName = (baseName, existingPaths, root) => {
   }
 };
 
-const getFileOperationsCopy = (root, existingUris, files, focusedUri) => {
+const getFileOperationsCopy = (targetUri, existingUris, files) => {
   const operations = [];
+  const reservedUris = [...existingUris];
   for (const file of files) {
     const baseName = getBaseName('/', file);
-    if (existingUris.includes(file)) {
-      operations.push({
-        from: file,
-        path: join2(focusedUri, baseName),
-        type: Rename$2
-      });
-    } else {
-      const uniqueName = generateUniqueName(baseName, existingUris, root);
-      const newUri = join2(root, uniqueName);
-      operations.push({
-        from: file,
-        // TODO ensure file is uri
-        path: newUri,
-        type: Copy$1
-      });
-    }
+    const uniqueName = generateUniqueName(baseName, reservedUris, targetUri);
+    const newUri = join2(targetUri, uniqueName);
+    operations.push({
+      from: file,
+      path: newUri,
+      type: Copy$1
+    });
+    reservedUris.push(newUri);
   }
   return operations;
 };
@@ -6229,11 +6292,13 @@ const handlePasteCopy = async (state, nativeFiles) => {
   const {
     focusedIndex,
     items,
+    pathSeparator,
     root
   } = state;
-  const focusedUri = items[focusedIndex]?.path || root;
-  const existingUris = items.map(item => item.path);
-  const operations = getFileOperationsCopy(root, existingUris, nativeFiles.files, focusedUri);
+  const targetUri = getParentFolder(items, focusedIndex, root, pathSeparator);
+  const targetDirents = await readDirWithFileTypes(targetUri);
+  const existingUris = targetDirents.map(dirent => join2(targetUri, dirent.name));
+  const operations = getFileOperationsCopy(targetUri, existingUris, nativeFiles.files);
   // TODO handle error?
   await applyFileOperations(operations);
 
@@ -6326,6 +6391,9 @@ const handlePasteCut = async (state, nativeFiles) => {
 const None$1 = 'none';
 
 const handlePaste = async state => {
+  if (state.isReadonly) {
+    return state;
+  }
   const nativeFiles = await readNativeFiles();
   if (!nativeFiles) {
     return state;
@@ -6411,6 +6479,9 @@ const handleResize = (state, dimensions) => {
 };
 
 const handleUpload = async (state, dirents) => {
+  if (state.isReadonly) {
+    return state;
+  }
   const {
     pathSeparator,
     root
@@ -6517,6 +6588,9 @@ const showErrorAlert = async errorMessage => {
 };
 
 const removeDirent = async state => {
+  if (state.isReadonly) {
+    return state;
+  }
   const {
     confirmDelete: confirmDelete$1,
     focusedIndex,
@@ -6587,6 +6661,9 @@ const User = 1;
 const Script = 2;
 
 const renameDirent = async state => {
+  if (state.isReadonly) {
+    return state;
+  }
   const {
     focusedIndex,
     icons,
@@ -7193,11 +7270,12 @@ const applyRender = (oldState, newState, diffResult) => {
   return commands;
 };
 
-const render2 = (uid, diffResult) => {
+const render2 = (uid, _diffResult) => {
   const {
     oldState,
     scheduledState
   } = get(uid);
+  const diffResult = diff(oldState, scheduledState);
   set(uid, scheduledState, scheduledState);
   const commands = applyRender(oldState, scheduledState, diffResult);
   return commands;
@@ -7210,23 +7288,27 @@ const NewFile = 'NewFile';
 const NewFolder = 'NewFolder';
 const Refresh = 'Refresh';
 
-const getActions = root => {
+const getActions = (root, isReadonly) => {
   if (!root) {
     return [];
   }
-  return [{
-    command: 'newFile',
-    icon: NewFile,
-    id: newFile$1(),
-    name: NewFile$1,
-    type: Button
-  }, {
-    command: 'newFolder',
-    icon: NewFolder,
-    id: newFolder$1(),
-    name: NewFolder$1,
-    type: Button
-  }, {
+  const actions = [];
+  if (!isReadonly) {
+    actions.push({
+      command: 'newFile',
+      icon: NewFile,
+      id: newFile$1(),
+      name: NewFile$1,
+      type: Button
+    }, {
+      command: 'newFolder',
+      icon: NewFolder,
+      id: newFolder$1(),
+      name: NewFolder$1,
+      type: Button
+    });
+  }
+  actions.push({
     command: 'refresh',
     icon: Refresh,
     id: refresh$1(),
@@ -7238,7 +7320,8 @@ const getActions = root => {
     id: collapseAll$1(),
     name: CollapseAll$1,
     type: Button
-  }];
+  });
+  return actions;
 };
 
 const getIconVirtualDom = (icon, type = Div) => {
@@ -7288,7 +7371,7 @@ const renderActions = uid => {
   const {
     newState
   } = get(uid);
-  const actions = getActions(newState.root);
+  const actions = getActions(newState.root, newState.isReadonly);
   const dom = getActionsVirtualDom(actions);
   return dom;
 };
@@ -7644,13 +7727,16 @@ const updateEditingValue = async (state, value, inputSource = User) => {
     editingIndex,
     editingType,
     focusedIndex,
-    items} = state;
+    items,
+    pathSeparator} = state;
   const editingIcon = await getEditingIcon(editingType, value, items[editingIndex]?.type);
 
   // Get sibling file names for validation during file/folder creation
   let siblingFileNames = [];
   if (editingType === CreateFile || editingType === CreateFolder) {
     siblingFileNames = getSiblingFileNames(items, focusedIndex);
+  } else if (editingType === Rename$1) {
+    siblingFileNames = getRenameSiblingFileNames(items, editingIndex, pathSeparator);
   }
   const editingErrorMessage = validateFileName2(value, siblingFileNames);
   return {

package/package.json

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