@lvce-editor/title-bar-worker 4.16.0 → 4.17.0

package/dist/titleBarWorkerMain.js

@@ -1032,7 +1032,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 => {
@@ -1065,7 +1065,7 @@ const create$2 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$2(rpcId, mockRpc);
+      set$4(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1074,7 +1074,7 @@ const create$2 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$2(rpcId, rpc);
+      set$4(rpcId, rpc);
     }
   };
 };
@@ -1495,6 +1495,7 @@ const parseKey = rawKey => {
 
 const Electron$1 = 2;
 
+const RendererProcess = 1670;
 const RendererWorker = 1;
 
 const FocusSelector = 'Viewlet.focusSelector';
@@ -1503,6 +1504,11 @@ const SetFocusContext = 'Viewlet.setFocusContext';
 
 const FocusTitleBarMenuBar = 26;
 
+const {
+  invoke: invoke$2,
+  set: set$3
+} = create$2(RendererProcess);
+
 class AssertionError extends Error {
   constructor(message) {
     super(message);
@@ -1559,32 +1565,32 @@ const array = value => {
 };
 
 const {
-  invoke,
+  invoke: invoke$1,
   invokeAndTransfer,
-  set: set$1
+  set: set$2
 } = create$2(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 sendMessagePortToTextMeasurementWorker = async port => {
   const command = 'TextMeasurement.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToTextMeasurementWorker', port, command, 0);
 };
 const getWindowId$1 = async () => {
-  return invoke('GetWindowId.getWindowId');
+  return invoke$1('GetWindowId.getWindowId');
 };
 const minimizeWindow = async () => {
-  return invoke('ElectronWindow.minimize');
+  return invoke$1('ElectronWindow.minimize');
 };
 const maximizeWindow = async () => {
-  return invoke('ElectronWindow.maximize');
+  return invoke$1('ElectronWindow.maximize');
 };
 const closeWindow = async () => {
-  return invoke('ElectronWindow.close');
+  return invoke$1('ElectronWindow.close');
 };
 
 const toCommandId = key => {
@@ -1839,7 +1845,7 @@ const Remote = 3;
 
 const DEFAULT_UID = 1;
 const DEFAULT_APP_NAME = 'Lvce Editor';
-const DEFAULT_MAIN_AREA_UID$1 = 2;
+const DEFAULT_MAIN_AREA_UID = 2;
 const createDefaultState = (uid = DEFAULT_UID) => ({
   appName: DEFAULT_APP_NAME,
   assetDir: '',
@@ -1858,7 +1864,7 @@ const createDefaultState = (uid = DEFAULT_UID) => ({
   labelLetterSpacing: 0,
   labelPadding: 8,
   layoutControlsEnabled: false,
-  mainAreaUid: DEFAULT_MAIN_AREA_UID$1,
+  mainAreaUid: DEFAULT_MAIN_AREA_UID,
   menus: [],
   platform: Electron,
   title: '',
@@ -2109,7 +2115,7 @@ const {
   get,
   getCommandIds,
   registerCommands,
-  set,
+  set: set$1,
   wrapCommand,
   wrapGetter
 } = create$1();
@@ -2145,7 +2151,7 @@ const create3 = (id, uri, x, y, width, height, platform, controlsOverlayEnabled,
     x,
     y
   };
-  set(id, state, state);
+  set$1(id, state, state);
 };
 
 const isEqual$3 = (oldState, newState) => {
@@ -2233,14 +2239,6 @@ const getMenuIds = () => {
   return [Edit$2, File$3, Go$2, Help$3, OpenRecent$1, Run$2, Selection$2, Terminal$2, TitleBar$3, View$2, MenuIdAppearance, MenuIdEditorLayout, MenuIdSwitchEditor, MenuIdSwitchGroup, MenuIdTitleBarContextMenu, TitleBarContextMenu];
 };
 
-const hasActiveTextEditor$1 = async mainAreaUid => {
-  try {
-    return await invoke('Main.hasActiveTextEditor', mainAreaUid);
-  } catch {
-    return false;
-  }
-};
-
 const nonTextEditorExtensions = new Set(['.avif', '.avi', '.bmp', '.gif', '.ico', '.jpeg', '.jpg', '.m4v', '.mkv', '.mov', '.mp4', '.mpeg', '.mpg', '.ogv', '.png', '.svg', '.tif', '.tiff', '.webm', '.webp']);
 const nonTextEditorPrefixes = ['diff://?', 'extension-detail://', 'process-explorer://', 'running-extensions://'];
 const getPathEndIndex = uri => {
@@ -2267,7 +2265,7 @@ const isTextEditorUri = uri => {
 };
 const hasActiveTextEditor = async () => {
   try {
-    const activeEditorId = await invoke('GetActiveEditor.getActiveEditorId');
+    const activeEditorId = await invoke$1('GetActiveEditor.getActiveEditorId');
     return typeof activeEditorId === 'number' && activeEditorId >= 0;
   } catch {
     return false;
@@ -2275,7 +2273,7 @@ const hasActiveTextEditor = async () => {
 };
 const hasOpenTextEditor = async () => {
   try {
-    const openEditorUris = await invoke('GetActiveEditor.getOpenEditorUris');
+    const openEditorUris = await invoke$1('GetActiveEditor.getOpenEditorUris');
     if (Array.isArray(openEditorUris)) {
       return openEditorUris.some(isTextEditorUri);
     }
@@ -2299,7 +2297,7 @@ const sideBarLeft = 1;
 const sideBarRight = 2;
 const getSideBarPosition = async () => {
   try {
-    return await invoke('Layout.getSideBarPosition');
+    return await invoke$1('Layout.getSideBarPosition');
   } catch {
     return sideBarRight;
   }
@@ -2589,7 +2587,7 @@ const View = 16;
 
 const getAutoSave = async () => {
   try {
-    return await invoke('Preferences.get', 'files.autoSave');
+    return await invoke$1('Preferences.get', 'files.autoSave');
   } catch {
     return 'off';
   }
@@ -2638,7 +2636,7 @@ const getMenuEntries$b = async (platform, autoSave$1, hasActiveTextEditor = fals
     label: save()
   }, {
     command: 'Main.saveAll',
-    flags: saveFlags,
+    flags: Disabled,
     id: 'saveAll',
     label: saveAll()
   }, menuEntrySeparator, {
@@ -2777,7 +2775,7 @@ const normalizeUri = value => {
   }
 };
 const getRecentlyOpened = async () => {
-  const recentlyOpened = await invoke(/* RecentlyOpened.getRecentlyOpened */'RecentlyOpened.getRecentlyOpened');
+  const recentlyOpened = await invoke$1(/* RecentlyOpened.getRecentlyOpened */'RecentlyOpened.getRecentlyOpened');
   if (!Array.isArray(recentlyOpened)) {
     return [];
   }
@@ -3144,13 +3142,12 @@ const getMenuEntries$1 = () => {
   }];
 };
 
-const DEFAULT_MAIN_AREA_UID = 2;
 const getMenuEntries2 = async (state, props) => {
   switch (props.menuId) {
     case Edit$2:
       return getMenuEntries$d();
     case File$3:
-      return getMenuEntries$b(props.platform, undefined, await hasActiveTextEditor$1(state.mainAreaUid ?? DEFAULT_MAIN_AREA_UID));
+      return getMenuEntries$b(props.platform, undefined, await hasOpenTextEditor());
     case Go$2:
       return getMenuEntries$a();
     case Help$3:
@@ -3347,7 +3344,7 @@ const toElectronMenu = (map, rootId) => {
 
 const setItems = async items => {
   const windowId = await getWindowId();
-  return invoke('WebView.compatSharedProcessInvoke', 'ElectronApplicationMenu.setItems', windowId, items);
+  return invoke$1('WebView.compatSharedProcessInvoke', 'ElectronApplicationMenu.setItems', windowId, items);
 };
 const hydrate = async state => {
   const {
@@ -3488,7 +3485,7 @@ const commandCenterItems = [{
   label: 'More'
 }];
 const handleCommandCenterClick = async state => {
-  await invoke('QuickPick.show', 'custom', commandCenterItems, undefined, {
+  await invoke$1('QuickPick.show', 'custom', commandCenterItems, undefined, {
     executeItemCommand: true,
     mode: 'quickPick',
     placeholder: 'Search files by name (append : to go to line or @ to go to symbol)',
@@ -3530,10 +3527,35 @@ const handleElectronMenuClick = async (state, label) => {
     args = [],
     command
   } = commandPair;
-  await invoke(command, ...args);
+  await invoke$1(command, ...args);
   return state;
 };
 
+const state = {
+  connected: false
+};
+const isConnected = () => {
+  const {
+    connected
+  } = state;
+  return connected;
+};
+const invoke = (method, ...params) => {
+  return invoke$2(method, ...params);
+};
+const set = rpc => {
+  set$3(rpc);
+  state.connected = true;
+};
+
+const handleMessagePort = async port => {
+  const rpc = await create$5({
+    commandMap: {},
+    messagePort: port
+  });
+  set(rpc);
+};
+
 const getMenuOffset = (x, clientX, iconWidth) => {
   return clientX - x - iconWidth;
 };
@@ -3629,7 +3651,7 @@ const toCommandInfo = entry => {
 const addMenuEntryKeyBindings = async entries => {
   try {
     const commands = entries.map(toCommandInfo);
-    const keys = await invoke('Layout.getKeyBindings', commands);
+    const keys = await invoke$1('Layout.getKeyBindings', commands);
     if (!keys.some(Boolean)) {
       return entries;
     }
@@ -4050,7 +4072,7 @@ const getTitleBarMenuBarWidth = (windowWidth, menuBarX, iconWidth, titleWidth) =
 };
 
 const getWorkspaceUri = () => {
-  return invoke('Workspace.getUri');
+  return invoke$1('Workspace.getUri');
 };
 
 const loadContent2 = async state => {
@@ -4106,7 +4128,7 @@ const loadContent2Command = async uid => {
     titleWidth: latest.newState.titleWidth,
     workspaceUri: latest.newState.workspaceUri
   };
-  set(uid, latest.oldState, nextState, nextState);
+  set$1(uid, latest.oldState, nextState, nextState);
 };
 
 const renderFocusContext = (oldState, newState) => {
@@ -4639,12 +4661,18 @@ const getRenderer3 = diffType => {
   }
 };
 
+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 render3 = async (uid, diffResult) => {
   const {
     newState,
     oldState
   } = get(uid);
-  set(uid, newState, newState);
+  set$1(uid, newState, newState);
   const commands = [];
   for (const item of diffResult) {
     const fn = getRenderer3(item);
@@ -4653,6 +4681,9 @@ const render3 = async (uid, diffResult) => {
       commands.push(result);
     }
   }
+  if (isConnected()) {
+    return renderDirect(uid, commands);
+  }
   return commands;
 };
 
@@ -4811,7 +4842,7 @@ const create = (id, uri, x, y, width, height) => {
     x,
     y
   };
-  set(id, state, state);
+  set$1(id, state, state);
   return state;
 };
 
@@ -5139,7 +5170,7 @@ const handleKeyEnterMenuClosed = state => {
 };
 
 const executeMenuItemCommand = async item => {
-  await invoke(item.command, ...(item.args || []));
+  await invoke$1(item.command, ...(item.args || []));
 };
 
 const selectIndexIgnore = async (state, item) => {
@@ -5161,7 +5192,7 @@ const selectIndexNone = async (state, item) => {
     menus: []
   };
   if (storedState) {
-    set(uid, storedState.oldState, newState, newState);
+    set$1(uid, storedState.oldState, newState, newState);
   }
   return newState;
 };
@@ -5169,7 +5200,7 @@ const selectIndexNone = async (state, item) => {
 const selectIndexRestoreEditorFocus = async (state, item) => {
   await executeMenuItemCommand(item);
   try {
-    await invoke('Main.focus');
+    await invoke$1('Main.focus');
   } catch {
     // Focus restoration is best effort and must not turn a successful command into a failure.
   }
@@ -5411,7 +5442,7 @@ const toggleMenu = async state => {
 };
 
 const wakeUp = sleepState => {
-  set(sleepState.uid, sleepState, sleepState);
+  set$1(sleepState.uid, sleepState, sleepState);
 };
 
 const commandMap = {
@@ -5454,6 +5485,7 @@ const commandMap = {
   'TitleBar.handleKeySpace': wrapCommand(handleKeySpace),
   'TitleBar.handleMenuClick': wrapCommand(handleMenuClick),
   'TitleBar.handleMenuMouseOver': wrapCommand(handleMenuMouseOver),
+  'TitleBar.handleMessagePort': handleMessagePort,
   'TitleBar.handleMouseOut': wrapCommand(handleMouseOut),
   'TitleBar.handleMouseOver': wrapCommand(handleMouseOver),
   'TitleBar.handlePointerOut': wrapCommand(handlePointerOut),
@@ -5485,7 +5517,7 @@ const listen = async () => {
   const rpc = await create$3({
     commandMap: commandMap
   });
-  set$1(rpc);
+  set$2(rpc);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/title-bar-worker",
-  "version": "4.16.0",
+  "version": "4.17.0",
   "description": "Title Bar Worker",
   "repository": {
     "type": "git",