@lvce-editor/file-search-worker 3.7.0 → 3.8.0

package/dist/fileSearchWorkerMain.js

@@ -1001,7 +1001,7 @@ const prefixIdWithExt = item => {
 const getExtensionPicks = async () => {
   try {
     // TODO don't call this every time
-    const extensionPicks = await invoke$1('ExtensionHostCommands.getCommands');
+    const extensionPicks = await invoke$1('ExtensionHost.getCommands');
     if (!extensionPicks) {
       return [];
     }
@@ -1090,6 +1090,9 @@ const execute = async (method, ...params) => {
   // TODO
 };
 
+const Directory$1 = 3;
+const File$2 = 7;
+
 const RE_PROTOCOL = /^([a-z-]+):\/\//;
 const getProtocol = uri => {
   const protocolMatch = uri.match(RE_PROTOCOL);
@@ -1103,9 +1106,6 @@ const Memfs = 'memfs';
 const Html = 'html';
 const Fetch = 'fetch';
 
-const Directory$1 = 3;
-const File$2 = 7;
-
 class FileNotFoundError extends Error {
   constructor(uri) {
     super(`File not found: ${uri}`);
@@ -1877,18 +1877,34 @@ const filterQuickPickItem = (pattern, word) => {
   return matches;
 };
 
-const getBaseName = path => {
+// TODO this should be in FileSystem module
+const pathBaseName = path => {
   return path.slice(path.lastIndexOf('/') + 1);
 };
 
-const filterQuickPickItems = (items, value) => {
+// TODO this should be in FileSystem module
+const pathDirName = path => {
+  const pathSeparator = '/';
+  const index = path.lastIndexOf(pathSeparator);
+  if (index === -1) {
+    return '';
+  }
+  return path.slice(0, index);
+};
+
+const filterQuickPickItems = (items, value, provider) => {
   if (!value) {
     return items.map(convertToPick);
   }
   const results = [];
   for (const item of items) {
-    const baseName = getBaseName(item);
-    const matches = filterQuickPickItem(value, baseName);
+    let filterValue = '';
+    if (provider) {
+      filterValue = provider.getPickLabel(item);
+    } else {
+      filterValue = pathBaseName(item);
+    }
+    const matches = filterQuickPickItem(value, filterValue);
     if (matches.length > 0) {
       results.push({
         pick: item,
@@ -1959,21 +1975,6 @@ const searchFile$1 = async (path, value, prepare, assetDir) => {
   return result;
 };
 
-// TODO this should be in FileSystem module
-const pathBaseName = path => {
-  return path.slice(path.lastIndexOf('/') + 1);
-};
-
-// TODO this should be in FileSystem module
-const pathDirName = path => {
-  const pathSeparator = '/';
-  const index = path.lastIndexOf(pathSeparator);
-  if (index === -1) {
-    return '';
-  }
-  return path.slice(0, index);
-};
-
 const searchFile = async (path, value) => {
   const prepare = true;
   // @ts-ignore
@@ -2048,7 +2049,17 @@ const getPickIcon$4 = () => {
   return '';
 };
 const getPickFileIcon$2 = pick => {
-  return '';
+  if (typeof pick === 'object') {
+    pick = pick.pick;
+  }
+  if (typeof pick === 'object') {
+    pick = pick.pick;
+  }
+  const baseName = pathBaseName(pick);
+  return {
+    type: File$2,
+    name: baseName
+  };
 };
 const isPrepared$1 = () => {
   const workspace = '';
@@ -2951,7 +2962,7 @@ const handleInput = async (state, newValue, cursorOffset, inputSource = Script)
   state.inputSource = inputSource;
   const newPicks = await state.provider.getPicks(newValue);
   const filterValue = state.provider.getFilterValue(newValue);
-  const items = filterQuickPickItems(newPicks, filterValue);
+  const items = filterQuickPickItems(newPicks, filterValue, state.provider);
   const focusedIndex = items.length === 0 ? -1 : 0;
   return {
     ...state,
@@ -3197,11 +3208,6 @@ const QuickPickEntriesNumber = {
   selectPick: selectPick$1
 };
 
-// TODO support file icons
-const getFolderIcon = () => {
-  return '';
-};
-
 const getRecentlyOpened = () => {
   return invoke$1(/* RecentlyOpened.getRecentlyOpened */'RecentlyOpened.getRecentlyOpened');
 };
@@ -3256,8 +3262,17 @@ const getPickDescription$1 = pick => {
 const getPickIcon = () => {
   return '';
 };
-const getPickFileIcon = () => {
-  return getFolderIcon();
+const getPickFileIcon = pick => {
+  if (typeof pick === 'object') {
+    pick = pick.pick;
+  }
+  if (typeof pick === 'object') {
+    pick = pick.pick;
+  }
+  return {
+    type: Directory$1,
+    name: pick
+  };
 };
 
 const QuickPickEntriesOpenRecent = {
@@ -3327,7 +3342,7 @@ const loadContent = async state => {
   array(newPicks);
   // @ts-ignore
   const filterValue = provider.getFilterValue(value);
-  const items = filterQuickPickItems(newPicks, filterValue);
+  const items = filterQuickPickItems(newPicks, filterValue, provider);
   // @ts-ignore
   provider.getLabel();
   const minLineY = 0;
@@ -3357,6 +3372,87 @@ const loadQuickPickEntries = moduleId => {
   }
 };
 
+const getIconRequests = (items, provider) => {
+  const iconRequests = [];
+  for (let i = 0; i < items.length; i++) {
+    const pick = items[i];
+    const iconObject = provider.getPickFileIcon(pick);
+    iconRequests.push({
+      name: iconObject?.name,
+      path: '',
+      type: iconObject?.type
+    });
+  }
+  return iconRequests;
+};
+
+const requestFileIcons = async requests => {
+  const promises = requests.map(request => {
+    if (!request.name) {
+      return '';
+    }
+    return request.type === File$2 ? invoke$1('IconTheme.getFileIcon', {
+      name: request.name
+    }) : invoke$1('IconTheme.getFolderIcon', {
+      name: request.name
+    });
+  });
+  return Promise.all(promises);
+};
+
+const getPickDescription = (provider, pick) => {
+  if (provider.getPickDescription) {
+    return provider.getPickDescription(pick);
+  }
+  return '';
+};
+const getVisible = async (provider, items, minLineY, maxLineY, focusedIndex) => {
+  const visibleItems = [];
+  const setSize = items.length;
+  const max = Math.min(setSize, maxLineY);
+  const iconsRequests = getIconRequests(items.slice(minLineY, maxLineY), provider);
+  const icons = await requestFileIcons(iconsRequests);
+  let iconIndex = 0;
+  for (let i = minLineY; i < max; i++) {
+    const item = items[i];
+    const pick = item.pick;
+    const label = provider.getPickLabel(pick);
+    const description = getPickDescription(provider, pick);
+    const icon = provider.getPickIcon(pick);
+    const fileIcon = icons[iconIndex++];
+    visibleItems.push({
+      label,
+      description,
+      icon,
+      fileIcon,
+      posInSet: i + 1,
+      setSize,
+      isActive: i === focusedIndex,
+      matches: item.matches
+    });
+  }
+  return visibleItems;
+};
+
+const createQuickPickViewModel = async (oldState, newState) => {
+  const visibleItems = await getVisible(newState.provider, newState.items, newState.minLineY, newState.maxLineY, newState.focusedIndex);
+  const oldFocusedIndex = oldState.focusedIndex - oldState.minLineY;
+  const newFocusedIndex = newState.focusedIndex - newState.minLineY;
+  const maxLineY = Math.min(newState.maxLineY, newState.items.length);
+  const itemCount = maxLineY - newState.minLineY;
+  const height = itemCount * newState.itemHeight;
+  return {
+    visibleItems,
+    value: newState.value,
+    cursorOffset: newState.cursorOffset,
+    focused: newState.focused,
+    height,
+    oldFocusedIndex,
+    newFocusedIndex,
+    uid: newState.uid
+  };
+};
+
 const RenderItems = 1;
 const RenderFocus = 2;
 const RenderValue = 3;
@@ -3496,74 +3592,31 @@ const getQuickPickItemsVirtualDom = visibleItems => {
   return dom;
 };
 
-const getPickDescription = (provider, pick) => {
-  if (provider.getPickDescription) {
-    return provider.getPickDescription(pick);
-  }
-  return '';
-};
-const getFileIcon = (provider, pick) => {
-  if (provider.getPickFileIcon) {
-    return provider.getPickFileIcon(pick);
-  }
-  return '';
-};
-const getVisible = (provider, items, minLineY, maxLineY, focusedIndex) => {
-  const visibleItems = [];
-  const setSize = items.length;
-  const max = Math.min(setSize, maxLineY);
-  for (let i = minLineY; i < max; i++) {
-    const item = items[i];
-    const pick = item.pick;
-    const label = provider.getPickLabel(pick);
-    const description = getPickDescription(provider, pick);
-    const icon = provider.getPickIcon(pick);
-    const fileIcon = getFileIcon(provider, pick);
-    visibleItems.push({
-      label,
-      description,
-      icon,
-      fileIcon,
-      posInSet: i + 1,
-      setSize,
-      isActive: i === focusedIndex,
-      matches: item.matches
-    });
-  }
-  return visibleItems;
-};
-
 const SetCursorOffset = 'setCursorOffset';
 const SetFocusedIndex = 'setFocusedIndex';
 const SetItemsHeight = 'setItemsHeight';
 const SetValue = 'setValue';
 
-const renderValue = (oldState, newState) => {
+const renderValue = newState => {
   return ['Viewlet.send', newState.uid, /* method */SetValue, /* value */newState.value];
 };
-const renderCursorOffset = (oldState, newState) => {
+const renderCursorOffset = newState => {
   return ['Viewlet.send', newState.uid, /* method */SetCursorOffset, /* cursorOffset */newState.cursorOffset];
 };
-const renderItems = (oldState, newState) => {
-  const visibleItems = getVisible(newState.provider, newState.items, newState.minLineY, newState.maxLineY, newState.focusedIndex);
-  const dom = getQuickPickItemsVirtualDom(visibleItems);
+const renderItems = newState => {
+  const dom = getQuickPickItemsVirtualDom(newState.visibleItems);
   return ['Viewlet.send', newState.uid, /* method */'setItemsDom', dom];
 };
-const renderFocusedIndex = (oldState, newState) => {
-  const oldFocusedIndex = oldState.focusedIndex - oldState.minLineY;
-  const newFocusedIndex = newState.focusedIndex - newState.minLineY;
-  return ['Viewlet.send', newState.uid, /* method */SetFocusedIndex, /* oldFocusedIndex */oldFocusedIndex, /* newFocusedIndex */newFocusedIndex];
+const renderFocusedIndex = newState => {
+  return ['Viewlet.send', newState.uid, /* method */SetFocusedIndex, /* oldFocusedIndex */newState.oldFocusedIndex, /* newFocusedIndex */newState.newFocusedIndex];
 };
-const renderHeight = (oldState, newState) => {
-  if (newState.items.length === 0) {
-    return ['Viewlet.send', newState.uid, /* method */SetItemsHeight, /* height */newState.itemHeight];
+const renderHeight = newState => {
+  if (newState.height === 0) {
+    return ['Viewlet.send', newState.uid, /* method */SetItemsHeight, /* height */20];
   }
-  const maxLineY = Math.min(newState.maxLineY, newState.items.length);
-  const itemCount = maxLineY - newState.minLineY;
-  const height = itemCount * newState.itemHeight;
-  return ['Viewlet.send', newState.uid, /* method */SetItemsHeight, /* height */height];
+  return ['Viewlet.send', newState.uid, /* method */SetItemsHeight, /* height */newState.height];
 };
-const renderFocus = (oldState, newState) => {
+const renderFocus = newState => {
   const selector = newState.focused ? '.InputBox' : '';
   return ['Viewlet.focusSelector', selector];
 };
@@ -3586,11 +3639,12 @@ const getRenderer = diffType => {
   }
 };
 
-const applyRender = (oldState, newState, diffResult) => {
+const applyRender = async (oldState, newState, diffResult) => {
   const commands = [];
+  const viewModel = await createQuickPickViewModel(oldState, newState);
   for (const item of diffResult) {
     const fn = getRenderer(item);
-    commands.push(fn(oldState, newState));
+    commands.push(fn(viewModel));
   }
   return commands;
 };
@@ -3662,7 +3716,7 @@ const diff = (oldState, newState) => {
   return diffResult;
 };
 
-const doRender = uid => {
+const doRender = async uid => {
   const {
     oldState,
     newState

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/file-search-worker",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "description": "",
   "keywords": [
     "text-search"