@lvce-editor/status-bar-worker 3.32.2 → 3.32.3

package/dist/statusBarWorkerMain.js

@@ -270,8 +270,11 @@ const {
   wrapGetter,
   wrapSerialAsyncCommand} = create$a();
 
-const create$9 = (uid, uri, x, y, width, height, platform, assetDir) => {
+const create$9 = (uid, uri, x, y, width, height, platform, assetDir, applicationId) => {
   const state = {
+    ...(applicationId !== undefined && {
+      applicationId
+    }),
     assetDir,
     errorCount: 0,
     initial: true,
@@ -2146,9 +2149,16 @@ const getPreference = async key => {
   return await invoke$2('Preferences.get', key);
 };
 
-const handleClickExtensionStatusBarItem = async name => {
+const invokeExtensionCommand = (applicationId, command, ...args) => {
+  if (applicationId !== undefined) {
+    return invoke$5('Extensions.invokeForApplication', applicationId, command, ...args);
+  }
+  return invoke$5(command, ...args);
+};
+
+const handleClickExtensionStatusBarItem = async (name, applicationId) => {
   try {
-    await invoke$5('Extensions.executeCommand', name);
+    await invokeExtensionCommand(applicationId, 'Extensions.executeCommand', name);
   } catch (error) {
     console.error(new VError(error, `Failed to execute status bar command: ${name}`));
   }
@@ -2168,6 +2178,7 @@ const handleClick = async (state, name) => {
     return state;
   }
   const {
+    applicationId,
     editorStatus,
     statusBarItemsLeft,
     statusBarItemsRight
@@ -2183,7 +2194,7 @@ const handleClick = async (state, name) => {
   } else if (isEditorStatus(item.name)) {
     await handleClickEditorStatus(item.name, editorStatus);
   } else if (item.command && !isEditorStatus(item.name)) {
-    await handleClickExtensionStatusBarItem(item.command);
+    await handleClickExtensionStatusBarItem(item.command, applicationId);
   }
   // TODO
   // sendExtensionWorker([/* statusBarItemHandleClick */ 7657, /* name */ name])
@@ -2207,9 +2218,9 @@ const show2 = async (uid, menuId, x, y, args) => {
   await invoke$1('Menu.show2', uid, menuId, x, y, args);
 };
 
-const getStatusBarItemContextMenuItems = async (extensionId, providerId) => {
+const getStatusBarItemContextMenuItems = async (extensionId, providerId, applicationId) => {
   try {
-    return await invoke$5('Extensions.getStatusBarItemContextMenuItems', extensionId, providerId);
+    return await invokeExtensionCommand(applicationId, 'Extensions.getStatusBarItemContextMenuItems', extensionId, providerId);
   } catch {
     return [];
   }
@@ -2219,7 +2230,7 @@ const StatusBar = 31;
 
 const handleContextMenu = async (state, button, x, y, targetName = '') => {
   const item = [...state.statusBarItemsLeft, ...state.statusBarItemsRight].find(statusBarItem => statusBarItem.name === targetName);
-  const contextMenuItems = item?.extensionId && item.providerId ? await getStatusBarItemContextMenuItems(item.extensionId, item.providerId) : [];
+  const contextMenuItems = item?.extensionId && item.providerId ? await getStatusBarItemContextMenuItems(item.extensionId, item.providerId, state.applicationId) : [];
   await show2(state.uid, StatusBar, x, y, {
     contextMenuItems,
     menuId: StatusBar
@@ -2795,9 +2806,9 @@ const getBuiltinStatusBarItems = async (errorCount, warningCount, {
   return [...getEditorStatusBarItems(editorStatus), ...getNotificationsStatusBarItem(notificationsEnabled, notificationCount), ...getProblemsStatusBarItem(errorCount, warningCount, problemsEnabled)];
 };
 
-const getExtensionStatusBarItems = async (assetDir, platform) => {
-  await invoke$5('Extensions.activateByEvent', 'onStatusBarItem', assetDir, platform);
-  return invoke$5('Extensions.getStatusBarItems');
+const getExtensionStatusBarItems = async (assetDir, platform, applicationId) => {
+  await invokeExtensionCommand(applicationId, 'Extensions.activateByEvent', 'onStatusBarItem', assetDir, platform);
+  return invokeExtensionCommand(applicationId, 'Extensions.getStatusBarItems');
 };
 
 const toStatusBarItem = uiStatusBarItem => {
@@ -2881,6 +2892,7 @@ const getNotificationCount = async () => {
   }
 };
 const getStatusBarItems = async ({
+  applicationId,
   assetDir,
   builtinNotificationsEnabled = true,
   builtinProblemsEnabled = true,
@@ -2893,7 +2905,7 @@ const getStatusBarItems = async ({
   if (!showItems) {
     return [];
   }
-  const extensionStatusBarItems = await getExtensionStatusBarItems(assetDir, platform);
+  const extensionStatusBarItems = await getExtensionStatusBarItems(assetDir, platform, applicationId);
   const notificationCount = await getNotificationCount();
   const uiStatusBarItems = toUiStatusBarItems(extensionStatusBarItems);
   const extraItems = await getBuiltinStatusBarItems(errorCount, warningCount, {
@@ -2908,6 +2920,7 @@ const getStatusBarItems = async ({
 const refreshVersions = Object.create(null);
 const handleExtensionsChanged = async state => {
   const {
+    applicationId,
     assetDir,
     errorCount,
     platform,
@@ -2919,6 +2932,7 @@ const handleExtensionsChanged = async state => {
   refreshVersions[uid] = refreshVersion;
   // TODO requery status bar items
   const statusBarItems = await getStatusBarItems({
+    applicationId,
     assetDir,
     builtinNotificationsEnabled: false,
     builtinProblemsEnabled: false,
@@ -3140,6 +3154,7 @@ const loadStatusBarPreferences = async () => {
 
 const loadContent = async state => {
   const {
+    applicationId,
     assetDir,
     errorCount,
     platform,
@@ -3152,6 +3167,7 @@ const loadContent = async state => {
     itemsVisible
   } = await loadStatusBarPreferences();
   const statusBarItems = await getStatusBarItems({
+    applicationId,
     assetDir,
     builtinNotificationsEnabled: builtinNotificationsEnabled,
     builtinProblemsEnabled: builtinProblemsEnabled,

package/package.json

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