@lvce-editor/file-search-worker 5.2.0 → 5.4.0

package/dist/fileSearchWorkerMain.js

@@ -809,6 +809,9 @@ const createRpc = ipc => {
     },
     invokeAndTransfer(method, ...params) {
       return invokeAndTransfer(ipc, method, ...params);
+    },
+    async dispose() {
+      await ipc?.dispose();
     }
   };
   return rpc;
@@ -944,7 +947,7 @@ const getQuickPickProviderId = prefix => {
   }
 };
 
-const getVisibleItems$i = (picks, minLineY, maxLineY, focusedIndex, setSize, icons) => {
+const getVisibleItems$i = (picks, icons) => {
   return [];
 };
 
@@ -1052,9 +1055,9 @@ const state$b = {
   provider: QuickPickNoop,
   prefix: 'string-that-should-never-match-another-string'
 };
-const getVisibleItems$g = (picks, minLineY, maxLineY, focusedIndex, setSize, icons) => {
+const getVisibleItems$g = (picks, icons) => {
   const items = picks.map(pick => pick.pick);
-  const visibleItems = state$b.provider.getVisibleItems(items, minLineY, maxLineY, focusedIndex, setSize, icons);
+  const visibleItems = state$b.provider.getVisibleItems(items, icons);
   return visibleItems;
 };
 
@@ -1148,7 +1151,7 @@ const getPickIcon$e = pick => {
   // @ts-ignore
   return provider.getPickIcon(pick);
 };
-const getPickFileIcon$3 = pick => {
+const getPickFileIcon$2 = pick => {
   const {
     provider
   } = state$b;
@@ -1177,7 +1180,7 @@ const QuickPickEntriesEverything = {
   getLabel: getLabel$5,
   getNoResults: getNoResults$8,
   getPickDescription: getPickDescription$d,
-  getPickFileIcon: getPickFileIcon$3,
+  getPickFileIcon: getPickFileIcon$2,
   getPickFilterValue: getPickFilterValue$8,
   getPickIcon: getPickIcon$e,
   getPickLabel: getPickLabel$e,
@@ -1387,7 +1390,6 @@ const getIconsCached = (paths, fileIconCache) => {
   return paths.map(path => fileIconCache[path]);
 };
 
-const Directory = 3;
 const File$1 = 7;
 
 const getMissingIconRequests = (dirents, fileIconCache) => {
@@ -1600,53 +1602,47 @@ const getKeyBindings = () => {
   }];
 };
 
-const InsertText = 'insertText';
-const DeleteContentBackward = 'deleteContentBackward';
-const DeleteContentForward = 'deleteContentForward';
-const DeleteWordForward = 'deleteWordForward';
-const DeleteWordBackward = 'deleteWordBackward';
-const InsertLineBreak = 'insertLineBreak';
-const InsertCompositionText = 'insertCompositionText';
-const InsertFromPaste = 'insertFromPaste';
-
-const RE_ALPHA_NUMERIC = /[a-z\d]/i;
-const isAlphaNumeric = character => {
-  return RE_ALPHA_NUMERIC.test(character);
-};
-
-const getNewValueInsertText = (value, selectionStart, selectionEnd, data) => {
-  if (selectionStart === value.length) {
-    const newValue = value + data;
+const getNewValueDeleteContentBackward = (value, selectionStart, selectionEnd, data) => {
+  const after = value.slice(selectionEnd);
+  if (selectionStart === selectionEnd) {
+    const before = value.slice(0, selectionStart - 1);
+    const newValue = before + after;
     return {
       newValue,
-      cursorOffset: newValue.length
+      cursorOffset: before.length
     };
   }
   const before = value.slice(0, selectionStart);
-  const after = value.slice(selectionEnd);
-  const newValue = before + data + after;
+  const newValue = before + after;
   return {
     newValue,
-    cursorOffset: selectionStart + data.length
+    cursorOffset: selectionStart
   };
 };
-const getNewValueDeleteContentBackward = (value, selectionStart, selectionEnd, data) => {
-  const after = value.slice(selectionEnd);
+
+const getNewValueDeleteContentForward = (value, selectionStart, selectionEnd, data) => {
+  const before = value.slice(0, selectionStart);
   if (selectionStart === selectionEnd) {
-    const before = value.slice(0, selectionStart - 1);
+    const after = value.slice(selectionEnd + 1);
     const newValue = before + after;
     return {
       newValue,
-      cursorOffset: before.length
+      cursorOffset: selectionStart
     };
   }
-  const before = value.slice(0, selectionStart);
+  const after = value.slice(selectionEnd);
   const newValue = before + after;
   return {
     newValue,
     cursorOffset: selectionStart
   };
 };
+
+const RE_ALPHA_NUMERIC = /[a-z\d]/i;
+const isAlphaNumeric = character => {
+  return RE_ALPHA_NUMERIC.test(character);
+};
+
 const getNewValueDeleteWordBackward = (value, selectionStart, selectionEnd, data) => {
   const after = value.slice(selectionEnd);
   if (selectionStart === selectionEnd) {
@@ -1668,14 +1664,19 @@ const getNewValueDeleteWordBackward = (value, selectionStart, selectionEnd, data
     cursorOffset: selectionStart
   };
 };
-const getNewValueDeleteContentForward = (value, selectionStart, selectionEnd, data) => {
+
+const getNewValueDeleteWordForward = (value, selectionStart, selectionEnd, data) => {
   const before = value.slice(0, selectionStart);
   if (selectionStart === selectionEnd) {
-    const after = value.slice(selectionEnd + 1);
+    let startIndex = Math.min(selectionStart + 1, value.length - 1);
+    while (startIndex < value.length && isAlphaNumeric(value[startIndex])) {
+      startIndex++;
+    }
+    const after = value.slice(startIndex);
     const newValue = before + after;
     return {
       newValue,
-      cursorOffset: selectionStart
+      cursorOffset: before.length
     };
   }
   const after = value.slice(selectionEnd);
@@ -1685,36 +1686,44 @@ const getNewValueDeleteContentForward = (value, selectionStart, selectionEnd, da
     cursorOffset: selectionStart
   };
 };
-const getNewValueDeleteWordForward = (value, selectionStart, selectionEnd, data) => {
-  const before = value.slice(0, selectionStart);
-  if (selectionStart === selectionEnd) {
-    let startIndex = Math.min(selectionStart + 1, value.length - 1);
-    while (startIndex < value.length && isAlphaNumeric(value[startIndex])) {
-      startIndex++;
-    }
-    const after = value.slice(startIndex);
-    const newValue = before + after;
+
+const getNewValueInsertText = (value, selectionStart, selectionEnd, data) => {
+  if (selectionStart === value.length) {
+    const newValue = value + data;
     return {
       newValue,
-      cursorOffset: before.length
+      cursorOffset: newValue.length
     };
   }
+  const before = value.slice(0, selectionStart);
   const after = value.slice(selectionEnd);
-  const newValue = before + after;
+  const newValue = before + data + after;
   return {
     newValue,
-    cursorOffset: selectionStart
+    cursorOffset: selectionStart + data.length
   };
 };
+
 const getNewValueInsertCompositionText = (value, selectionStart, selectionEnd, data) => {
   return getNewValueInsertText(value, selectionStart, selectionEnd, data);
 };
+
 const getNewValueInsertLineBreak = (value, selectionStart, selectionEnd, data) => {
   return {
     newValue: value,
     cursorOffset: selectionEnd
   };
 };
+
+const InsertText = 'insertText';
+const DeleteContentBackward = 'deleteContentBackward';
+const DeleteContentForward = 'deleteContentForward';
+const DeleteWordForward = 'deleteWordForward';
+const DeleteWordBackward = 'deleteWordBackward';
+const InsertLineBreak = 'insertLineBreak';
+const InsertCompositionText = 'insertCompositionText';
+const InsertFromPaste = 'insertFromPaste';
+
 const getNewValueFunction = inputType => {
   switch (inputType) {
     case InsertFromPaste:
@@ -2145,15 +2154,27 @@ const add = menuEntries => {
   state$9.menuEntries = [...state$9.menuEntries, ...menuEntries];
 };
 
-const getVisible = (provider, items, minLineY, maxLineY, focusedIndex, icons) => {
-  const setSize = items.length;
+const getVisible$1 = (provider, items, minLineY, maxLineY, icons) => {
   const range = items.slice(minLineY, maxLineY);
-  const visibleItems = provider.getVisibleItems(range, minLineY, maxLineY, focusedIndex, setSize, icons);
+  const protoVisibleItems = provider.getVisibleItems(range, icons);
+  return protoVisibleItems;
+};
+
+const getVisible = (setSize, protoVisibleItems, minLineY, focusedIndex) => {
+  const visibleItems = protoVisibleItems.map((visibleItem, i) => {
+    return {
+      ...visibleItem,
+      posInSet: minLineY + i + 1,
+      setSize,
+      isActive: i === focusedIndex
+    };
+  });
   return visibleItems;
 };
 
 const createQuickPickViewModel = (oldState, newState) => {
-  const visibleItems = getVisible(newState.provider, newState.items, newState.minLineY, newState.maxLineY, newState.focusedIndex, newState.icons);
+  const protoVisibleItems = getVisible$1(newState.provider, newState.items, newState.minLineY, newState.maxLineY, newState.icons);
+  const visibleItems = getVisible(newState.items.length, protoVisibleItems, newState.minLineY, newState.focusedIndex);
   const oldFocusedIndex = oldState.focusedIndex - oldState.minLineY;
   const newFocusedIndex = newState.focusedIndex - newState.minLineY;
   const maxLineY = Math.min(newState.maxLineY, newState.items.length);
@@ -2567,17 +2588,17 @@ const getPickIcon$d = pick => {
 const getPickLabel$d = pick => {
   return pick;
 };
-const getVisibleItems$f = (picks, minLineY, maxLineY, focusedIndex, setSize, icons) => {
-  const visibleItems = picks.map((pick, index) => ({
-    description: getPickDescription$c(),
-    fileIcon: '',
-    icon: getPickIcon$d(),
-    isActive: index + minLineY === focusedIndex,
-    label: getPickLabel$d(pick),
-    matches: [],
-    posInSet: index + minLineY + 1,
-    setSize
-  }));
+const getVisibleItems$f = (picks, icons) => {
+  const visibleItems = picks.map((item, index) => {
+    const pick = item.pick;
+    return {
+      description: getPickDescription$c(),
+      fileIcon: '',
+      icon: getPickIcon$d(),
+      label: getPickLabel$d(pick),
+      matches: []
+    };
+  });
   return visibleItems;
 };
 
@@ -2680,17 +2701,17 @@ const getPickIcon$b = () => {
 const getPickLabel$b = pick => {
   return pick.label;
 };
-const getVisibleItems$d = (picks, minLineY, maxLineY, focusedIndex, setSize, icons) => {
-  const visibleItems = picks.map((pick, index) => ({
-    description: pick.description || '',
-    fileIcon: '',
-    icon: getPickIcon$b(),
-    isActive: index + minLineY === focusedIndex,
-    label: getPickLabel$b(pick),
-    matches: [],
-    posInSet: index + minLineY + 1,
-    setSize
-  }));
+const getVisibleItems$d = (picks, icons) => {
+  const visibleItems = picks.map((item, index) => {
+    const pick = item;
+    return {
+      description: pick.description || '',
+      fileIcon: '',
+      icon: getPickIcon$b(),
+      label: getPickLabel$b(pick),
+      matches: []
+    };
+  });
   return visibleItems;
 };
 
@@ -2854,16 +2875,13 @@ const convertIcon$1 = icon => {
 const getPickIcon$9 = pick => {
   return convertIcon$1(pick.icon);
 };
-const getVisibleItems$b = (picks, minLineY, maxLineY, focusedIndex, setSize, icons) => {
-  const visibleItems = picks.slice(minLineY, maxLineY + 1).map((pick, index) => ({
+const getVisibleItems$b = (picks, icons) => {
+  const visibleItems = picks.map((pick, index) => ({
     description: getPickDescription$9(pick),
     fileIcon: '',
     icon: getPickIcon$9(pick),
-    isActive: index + minLineY === focusedIndex,
     label: getPickLabel$9(pick),
-    matches: [],
-    posInSet: index + minLineY + 1,
-    setSize
+    matches: []
   }));
   return visibleItems;
 };
@@ -2966,7 +2984,7 @@ const getProtocol = uri => {
   return '';
 };
 
-const getVisibleItems$9 = (files, minLineY, maxLineY, focusedIndex, setSize, icons) => {
+const getVisibleItems$9 = (files, icons) => {
   const visibleItems = files.map((item, i) => {
     const pick = item.pick;
     const label = getPickLabel$7(pick);
@@ -2978,9 +2996,6 @@ const getVisibleItems$9 = (files, minLineY, maxLineY, focusedIndex, setSize, ico
       description,
       icon,
       fileIcon,
-      posInSet: minLineY + i + 1,
-      setSize,
-      isActive: i === focusedIndex,
       matches: item.matches
     };
   });
@@ -3093,7 +3108,7 @@ const getPickDescription$6 = pick => {
 const getPickIcon$6 = () => {
   return '';
 };
-const getPickFileIcon$2 = pick => {
+const getPickFileIcon$1 = pick => {
   if (typeof pick === 'object') {
     pick = pick.pick;
   }
@@ -3121,7 +3136,7 @@ const QuickPickEntriesFile = {
   getLabel: getLabel$1,
   getNoResults: getNoResults$4,
   getPickDescription: getPickDescription$6,
-  getPickFileIcon: getPickFileIcon$2,
+  getPickFileIcon: getPickFileIcon$1,
   getPickFilterValue: getPickFilterValue$4,
   getPickIcon: getPickIcon$6,
   getPickLabel: getPickLabel$6,
@@ -3147,29 +3162,18 @@ const getPickIcon$5 = () => {
 const getPickLabel$5 = pick => {
   return pathBaseName(pick);
 };
-const getPickFileIcon$1 = pick => {
-  if (typeof pick === 'object') {
-    pick = pick.pick;
-  }
-  if (typeof pick === 'object') {
-    pick = pick.pick;
-  }
-  return {
-    type: Directory,
-    name: pick
-  };
-};
-const getVisibleItems$7 = (picks, minLineY, maxLineY, focusedIndex, setSize) => {
-  const visibleItems = picks.map((pick, index) => ({
-    description: getPickDescription$5(pick),
-    fileIcon: getPickFileIcon$1(pick),
-    icon: getPickIcon$5(),
-    isActive: index + minLineY === focusedIndex,
-    label: getPickLabel$5(pick),
-    matches: [],
-    posInSet: index + minLineY + 1,
-    setSize
-  }));
+const getVisibleItems$7 = (picks, icons) => {
+  const visibleItems = picks.map((item, index) => {
+    const pick = item.pick;
+    const fileIcon = icons[index];
+    return {
+      description: getPickDescription$5(pick),
+      fileIcon,
+      icon: getPickIcon$5(),
+      label: getPickLabel$5(pick),
+      matches: pick.matches || []
+    };
+  });
   return visibleItems;
 };
 
@@ -3230,9 +3234,11 @@ const getPickFileIcon = pick => {
   if (typeof pick === 'object') {
     pick = pick.pick;
   }
+  const baseName = pathBaseName(pick);
   return {
-    type: Directory,
-    name: pick
+    type: File$1,
+    name: baseName,
+    path: pick
   };
 };
 const state$3 = {};
@@ -3260,7 +3266,7 @@ const QuickPickEntriesOpenRecent = {
   state: state$3
 };
 
-const getVisibleItems$5 = (picks, minLineY, maxLineY, focusedIndex, setSize) => {
+const getVisibleItems$5 = picks => {
   return [];
 };
 
@@ -3329,16 +3335,13 @@ const getPickIcon$2 = value => {
 const getPickLabel$2 = value => {
   return value;
 };
-const getVisibleItems$3 = (picks, minLineY, maxLineY, focusedIndex, setSize) => {
+const getVisibleItems$3 = picks => {
   const visibleItems = picks.map((pick, index) => ({
     description: getPickDescription$2(),
     fileIcon: '',
     icon: getPickIcon$2(),
-    isActive: index + minLineY === focusedIndex,
     label: getPickLabel$2(pick),
-    matches: [],
-    posInSet: index + minLineY + 1,
-    setSize
+    matches: []
   }));
   return visibleItems;
 };
@@ -3406,16 +3409,13 @@ const QuickPickEntriesView = {
   state: state$1
 };
 
-const getVisibleItems$1 = (picks, minLineY, maxLineY, focusedIndex, setSize) => {
+const getVisibleItems$1 = picks => {
   const visibleItems = picks.map((pick, index) => ({
     description: '',
     fileIcon: '',
     icon: '',
-    isActive: index + minLineY === focusedIndex,
     label: pick.label || '',
-    matches: [],
-    posInSet: index + minLineY + 1,
-    setSize
+    matches: []
   }));
   return visibleItems;
 };

package/package.json

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