@lvce-editor/extension-search-view 7.22.0 → 7.24.0

package/dist/extensionSearchViewWorkerMain.js

@@ -2221,6 +2221,7 @@ const requestVersionGenerator = {
 const getSearchResult = async state => {
   const {
     allExtensions,
+    focus,
     headerHeight,
     height,
     itemHeight,
@@ -2253,7 +2254,7 @@ const getSearchResult = async state => {
   return {
     deltaY: 0,
     finalDeltaY,
-    focus: state.focus,
+    focus,
     inputActions,
     items,
     maxLineY,
@@ -2281,7 +2282,10 @@ const handleChangeWithContext = async (context, update, waitForExtensions = true
   try {
     const result = await getSearchResult(requestState);
     await context.updateState(state => {
-      if (requestVersions.get(state.uid) !== requestVersion) {
+      const {
+        uid
+      } = state;
+      if (requestVersions.get(uid) !== requestVersion) {
         return state;
       }
       return {
@@ -2294,7 +2298,10 @@ const handleChangeWithContext = async (context, update, waitForExtensions = true
   } catch (error) {
     await handleError(error);
     await context.updateState(state => {
-      if (requestVersions.get(state.uid) !== requestVersion) {
+      const {
+        uid
+      } = state;
+      if (requestVersions.get(uid) !== requestVersion) {
         return state;
       }
       return {
@@ -2342,45 +2349,56 @@ const getCompletionText = (searchValue, completion, rangeEnd) => {
   return completion.endsWith(':') || hasTrailingWhitespace ? completion : `${completion} `;
 };
 const acceptCompletionWithContext = async (context, label) => {
-  const state = context.getState();
-  const completion = label || state.completionItems[state.completionFocusedIndex]?.label;
+  const {
+    completionFocusedIndex,
+    completionItems,
+    cursorOffset,
+    searchValue
+  } = context.getState();
+  const completion = label || completionItems[completionFocusedIndex]?.label;
   if (!completion) {
     return;
   }
-  const range = getCompletionRange(state.searchValue, state.cursorOffset);
+  const range = getCompletionRange(searchValue, cursorOffset);
   if (!range) {
     return;
   }
-  const completionText = getCompletionText(state.searchValue, completion, range.end);
-  const searchValue = `${state.searchValue.slice(0, range.start)}${completionText}${state.searchValue.slice(range.end)}`;
+  const completionText = getCompletionText(searchValue, completion, range.end);
+  const newSearchValue = `${searchValue.slice(0, range.start)}${completionText}${searchValue.slice(range.end)}`;
   await handleChangeWithContext(context, {
     completionFocusedIndex: 0,
     completionItems: [],
     cursorOffset: range.start + completionText.length,
     focus: Input,
     inputSource: Script,
-    searchValue,
+    searchValue: newSearchValue,
     suggestOpen: false
   });
 };
 const acceptCompletion = async (state, label) => {
-  const completion = label || state.completionItems[state.completionFocusedIndex]?.label;
+  const {
+    completionFocusedIndex,
+    completionItems,
+    cursorOffset,
+    searchValue
+  } = state;
+  const completion = label || completionItems[completionFocusedIndex]?.label;
   if (!completion) {
     return state;
   }
-  const range = getCompletionRange(state.searchValue, state.cursorOffset);
+  const range = getCompletionRange(searchValue, cursorOffset);
   if (!range) {
     return state;
   }
-  const completionText = getCompletionText(state.searchValue, completion, range.end);
-  const searchValue = `${state.searchValue.slice(0, range.start)}${completionText}${state.searchValue.slice(range.end)}`;
+  const completionText = getCompletionText(searchValue, completion, range.end);
+  const newSearchValue = `${searchValue.slice(0, range.start)}${completionText}${searchValue.slice(range.end)}`;
   return handleChange(state, {
     completionFocusedIndex: 0,
     completionItems: [],
     cursorOffset: range.start + completionText.length,
     focus: Input,
     inputSource: Script,
-    searchValue,
+    searchValue: newSearchValue,
     suggestOpen: false
   });
 };
@@ -2398,7 +2416,10 @@ const clearSearchResultsWithContext = async context => {
 };
 
 const closeSuggest = state => {
-  if (!state.suggestOpen) {
+  const {
+    suggestOpen
+  } = state;
+  if (!suggestOpen) {
     return state;
   }
   return {
@@ -2590,13 +2611,17 @@ const updateStatus = (extension, id, status, builtin) => {
   };
 };
 const setExtensionStatus = (state, id, status, builtin) => {
+  const {
+    allExtensions,
+    items
+  } = state;
   if (!isExtensionStatus(status)) {
     throw new TypeError(`Invalid extension status: ${status}`);
   }
   return {
     ...state,
-    allExtensions: state.allExtensions.map(extension => updateStatus(extension, id, status, builtin)),
-    items: state.items.map(extension => updateStatus(extension, id, status, builtin))
+    allExtensions: allExtensions.map(extension => updateStatus(extension, id, status, builtin)),
+    items: items.map(extension => updateStatus(extension, id, status, builtin))
   };
 };
 
@@ -3907,6 +3932,17 @@ const getMenuEntriesList = (builtin, disabled = false, status) => {
   }];
 };
 
+const RE_WORD_START = /\b[a-z]/g;
+const getMenuEntriesCategory = () => {
+  return CategorySuggestions.map(query => ({
+    args: [query],
+    command: 'Extensions.filterByCategory',
+    flags: None,
+    id: query,
+    label: query.slice(11, -1).replaceAll(RE_WORD_START, character => character.toUpperCase()).replace('Ai', 'AI').replace('Scm', 'SCM')
+  }));
+};
+
 const getMenuEntriesFilter = () => {
   return [{
     command: 'Extensions.filterByFeatured',
@@ -3939,9 +3975,13 @@ const getMenuEntriesFilter = () => {
     id: 'separator1',
     label: ''
   }, {
-    command: 'SearchExtensions.filterByCategory',
+    args: [{
+      menuId: ExtensionSearchFilter,
+      subMenu: 'category'
+    }],
+    command: '',
     flags: SubMenu,
-    id: 'filterByCategory',
+    id: ExtensionSearchFilter,
     label: category()
   }, {
     command: 'Extensions.filterByInstalled',
@@ -3997,7 +4037,7 @@ const getMenuEntries2 = (state, props) => {
   } = props;
   switch (menuId) {
     case ExtensionSearchFilter:
-      return getMenuEntriesFilter();
+      return props.subMenu === 'category' ? getMenuEntriesCategory() : getMenuEntriesFilter();
     default:
       return getMenuEntriesList(props.builtin, props.disabled, props.status);
   }
@@ -4062,7 +4102,10 @@ const getListIndex = (eventX, eventY, x, y, deltaY, itemHeight, headerHeight) =>
 };
 
 const handleCompletionPointerDown = (state, label) => {
-  if (state.completionItems.every(item => item.label !== label)) {
+  const {
+    completionItems
+  } = state;
+  if (completionItems.every(item => item.label !== label)) {
     return Promise.resolve(state);
   }
   return acceptCompletion(state, label);
@@ -4119,7 +4162,8 @@ const handleClickFilter = async state => {
   const menuHeight = 370;
   const menuY = y + headerHeight + menuHeight;
   await show2(uid, ExtensionSearchFilter, menuX, menuY, {
-    menuId: ExtensionSearchFilter
+    menuId: ExtensionSearchFilter,
+    openSubMenuToLeft: true
   });
   return state;
 };
@@ -4637,9 +4681,13 @@ const handleUninstall = async (state, id) => {
 };
 
 const handleWheel = (state, deltaMode, deltaY) => {
+  const {
+    deltaY: currentDeltaY,
+    scrollSensitivity
+  } = state;
   number(deltaMode);
   number(deltaY);
-  return setDeltaY(state, state.deltaY + deltaY * state.scrollSensitivity);
+  return setDeltaY(state, currentDeltaY + deltaY * scrollSensitivity);
 };
 
 const createExtensionManagementWorkerRpc = async () => {
@@ -4732,7 +4780,10 @@ const loadContentWithContext = async (context, savedState) => {
     const size = getViewletSize(width);
     const scrollSensitivity = getIsFirefox() ? 2.5 : 1;
     await context.updateState(state => {
-      if (!state.initial) {
+      const {
+        initial
+      } = state;
+      if (!initial) {
         return state;
       }
       return {
@@ -4758,7 +4809,11 @@ const loadContentWithContext = async (context, savedState) => {
 };
 
 const openSuggest = state => {
-  const completionItems = getCompletionItems(state.searchValue, state.cursorOffset);
+  const {
+    cursorOffset,
+    searchValue
+  } = state;
+  const completionItems = getCompletionItems(searchValue, cursorOffset);
   if (completionItems.length === 0) {
     return state;
   }
@@ -5041,7 +5096,10 @@ const getTitleSuffix = searchValue => {
   return marketplace();
 };
 const renderTitle = state => {
-  return `${extensions()}: ${getTitleSuffix(state.searchValue)}`;
+  const {
+    searchValue
+  } = state;
+  return `${extensions()}: ${getTitleSuffix(searchValue)}`;
 };
 
 const renderTitleCommand = newState => {
@@ -5281,22 +5339,32 @@ const scrollDown = state => {
 };
 
 const selectNextCompletion = state => {
-  if (!state.suggestOpen || state.completionItems.length === 0) {
+  const {
+    completionFocusedIndex,
+    completionItems,
+    suggestOpen
+  } = state;
+  if (!suggestOpen || completionItems.length === 0) {
     return state;
   }
   return {
     ...state,
-    completionFocusedIndex: (state.completionFocusedIndex + 1) % state.completionItems.length
+    completionFocusedIndex: (completionFocusedIndex + 1) % completionItems.length
   };
 };
 
 const selectPreviousCompletion = state => {
-  if (!state.suggestOpen || state.completionItems.length === 0) {
+  const {
+    completionFocusedIndex,
+    completionItems,
+    suggestOpen
+  } = state;
+  if (!suggestOpen || completionItems.length === 0) {
     return state;
   }
   return {
     ...state,
-    completionFocusedIndex: (state.completionFocusedIndex - 1 + state.completionItems.length) % state.completionItems.length
+    completionFocusedIndex: (completionFocusedIndex - 1 + completionItems.length) % completionItems.length
   };
 };
 
@@ -5318,7 +5386,10 @@ const applyComponentState = (currentState, state) => {
 const setComponentState = wrapCommand(applyComponentState);
 
 const toggleSuggest = state => {
-  return state.suggestOpen ? closeSuggest(state) : openSuggest(state);
+  const {
+    suggestOpen
+  } = state;
+  return suggestOpen ? closeSuggest(state) : openSuggest(state);
 };
 
 const handleDirectMessagePort = (port, setAsRendererProcess = true) => handleMessagePort(port, commandMap, setAsRendererProcess);
@@ -5338,6 +5409,7 @@ const commandMap = {
   'SearchExtensions.enable': wrapCommand(enable$1),
   'SearchExtensions.enableWorkspace': wrapCommand(enableWorkspace),
   'SearchExtensions.filterByBuiltin': wrapAsyncCommand(createFilterCommand(Builtin)),
+  'SearchExtensions.filterByCategory': wrapAsyncCommand(filterByValueWithContext),
   'SearchExtensions.filterByDisabled': wrapAsyncCommand(createFilterCommand(Disabled$2)),
   'SearchExtensions.filterByEnabled': wrapAsyncCommand(createFilterCommand(Enabled$1)),
   'SearchExtensions.filterByFeatured': wrapAsyncCommand(createFilterCommand(Featured)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-search-view",
-  "version": "7.22.0",
+  "version": "7.24.0",
   "description": "Extension Search View Worker",
   "repository": {
     "type": "git",