@lvce-editor/status-bar-worker 2.2.0 → 2.4.0

package/dist/statusBarWorkerMain.js

@@ -1245,23 +1245,28 @@ const diff2 = uid => {
   return result;
 };
 
-const getMatchingItem = (itemsLeft, itemsRight, name) => {
-  for (const item of itemsLeft) {
-    if (item.name === name) {
-      return item;
-    }
-  }
-  for (const item of itemsRight) {
+const getMatchingItemInternal = (items, name) => {
+  for (const item of items) {
     if (item.name === name) {
       return item;
     }
   }
   return undefined;
 };
+const getMatchingItem = (itemsLeft, itemsRight, name) => {
+  return getMatchingItemInternal(itemsLeft, name) ?? getMatchingItemInternal(itemsRight, name);
+};
 
 const handleClickExtensionStatusBarItem = async name => {
-  // @ts-ignore
-  await invoke$1(`ExtensionHostStatusBar.executeCommand`, name);
+  // TODO maybe relay this to extension management worker,
+  // and it forwards it to the right extension host?
+
+  try {
+    // @ts-ignore
+    await invoke$1(`ExtensionHostStatusBar.executeCommand`, name);
+  } catch (error) {
+    console.error(new VError(error, `Failed to execute status bar command: ${name}`));
+  }
 };
 
 const handleClickNotification = async () => {
@@ -1306,78 +1311,6 @@ const handleContextMenu = async state => {
   return state;
 };
 
-const handleExtensionsChanged = async state => {
-  // TODO requery status bar items
-  return state;
-};
-
-const id = 7201;
-const sendMessagePortToExtensionHostWorker = async port => {
-  await sendMessagePortToExtensionHostWorker$1(port, id);
-};
-
-const createExtensionHostRpc = async () => {
-  try {
-    const rpc = await create$4({
-      commandMap: {},
-      send: sendMessagePortToExtensionHostWorker
-    });
-    return rpc;
-  } catch (error) {
-    throw new VError(error, `Failed to create extension host rpc`);
-  }
-};
-
-const initialize = async () => {
-  const rpc = await createExtensionHostRpc();
-  set$2(rpc);
-};
-
-const getIndex = (items, item) => {
-  for (let i = 0; i < items.length; i++) {
-    if (items[i].name === item.name) {
-      return i;
-    }
-  }
-  return -1;
-};
-
-const updateArray = (items, newItem) => {
-  const index = getIndex(items, newItem);
-  const before = items.slice(0, index);
-  const after = items.slice(index + 1);
-  return [...before, newItem, ...after];
-};
-
-const itemLeftUpdate = (state, newItem) => {
-  return {
-    ...state,
-    statusBarItemsLeft: updateArray([...state.statusBarItemsLeft], newItem)
-  };
-};
-
-const itemRightCreate = (state, newItem) => {
-  const {
-    statusBarItemsRight
-  } = state;
-  const newStatusBarItemsRight = [...statusBarItemsRight, newItem];
-  return {
-    ...state,
-    statusBarItemsRight: newStatusBarItemsRight
-  };
-};
-
-const itemRightUpdate = (state, newItem) => {
-  const {
-    statusBarItemsRight
-  } = state;
-  const newStatusBarItemsRight = updateArray([...statusBarItemsRight], newItem);
-  return {
-    ...state,
-    statusBarItemsRight: newStatusBarItemsRight
-  };
-};
-
 const OnStatusBarItem = 'onStatusBarItem';
 
 const GetStatusBarItems = 'ExtensionHost.getStatusBarItems2';
@@ -1565,6 +1498,100 @@ const getStatusBarItems = async ({
   return [...uiStatusBarItems.map(toStatusBarItem), ...extraItems];
 };
 
+const handleExtensionsChanged = async state => {
+  const {
+    assetDir,
+    errorCount,
+    platform,
+    warningCount
+  } = state;
+  // TODO requery status bar items
+  const statusBarItems = await getStatusBarItems({
+    assetDir,
+    builtinNotificationsEnabled: false,
+    builtinProblemsEnabled: false,
+    errorCount,
+    platform,
+    showItems: true,
+    warningCount
+  });
+  return {
+    ...state,
+    statusBarItemsLeft: [...statusBarItems]
+  };
+};
+
+const handleItemsChanged = async state => {
+  return handleExtensionsChanged(state);
+};
+
+const id = 7201;
+const sendMessagePortToExtensionHostWorker = async port => {
+  await sendMessagePortToExtensionHostWorker$1(port, id);
+};
+
+const createExtensionHostRpc = async () => {
+  try {
+    const rpc = await create$4({
+      commandMap: {},
+      send: sendMessagePortToExtensionHostWorker
+    });
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create extension host rpc`);
+  }
+};
+
+const initialize = async () => {
+  const rpc = await createExtensionHostRpc();
+  set$2(rpc);
+};
+
+const getIndex = (items, item) => {
+  for (let i = 0; i < items.length; i++) {
+    if (items[i].name === item.name) {
+      return i;
+    }
+  }
+  return -1;
+};
+
+const updateArray = (items, newItem) => {
+  const index = getIndex(items, newItem);
+  const before = items.slice(0, index);
+  const after = items.slice(index + 1);
+  return [...before, newItem, ...after];
+};
+
+const itemLeftUpdate = (state, newItem) => {
+  return {
+    ...state,
+    statusBarItemsLeft: updateArray([...state.statusBarItemsLeft], newItem)
+  };
+};
+
+const itemRightCreate = (state, newItem) => {
+  const {
+    statusBarItemsRight
+  } = state;
+  const newStatusBarItemsRight = [...statusBarItemsRight, newItem];
+  return {
+    ...state,
+    statusBarItemsRight: newStatusBarItemsRight
+  };
+};
+
+const itemRightUpdate = (state, newItem) => {
+  const {
+    statusBarItemsRight
+  } = state;
+  const newStatusBarItemsRight = updateArray([...statusBarItemsRight], newItem);
+  return {
+    ...state,
+    statusBarItemsRight: newStatusBarItemsRight
+  };
+};
+
 const get = async key => {
   return getPreference(key);
 };
@@ -2084,9 +2111,11 @@ const commandMap = {
   'StatusBar.create': create,
   'StatusBar.diff2': diff2,
   'StatusBar.getCommandIds': getCommandIds,
+  'StatusBar.handleChange': wrapCommand(handleItemsChanged),
   'StatusBar.handleClick': wrapCommand(handleClick),
   'StatusBar.handleContextMenu': wrapCommand(handleContextMenu),
   'StatusBar.handleExtensionsChanged': wrapCommand(handleExtensionsChanged),
+  'StatusBar.handleItemsChanged': wrapCommand(handleItemsChanged),
   'StatusBar.initialize': initialize,
   'StatusBar.itemLeftUpdate': wrapCommand(itemLeftUpdate),
   'StatusBar.itemRightCreate': wrapCommand(itemRightCreate),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/status-bar-worker",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "description": "Status Bar Worker",
   "repository": {
     "type": "git",