@lvce-editor/extension-search-view 2.12.0 → 3.1.0

package/dist/extensionSearchViewWorkerMain.js

@@ -436,7 +436,7 @@ const set$2 = (id, fn) => {
 const get$2 = id => {
   return callbacks[id];
 };
-const remove$1 = id => {
+const remove = id => {
   delete callbacks[id];
 };
 let id = 0;
@@ -455,7 +455,7 @@ const registerPromise = () => {
     promise
   };
 };
-const create$2 = (method, params) => {
+const create$2$1 = (method, params) => {
   const {
     id,
     promise
@@ -613,7 +613,7 @@ const resolve = (id, response) => {
     return;
   }
   fn(response);
-  remove$1(id);
+  remove(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -747,7 +747,7 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   const {
     message,
     promise
-  } = create$2(method, params);
+  } = create$2$1(method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -831,7 +831,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$1 = async ({
+const create$2 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -843,7 +843,7 @@ const create$1 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$1
+  create: create$2
 };
 
 const handleError = (error, notify = true, prefix = '') => {
@@ -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 {
@@ -1110,19 +1104,33 @@ const closeSuggest = state => {
   return state;
 };
 
-const states = Object.create(null);
-const get$1 = uid => {
-  return states[uid];
-};
-const set$1 = (uid, oldState, newState) => {
-  states[uid] = {
-    oldState,
-    newState
+const create$1 = () => {
+  const states = Object.create(null);
+  return {
+    get(uid) {
+      return states[uid];
+    },
+    set(uid, oldState, newState) {
+      states[uid] = {
+        oldState,
+        newState
+      };
+    },
+    dispose(uid) {
+      delete states[uid];
+    },
+    getKeys() {
+      return Object.keys(states).map(key => {
+        return Number.parseInt(key);
+      });
+    }
   };
 };
-const remove = uid => {
-  delete states[uid];
-};
+
+const {
+  get: get$1,
+  set: set$1,
+  dispose: dispose$1} = create$1();
 
 const create = (id, uri, x, y, width, height, platform, assetDir) => {
   const state = {
@@ -1162,58 +1170,67 @@ const RenderScrollBar = 5;
 const RenderMessage = 6;
 const RenderSearchValue = 7;
 
-const diffType$4 = RenderItems;
+const diffType$5 = RenderItems;
 const isEqual$5 = (oldState, newState) => {
   return true;
 };
 
-const diffType$3 = RenderHeader;
+const diffType$4 = RenderHeader;
 const isEqual$4 = (oldState, newState) => {
   return oldState.placeholder === newState.placeholder;
 };
 
-const diffType$2 = RenderItems;
+const diffType$3 = RenderItems;
 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 diffType$2 = RenderMessage;
 const isEqual$2 = (oldState, newState) => {
   return oldState.message === newState.message;
 };
 
-const diffType = RenderScrollBar;
+const diffType$1 = RenderScrollBar;
 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$1, isEqual$2, isEqual$4, isEqual$3, isEqual$5];
-const numbers = [diffType, diffType$1, diffType$3, diffType$2, diffType$4];
+const User = 1;
+const Script = 2;
 
-const diff = (oldState, newState) => {
-  const diffResult = [];
-  for (let i = 0; i < modules.length; i++) {
-    const fn = modules[i];
-    if (!fn(oldState, newState)) {
-      diffResult.push(numbers[i]);
-    }
-  }
-  return diffResult;
+const diffType = RenderSearchValue;
+const isEqual = (oldState, newState) => {
+  return newState.inputSource === User || oldState.searchValue === newState.searchValue;
 };
 
+const modules = [isEqual$1, isEqual$2, isEqual$4, isEqual$3, isEqual$5, isEqual];
+const numbers = [diffType$1, diffType$2, diffType$4, diffType$3, diffType$5, diffType];
+
 const diff2 = uid => {
   const {
     oldState,
     newState
   } = get$1(uid);
-  const diffResult = diff(oldState, newState);
+  const diffResult = [];
+  for (let i = 0; i < modules.length; i++) {
+    const fn = modules[i];
+    if (!fn(oldState, newState)) {
+      diffResult.push(numbers[i]);
+    }
+  }
   return diffResult;
 };
 
 const dispose = uid => {
-  remove(uid);
+  dispose$1(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);
@@ -1228,7 +1245,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);
@@ -1243,7 +1259,6 @@ const focusIndexScrollUp = (state, index, listHeight, itemHeight, itemsLength) =
     deltaY: newDeltaY
   };
 };
-
 const focusIndex = (state, index) => {
   const {
     itemHeight,
@@ -1278,7 +1293,6 @@ const focusIndex = (state, index) => {
     focused: true
   };
 };
-
 const first = () => {
   return 0;
 };
@@ -1288,12 +1302,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
@@ -1301,7 +1313,6 @@ const focusLast = state => {
   const lastIndex = last(items);
   return focusIndex(state, lastIndex);
 };
-
 const focusNext = state => {
   const {
     focusedIndex,
@@ -1311,6 +1322,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,
@@ -1324,7 +1343,6 @@ const focusNextPage = state => {
   const indexNextPage = Math.min(maxLineY + (maxLineY - minLineY) - 2, lastIndex(items));
   return focusIndex(state, indexNextPage);
 };
-
 const focusPreviousPage = state => {
   const {
     focusedIndex,
@@ -1595,7 +1613,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,
@@ -1700,9 +1718,6 @@ const getViewletSize = width => {
   return Large;
 };
 
-const User = 1;
-const Script = 2;
-
 const getRemoteUrl = (extension, platform, assetDir) => {
   if (platform === Remote || platform === Electron) {
     if (extension.builtin) {
@@ -1843,10 +1858,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';
@@ -1942,7 +1953,7 @@ const getExtensionHeaderVirtualDom = (placeholder, actions) => {
   }, ...getSearchFieldVirtualDom('extensions', placeholder, 'handleExtensionsInput', actions, [])];
 };
 
-const renderHeader$1 = newState => {
+const renderHeader = newState => {
   const actions = [{
     type: Button$2,
     title: clearExtensionSearchResults(),
@@ -2236,7 +2247,7 @@ const SetMessage = 'setMessage';
 const SetScrollBar = 'setScrollBar';
 const SetSearchValue = 'setSearchValue';
 
-const renderMessage$1 = newState => {
+const renderMessage = newState => {
   return [/* method */SetMessage, /* message */newState.message];
 };
 
@@ -2247,7 +2258,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;
@@ -2263,55 +2274,6 @@ 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$1 = {
-  isEqual: isEqual,
-  apply(oldState, newState) {
-    return [/* method */SetSearchValue, oldState.searchValue, newState.searchValue];
-  }
-};
-const renderHeader = {
-  isEqual: isEqual$4,
-  apply(oldState, newState) {
-    return renderHeader$1(newState);
-  }
-};
-const render = [renderScrollBar, renderMessage, renderExtensions, renderHeader, renderSearchValue$1];
-const doRender = (oldState, newState) => {
-  const commands = [];
-  for (const item of render) {
-    if (!item.isEqual(oldState, newState)) {
-      commands.push(item.apply(oldState, newState));
-    }
-  }
-  return commands;
-};
-
-const render2 = uid => {
-  const {
-    oldState,
-    newState
-  } = get$1(uid);
-  return doRender(oldState, newState);
-};
-
 const renderSearchValue = newState => {
   return [/* method */SetSearchValue, '', newState.searchValue];
 };
@@ -2321,13 +2283,13 @@ const getRenderer = diffType => {
     case RenderItems:
       return renderItems;
     case RenderMessage:
-      return renderMessage$1;
+      return renderMessage;
     case RenderScrollBar:
-      return renderScrollBar$1;
+      return renderScrollBar;
     case RenderSearchValue:
       return renderSearchValue;
     case RenderHeader:
-      return renderHeader$1;
+      return renderHeader;
     default:
       throw new Error('unknown renderer');
   }
@@ -2502,11 +2464,7 @@ const commandMap = {
   'SearchExtensions.selectIndex': wrapCommand(selectIndex),
   'SearchExtensions.setDeltaY': wrapCommand(setDeltaY),
   'SearchExtensions.terminate': terminate,
-  'SearchExtensions.toggleSuggest': wrapCommand(toggleSuggest),
-  // deprecated
-  'SearchExtensions.diff': diff,
-  'SearchExtensions.render': doRender,
-  'SearchExtensions.render2': render2
+  'SearchExtensions.toggleSuggest': wrapCommand(toggleSuggest)
 };
 
 const listen = async () => {

package/package.json

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