@lvce-editor/explorer-view 5.0.0 → 5.2.0

package/dist/explorerViewWorkerMain.js

@@ -533,7 +533,7 @@ const create$4$1 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$6 = (id, fn) => {
+const set$7 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$2 = id => {
@@ -552,7 +552,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$6(id, resolve);
+  set$7(id, resolve);
   return {
     id,
     promise
@@ -893,11 +893,11 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   const responseMessage = await promise;
   return unwrapJsonRpcResult(responseMessage);
 };
-const send$1 = (transport, method, ...params) => {
+const send$2 = (transport, method, ...params) => {
   const message = create$4$1(method, params);
   transport.send(message);
 };
-const invoke$4 = (ipc, method, ...params) => {
+const invoke$5 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
 const invokeAndTransfer$2 = (ipc, method, ...params) => {
@@ -933,10 +933,10 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      send$1(ipc, method, ...params);
+      send$2(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke$4(ipc, method, ...params);
+      return invoke$5(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
       return invokeAndTransfer$2(ipc, method, ...params);
@@ -1084,6 +1084,7 @@ const Alt = 1 << 9 >>> 0;
 
 const FileSystemWorker$1 = 209;
 const RendererWorker = 1;
+const SourceControlWorker = 66;
 const IconThemeWorker = 7009;
 
 const FocusElementByName = 'Viewlet.focusElementByName';
@@ -1096,7 +1097,7 @@ const FocusExplorer = 13;
 const FocusExplorerEditBox = 14;
 
 const rpcs = Object.create(null);
-const set$5 = (id, rpc) => {
+const set$6 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1118,7 +1119,7 @@ const create$2 = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$5(rpcId, rpc);
+      set$6(rpcId, rpc);
     },
     async dispose() {
       const rpc = get$1(rpcId);
@@ -1128,66 +1129,66 @@ const create$2 = rpcId => {
 };
 
 const {
-  invoke: invoke$3,
+  invoke: invoke$4,
   invokeAndTransfer: invokeAndTransfer$1,
-  set: set$4,
+  set: set$5,
   dispose
 } = create$2(FileSystemWorker$1);
 const remove$1 = async dirent => {
-  return invoke$3('FileSystem.remove', dirent);
+  return invoke$4('FileSystem.remove', dirent);
 };
 const readDirWithFileTypes$1 = async uri => {
-  return invoke$3('FileSystem.readDirWithFileTypes', uri);
+  return invoke$4('FileSystem.readDirWithFileTypes', uri);
 };
 const getPathSeparator$2 = async root => {
   // @ts-ignore
-  return invoke$3('FileSystem.getPathSeparator', root);
+  return invoke$4('FileSystem.getPathSeparator', root);
 };
 const getRealPath$1 = async path => {
-  return invoke$3('FileSystem.getRealPath', path);
+  return invoke$4('FileSystem.getRealPath', path);
 };
 const stat$1 = async dirent => {
-  return invoke$3('FileSystem.stat', dirent);
+  return invoke$4('FileSystem.stat', dirent);
 };
 const createFile = async uri => {
-  return invoke$3('FileSystem.writeFile', uri, '');
+  return invoke$4('FileSystem.writeFile', uri, '');
 };
 const readFile = async uri => {
-  return invoke$3('FileSystem.readFile', uri);
+  return invoke$4('FileSystem.readFile', uri);
 };
 const writeFile$1 = async (uri, content) => {
-  return invoke$3('FileSystem.writeFile', uri, content);
+  return invoke$4('FileSystem.writeFile', uri, content);
 };
 const mkdir$1 = async uri => {
-  return invoke$3('FileSystem.mkdir', uri);
+  return invoke$4('FileSystem.mkdir', uri);
 };
 const rename$2 = async (oldUri, newUri) => {
-  return invoke$3('FileSystem.rename', oldUri, newUri);
+  return invoke$4('FileSystem.rename', oldUri, newUri);
 };
 const copy$2 = async (oldUri, newUri) => {
-  return invoke$3('FileSystem.copy', oldUri, newUri);
+  return invoke$4('FileSystem.copy', oldUri, newUri);
 };
 const exists = async uri => {
   // @ts-ignore
-  return invoke$3('FileSystem.exists', uri);
+  return invoke$4('FileSystem.exists', uri);
 };
 const getFolderSize = async uri => {
   // @ts-ignore
-  return invoke$3('FileSystem.getFolderSize', uri);
+  return invoke$4('FileSystem.getFolderSize', uri);
 };
 const readFileAsBlob = async uri => {
   // @ts-ignore
-  return invoke$3('FileSystem.readFileAsBlob', uri);
+  return invoke$4('FileSystem.readFileAsBlob', uri);
 };
 const appendFile = async (uri, text) => {
   // @ts-ignore
-  return invoke$3('FileSystem.appendFile', uri, text);
+  return invoke$4('FileSystem.appendFile', uri, text);
 };
 const registerMockRpc = commandMap => {
   const mockRpc = createMockRpc({
     commandMap
   });
-  set$4(mockRpc);
+  set$5(mockRpc);
   return mockRpc;
 };
 
@@ -1201,7 +1202,7 @@ const FileSystemWorker = {
   getFolderSize,
   getPathSeparator: getPathSeparator$2,
   getRealPath: getRealPath$1,
-  invoke: invoke$3,
+  invoke: invoke$4,
   invokeAndTransfer: invokeAndTransfer$1,
   mkdir: mkdir$1,
   readDirWithFileTypes: readDirWithFileTypes$1,
@@ -1210,30 +1211,30 @@ const FileSystemWorker = {
   registerMockRpc,
   remove: remove$1,
   rename: rename$2,
-  set: set$4,
+  set: set$5,
   stat: stat$1,
   writeFile: writeFile$1
 };
 
 const {
-  invoke: invoke$2,
-  set: set$3} = create$2(IconThemeWorker);
+  invoke: invoke$3,
+  set: set$4} = create$2(IconThemeWorker);
 const getIcons = async iconRequests => {
   // @ts-ignore
-  return invoke$2('IconTheme.getIcons', iconRequests);
+  return invoke$3('IconTheme.getIcons', iconRequests);
 };
 
 const {
-  invoke: invoke$1,
+  invoke: invoke$2,
   invokeAndTransfer,
-  set: set$2} = create$2(RendererWorker);
+  set: set$3} = create$2(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
   number(x);
   number(y);
   // @ts-ignore
-  await invoke$1('ContextMenu.show2', uid, menuId, x, y, args);
+  await invoke$2('ContextMenu.show2', uid, menuId, x, y, args);
 };
 const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
   const command = 'IconTheme.handleMessagePort';
@@ -1247,13 +1248,22 @@ const sendMessagePortToFileSystemWorker$1 = async (port, rpcId) => {
 };
 const confirm = async (message, options) => {
   // @ts-ignore
-  const result = await invoke$1('ConfirmPrompt.prompt', message, options);
+  const result = await invoke$2('ConfirmPrompt.prompt', message, options);
   return result;
 };
 const writeClipBoardText = async text => {
-  await invoke$1('ClipBoard.writeText', /* text */text);
+  await invoke$2('ClipBoard.writeText', /* text */text);
+};
+const sendMessagePortToSourceControlWorker = async port => {
+  const command = 'SourceControl.handleMessagePort';
+  // @ts-ignore
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToSourceControlWorker', port, command, 0);
 };
 
+const {
+  invoke: invoke$1,
+  set: set$2} = create$2(SourceControlWorker);
+
 const toCommandId = key => {
   const dotIndex = key.indexOf('.');
   return key.slice(dotIndex + 1);
@@ -1287,10 +1297,11 @@ const create$1 = () => {
     wrapCommand(fn) {
       const wrapped = async (uid, ...args) => {
         const {
+          oldState,
           newState
         } = states[uid];
         const newerState = await fn(newState, ...args);
-        if (newState === newerState) {
+        if (oldState === newerState || newState === newerState) {
           return;
         }
         const latest = states[uid];
@@ -1346,7 +1357,7 @@ const Remove = 5;
 
 // TODO use direct connection
 const invoke = async (method, ...params) => {
-  return invoke$1(method, ...params);
+  return invoke$2(method, ...params);
 };
 const {
   set: set$1
@@ -2209,10 +2220,10 @@ const writeText = async text => {
 };
 const readNativeFiles = async () => {
   // @ts-ignore
-  return invoke$1('ClipBoard.readNativeFiles');
+  return invoke$2('ClipBoard.readNativeFiles');
 };
 const writeNativeFiles = async (type, files) => {
-  return invoke$1('ClipBoard.writeNativeFiles', type, files);
+  return invoke$2('ClipBoard.writeNativeFiles', type, files);
 };
 
 const copyRelativePath = async state => {
@@ -2329,6 +2340,25 @@ const None$4 = 0;
 const Right = 1;
 const Down = 2;
 
+const ensureUri = item => {
+  if (item.startsWith('/')) {
+    return `file://` + item;
+  }
+  return item;
+};
+const ensureUris = maybeUris => {
+  return maybeUris.map(ensureUri);
+};
+
+const createDecorationMap = decorations => {
+  const map = Object.create(null);
+  for (const decoration of decorations) {
+    const uri = ensureUri(decoration.uri);
+    map[uri] = decoration.decoration;
+  }
+  return map;
+};
+
 const getChevronType = (type, useChevrons) => {
   if (!useChevrons) {
     return None$4;
@@ -2419,7 +2449,7 @@ const text = data => {
   };
 };
 
-const getTreeItemClassName = (isSelected, isFocused, isDropping, useChevrons, indent) => {
+const getTreeItemClassName = (isSelected, isFocused, isDropping, useChevrons, indent, decoration) => {
   let className = TreeItem$1;
   className = mergeClassNames(className, `Indent-${indent}`);
   if (isSelected || isFocused) {
@@ -2428,6 +2458,9 @@ const getTreeItemClassName = (isSelected, isFocused, isDropping, useChevrons, in
   if (isDropping) {
     className = mergeClassNames(className, 'DropTarget');
   }
+  if (decoration) {
+    className = mergeClassNames(className, `decoration-${decoration}`);
+  }
   return className;
 };
 
@@ -2459,7 +2492,8 @@ const getEditingChevron = direntType => {
       return None$4;
   }
 };
-const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editingIndex, editingErrorMessage, icons, useChevrons, dropTargets, editingIcon, cutItems, sourceControlIgnoredUris = []) => {
+const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editingIndex, editingErrorMessage, icons, useChevrons, dropTargets, editingIcon, cutItems, sourceControlIgnoredUris = [], decorations) => {
+  const decorationMap = createDecorationMap(decorations);
   const visible = [];
   const indentFn = useChevrons ? getTreeItemIndentWithChevron : getTreeItemIndent;
   let iconIndex = 0;
@@ -2473,7 +2507,8 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
     const isDropping = dropTargets.includes(i);
     const isIgnored = sourceControlIgnoredUris.includes(item.path);
     const indent = indentFn(item.depth, chevron);
-    const className = getTreeItemClassName(isSelected, isFocused, isDropping, useChevrons, indent);
+    const decoration = decorationMap[item.path] || '';
+    const className = getTreeItemClassName(isSelected, isFocused, isDropping, useChevrons, indent, decoration);
     const expanded = getExpandedType(item.type);
     const ariaExpanded = ariaExpandedValues[expanded];
     const isEditing = i === editingIndex;
@@ -2496,7 +2531,9 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
       className,
       isCut,
       isIgnored,
-      index: i
+      index: i,
+      // @ts-ignore
+      decoration
     });
   }
   return visible;
@@ -2528,12 +2565,13 @@ const wrapListItemCommand = fn => {
       sourceControlIgnoredUris,
       height,
       itemHeight,
-      fileIconCache
+      fileIconCache,
+      decorations
     } = updatedState;
     const intermediate = get(id);
     set(id, intermediate.oldState, updatedState);
     const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, items.length);
-    if (items === intermediate.newState.items && minLineY === intermediate.newState.minLineY && editingIcon === intermediate.newState.editingIcon && cutItems === intermediate.newState.cutItems && editingErrorMessage === intermediate.newState.editingErrorMessage && dropTargets === intermediate.newState.dropTargets && fileIconCache === intermediate.newState.fileIconCache) {
+    if (items === intermediate.newState.items && minLineY === intermediate.newState.minLineY && editingIcon === intermediate.newState.editingIcon && cutItems === intermediate.newState.cutItems && editingErrorMessage === intermediate.newState.editingErrorMessage && dropTargets === intermediate.newState.dropTargets && fileIconCache === intermediate.newState.fileIconCache && decorations === intermediate.newState.decorations) {
       return;
     }
     const visible = items.slice(minLineY, maxLineY);
@@ -2541,7 +2579,7 @@ const wrapListItemCommand = fn => {
       icons,
       newFileIconCache
     } = await getFileIcons(visible, fileIconCache);
-    const visibleExplorerItems = getVisibleExplorerItems(items, minLineY, maxLineY, focusedIndex, editingIndex, editingErrorMessage, icons, useChevrons, dropTargets, editingIcon, cutItems, sourceControlIgnoredUris);
+    const visibleExplorerItems = getVisibleExplorerItems(items, minLineY, maxLineY, focusedIndex, editingIndex, editingErrorMessage, icons, useChevrons, dropTargets, editingIcon, cutItems, sourceControlIgnoredUris, decorations);
     const finalState = {
       ...updatedState,
       visibleExplorerItems,
@@ -2611,7 +2649,8 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     errorMessageLeft: 0,
     errorMessageTop: 0,
     visibleExplorerItems: [],
-    errorMessageWidth: 0
+    errorMessageWidth: 0,
+    decorations: []
   };
   set(state.uid, state, state);
   return state;
@@ -3304,7 +3343,7 @@ const handleClickDirectory = async (state, dirent, index, keepFocus) => {
 };
 
 const openUri = async (uri, focus) => {
-  await invoke$1(/* Main.openAbsolutePath */'Main.openUri', /* absolutePath */uri, /* focus */focus);
+  await invoke$2(/* Main.openAbsolutePath */'Main.openUri', /* absolutePath */uri, /* focus */focus);
 };
 
 const handleClickFile = async (state, dirent, index, keepFocus = false) => {
@@ -3597,7 +3636,7 @@ const handleClickCurrentButKeepFocus = state => {
 
 const openFolder = async () => {
   // @ts-ignore
-  await invoke$1(`Dialog.openFolder`);
+  await invoke$2(`Dialog.openFolder`);
 };
 
 const handleClickOpenFolder = async state => {
@@ -4134,12 +4173,12 @@ const getFileArray = fileList => {
 };
 
 const getFileHandles = async fileIds => {
-  const files = await invoke$1('FileSystemHandle.getFileHandles', fileIds);
+  const files = await invoke$2('FileSystemHandle.getFileHandles', fileIds);
   return files;
 };
 
 const getFilePathElectron = async file => {
-  return invoke$1('FileSystemHandle.getFilePathElectron', file);
+  return invoke$2('FileSystemHandle.getFilePathElectron', file);
 };
 
 const getFilepath = async file => {
@@ -4274,7 +4313,7 @@ const handleKeyDown = (state, key) => {
 
   // @ts-ignore
   timeout = setTimeout(async () => {
-    await invoke$1('Explorer.cancelTypeAhead');
+    await invoke$2('Explorer.cancelTypeAhead');
   }, focusWordTimeout);
   if (matchingIndex === -1) {
     return {
@@ -4593,16 +4632,37 @@ const handleWheel = (state, deltaMode, deltaY) => {
 };
 
 const getWorkspacePath = () => {
-  return invoke$1('Workspace.getPath');
+  return invoke$2('Workspace.getPath');
+};
+
+const DecorationsEnabled = false;
+
+const getFileDecorations = async (scheme, root, maybeUris) => {
+  try {
+    if (!DecorationsEnabled) {
+      return [];
+    }
+    const providerIds = await invoke$1('SourceControl.getEnabledProviderIds', scheme, root);
+    if (providerIds.length === 0) {
+      return [];
+    }
+    const providerId = providerIds[0];
+    const uris = ensureUris(maybeUris);
+    const decorations = await invoke$1('SourceControl.getFileDecorations', providerId, uris);
+    return decorations;
+  } catch (error) {
+    console.error(error);
+    return [];
+  }
 };
 
 const getSettings = async () => {
   // TODO get all settings at once
-  const useChevronsRaw = await invoke$1('Preferences.get', 'explorer.useChevrons');
+  const useChevronsRaw = await invoke$2('Preferences.get', 'explorer.useChevrons');
   const useChevrons = useChevronsRaw === false ? false : true;
-  const confirmDeleteRaw = await invoke$1('Preferences.get', 'explorer.confirmdelete');
+  const confirmDeleteRaw = await invoke$2('Preferences.get', 'explorer.confirmdelete');
   const confirmDelete = confirmDeleteRaw === false ? false : false;
-  const confirmPasteRaw = await invoke$1('Preferences.get', 'explorer.confirmpaste');
+  const confirmPasteRaw = await invoke$2('Preferences.get', 'explorer.confirmpaste');
   const confirmPaste = confirmPasteRaw === false ? false : false;
   return {
     useChevrons,
@@ -4720,6 +4780,14 @@ const getExcluded = () => {
 const getSavedRoot = (savedState, workspacePath) => {
   return workspacePath;
 };
+const RE_PROTOCOL = /^[a-z+]:\/\//;
+const getScheme = uri => {
+  const match = uri.match(RE_PROTOCOL);
+  if (!match) {
+    return '';
+  }
+  return match[0];
+};
 const loadContent = async (state, savedState) => {
   const {
     useChevrons,
@@ -4739,6 +4807,8 @@ const loadContent = async (state, savedState) => {
   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));
   return {
     ...state,
     confirmDelete,
@@ -4749,7 +4819,8 @@ const loadContent = async (state, savedState) => {
     minLineY,
     pathSeparator,
     root,
-    useChevrons
+    useChevrons,
+    decorations
   };
 };
 
@@ -4784,14 +4855,14 @@ const initializeFileSystemWorker = async () => {
   set$1(rpc);
 };
 
-const send = port => {
+const send$1 = port => {
   return sendMessagePortToIconThemeWorker(port, 0);
 };
 const createIconThemeWorkerRpc = async () => {
   try {
     const rpc = await TransferMessagePortRpcParent.create({
       commandMap: {},
-      send
+      send: send$1
     });
     return rpc;
   } catch (error) {
@@ -4801,11 +4872,40 @@ const createIconThemeWorkerRpc = async () => {
 
 const initializeIconThemeWorker = async () => {
   const rpc = await createIconThemeWorkerRpc();
-  set$3(rpc);
+  set$4(rpc);
+};
+
+const send = port => {
+  // @ts-ignore
+  return sendMessagePortToSourceControlWorker(port);
+};
+const createSourceControlWorkerRpc = async () => {
+  try {
+    const rpc = await TransferMessagePortRpcParent.create({
+      commandMap: {},
+      send
+    });
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create source control worker rpc`);
+  }
+};
+
+const initializeSourceControlWorker = async () => {
+  try {
+    if (!DecorationsEnabled) {
+      return;
+    }
+    const rpc = await createSourceControlWorkerRpc();
+    // TODO
+    set$2(rpc);
+  } catch {
+    // ignore
+  }
 };
 
 const initialize = async () => {
-  await Promise.all([initializeFileSystemWorker(), initializeIconThemeWorker()]);
+  await Promise.all([initializeFileSystemWorker(), initializeIconThemeWorker(), initializeSourceControlWorker()]);
 };
 
 const getNewChildDirentsForNewDirent = async (items, depth, parentPath, direntType) => {
@@ -4942,7 +5042,7 @@ const getContainingFolder = (root, dirents, focusedIndex, pathSeparator) => {
 };
 
 const openNativeFolder = async path => {
-  await invoke$1('OpenNativeFolder.openNativeFolder', /* path */path);
+  await invoke$2('OpenNativeFolder.openNativeFolder', /* path */path);
 };
 
 const openContainingFolder = async state => {
@@ -5930,24 +6030,24 @@ const selectUp = state => {
 
 const getEditingIcon = async (editingType, value, direntType) => {
   if (editingType === CreateFile) {
-    return invoke$1('IconTheme.getFileIcon', {
+    return invoke$2('IconTheme.getFileIcon', {
       name: value
     });
   }
   if (editingType === Rename$1) {
     if (direntType === File || direntType === EditingFile) {
-      return invoke$1('IconTheme.getFileIcon', {
+      return invoke$2('IconTheme.getFileIcon', {
         name: value
       });
     }
     if (direntType === Directory || direntType === EditingFolder || direntType === EditingDirectoryExpanded) {
-      return invoke$1('IconTheme.getFolderIcon', {
+      return invoke$2('IconTheme.getFolderIcon', {
         name: value
       });
     }
   }
   if (editingType === CreateFolder) {
-    return invoke$1('IconTheme.getFolderIcon', {
+    return invoke$2('IconTheme.getFolderIcon', {
       name: value
     });
   }
@@ -6062,7 +6162,7 @@ const listen = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
-  set$2(rpc);
+  set$3(rpc);
 };
 
 const main = async () => {

package/package.json

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