@lvce-editor/quick-pick-worker 4.20.2 → 4.21.1

package/dist/quickPickWorkerMain.js

@@ -2613,7 +2613,39 @@ const filterQuickPickItem = (pattern, word) => {
   return matches;
 };
 
-const filterQuickPickItems = (items, value) => {
+const getMatchRank = (label, value) => {
+  if (label === value) {
+    return 4;
+  }
+  if (label.startsWith(value)) {
+    return 3;
+  }
+  let index = label.indexOf(value);
+  if (index === -1) {
+    return 0;
+  }
+  while (index !== -1) {
+    if (!/[\p{L}\p{N}]/u.test(label[index - 1])) {
+      return 2;
+    }
+    index = label.indexOf(value, index + 1);
+  }
+  return 1;
+};
+const rankCommandPicks = (items, value) => {
+  const normalizedValue = value.toLowerCase();
+  const ranked = items.map(item => ({
+    item,
+    rank: getMatchRank(item.label.toLowerCase(), normalizedValue)
+  }));
+  // The first match entry is the fuzzy score; the remaining entries describe highlights.
+  ranked.sort((a, b) => b.rank - a.rank || b.item.matches[0] - a.item.matches[0]);
+  return ranked.map(({
+    item
+  }) => item);
+};
+
+const filterQuickPickItems = (items, value, rankCommands = false) => {
   if (!value) {
     return items;
   }
@@ -2628,7 +2660,7 @@ const filterQuickPickItems = (items, value) => {
       });
     }
   }
-  return results;
+  return rankCommands ? rankCommandPicks(results, value) : results;
 };
 
 const Command = '>';
@@ -2904,6 +2936,11 @@ const invoke$2 = (method, ...args) => {
   return state$1.rpc.invoke(method, ...args);
 };
 
+const isTextInput = args => {
+  const options = args.at(-1);
+  return options?.type === 'text';
+};
+
 const toProtoVisibleItem$2 = item => {
   const {
     args,
@@ -2928,6 +2965,9 @@ const toProtoVisibleItem$2 = item => {
 };
 const getPicks$d = async (searchValue, args) => {
   state$2.args = args;
+  if (isTextInput(args)) {
+    return [];
+  }
   const options = args.at(-1);
   let items;
   if (options?.mode === 'quickInput') {
@@ -3762,6 +3802,13 @@ const setValue = async (state, newValue) => {
   if (value === newValue) {
     return state;
   }
+  if (isTextInput(args)) {
+    return {
+      ...state,
+      inputSource: Script,
+      value: newValue
+    };
+  }
   const prefix = getQuickPickPrefix(newValue);
   const subId = getQuickPickSubProviderId(providerId, prefix);
   const quickInput = isQuickInput(args);
@@ -3771,7 +3818,7 @@ const setValue = async (state, newValue) => {
     platform
   });
   const filterValue = quickInput ? '' : getFilterValue(providerId, subId, newValue);
-  const items = filterQuickPickItems(newPicks, filterValue);
+  const items = filterQuickPickItems(newPicks, filterValue, subId === Commands$1);
   const focusedIndex = items.length === 0 ? -1 : 0;
   const sliced = items.slice(minLineY, maxLineY);
   const {
@@ -4042,7 +4089,7 @@ const getLoadedState = async state => {
   });
   array(newPicks);
   const filterValue = getFilterValue(id, subId, value);
-  const items = filterQuickPickItems(newPicks, filterValue);
+  const items = isTextInput(args) ? newPicks : filterQuickPickItems(newPicks, filterValue, subId === Commands$1);
   const minLineY = 0;
   const maxLineY = Math.min(minLineY + maxVisibleItems, newPicks.length);
   const sliced = newPicks.slice(minLineY, maxLineY);
@@ -4780,14 +4827,17 @@ const QuickPick$1 = 'QuickPick';
 const QuickPickItems = 'QuickPickItems';
 const QuickPickItemActive = 'QuickPickItemActive';
 
-const getQuickPickInputVirtualDom = (placeholder = '', ariaLabel = typeNameofCommandToRun()) => {
+const getQuickPickInputVirtualDom = (placeholder = '', ariaLabel = typeNameofCommandToRun(), textInput = false) => {
   return [{
     childCount: 1,
     className: QuickPickInputWrapper,
     type: Div
   }, {
-    ariaAutoComplete: 'list',
-    ariaExpanded: true,
+    ...(!textInput && {
+      ariaAutoComplete: 'list',
+      ariaExpanded: true,
+      role: ComboBox
+    }),
     ariaLabel: ariaLabel,
     autocapitalize: 'off',
     autocomplete: 'off',
@@ -4799,18 +4849,17 @@ const getQuickPickInputVirtualDom = (placeholder = '', ariaLabel = typeNameofCom
     onFocus: HandleFocus,
     onInput: HandleInput,
     placeholder,
-    role: ComboBox,
     spellcheck: false,
     type: Input
   }];
 };
 
-const getQuickPickHeaderVirtualDom = (placeholder = '', ariaLabel) => {
+const getQuickPickHeaderVirtualDom = (placeholder = '', ariaLabel, textInput = false) => {
   return [{
     childCount: 1,
     className: QuickPickHeader,
     type: Div
-  }, ...getQuickPickInputVirtualDom(placeholder, ariaLabel)];
+  }, ...getQuickPickInputVirtualDom(placeholder, ariaLabel, textInput)];
 };
 
 const getFileIconVirtualDom = icon => {
@@ -4955,8 +5004,17 @@ const getRootNodeCount = nodes => {
   }
   return count;
 };
-const getQuickPickVirtualDom = (visibleItems, scrollBarHeight, scrollBarTop, placeholder = '', inputAriaLabel) => {
+const getQuickPickVirtualDom = (visibleItems, scrollBarHeight, scrollBarTop, placeholder = '', inputAriaLabel, textInput = false) => {
   const quickOpen$1 = quickOpen();
+  if (textInput) {
+    return [{
+      ariaLabel: quickOpen$1,
+      childCount: 1,
+      className: mergeClassNames(Viewlet, QuickPick$2),
+      id: QuickPick$1,
+      type: Div
+    }, ...getQuickPickHeaderVirtualDom(placeholder, inputAriaLabel, true)];
+  }
   const shouldShowScrollbar = scrollBarHeight > 0;
   const quickPickItemsDom = getQuickPickItemsVirtualDom(visibleItems);
   const listItemsChildCount = getRootNodeCount(quickPickItemsDom);
@@ -4993,7 +5051,7 @@ const renderItemsDom = state => {
     visibleItems
   } = viewModel;
   const inputAriaLabel = getQuickPickInputAriaLabel(state.providerId, state.value, state.placeholder);
-  return getQuickPickVirtualDom(visibleItems, scrollBarHeight, scrollBarTop, state.placeholder, inputAriaLabel);
+  return getQuickPickVirtualDom(visibleItems, scrollBarHeight, scrollBarTop, state.placeholder, inputAriaLabel, isTextInput(state.args));
 };
 const renderItems = (_oldState, newState) => {
   const dom = renderItemsDom(newState);
@@ -5167,6 +5225,7 @@ const showQuickInput = async ({
   initialItems = [],
   initialValue,
   placeholder,
+  type = id === undefined && initialItems.length === 0 ? 'text' : 'select',
   waitUntil
 }) => {
   const customItemsId = add(initialItems);
@@ -5179,6 +5238,7 @@ const showQuickInput = async ({
       mode: 'quickInput',
       placeholder,
       quickInputId: id,
+      type,
       waitUntil
     });
     return result ?? {
@@ -5197,20 +5257,22 @@ const showQuickPick = async ({
   applicationId,
   items,
   placeholder = '',
+  type = 'select',
   waitUntil = 'selected'
 }) => {
-  const customItemsId = add(items);
+  const customItemsId = add(type === 'text' ? [] : items);
   const {
     id,
     promise
   } = registerCallback();
   try {
     await invoke(applicationId, 'Viewlet.openWidget', QuickPick, 'custom', [], id, {
-      acceptInput,
+      acceptInput: type === 'text' || acceptInput,
       callbackOwner: 'quickPickWorker',
       customItemsId,
       mode: 'quickPick',
-      placeholder
+      placeholder,
+      type
     });
     if (waitUntil === 'visible') {
       return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/quick-pick-worker",
-  "version": "4.20.2",
+  "version": "4.21.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lvce-editor/quick-pick-worker.git"