@lvce-editor/extension-search-view 2.8.0 → 2.10.0

package/dist/extensionSearchViewWorkerMain.js

@@ -935,132 +935,68 @@ const RE_PARAM = /@\w+/g;
 
 // TODO test sorting and filtering
 const parseValue = value => {
-  const parameters = Object.create(null);
+  let installed = false;
+  let enabled = false;
+  let disabled = false;
+  let builtin = false;
+  let sort = '';
+  let id = '';
+  let outdated = false;
   // TODO this is not very functional code (assignment)
   const replaced = value.replaceAll(RE_PARAM, (match, by, order) => {
     if (match.startsWith(Installed)) {
-      parameters.installed = true;
+      installed = true;
     }
     if (match.startsWith(Enabled)) {
-      parameters.enabled = true;
+      enabled = true;
     }
     if (match.startsWith(Disabled)) {
-      parameters.disabled = true;
+      disabled = true;
     }
     if (match.startsWith(Builtin)) {
-      parameters.builtin = true;
+      builtin = true;
     }
     if (match.startsWith(Sort)) {
       // TODO
-      parameters.sort = 'installs';
+      sort = 'installs';
     }
     if (match.startsWith(Id)) {
       // TODO
-      parameters.id = 'abc';
+      id = 'abc';
     }
     if (match.startsWith(Outdated)) {
-      parameters.outdated = true;
+      outdated = true;
     }
     return '';
   });
-  const isLocal = parameters.enabled || parameters.builtin || parameters.disabled || parameters.outdated || parameters.installed;
+  const isLocal = enabled || builtin || disabled || outdated || installed;
   return {
     query: replaced,
-    ...parameters,
+    enabled,
+    builtin,
+    disabled,
+    outdated,
+    installed,
+    id,
+    sort,
     isLocal
   };
 };
 
-const Web = 1;
-const Electron = 2;
-const Remote = 3;
-
-const getRemoteUrl = (extension, platform, assetDir) => {
-  if (platform === Remote || platform === Electron) {
-    if (extension.builtin) {
-      return `${assetDir}/extensions/${extension.id}/${extension.icon}`;
-    }
-    return `/remote/${extension.path}/${extension.icon}`; // TODO support windows paths
-  }
-  return '';
-};
-
-const getExtensionDefaultIcon = assetDir => {
-  return `${assetDir}/icons/extensionDefaultIcon.png`;
-};
-const getExtensionLanguageBasicsIcon = assetDir => {
-  return `${assetDir}/icons/language-icon.svg`;
-};
-const getExtensionThemeIcon = assetDir => {
-  return `${assetDir}/icons/theme-icon.png`;
-};
-
-const isLanguageBasicsExtension = extension => {
-  return extension.name && extension.name.startsWith('Language Basics');
-};
-const isThemeExtension = extension => {
-  return extension.name && extension.name.endsWith(' Theme');
-};
-const getIcon = (extension, platform, assetDir) => {
-  if (!extension) {
-    return getExtensionDefaultIcon(assetDir);
-  }
-  if (!extension.path || !extension.icon) {
-    if (isLanguageBasicsExtension(extension)) {
-      return getExtensionLanguageBasicsIcon(assetDir);
-    }
-    if (isThemeExtension(extension)) {
-      return getExtensionThemeIcon(assetDir);
-    }
-    return getExtensionDefaultIcon(assetDir);
-  }
-  return getRemoteUrl(extension, platform, assetDir);
-};
-const getName = extension => {
-  if (extension && extension.name) {
-    return extension.name;
-  }
-  if (extension && extension.id) {
-    return extension.id;
-  }
-  return 'n/a';
-};
-const getDescription = extension => {
-  if (!extension || !extension.description) {
-    return 'n/a';
-  }
-  return extension.description;
+const matchesName = (extension, query) => {
+  const extensionNameLower = extension.name.toLowerCase();
+  return extensionNameLower.includes(query);
 };
-const getId = extension => {
-  if (!extension || !extension.id) {
-    return 'n/a';
-  }
-  return extension.id;
-};
-
-const RE_PUBLISHER = /^[a-z\d-]+/;
-
-// TODO handle case when extension is of type number|array|null|string
-const getPublisher = extension => {
-  if (!extension || !extension.id) {
-    return 'n/a';
-  }
-  // TODO handle case when id is not of type string -> should not crash application
-  const match = extension.id.match(RE_PUBLISHER);
-  if (!match) {
-    return 'n/a';
-  }
-  return match[0];
+const matchesId = (extension, query) => {
+  const extensionIdLower = extension.id.toLowerCase();
+  return extensionIdLower.includes(query);
 };
-
 const matchesParsedValue = (extension, parsedValue) => {
-  if (extension && typeof extension.name === 'string') {
-    const extensionNameLower = extension.name.toLowerCase();
-    return extensionNameLower.includes(parsedValue.query);
+  if (extension.name) {
+    return matchesName(extension, parsedValue.query);
   }
-  if (extension && typeof extension.id === 'string') {
-    const extensionIdLower = extension.id.toLowerCase();
-    return extensionIdLower.includes(parsedValue.query);
+  if (extension.id) {
+    return matchesId(extension, parsedValue.query);
   }
   return false;
 };
@@ -1083,17 +1019,11 @@ const sortExtensions = extensions => {
   return toSorted(extensions, compareExtension);
 };
 
-const getExtensions = async (extensions, parsedValue, platform, assetDir) => {
+const getExtensions = async (extensions, parsedValue) => {
   const filteredExtensions = [];
   for (const extension of extensions) {
     if (matchesParsedValue(extension, parsedValue)) {
-      filteredExtensions.push({
-        name: getName(extension),
-        id: getId(extension),
-        publisher: getPublisher(extension),
-        icon: getIcon(extension, platform, assetDir),
-        description: getDescription(extension)
-      });
+      filteredExtensions.push(extension);
     }
   }
   const sortedExtensions = sortExtensions(filteredExtensions);
@@ -1103,7 +1033,7 @@ const getExtensions = async (extensions, parsedValue, platform, assetDir) => {
 const searchExtensions = async (extensions, value, platform, assetDir) => {
   try {
     const parsedValue = parseValue(value);
-    const filteredExtensions = await getExtensions(extensions, parsedValue, platform, assetDir);
+    const filteredExtensions = await getExtensions(extensions, parsedValue);
     return filteredExtensions;
   } catch (error) {
     throw new VError(error, 'Failed to search for extensions');
@@ -1139,7 +1069,7 @@ const handleInput = async (state, value) => {
         placeholder: searchExtensionsInMarketPlace()
       };
     }
-    const listHeight = getListHeight(state.items.length, state.itemHeight, state.height);
+    const listHeight = getListHeight(items.length, itemHeight, height);
     const total = items.length;
     const contentHeight = total * itemHeight;
     const scrollBarHeight = getScrollBarSize(height, contentHeight, minimumSliderSize);
@@ -1217,7 +1147,8 @@ const create = (id, uri, x, y, width, height, platform, assetDir) => {
     width,
     x,
     y,
-    focused: false
+    focused: false,
+    inputSource: 0
   };
   set$1(id, state, state);
 };
@@ -1228,31 +1159,31 @@ const RenderScrollBar = 5;
 const RenderMessage = 6;
 
 const diffType$4 = RenderItems;
-const isEqual$4 = (oldState, newState) => {
+const isEqual$5 = (oldState, newState) => {
   return true;
 };
 
 const diffType$3 = RenderHeader;
-const isEqual$3 = (oldState, newState) => {
+const isEqual$4 = (oldState, newState) => {
   return oldState.placeholder === newState.placeholder;
 };
 
 const diffType$2 = RenderItems;
-const isEqual$2 = (oldState, newState) => {
+const isEqual$3 = (oldState, newState) => {
   return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.deltaY === newState.deltaY && oldState.focusedIndex === newState.focusedIndex;
 };
 
 const diffType$1 = RenderMessage;
-const isEqual$1 = (oldState, newState) => {
+const isEqual$2 = (oldState, newState) => {
   return oldState.message === newState.message;
 };
 
 const diffType = RenderScrollBar;
-const isEqual = (oldState, newState) => {
+const isEqual$1 = (oldState, newState) => {
   return oldState.negativeMargin === newState.negativeMargin && oldState.deltaY === newState.deltaY && oldState.height === newState.height && oldState.finalDeltaY === newState.finalDeltaY && oldState.items.length === newState.items.length && oldState.scrollBarActive === newState.scrollBarActive;
 };
 
-const modules = [isEqual$4, isEqual, isEqual$1, isEqual$3, isEqual$2];
+const modules = [isEqual$5, isEqual$1, isEqual$2, isEqual$4, isEqual$3];
 const numbers = [diffType$4, diffType, diffType$1, diffType$3, diffType$2];
 
 const diff = (oldState, newState) => {
@@ -1411,7 +1342,7 @@ const getActions = () => {
   }];
 };
 
-const commandIds = ['clearSearchResults', 'closeSuggest', 'focusFirst', 'focusLast', 'focusNext', 'focusNextPage', 'focusPrevious', 'focusPreviousPage', 'handleBlur', 'handleClick', 'handleContextMenu', 'handleDisable', 'handleFocus', 'handleInput', 'handleInstall', 'handleScrollBarCaptureLost', 'handleScrollBarClick', 'handleScrollBarMove', 'handleUninstall', 'handleWheel', 'openSuggest', 'render', 'saveState', 'scrollDown', 'selectIndex', 'setDeltaY', 'toggleSuggest'];
+const commandIds = ['clearSearchResults', 'closeSuggest', 'focusFirst', 'focusLast', 'focusNext', 'focusNextPage', 'focusPrevious', 'focusPreviousPage', 'handleBlur', 'handleClick', 'handleContextMenu', 'handleDisable', 'handleFocus', 'handleInput', 'handleInstall', 'handleScrollBarCaptureLost', 'handleScrollBarClick', 'handleScrollBarMove', 'handleUninstall', 'handleWheel', 'openSuggest', 'render', 'saveState', 'scrollDown', 'selectIndex', 'setDeltaY', 'toggleSuggest', 'handleScrollBarThumbPointerMove'];
 
 const getCommandIds = () => {
   return commandIds;
@@ -1723,13 +1654,21 @@ const handleWheel = (state, deltaMode, deltaY) => {
   return setDeltaY(state, state.deltaY + deltaY);
 };
 
-const getAllExtensions = async platform => {
+const Web = 1;
+const Electron = 2;
+const Remote = 3;
+
+const getAllExtensions$1 = async platform => {
   if (platform === Web) {
     return [];
   }
   return invoke('ExtensionManagement.getAllExtensions');
 };
 
+const getAllExtensions = platform => {
+  return getAllExtensions$1(platform);
+};
+
 const Small = 1;
 const Normal = 2;
 const Large = 3;
@@ -1744,12 +1683,113 @@ const getViewletSize = width => {
   return Large;
 };
 
+const User = 1;
+const Script = 2;
+
+const getRemoteUrl = (extension, platform, assetDir) => {
+  if (platform === Remote || platform === Electron) {
+    if (extension.builtin) {
+      return `${assetDir}/extensions/${extension.id}/${extension.icon}`;
+    }
+    return `/remote/${extension.path}/${extension.icon}`; // TODO support windows paths
+  }
+  return '';
+};
+
+const getExtensionDefaultIcon = assetDir => {
+  return `${assetDir}/icons/extensionDefaultIcon.png`;
+};
+const getExtensionLanguageBasicsIcon = assetDir => {
+  return `${assetDir}/icons/language-icon.svg`;
+};
+const getExtensionThemeIcon = assetDir => {
+  return `${assetDir}/icons/theme-icon.png`;
+};
+
+const isLanguageBasicsExtension = extension => {
+  return extension.name && extension.name.startsWith('Language Basics');
+};
+const isThemeExtension = extension => {
+  return extension.name && extension.name.endsWith(' Theme');
+};
+const getIcon = (extension, platform, assetDir) => {
+  if (!extension) {
+    return getExtensionDefaultIcon(assetDir);
+  }
+  if (!extension.path || !extension.icon) {
+    if (isLanguageBasicsExtension(extension)) {
+      return getExtensionLanguageBasicsIcon(assetDir);
+    }
+    if (isThemeExtension(extension)) {
+      return getExtensionThemeIcon(assetDir);
+    }
+    return getExtensionDefaultIcon(assetDir);
+  }
+  return getRemoteUrl(extension, platform, assetDir);
+};
+const getName = extension => {
+  if (extension && extension.name) {
+    return extension.name;
+  }
+  if (extension && extension.id) {
+    return extension.id;
+  }
+  return 'n/a';
+};
+const getDescription = extension => {
+  if (!extension || !extension.description) {
+    return 'n/a';
+  }
+  return extension.description;
+};
+const getId = extension => {
+  if (!extension || !extension.id) {
+    return 'n/a';
+  }
+  return extension.id;
+};
+
+const RE_PUBLISHER = /^[a-z\d-]+/;
+
+// TODO handle case when extension is of type number|array|null|string
+const getPublisher = extension => {
+  if (!extension || !extension.id) {
+    return 'n/a';
+  }
+  // TODO handle case when id is not of type string -> should not crash application
+  const match = extension.id.match(RE_PUBLISHER);
+  if (!match) {
+    return 'n/a';
+  }
+  return match[0];
+};
+
+const normalizeExtension$1 = (extension, platform, assetDir) => {
+  return {
+    id: getId(extension),
+    name: getName(extension),
+    description: getDescription(extension),
+    uri: '',
+    publisher: getPublisher(extension),
+    icon: getIcon(extension, platform, assetDir)
+  };
+};
+
+const normalizeExtension = (extensions, platform, assetDir) => {
+  const normalized = [];
+  for (const extension of extensions) {
+    normalized.push(normalizeExtension$1(extension, platform, assetDir));
+  }
+  return normalized;
+};
+
 const getSavedValue = savedState => {
   if (savedState && typeof savedState === 'object' && 'searchValue' in savedState && typeof savedState.searchValue === 'string') {
     return savedState.searchValue;
   }
   return '';
 };
+
 const restoreState = savedState => {
   const searchValue = getSavedValue(savedState);
   return {
@@ -1763,7 +1803,8 @@ const loadContent = async (uid, savedState) => {
   } = get$1(uid);
   const {
     width,
-    platform
+    platform,
+    assetDir
   } = newState;
   const {
     searchValue
@@ -1771,10 +1812,12 @@ const loadContent = async (uid, savedState) => {
   // TODO just get local extensions on demand (not when query string is already different)
   const allExtensions = await getAllExtensions(platform);
   const size = getViewletSize(width);
+  const normalized = normalizeExtension(allExtensions, platform, assetDir);
   const updatedState = await handleInput({
     ...newState,
-    allExtensions,
-    size
+    allExtensions: normalized,
+    size,
+    inputSource: Script
   }, searchValue);
   set$1(uid, newState, updatedState);
 };
@@ -1783,6 +1826,10 @@ const openSuggest = state => {
   return state;
 };
 
+const isEqual = (oldState, newState) => {
+  return newState.inputSource === User || oldState.searchValue === newState.searchValue;
+};
+
 const Actions = 'Actions';
 const ExtensionActions = 'ExtensionActions';
 const ExtensionActive = 'ExtensionActive';
@@ -2121,12 +2168,24 @@ const getExtensionsVirtualDom = visibleExtensions => {
 };
 
 const getVisibleItem = (item, setSize, itemHeight, minLineY, relative, i, focusedIndex) => {
+  // TODO use normal parameters
+  const {
+    publisher,
+    description,
+    icon,
+    id,
+    name
+  } = item;
   return {
-    ...item,
     setSize,
     posInSet: i + 1,
     top: (i - minLineY) * itemHeight - relative,
-    focused: i === focusedIndex
+    focused: i === focusedIndex,
+    publisher,
+    description,
+    icon,
+    id,
+    name
   };
 };
 
@@ -2188,38 +2247,36 @@ const renderScrollBar$1 = newState => {
 };
 
 const renderExtensions = {
-  isEqual: isEqual$2,
+  isEqual: isEqual$3,
   apply(oldState, newState) {
     return renderItems(newState);
   }
 };
 const renderScrollBar = {
-  isEqual: isEqual,
+  isEqual: isEqual$1,
   apply(oldState, newState) {
     return renderScrollBar$1(newState);
   }
 };
 const renderMessage = {
-  isEqual: isEqual$1,
+  isEqual: isEqual$2,
   apply(oldState, newState) {
     return renderMessage$1(newState);
   }
 };
 const renderSearchValue = {
-  isEqual(oldState, newState) {
-    return oldState.searchValue === newState.searchValue;
-  },
+  isEqual: isEqual,
   apply(oldState, newState) {
     return [/* method */SetSearchValue, oldState.searchValue, newState.searchValue];
   }
 };
 const renderHeader = {
-  isEqual: isEqual$3,
+  isEqual: isEqual$4,
   apply(oldState, newState) {
     return renderHeader$1(newState);
   }
 };
-const render = [renderScrollBar, renderMessage, renderExtensions, renderSearchValue, renderHeader];
+const render = [renderScrollBar, renderMessage, renderExtensions, renderHeader, renderSearchValue];
 const doRender = (oldState, newState) => {
   const commands = [];
   for (const item of render) {
@@ -2305,10 +2362,13 @@ const renderEventListeners = () => {
   }];
 };
 
-const saveState = state => {
+const saveState = uid => {
+  const {
+    newState
+  } = get$1(uid);
   const {
     searchValue
-  } = state;
+  } = newState;
   return {
     searchValue
   };
@@ -2323,6 +2383,10 @@ const scrollDown = state => {
   return setDeltaY(state, newDeltaY);
 };
 
+const terminate = () => {
+  globalThis.close();
+};
+
 const toggleSuggest = state => {
   return state;
 };
@@ -2344,6 +2408,7 @@ const commandMap = {
   'SearchExtensions.create': create,
   'SearchExtensions.diff': diff,
   'SearchExtensions.focusFirst': wrapCommand(focusFirst),
+  'SearchExtensions.terminate': terminate,
   'SearchExtensions.focusIndex': wrapCommand(focusIndex),
   'SearchExtensions.focusLast': wrapCommand(focusLast),
   'SearchExtensions.focusNext': wrapCommand(focusNext),
@@ -2366,6 +2431,7 @@ const commandMap = {
   'SearchExtensions.handleScrollBarCaptureLost': wrapCommand(handleScrollBarCaptureLost),
   'SearchExtensions.handleScrollBarClick': wrapCommand(handleScrollBarClick),
   'SearchExtensions.handleScrollBarMove': wrapCommand(handleScrollBarMove),
+  'SearchExtensions.handleScrollBarThumbPointerMove': wrapCommand(handleScrollBarMove),
   'SearchExtensions.handleUninstall': wrapCommand(handleUninstall),
   'SearchExtensions.handleWheel': wrapCommand(handleWheel),
   'SearchExtensions.loadContent': loadContent,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-search-view",
-  "version": "2.8.0",
+  "version": "2.10.0",
   "description": "Extension Search View Worker",
   "license": "MIT",
   "author": "Lvce Editor",