@lvce-editor/status-bar-worker 3.15.1 → 3.16.0

package/dist/statusBarWorkerMain.js

@@ -123,7 +123,7 @@ const {
   getCommandIds,
   getKeys,
   registerCommands,
-  set: set$3,
+  set: set$5,
   wrapCommand,
   wrapGetter
 } = create$8();
@@ -139,7 +139,7 @@ const create$7 = (uid, uri, x, y, width, height, platform, assetDir) => {
     uid,
     warningCount: 0
   };
-  set$3(uid, state, state);
+  set$5(uid, state, state);
 };
 
 const isEqual = (oldState, newState) => {
@@ -1244,7 +1244,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$2 = (id, rpc) => {
+const set$4 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1277,7 +1277,7 @@ const create = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$2(rpcId, mockRpc);
+      set$4(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1286,7 +1286,7 @@ const create = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$2(rpcId, rpc);
+      set$4(rpcId, rpc);
     }
   };
 };
@@ -1307,47 +1307,54 @@ const ClientY = 'event.clientY';
 const TargetName = 'event.target.name';
 
 const ExtensionManagementWorker = 9006;
+const RendererProcess = 1670;
 const RendererWorker = 1;
 
 const SetDom2 = 'Viewlet.setDom2';
+const SetFocusContext = 'Viewlet.setFocusContext';
 
 const {
-  invoke: invoke$1,
-  set: set$1
+  invoke: invoke$3,
+  set: set$3
 } = create(ExtensionManagementWorker);
 
 const {
-  invoke,
-  set
+  invoke: invoke$2,
+  set: set$2
+} = create(RendererProcess);
+
+const {
+  invoke: invoke$1,
+  set: set$1
 } = create(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
   number(x);
   number(y);
-  await invoke('ContextMenu.show2', uid, menuId, x, y, args);
+  await invoke$1('ContextMenu.show2', uid, menuId, x, y, args);
 };
 const getPreference = async key => {
-  return await invoke('Preferences.get', key);
+  return await invoke$1('Preferences.get', key);
 };
 
 const handleClickExtensionStatusBarItem = async name => {
   try {
-    await invoke$1('Extensions.executeCommand', name);
+    await invoke$3('Extensions.executeCommand', name);
   } catch (error) {
     console.error(new VError(error, `Failed to execute status bar command: ${name}`));
   }
 };
 
 const handleClickNotification = async () => {
-  await invoke('Viewlet.openWidget', 'NotificationCenter');
+  await invoke$1('Viewlet.openWidget', 'NotificationCenter');
 };
 
 const handleClickProblems = async () => {
   // @ts-ignore
-  await invoke('Layout.showPanel');
+  await invoke$1('Layout.showPanel');
   // @ts-ignore
-  await invoke('Panel.toggleView', 'Problems');
+  await invoke$1('Panel.toggleView', 'Problems');
 };
 
 const Notifications = 'Notifications';
@@ -1390,6 +1397,31 @@ const handleContextMenu = async (state, button, x, y) => {
   return state;
 };
 
+const handleExtensionManagementChange = async () => {
+  for (const uid of getKeys()) {
+    await invoke$1('Viewlet.executeViewletCommand', uid, 'handleItemsChanged');
+  }
+};
+
+const handleNotificationCountChangedAll = async count => {
+  for (const uid of getKeys()) {
+    await invoke$1('Viewlet.executeViewletCommand', uid, 'handleNotificationCountChanged', count);
+  }
+};
+
+const commandMap$1 = {
+  'StatusBar.handleChange': handleExtensionManagementChange,
+  'StatusBar.handleNotificationCountChanged': handleNotificationCountChangedAll
+};
+
+const handleExtensionManagementMessagePort = async port => {
+  const rpc = await create$2({
+    commandMap: commandMap$1,
+    messagePort: port
+  });
+  set$3(rpc);
+};
+
 const getAriaLabel = count => {
   if (count === 0) {
     return 'No Notifications';
@@ -1473,8 +1505,8 @@ const getBuiltinStatusBarItems = async (errorCount, warningCount, {
 };
 
 const getExtensionStatusBarItems = async (assetDir, platform) => {
-  await invoke$1('Extensions.activateByEvent', 'onStatusBarItem', assetDir, platform);
-  return invoke$1('Extensions.getStatusBarItems');
+  await invoke$3('Extensions.activateByEvent', 'onStatusBarItem', assetDir, platform);
+  return invoke$3('Extensions.getStatusBarItems');
 };
 
 const toStatusBarItem = uiStatusBarItem => {
@@ -1540,7 +1572,7 @@ const toUiStatusBarItems = statusBarItems => {
 
 const getNotificationCount = async () => {
   try {
-    return await invoke$1('Extensions.getNotificationCount');
+    return await invoke$3('Extensions.getNotificationCount');
   } catch {
     return 0;
   }
@@ -1595,22 +1627,29 @@ const handleItemsChanged = async state => {
   return handleExtensionsChanged(state);
 };
 
-const handleExtensionManagementChange = async () => {
-  const uids = getKeys();
-  for (const uid of uids) {
-    const {
-      newState,
-      oldState
-    } = get$3(uid);
-    const newerState = await handleItemsChanged(newState);
-    if (newState === newerState || oldState === newerState) {
-      continue;
-    }
-    set$3(uid, oldState, {
-      ...newState,
-      ...newerState
-    });
-  }
+const state = {
+  connected: false
+};
+const isConnected = () => {
+  const {
+    connected
+  } = state;
+  return connected;
+};
+const invoke = (method, ...params) => {
+  return invoke$2(method, ...params);
+};
+const set = rpc => {
+  set$2(rpc);
+  state.connected = true;
+};
+
+const handleMessagePort = async port => {
+  const rpc = await create$2({
+    commandMap: {},
+    messagePort: port
+  });
+  set(rpc);
 };
 
 const handleNotificationCountChanged = (state, count) => {
@@ -1631,33 +1670,6 @@ const handleNotificationCountChanged = (state, count) => {
   };
 };
 
-const handleNotificationCountChangedAll = async count => {
-  for (const uid of getKeys()) {
-    const {
-      newState,
-      oldState
-    } = get$3(uid);
-    const newerState = handleNotificationCountChanged(newState, count);
-    if (newState === newerState || oldState === newerState) {
-      continue;
-    }
-    set$3(uid, oldState, newerState);
-  }
-};
-
-const commandMap$1 = {
-  'StatusBar.handleChange': handleExtensionManagementChange,
-  'StatusBar.handleNotificationCountChanged': handleNotificationCountChangedAll
-};
-
-const handleExtensionManagementMessagePort = async port => {
-  const rpc = await create$2({
-    commandMap: commandMap$1,
-    messagePort: port
-  });
-  set$1(rpc);
-};
-
 const handleProblemsSummaryChange = (state, summary) => {
   const {
     errorCount: oldErrorCount,
@@ -1918,14 +1930,23 @@ const applyRender = (oldState, newState, diffResult) => {
   return commands;
 };
 
+const renderDirect = async (uid, commands) => {
+  const rendererWorkerCommands = commands.filter(command => command[0] === SetFocusContext);
+  const rendererProcessCommands = commands.filter(command => command[0] !== SetFocusContext);
+  const transactionId = await invoke('Viewlet.queueCommands', uid, rendererProcessCommands);
+  return [...rendererWorkerCommands, ['Viewlet.commitPending', uid, transactionId]];
+};
 const render2 = (uid, diffResult) => {
   const {
     newState,
     oldState
   } = get$3(uid);
-  set$3(uid, newState, newState);
+  set$5(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
-  return commands;
+  if (!isConnected()) {
+    return commands;
+  }
+  return renderDirect(uid, commands);
 };
 
 const renderEventListeners = () => {
@@ -1967,6 +1988,7 @@ const commandMap = {
   'StatusBar.handleExtensionManagementMessagePort': handleExtensionManagementMessagePort,
   'StatusBar.handleExtensionsChanged': wrapCommand(handleExtensionsChanged),
   'StatusBar.handleItemsChanged': wrapCommand(handleItemsChanged),
+  'StatusBar.handleMessagePort': handleMessagePort,
   'StatusBar.handleNotificationCountChanged': wrapCommand(handleNotificationCountChanged),
   'StatusBar.handleProblemsSummaryChange': wrapCommand(handleProblemsSummaryChange),
   'StatusBar.initialize': initialize,
@@ -1985,7 +2007,7 @@ const initializeRenderWorker = async () => {
   const rpc = await create$1({
     commandMap: commandMap
   });
-  set(rpc);
+  set$1(rpc);
 };
 
 const listen = async () => {

package/package.json

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