@lvce-editor/explorer-view 7.23.1 → 7.23.3

package/dist/explorerViewWorkerMain.js

@@ -54,6 +54,67 @@ class VError extends Error {
   }
 }
 
+class AssertionError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'AssertionError';
+  }
+}
+const Object$1 = 1;
+const Number$1 = 2;
+const Array$1 = 3;
+const String$1 = 4;
+const Boolean$1 = 5;
+const Function = 6;
+const Null = 7;
+const Unknown$1 = 8;
+const getType = value => {
+  switch (typeof value) {
+    case 'number':
+      return Number$1;
+    case 'function':
+      return Function;
+    case 'string':
+      return String$1;
+    case 'object':
+      if (value === null) {
+        return Null;
+      }
+      if (Array.isArray(value)) {
+        return Array$1;
+      }
+      return Object$1;
+    case 'boolean':
+      return Boolean$1;
+    default:
+      return Unknown$1;
+  }
+};
+const object = value => {
+  const type = getType(value);
+  if (type !== Object$1) {
+    throw new AssertionError('expected value to be of type object');
+  }
+};
+const number = value => {
+  const type = getType(value);
+  if (type !== Number$1) {
+    throw new AssertionError('expected value to be of type number');
+  }
+};
+const array = value => {
+  const type = getType(value);
+  if (type !== Array$1) {
+    throw new AssertionError('expected value to be of type array');
+  }
+};
+const string = value => {
+  const type = getType(value);
+  if (type !== String$1) {
+    throw new AssertionError('expected value to be of type string');
+  }
+};
+
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
 };
@@ -1379,67 +1440,6 @@ const {
   set: set$6
 } = create$2(RendererProcess);
 
-class AssertionError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'AssertionError';
-  }
-}
-const Object$1 = 1;
-const Number$1 = 2;
-const Array$1 = 3;
-const String$1 = 4;
-const Boolean$1 = 5;
-const Function = 6;
-const Null = 7;
-const Unknown$1 = 8;
-const getType = value => {
-  switch (typeof value) {
-    case 'number':
-      return Number$1;
-    case 'function':
-      return Function;
-    case 'string':
-      return String$1;
-    case 'object':
-      if (value === null) {
-        return Null;
-      }
-      if (Array.isArray(value)) {
-        return Array$1;
-      }
-      return Object$1;
-    case 'boolean':
-      return Boolean$1;
-    default:
-      return Unknown$1;
-  }
-};
-const object = value => {
-  const type = getType(value);
-  if (type !== Object$1) {
-    throw new AssertionError('expected value to be of type object');
-  }
-};
-const number = value => {
-  const type = getType(value);
-  if (type !== Number$1) {
-    throw new AssertionError('expected value to be of type number');
-  }
-};
-const array = value => {
-  const type = getType(value);
-  if (type !== Array$1) {
-    throw new AssertionError('expected value to be of type array');
-  }
-};
-const string = value => {
-  const type = getType(value);
-  if (type !== String$1) {
-    throw new AssertionError('expected value to be of type string');
-  }
-};
-
 const {
   invoke: invoke$3,
   invokeAndTransfer,
@@ -3030,7 +3030,7 @@ const getFileIcons = async (dirents, fileIconCache) => {
   };
 };
 
-const directoryTypes$2 = new Set([DirectoryExpanded, DirectoryExpanding, EditingDirectoryExpanded]);
+const directoryTypes$3 = new Set([DirectoryExpanded, DirectoryExpanding, EditingDirectoryExpanded]);
 const getParentPath = (path, pathSeparator) => {
   const index = path.lastIndexOf(pathSeparator);
   if (index === -1) {
@@ -3041,7 +3041,7 @@ const getParentPath = (path, pathSeparator) => {
 const getGitIgnoreCandidateDirs = (root, items, pathSeparator) => {
   const dirs = new Set([root]);
   for (const item of items) {
-    if (directoryTypes$2.has(item.type)) {
+    if (directoryTypes$3.has(item.type)) {
       dirs.add(item.path);
     }
     const parent = getParentPath(item.path, pathSeparator);
@@ -3719,6 +3719,8 @@ const {
   wrapGetter
 } = create$1();
 const commandQueues = new Map();
+const gitIgnoreApplyDelay = 100;
+const pendingGitIgnoreUpdates = new Map();
 const runQueuedCommand = async (previousCommand, command) => {
   await previousCommand;
   return command();
@@ -3747,21 +3749,66 @@ const enqueueCommand = async (id, command) => {
 const hasSameVisibleExplorerItemInputs = (oldState, newState) => {
   return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.height === newState.height && oldState.itemHeight === newState.itemHeight && oldState.focusedIndex === newState.focusedIndex && oldState.editingIndex === newState.editingIndex && oldState.editingSessionId === newState.editingSessionId && oldState.editingIcon === newState.editingIcon && oldState.cutItems === newState.cutItems && oldState.editingErrorMessage === newState.editingErrorMessage && oldState.dropTargets === newState.dropTargets && oldState.fileIconCache === newState.fileIconCache && oldState.decorations === newState.decorations && oldState.useChevrons === newState.useChevrons && oldState.sourceControlIgnoredUris === newState.sourceControlIgnoredUris;
 };
-const maybeUpdateGitIgnoredUris = async (oldState, newState) => {
-  if (oldState.items === newState.items || oldState.sourceControlIgnoredUris !== newState.sourceControlIgnoredUris) {
-    return newState;
+const updateGitIgnoredUris = (state, generation, sourceControlIgnoredUris) => {
+  const {
+    gitIgnoreGeneration
+  } = state;
+  if (gitIgnoreGeneration !== generation) {
+    return state;
+  }
+  return {
+    ...state,
+    sourceControlIgnoredUris
+  };
+};
+const scheduleGitIgnoredUrisUpdate = (uid, generation, sourceControlIgnoredUris) => {
+  const previous = pendingGitIgnoreUpdates.get(uid);
+  if (previous) {
+    clearTimeout(previous.timer);
+  }
+  const run = () => {
+    pendingGitIgnoreUpdates.delete(uid);
+    void invoke$3('Viewlet.executeViewletCommand', uid, 'updateGitIgnoredUris', generation, sourceControlIgnoredUris).catch(() => {
+      // Ignored decorations are optional and must not block explorer interaction.
+    });
+  };
+  const timer = setTimeout(run, gitIgnoreApplyDelay);
+  pendingGitIgnoreUpdates.set(uid, {
+    run,
+    timer
+  });
+};
+const postponeGitIgnoredUrisUpdate = uid => {
+  const pending = pendingGitIgnoreUpdates.get(uid);
+  if (!pending) {
+    return;
+  }
+  clearTimeout(pending.timer);
+  const timer = setTimeout(pending.run, gitIgnoreApplyDelay);
+  pendingGitIgnoreUpdates.set(uid, {
+    run: pending.run,
+    timer
+  });
+};
+const maybeScheduleGitIgnoredUrisUpdate = (oldState, newState) => {
+  if (!newState.gitIgnoreDecorations || oldState.items === newState.items || oldState.sourceControlIgnoredUris !== newState.sourceControlIgnoredUris) {
+    return;
   }
   const {
     gitIgnoreDecorations,
+    gitIgnoreGeneration,
     items,
     pathSeparator,
-    root
+    root,
+    uid
   } = newState;
-  const sourceControlIgnoredUris = await getGitIgnoredUris(root, items, pathSeparator, gitIgnoreDecorations);
-  return {
-    ...newState,
-    sourceControlIgnoredUris
-  };
+  setTimeout(() => {
+    void getGitIgnoredUris(root, items, pathSeparator, gitIgnoreDecorations).then(sourceControlIgnoredUris => {
+      scheduleGitIgnoredUrisUpdate(uid, gitIgnoreGeneration, sourceControlIgnoredUris);
+    }).catch(() => {
+      // Ignored decorations are optional and must not block explorer interaction.
+    });
+  }, 0);
 };
 const wrapListItemCommandInternal = (fn, queued) => {
   const runCommand = async (id, ...args) => {
@@ -3775,7 +3822,11 @@ const wrapListItemCommandInternal = (fn, queued) => {
         completion
       };
     }
-    const updatedState = await maybeUpdateGitIgnoredUris(newState, rawUpdatedState);
+    const gitIgnoreInputsChanged = newState.items !== rawUpdatedState.items || newState.root !== rawUpdatedState.root || newState.pathSeparator !== rawUpdatedState.pathSeparator || newState.gitIgnoreDecorations !== rawUpdatedState.gitIgnoreDecorations;
+    const updatedState = gitIgnoreInputsChanged ? {
+      ...rawUpdatedState,
+      gitIgnoreGeneration: newState.gitIgnoreGeneration + 1
+    } : rawUpdatedState;
     const {
       cutItems,
       decorations,
@@ -3818,18 +3869,27 @@ const wrapListItemCommandInternal = (fn, queued) => {
     };
     const intermediate2 = get(id);
     set$1(id, intermediate2.oldState, finalState);
+    maybeScheduleGitIgnoredUrisUpdate(newState, finalState);
     return {
       completion
     };
   };
   if (!queued) {
     return async (id, ...args) => {
-      const result = await runCommand(id, ...args);
-      await result.completion;
+      try {
+        const result = await runCommand(id, ...args);
+        await result.completion;
+      } finally {
+        postponeGitIgnoredUrisUpdate(id);
+      }
     };
   }
   const wrappedCommand = async (id, ...args) => {
-    await enqueueCommand(id, () => runCommand(id, ...args));
+    try {
+      await enqueueCommand(id, () => runCommand(id, ...args));
+    } finally {
+      postponeGitIgnoredUrisUpdate(id);
+    }
   };
   return wrappedCommand;
 };
@@ -3881,6 +3941,7 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0, ass
     focusWord: '',
     focusWordTimeout: 800,
     gitIgnoreDecorations: false,
+    gitIgnoreGeneration: 0,
     handleOffset: 0,
     hasError: false,
     height,
@@ -6037,9 +6098,9 @@ const handleDrop$1 = async (state, fileHandles, files, paths) => {
   };
 };
 
-const directoryTypes$1 = [Directory, DirectoryExpanded, DirectoryExpanding];
+const directoryTypes$2 = [Directory, DirectoryExpanded, DirectoryExpanding];
 const isDirectory = item => {
-  return directoryTypes$1.includes(item.type);
+  return directoryTypes$2.includes(item.type);
 };
 const isDescendant = (path, parentPath, pathSeparator) => {
   const prefix = parentPath.endsWith(pathSeparator) ? parentPath : `${parentPath}${pathSeparator}`;
@@ -6265,11 +6326,20 @@ const getDroppedItems = async (itemIds, isElectron) => {
   };
 };
 
+const directoryTypes$1 = new Set([Directory, DirectoryExpanded, DirectoryExpanding, EditingDirectoryExpanded, EditingFolder, SymLinkFolder]);
+const getDragUri = item => {
+  const uri = ensureUri(item.path);
+  if (directoryTypes$1.has(item.type) && !uri.endsWith('/')) {
+    return `${uri}/`;
+  }
+  return uri;
+};
+
 const getInternalDragPaths = (items, uris) => {
   if (uris.length === 0) {
     return [];
   }
-  const pathByUri = new Map(items.map(item => [ensureUri(item.path), item.path]));
+  const pathByUri = new Map(items.map(item => [getDragUri(item), item.path]));
   const paths = [];
   for (const uri of uris) {
     const path = pathByUri.get(uri);
@@ -7241,8 +7311,8 @@ const getDragLabel = urls => {
   return String(urls.length);
 };
 
-const getDragData = urls => {
-  const data = urls.map(ensureUri).join('\n');
+const getDragData = items => {
+  const data = items.map(getDragUri).join('\n');
   const dragData = [{
     data,
     type: 'text/uri-list'
@@ -7252,7 +7322,7 @@ const getDragData = urls => {
   }];
   return {
     items: dragData,
-    label: getDragLabel(urls)
+    label: getDragLabel(items.map(item => item.path))
   };
 };
 
@@ -7276,7 +7346,7 @@ const renderDragData = (oldState, newState) => {
   } else {
     draggedItems = [];
   }
-  const dragData = getDragData(draggedItems.map(item => item.path));
+  const dragData = getDragData(draggedItems);
   return ['Viewlet.setDragData', uid, dragData];
 };
 
@@ -8345,6 +8415,7 @@ const commandMap = {
   'Explorer.terminate': terminate,
   'Explorer.toggleIndividualSelection': wrapListItemCommand(toggleIndividualSelection),
   'Explorer.updateEditingValue': wrapListItemCommand(updateEditingValue),
+  'Explorer.updateGitIgnoredUris': wrapListItemCommand(updateGitIgnoredUris),
   'Explorer.updateIcons': wrapListItemCommand(updateIcons)
 };
 

package/package.json

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