@lvce-editor/extension-search-view 2.11.0 → 3.0.0

package/dist/extensionSearchViewWorkerMain.js

@@ -436,7 +436,7 @@ const set$2 = (id, fn) => {
 const get$2 = id => {
   return callbacks[id];
 };
-const remove = id => {
+const remove$1 = id => {
   delete callbacks[id];
 };
 let id = 0;
@@ -613,7 +613,7 @@ const resolve = (id, response) => {
     return;
   }
   fn(response);
-  remove(id);
+  remove$1(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -912,7 +912,7 @@ const getListHeight = (itemsLength, itemHeight, maxHeight) => {
 // TODO optimize this function to return the minimum number
 // of visible items needed, e.g. when not scrolled 5 items with
 // 20px fill 100px but when scrolled 6 items are needed
-const getNumberOfVisibleItems = (listHeight, itemHeight) => {
+const getNumberOfVisibleItems$1 = (listHeight, itemHeight) => {
   return Math.ceil(listHeight / itemHeight) + 1;
 };
 
@@ -1004,12 +1004,6 @@ const matchesParsedValue = (extension, parsedValue) => {
 const toSorted = (array, compare) => {
   return [...array].sort(compare);
 };
-const isLastIndex = (array, index) => {
-  return index === array.length - 1;
-};
-const lastIndex = array => {
-  return array.length - 1;
-};
 
 const compareExtension = (extensionA, extensionB) => {
   return extensionA.name.localeCompare(extensionB.name) || extensionA.id.localeCompare(extensionB.id);
@@ -1073,7 +1067,7 @@ const handleInput = async (state, value) => {
     const total = items.length;
     const contentHeight = total * itemHeight;
     const scrollBarHeight = getScrollBarSize(height, contentHeight, minimumSliderSize);
-    const numberOfVisible = getNumberOfVisibleItems(listHeight, itemHeight);
+    const numberOfVisible = getNumberOfVisibleItems$1(listHeight, itemHeight);
     const maxLineY = Math.min(numberOfVisible, total);
     const finalDeltaY = getFinalDeltaY(listHeight, itemHeight, total);
     return {
@@ -1120,6 +1114,9 @@ const set$1 = (uid, oldState, newState) => {
     newState
   };
 };
+const remove = uid => {
+  delete states[uid];
+};
 
 const create = (id, uri, x, y, width, height, platform, assetDir) => {
   const state = {
@@ -1157,34 +1154,35 @@ const RenderHeader = 1;
 const RenderItems = 4;
 const RenderScrollBar = 5;
 const RenderMessage = 6;
+const RenderSearchValue = 7;
 
 const diffType$4 = RenderItems;
-const isEqual$5 = (oldState, newState) => {
+const isEqual$4 = (oldState, newState) => {
   return true;
 };
 
 const diffType$3 = RenderHeader;
-const isEqual$4 = (oldState, newState) => {
+const isEqual$3 = (oldState, newState) => {
   return oldState.placeholder === newState.placeholder;
 };
 
 const diffType$2 = RenderItems;
-const isEqual$3 = (oldState, newState) => {
+const isEqual$2 = (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$2 = (oldState, newState) => {
+const isEqual$1 = (oldState, newState) => {
   return oldState.message === newState.message;
 };
 
 const diffType = RenderScrollBar;
-const isEqual$1 = (oldState, newState) => {
+const isEqual = (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$5, isEqual$1, isEqual$2, isEqual$4, isEqual$3];
-const numbers = [diffType$4, diffType, diffType$1, diffType$3, diffType$2];
+const modules = [isEqual, isEqual$1, isEqual$3, isEqual$2, isEqual$4];
+const numbers = [diffType, diffType$1, diffType$3, diffType$2, diffType$4];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -1197,6 +1195,25 @@ const diff = (oldState, newState) => {
   return diffResult;
 };
 
+const diff2 = uid => {
+  const {
+    oldState,
+    newState
+  } = get$1(uid);
+  const diffResult = diff(oldState, newState);
+  return diffResult;
+};
+
+const dispose = uid => {
+  remove(uid);
+};
+
+// TODO optimize this function to return the minimum number
+// of visible items needed, e.g. when not scrolled 5 items with
+// 20px fill 100px but when scrolled 6 items are needed
+const getNumberOfVisibleItems = (listHeight, itemHeight) => {
+  return Math.ceil(listHeight / itemHeight) + 1;
+};
 const focusIndexScrollDown = (state, index, listHeight, itemHeight, itemsLength) => {
   const newMaxLineY = Math.min(index + 1, itemsLength);
   const fittingItems = getNumberOfVisibleItems(listHeight, itemHeight);
@@ -1211,7 +1228,6 @@ const focusIndexScrollDown = (state, index, listHeight, itemHeight, itemsLength)
     deltaY: newDeltaY
   };
 };
-
 const focusIndexScrollUp = (state, index, listHeight, itemHeight, itemsLength) => {
   const newMinLineY = index;
   const fittingItems = getNumberOfVisibleItems(listHeight, itemHeight);
@@ -1226,7 +1242,6 @@ const focusIndexScrollUp = (state, index, listHeight, itemHeight, itemsLength) =
     deltaY: newDeltaY
   };
 };
-
 const focusIndex = (state, index) => {
   const {
     itemHeight,
@@ -1261,7 +1276,6 @@ const focusIndex = (state, index) => {
     focused: true
   };
 };
-
 const first = () => {
   return 0;
 };
@@ -1271,12 +1285,10 @@ const last = items => {
 const next = (items, index) => {
   return (index + 1) % items.length;
 };
-
 const focusFirst = state => {
   const firstIndex = first();
   return focusIndex(state, firstIndex);
 };
-
 const focusLast = state => {
   const {
     items
@@ -1284,7 +1296,6 @@ const focusLast = state => {
   const lastIndex = last(items);
   return focusIndex(state, lastIndex);
 };
-
 const focusNext = state => {
   const {
     focusedIndex,
@@ -1294,6 +1305,14 @@ const focusNext = state => {
   return focusIndex(state, nextIndex);
 };
 
+// based on https://github.com/microsoft/vscode/blob/c0769274fa136b45799edeccc0d0a2f645b75caf/src/vs/base/common/arrays.ts#L625 (License MIT)
+
+const isLastIndex = (array, index) => {
+  return index === array.length - 1;
+};
+const lastIndex = array => {
+  return array.length - 1;
+};
 const focusNextPage = state => {
   const {
     focusedIndex,
@@ -1307,7 +1326,6 @@ const focusNextPage = state => {
   const indexNextPage = Math.min(maxLineY + (maxLineY - minLineY) - 2, lastIndex(items));
   return focusIndex(state, indexNextPage);
 };
-
 const focusPreviousPage = state => {
   const {
     focusedIndex,
@@ -1578,7 +1596,7 @@ const setDeltaY = (state, value) => {
   }
   // TODO when it only moves by one px, extensions don't need to be rerendered, only negative margin
   const minLineY = Math.floor(newDeltaY / itemHeight);
-  const maxLineY = minLineY + getNumberOfVisibleItems(listHeight, itemHeight);
+  const maxLineY = minLineY + getNumberOfVisibleItems$1(listHeight, itemHeight);
   return {
     ...state,
     deltaY: newDeltaY,
@@ -1683,7 +1701,6 @@ const getViewletSize = width => {
   return Large;
 };
 
-const User = 1;
 const Script = 2;
 
 const getRemoteUrl = (extension, platform, assetDir) => {
@@ -1826,10 +1843,6 @@ 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';
@@ -1925,7 +1938,7 @@ const getExtensionHeaderVirtualDom = (placeholder, actions) => {
   }, ...getSearchFieldVirtualDom('extensions', placeholder, 'handleExtensionsInput', actions, [])];
 };
 
-const renderHeader$1 = newState => {
+const renderHeader = newState => {
   const actions = [{
     type: Button$2,
     title: clearExtensionSearchResults(),
@@ -2219,7 +2232,7 @@ const SetMessage = 'setMessage';
 const SetScrollBar = 'setScrollBar';
 const SetSearchValue = 'setSearchValue';
 
-const renderMessage$1 = newState => {
+const renderMessage = newState => {
   return [/* method */SetMessage, /* message */newState.message];
 };
 
@@ -2230,7 +2243,7 @@ const position = (x, y) => {
   return `${x}px ${y}px`;
 };
 
-const renderScrollBar$1 = newState => {
+const renderScrollBar = newState => {
   const listHeight = getListHeight(newState.items.length, newState.itemHeight, newState.height);
   const total = newState.items.length;
   const contentHeight = total * newState.itemHeight;
@@ -2246,53 +2259,44 @@ const renderScrollBar$1 = newState => {
   return [/* method */SetScrollBar, translateString, heightString, className];
 };
 
-const renderExtensions = {
-  isEqual: isEqual$3,
-  apply(oldState, newState) {
-    return renderItems(newState);
-  }
-};
-const renderScrollBar = {
-  isEqual: isEqual$1,
-  apply(oldState, newState) {
-    return renderScrollBar$1(newState);
-  }
-};
-const renderMessage = {
-  isEqual: isEqual$2,
-  apply(oldState, newState) {
-    return renderMessage$1(newState);
-  }
-};
-const renderSearchValue = {
-  isEqual: isEqual,
-  apply(oldState, newState) {
-    return [/* method */SetSearchValue, oldState.searchValue, newState.searchValue];
-  }
+const renderSearchValue = newState => {
+  return [/* method */SetSearchValue, '', newState.searchValue];
 };
-const renderHeader = {
-  isEqual: isEqual$4,
-  apply(oldState, newState) {
-    return renderHeader$1(newState);
+
+const getRenderer = diffType => {
+  switch (diffType) {
+    case RenderItems:
+      return renderItems;
+    case RenderMessage:
+      return renderMessage;
+    case RenderScrollBar:
+      return renderScrollBar;
+    case RenderSearchValue:
+      return renderSearchValue;
+    case RenderHeader:
+      return renderHeader;
+    default:
+      throw new Error('unknown renderer');
   }
 };
-const render = [renderScrollBar, renderMessage, renderExtensions, renderHeader, renderSearchValue];
-const doRender = (oldState, newState) => {
+
+const applyRender = (oldState, newState, diffResult) => {
   const commands = [];
-  for (const item of render) {
-    if (!item.isEqual(oldState, newState)) {
-      commands.push(item.apply(oldState, newState));
-    }
+  for (const item of diffResult) {
+    const fn = getRenderer(item);
+    commands.push(fn(newState));
   }
   return commands;
 };
 
-const render2 = uid => {
+const render3 = (uid, diffResult) => {
   const {
     oldState,
     newState
   } = get$1(uid);
-  return doRender(oldState, newState);
+  set$1(uid, newState, newState);
+  const commands = applyRender(oldState, newState, diffResult);
+  return commands;
 };
 
 const getIconVirtualDom = (icon, type = Div$1) => {
@@ -2406,9 +2410,9 @@ const commandMap = {
   'SearchExtensions.clearSearchResults': wrapCommand(clearSearchResults),
   'SearchExtensions.closeSuggest': wrapCommand(closeSuggest),
   'SearchExtensions.create': create,
-  'SearchExtensions.diff': diff,
+  'SearchExtensions.diff2': diff2,
+  'SearchExtensions.dispose': dispose,
   'SearchExtensions.focusFirst': wrapCommand(focusFirst),
-  'SearchExtensions.terminate': terminate,
   'SearchExtensions.focusIndex': wrapCommand(focusIndex),
   'SearchExtensions.focusLast': wrapCommand(focusLast),
   'SearchExtensions.focusNext': wrapCommand(focusNext),
@@ -2436,8 +2440,7 @@ const commandMap = {
   'SearchExtensions.handleWheel': wrapCommand(handleWheel),
   'SearchExtensions.loadContent': loadContent,
   'SearchExtensions.openSuggest': wrapCommand(openSuggest),
-  'SearchExtensions.render': doRender,
-  'SearchExtensions.render2': render2,
+  'SearchExtensions.render3': render3,
   'SearchExtensions.renderActions': renderActions,
   'SearchExtensions.renderEventListeners': renderEventListeners,
   'SearchExtensions.saveState': saveState,
@@ -2445,6 +2448,7 @@ const commandMap = {
   'SearchExtensions.searchExtensions': searchExtensions,
   'SearchExtensions.selectIndex': wrapCommand(selectIndex),
   'SearchExtensions.setDeltaY': wrapCommand(setDeltaY),
+  'SearchExtensions.terminate': terminate,
   'SearchExtensions.toggleSuggest': wrapCommand(toggleSuggest)
 };
 

package/package.json

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