@lvce-editor/file-search-worker 5.3.0 → 5.5.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;
 };
 
@@ -1599,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) {
@@ -1667,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);
@@ -1684,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:
@@ -2035,6 +2045,9 @@ const selectIndex = async (state, index, button = /* left */0) => {
   } = state;
   const actualIndex = index + minLineY;
   const pick = getPick(items, actualIndex);
+  if (!pick) {
+    return state;
+  }
   // @ts-ignore
   const selectPickResult = await provider.selectPick(pick, actualIndex, button);
   object(selectPickResult);
@@ -2144,10 +2157,13 @@ 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 protoVisibleItems = 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,
@@ -2160,7 +2176,8 @@ const getVisible = (provider, items, minLineY, maxLineY, focusedIndex, icons) =>
 };
 
 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);
@@ -2561,10 +2578,6 @@ const commandMap = {
   'QuickPick.loadEntries2': get$1
 };
 
-const getColorThemeNames = async () => {
-  return invoke$1(/* Ajax.getJson */'ColorTheme.getColorThemeNames');
-};
-
 const getPickDescription$c = value => {
   return '';
 };
@@ -2574,7 +2587,7 @@ const getPickIcon$d = pick => {
 const getPickLabel$d = pick => {
   return pick;
 };
-const getVisibleItems$f = (picks, minLineY, maxLineY, focusedIndex, setSize, icons) => {
+const getVisibleItems$f = (picks, icons) => {
   const visibleItems = picks.map((item, index) => {
     const pick = item.pick;
     return {
@@ -2588,29 +2601,37 @@ const getVisibleItems$f = (picks, minLineY, maxLineY, focusedIndex, setSize, ico
   return visibleItems;
 };
 
-const setColorTheme = id => {
-  return invoke$1(/* ColorTheme.setColorTheme */'ColorTheme.setColorTheme', /* colorThemeId */id);
-};
-const getPlaceholder$7 = () => {
-  return selectColorTheme();
-};
-const getLabel$4 = () => {
-  return selectColorTheme();
+const getColorThemeNames = async () => {
+  return invoke$1(/* Ajax.getJson */'ColorTheme.getColorThemeNames');
 };
+
 const getPicks$7 = async searchValue => {
   const colorThemeNames = await getColorThemeNames();
   return colorThemeNames;
 };
-const getVisibleItems$e = getVisibleItems$f;
+
+const setColorTheme = id => {
+  return invoke$1(/* ColorTheme.setColorTheme */'ColorTheme.setColorTheme', /* colorThemeId */id);
+};
+
 const selectPick$7 = async pick => {
   await setColorTheme(/* colorThemeId */pick);
   return {
     command: Hide
   };
 };
+
 const focusPick = async pick => {
   await setColorTheme(/* colorThemeId */pick);
 };
+
+const getPlaceholder$7 = () => {
+  return selectColorTheme();
+};
+const getLabel$4 = () => {
+  return selectColorTheme();
+};
+const getVisibleItems$e = getVisibleItems$f;
 const getFilterValue$7 = value => {
   return value;
 };
@@ -2657,37 +2678,16 @@ const QuickPickEntriesColorTheme = {
   isPrepared: isPrepared$7,
   name: name$7,
   selectPick: selectPick$7,
-  setColorTheme,
   state: state$8
 };
 
-const handleError = async (error, notify = true, prefix = '') => {
-  console.error(error);
-};
-const showErrorDialog = async error => {
-  const code = error.code;
-  const message = error.message;
-  const stack = error.stack;
-  const name = error.name;
-  const errorInfo = {
-    code,
-    message,
-    stack,
-    name
-  };
-  await invoke$1('ErrorHandling.showErrorDialog', errorInfo);
-};
-const warn = (...args) => {
-  console.warn(...args);
-};
-
 const getPickIcon$b = () => {
   return '';
 };
 const getPickLabel$b = pick => {
   return pick.label;
 };
-const getVisibleItems$d = (picks, minLineY, maxLineY, focusedIndex, setSize, icons) => {
+const getVisibleItems$d = (picks, icons) => {
   const visibleItems = picks.map((item, index) => {
     const pick = item;
     return {
@@ -2701,24 +2701,24 @@ const getVisibleItems$d = (picks, minLineY, maxLineY, focusedIndex, setSize, ico
   return visibleItems;
 };
 
-const name$6 = 'command';
-const state$7 = {};
-const isPrepared$6 = () => {
-  return false;
-};
-const getPickDescription$a = () => {
-  return '';
-};
-const getPlaceholder$6 = () => {
-  return typeNameofCommandToRun();
-};
-const getLabel$3 = () => {
-  return '';
+const handleError = async (error, notify = true, prefix = '') => {
+  console.error(error);
 };
-const getNoResults$6 = () => {
-  return {
-    label: noMatchingResults()
+const showErrorDialog = async error => {
+  const code = error.code;
+  const message = error.message;
+  const stack = error.stack;
+  const name = error.name;
+  const errorInfo = {
+    code,
+    message,
+    stack,
+    name
   };
+  await invoke$1('ErrorHandling.showErrorDialog', errorInfo);
+};
+const warn = (...args) => {
+  console.warn(...args);
 };
 
 // TODO combine Ajax with cache (specify strategy: cacheFirst, networkFirst)
@@ -2753,16 +2753,13 @@ const getExtensionPicks = async () => {
     return [];
   }
 };
-
-// TODO send strings to renderer process only once for next occurrence send uint16array of ids of strings
-
 const getPicks$6 = async () => {
   const builtinPicks = await getBuiltinPicks();
   const extensionPicks = await getExtensionPicks();
   const allPicks = [...builtinPicks, ...extensionPicks];
   return allPicks;
 };
-const getVisibleItems$c = getVisibleItems$d;
+
 const shouldHide = item => {
   if (item.id === 'Viewlet.openWidget' && item.args[0] === 'QuickPick') {
     return false;
@@ -2800,6 +2797,27 @@ const selectPick$6 = async item => {
   }
   return selectPickBuiltin(item);
 };
+
+const name$6 = 'command';
+const state$7 = {};
+const isPrepared$6 = () => {
+  return false;
+};
+const getPickDescription$a = () => {
+  return '';
+};
+const getPlaceholder$6 = () => {
+  return typeNameofCommandToRun();
+};
+const getLabel$3 = () => {
+  return '';
+};
+const getNoResults$6 = () => {
+  return {
+    label: noMatchingResults()
+  };
+};
+const getVisibleItems$c = getVisibleItems$d;
 const getFilterValue$6 = value => {
   return value.trim();
 };
@@ -2861,8 +2879,8 @@ 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),
@@ -2970,7 +2988,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);
@@ -3009,10 +3027,6 @@ const getWorkspacePath = async () => {
   return invoke$1('Workspace.getPath');
 };
 
-const openUri = async uri => {
-  await invoke$1(/* Main.openUri */'Main.openUri', /* uri */uri);
-};
-
 const state$5 = Object.create(null);
 const register = modules => {
   Object.assign(state$5, modules);
@@ -3029,25 +3043,12 @@ const searchFile$5 = async (path, value, prepare, assetDir) => {
   return result;
 };
 
-const state$4 = {};
 const searchFile$4 = async (path, value) => {
   const prepare = true;
   // @ts-ignore
   const files = await searchFile$5(/* path */path, /* searchTerm */value, prepare);
   return files;
 };
-const name$4 = 'file';
-const getPlaceholder$4 = () => {
-  return '';
-};
-const getLabel$1 = () => {
-  return files();
-};
-const getNoResults$4 = () => {
-  return {
-    label: noMatchingResults()
-  };
-};
 const getPicks$4 = async searchValue => {
   // TODO cache workspace path
   const workspace = await getWorkspacePath();
@@ -3057,6 +3058,11 @@ const getPicks$4 = async searchValue => {
   const files = await searchFile$4(workspace, searchValue);
   return files;
 };
+
+const openUri = async uri => {
+  await invoke$1(/* Main.openUri */'Main.openUri', /* uri */uri);
+};
+
 const selectPick$4 = async pick => {
   if (typeof pick === 'object') {
     pick = pick.pick;
@@ -3068,6 +3074,20 @@ const selectPick$4 = async pick => {
     command: Hide
   };
 };
+
+const state$4 = {};
+const name$4 = 'file';
+const getPlaceholder$4 = () => {
+  return '';
+};
+const getLabel$1 = () => {
+  return files();
+};
+const getNoResults$4 = () => {
+  return {
+    label: noMatchingResults()
+  };
+};
 const getFilterValue$4 = value => {
   return value;
 };
@@ -3148,7 +3168,7 @@ const getPickIcon$5 = () => {
 const getPickLabel$5 = pick => {
   return pathBaseName(pick);
 };
-const getVisibleItems$7 = (picks, minLineY, maxLineY, focusedIndex, setSize, icons) => {
+const getVisibleItems$7 = (picks, icons) => {
   const visibleItems = picks.map((item, index) => {
     const pick = item.pick;
     const fileIcon = icons[index];
@@ -3157,7 +3177,7 @@ const getVisibleItems$7 = (picks, minLineY, maxLineY, focusedIndex, setSize, ico
       fileIcon,
       icon: getPickIcon$5(),
       label: getPickLabel$5(pick),
-      matches: pick.matches
+      matches: pick.matches || []
     };
   });
   return visibleItems;
@@ -3167,6 +3187,15 @@ const openWorkspaceFolder = uri => {
   return invoke$1(/* Workspace.setPath */'Workspace.setPath', /* path */uri);
 };
 
+// TODO selectPick should be independent of show/hide
+const selectPick$3 = async pick => {
+  const path = pick;
+  await openWorkspaceFolder(path);
+  return {
+    command: Hide
+  };
+};
+
 const getPlaceholder$3 = () => {
   return selectToOpen();
 };
@@ -3189,15 +3218,6 @@ const getPicks$3 = async () => {
   return recentlyOpened;
 };
 const getVisibleItems$6 = getVisibleItems$7;
-
-// TODO selectPick should be independent of show/hide
-const selectPick$3 = async pick => {
-  const path = pick;
-  await openWorkspaceFolder(path);
-  return {
-    command: Hide
-  };
-};
 const getFilterValue$3 = value => {
   return pathBaseName(value);
 };
@@ -3252,10 +3272,16 @@ const QuickPickEntriesOpenRecent = {
   state: state$3
 };
 
-const getVisibleItems$5 = (picks, minLineY, maxLineY, focusedIndex, setSize) => {
+const getVisibleItems$5 = picks => {
   return [];
 };
 
+const selectPick$2 = async item => {
+  return {
+    command: Hide
+  };
+};
+
 const name$2 = 'symbol';
 const getPlaceholder$2 = () => {
   return '';
@@ -3270,11 +3296,6 @@ const getPicks$2 = async () => {
   return picks;
 };
 const getVisibleItems$4 = getVisibleItems$5;
-const selectPick$2 = async item => {
-  return {
-    command: Hide
-  };
-};
 const getFilterValue$2 = value => {
   return value;
 };
@@ -3321,7 +3342,7 @@ 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: '',
@@ -3332,6 +3353,13 @@ const getVisibleItems$3 = (picks, minLineY, maxLineY, focusedIndex, setSize) =>
   return visibleItems;
 };
 
+const selectPick$1 = async item => {
+  // Command.execute(/* openView */ 549, /* viewName */ item.label)
+  // return {
+  //   command: QuickPickReturnValue.Hide,
+  // }
+};
+
 // TODO probably not needed
 
 const getPlaceholder$1 = () => {
@@ -3346,12 +3374,6 @@ const getPicks$1 = async () => {
   // return picks
   return [];
 };
-const selectPick$1 = async item => {
-  // Command.execute(/* openView */ 549, /* viewName */ item.label)
-  // return {
-  //   command: QuickPickReturnValue.Hide,
-  // }
-};
 const getFilterValue$1 = value => {
   return value;
 };
@@ -3395,7 +3417,7 @@ 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: '',
@@ -3406,6 +3428,12 @@ const getVisibleItems$1 = (picks, minLineY, maxLineY, focusedIndex, setSize) =>
   return visibleItems;
 };
 
+const selectPick = async item => {
+  return {
+    command: Hide
+  };
+};
+
 const name = 'workspace-symbol';
 const getPlaceholder = () => {
   return '';
@@ -3435,11 +3463,6 @@ const getPicks = async () => {
   const picks = [];
   return picks;
 };
-const selectPick = async item => {
-  return {
-    command: Hide
-  };
-};
 const getFilterValue = value => {
   return value;
 };

package/package.json

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