@lvce-editor/title-bar-worker 4.25.0 → 4.25.1

package/dist/titleBarWorkerMain.js

@@ -54,6 +54,61 @@ class VError extends Error {
   }
 }
 
+class AssertionError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'AssertionError';
+  }
+}
+const Object$1 = 1;
+const Number$1 = 2;
+const Array$1 = 3;
+const String$1 = 4;
+const Boolean$1 = 5;
+const Function = 6;
+const Null = 7;
+const Unknown$1 = 8;
+const getType = value => {
+  switch (typeof value) {
+    case 'number':
+      return Number$1;
+    case 'function':
+      return Function;
+    case 'string':
+      return String$1;
+    case 'object':
+      if (value === null) {
+        return Null;
+      }
+      if (Array.isArray(value)) {
+        return Array$1;
+      }
+      return Object$1;
+    case 'boolean':
+      return Boolean$1;
+    default:
+      return Unknown$1;
+  }
+};
+const object = value => {
+  const type = getType(value);
+  if (type !== Object$1) {
+    throw new AssertionError('expected value to be of type object');
+  }
+};
+const number = value => {
+  const type = getType(value);
+  if (type !== Number$1) {
+    throw new AssertionError('expected value to be of type number');
+  }
+};
+const array = value => {
+  const type = getType(value);
+  if (type !== Array$1) {
+    throw new AssertionError('expected value to be of type array');
+  }
+};
+
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
 };
@@ -602,6 +657,9 @@ const restoreExistingError = (error, currentStack) => {
 };
 const restoreMethodNotFoundError = (error, currentStack) => {
   const restoredError = new JsonRpcError(error.message);
+  Object.assign(restoredError, {
+    code: error.code
+  });
   const parentStack = getParentStack(error);
   setStack(restoredError, `${parentStack}${NewLine}${currentStack}`);
   return restoredError;
@@ -621,9 +679,13 @@ const applyDataProperties = (restoredError, error) => {
     // @ts-ignore
     restoredError.codeFrame = error.data.codeFrame;
   }
-  if (error.data.code) {
+  if (typeof error.data.code === 'string' || typeof error.data.code === 'number') {
     // @ts-ignore
-    restoredError.code = error.data.code;
+    Object.defineProperty(restoredError, 'code', {
+      configurable: true,
+      value: error.data.code,
+      writable: true
+    });
   }
   if (error.data.type) {
     // @ts-ignore
@@ -644,7 +706,14 @@ const applyDirectProperties = (restoredError, error) => {
   }
 };
 const restoreMessageError = (error, _currentStack) => {
-  const restoredError = constructError(error.message, error.type, error.name);
+  const restoredError = constructError(error.message, error.type || error.data?.type, error.name);
+  if (typeof error.code === 'string' || typeof error.code === 'number') {
+    Object.defineProperty(restoredError, 'code', {
+      configurable: true,
+      value: error.code,
+      writable: true
+    });
+  }
   if (error.data) {
     applyDataProperties(restoredError, error);
   } else {
@@ -723,9 +792,9 @@ const getErrorProperty = (error, prettyError) => {
   return {
     code: Custom,
     data: {
-      code: prettyError.code,
+      code: prettyError.code ?? error?.code,
       codeFrame: prettyError.codeFrame,
-      name: prettyError.name,
+      name: prettyError.name ?? error?.name,
       stack: getStack(prettyError),
       type: getErrorType(prettyError)
     },
@@ -760,7 +829,12 @@ const getErrorResponseSimple = (id, error) => {
   return {
     error: {
       code: Custom,
-      data: error,
+      data: error instanceof Error ? {
+        ...error,
+        code: 'code' in error ? error.code : undefined,
+        stack: error.stack,
+        type: error.name
+      } : error,
       // @ts-ignore
       message: error.message
     },
@@ -1370,7 +1444,7 @@ const Backslash$2 = 91;
 const Star$1 = 131;
 const Plus$1 = 132;
 
-const Unknown$1 = 'Unknown';
+const Unknown = 'Unknown';
 const Backspace = 'Backspace';
 const Tab = 'Tab';
 const Enter = 'Enter';
@@ -1503,7 +1577,7 @@ const keyCodeStringMap = {
   [UpArrow$1]: UpArrow
 };
 const getKeyCodeString = keyCode => {
-  return keyCodeStringMap[keyCode] || Unknown$1;
+  return keyCodeStringMap[keyCode] || Unknown;
 };
 
 const CtrlCmd = 1 << 11 >>> 0;
@@ -1557,61 +1631,6 @@ const {
   set: set$3
 } = create$2(RendererProcess);
 
-class AssertionError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'AssertionError';
-  }
-}
-const Object$1 = 1;
-const Number$1 = 2;
-const Array$1 = 3;
-const String$1 = 4;
-const Boolean$1 = 5;
-const Function = 6;
-const Null = 7;
-const Unknown = 8;
-const getType = value => {
-  switch (typeof value) {
-    case 'number':
-      return Number$1;
-    case 'function':
-      return Function;
-    case 'string':
-      return String$1;
-    case 'object':
-      if (value === null) {
-        return Null;
-      }
-      if (Array.isArray(value)) {
-        return Array$1;
-      }
-      return Object$1;
-    case 'boolean':
-      return Boolean$1;
-    default:
-      return Unknown;
-  }
-};
-const object = value => {
-  const type = getType(value);
-  if (type !== Object$1) {
-    throw new AssertionError('expected value to be of type object');
-  }
-};
-const number = value => {
-  const type = getType(value);
-  if (type !== Number$1) {
-    throw new AssertionError('expected value to be of type number');
-  }
-};
-const array = value => {
-  const type = getType(value);
-  if (type !== Array$1) {
-    throw new AssertionError('expected value to be of type array');
-  }
-};
-
 const {
   invoke: invoke$1,
   invokeAndTransfer,
@@ -2161,8 +2180,9 @@ const {
   getCommandIds,
   registerCommands,
   set: set$1,
-  wrapCommand,
-  wrapGetter
+  wrapCommand: wrapNotification,
+  wrapGetter,
+  wrapSerialCommand: wrapCommand
 } = create$1();
 
 const create3 = (id, uri, x, y, width, height, platform, controlsOverlayEnabled, titleBarStyleCustom, assetDir) => {
@@ -2651,7 +2671,7 @@ const getMenuEntries$b = async (platform, autoSave$1, hasActiveTextEditor = fals
   const saveFlags = getSaveFlags(hasActiveTextEditor);
   const entries = [{
     command: 'Main.newFile',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'newFile',
     label: newFile()
   }, {
@@ -3805,136 +3825,6 @@ const handleClick$1 = async (state, buttonName) => {
   return state;
 };
 
-const commandCenterItems = [{
-  command: 'QuickPick.showFile',
-  label: 'Go to File'
-}, {
-  command: 'QuickPick.showCommands',
-  label: 'Show and Run Commands'
-}, {
-  args: ['Search'],
-  command: 'Layout.openSideBarViewlet',
-  label: 'Search for Text'
-}, {
-  args: ['symbol'],
-  command: 'QuickPick.show',
-  label: 'Go to Symbol in Editor'
-}, {
-  args: ['Run And Debug'],
-  command: 'Layout.openSideBarViewlet',
-  label: 'Start Debugging'
-}, {
-  command: 'QuickPick.showCommands',
-  label: 'Run Task'
-}, {
-  command: 'QuickPick.showEverything',
-  label: 'More'
-}];
-const handleCommandCenterClick = async state => {
-  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)',
-    waitUntil: 'visible'
-  });
-  return state;
-};
-
-const handleCommandCenterKeyDown = async (state, key) => {
-  if (key !== 'Enter' && key !== ' ' && key !== 'Space') {
-    return state;
-  }
-  return handleCommandCenterClick(state);
-};
-
-const show2 = async (uid, menuId, x, y, args) => {
-  await showContextMenu2(uid, menuId, x, y, args);
-};
-
-const handleContextMenu = async (state, button, eventX, eventY) => {
-  const {
-    uid
-  } = state;
-  await show2(uid, MenuIdTitleBarContextMenu, eventX, eventY, {
-    menuId: MenuIdTitleBarContextMenu
-  });
-  return state;
-};
-
-const handleElectronMenuClick = async (state, label) => {
-  const {
-    commandMap
-  } = state;
-  const commandPair = commandMap[label];
-  if (!commandPair) {
-    throw new Error(`no command found for ${label}`);
-  }
-  const {
-    args = [],
-    command
-  } = commandPair;
-  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 commandQueues = new Map();
-const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess = true) => {
-  const executeViewletCommand = async (uid, command, ...args) => {
-    const fn = viewletCommandMap[`TitleBar.${command}`];
-    if (typeof fn !== 'function') {
-      throw new TypeError(`Viewlet command not found: ${command}`);
-    }
-    const previous = commandQueues.get(uid);
-    const {
-      promise: next,
-      resolve
-    } = Promise.withResolvers();
-    commandQueues.set(uid, next);
-    if (previous) {
-      await previous;
-    }
-    try {
-      await fn(uid, ...args);
-      await invoke$1('Viewlet.requestRender', uid);
-    } finally {
-      resolve();
-      if (commandQueues.get(uid) === next) {
-        commandQueues.delete(uid);
-      }
-    }
-  };
-  const rpc = await create$6({
-    commandMap: {
-      'Viewlet.executeViewletCommand': executeViewletCommand
-    },
-    messagePort: port
-  });
-  if (setAsRendererProcess) {
-    set(rpc);
-  }
-};
-
-const getMenuOffset = (x, clientX, iconWidth) => {
-  return clientX - x - iconWidth;
-};
-
 const getNavigableTitleBarEntries = state => {
   const {
     focusedIndex,
@@ -3945,17 +3835,30 @@ const getNavigableTitleBarEntries = state => {
   return getVisibleTitleBarEntries(titleBarEntries, width, focusedIndex, isMenuOpen);
 };
 
-const getTitleBarIndexFromPosition = (titleBarEntries, x, y) => {
-  let currentX = 0;
-  for (let i = 0; i < titleBarEntries.length; i++) {
-    const entry = titleBarEntries[i];
-    const entryWidth = entry.width;
-    if (x >= currentX && x < currentX + entryWidth) {
-      return i;
-    }
-    currentX += entryWidth;
+const LeftClick = 0;
+
+const closeMenu = (state, keepFocus) => {
+  const {
+    focused,
+    focusedIndex,
+    isMenuOpen,
+    menus
+  } = state;
+  // TODO send to renderer process
+  // 1. close menu
+  // 2. focus top level entry
+  const newFocused = keepFocus ? focused : false;
+  const newFocusedIndex = keepFocus ? focusedIndex : -1;
+  if (!isMenuOpen && menus.length === 0 && focused === newFocused && focusedIndex === newFocusedIndex) {
+    return state;
   }
-  return -1;
+  return {
+    ...state,
+    focused: newFocused,
+    focusedIndex: newFocusedIndex,
+    isMenuOpen: false,
+    menus: []
+  };
 };
 
 const toCommandInfo = entry => {
@@ -4145,6 +4048,180 @@ const openMenuAtIndex = async (state, index, shouldBeFocused) => {
   };
 };
 
+const toggleIndex = async (state, index) => {
+  const {
+    focusedIndex,
+    isMenuOpen
+  } = state;
+  if (isMenuOpen && focusedIndex === index) {
+    return closeMenu(state, /* keepFocus */true);
+  }
+  return openMenuAtIndex(state, index, /* focus */false);
+};
+
+const handleClick = async (state, button, index) => {
+  if (button !== LeftClick) {
+    return state;
+  }
+  if (index === -1) {
+    return state;
+  }
+  const newState = await toggleIndex(state, index);
+  return {
+    ...newState,
+    focused: true
+  };
+};
+
+const handleClickByName = async (state, button, name) => {
+  const entries = getNavigableTitleBarEntries(state);
+  const index = entries.findIndex(entry => entry.label === name);
+  return handleClick(state, button, index);
+};
+
+const commandCenterItems = [{
+  command: 'QuickPick.showFile',
+  label: 'Go to File'
+}, {
+  command: 'QuickPick.showCommands',
+  label: 'Show and Run Commands'
+}, {
+  args: ['Search'],
+  command: 'Layout.openSideBarViewlet',
+  label: 'Search for Text'
+}, {
+  args: ['symbol'],
+  command: 'QuickPick.show',
+  label: 'Go to Symbol in Editor'
+}, {
+  args: ['Run And Debug'],
+  command: 'Layout.openSideBarViewlet',
+  label: 'Start Debugging'
+}, {
+  command: 'QuickPick.showCommands',
+  label: 'Run Task'
+}, {
+  command: 'QuickPick.showEverything',
+  label: 'More'
+}];
+const handleCommandCenterClick = async state => {
+  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)',
+    waitUntil: 'visible'
+  });
+  return state;
+};
+
+const handleCommandCenterKeyDown = async (state, key) => {
+  if (key !== 'Enter' && key !== ' ' && key !== 'Space') {
+    return state;
+  }
+  return handleCommandCenterClick(state);
+};
+
+const show2 = async (uid, menuId, x, y, args) => {
+  await showContextMenu2(uid, menuId, x, y, args);
+};
+
+const handleContextMenu = async (state, button, eventX, eventY) => {
+  const {
+    uid
+  } = state;
+  await show2(uid, MenuIdTitleBarContextMenu, eventX, eventY, {
+    menuId: MenuIdTitleBarContextMenu
+  });
+  return state;
+};
+
+const handleElectronMenuClick = async (state, label) => {
+  const {
+    commandMap
+  } = state;
+  const commandPair = commandMap[label];
+  if (!commandPair) {
+    throw new Error(`no command found for ${label}`);
+  }
+  const {
+    args = [],
+    command
+  } = commandPair;
+  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 commandQueues = new Map();
+const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess = true) => {
+  const executeViewletCommand = async (uid, command, ...args) => {
+    const fn = viewletCommandMap[`TitleBar.${command}`];
+    if (typeof fn !== 'function') {
+      throw new TypeError(`Viewlet command not found: ${command}`);
+    }
+    const previous = commandQueues.get(uid);
+    const {
+      promise: next,
+      resolve
+    } = Promise.withResolvers();
+    commandQueues.set(uid, next);
+    if (previous) {
+      await previous;
+    }
+    try {
+      await fn(uid, ...args);
+      await invoke$1('Viewlet.requestRender', uid);
+    } finally {
+      resolve();
+      if (commandQueues.get(uid) === next) {
+        commandQueues.delete(uid);
+      }
+    }
+  };
+  const rpc = await create$6({
+    commandMap: {
+      'Viewlet.executeViewletCommand': executeViewletCommand
+    },
+    messagePort: port
+  });
+  if (setAsRendererProcess) {
+    set(rpc);
+  }
+};
+
+const getMenuOffset = (x, clientX, iconWidth) => {
+  return clientX - x - iconWidth;
+};
+
+const getTitleBarIndexFromPosition = (titleBarEntries, x, y) => {
+  let currentX = 0;
+  for (let i = 0; i < titleBarEntries.length; i++) {
+    const entry = titleBarEntries[i];
+    const entryWidth = entry.width;
+    if (x >= currentX && x < currentX + entryWidth) {
+      return i;
+    }
+    currentX += entryWidth;
+  }
+  return -1;
+};
+
 const focusIndex = async (state, index) => {
   object(state);
   number(index);
@@ -4466,7 +4543,7 @@ const renderFocusedIndex = (oldState, newState) => {
   if (newState.focusedIndex === -1) {
     return [];
   }
-  return [FocusSelector, newState.uid, '.ViewletTitleBarMenuBar'];
+  return [FocusSelector, newState.uid, '.TitleBarMenuBar'];
 };
 
 const getKeyBindingString = (key, altKey, ctrlKey, shiftKey, metaKey) => {
@@ -4772,13 +4849,18 @@ const renderDirect = async (uid, commands) => {
   return [...rendererWorkerCommands, ['Viewlet.commitPending', uid, transactionId]];
 };
 const render3 = async (uid, diffResult) => {
+  // State may change between the renderer worker's diff and render RPCs.
+  const pendingDiffs = new Set([...diffResult, ...diff3(uid)]);
   const {
     newState,
     oldState
   } = get(uid);
   set$1(uid, newState, newState);
   const commands = [];
-  for (const item of diffResult) {
+  for (const item of numbers) {
+    if (!pendingDiffs.has(item)) {
+      continue;
+    }
     const fn = getRenderer3(item);
     const result = fn(oldState, newState);
     if (result.length > 0) {
@@ -4826,7 +4908,7 @@ const renderEventListeners = () => {
     params: ['handleMenuMouseOver', ClientX, ClientY]
   }, {
     name: HandleClick,
-    params: ['handleClickAt', Button, ClientX, ClientY]
+    params: ['handleClickByName', Button, TargetName]
   }, {
     name: HandlePointerOut,
     params: ['handlePointerOut', ClientX, ClientY]
@@ -4971,30 +5053,6 @@ const create = (id, uri, x, y, width, height) => {
   return state;
 };
 
-const closeMenu = (state, keepFocus) => {
-  const {
-    focused,
-    focusedIndex,
-    isMenuOpen,
-    menus
-  } = state;
-  // TODO send to renderer process
-  // 1. close menu
-  // 2. focus top level entry
-  const newFocused = keepFocus ? focused : false;
-  const newFocusedIndex = keepFocus ? focusedIndex : -1;
-  if (!isMenuOpen && menus.length === 0 && focused === newFocused && focusedIndex === newFocusedIndex) {
-    return state;
-  }
-  return {
-    ...state,
-    focused: newFocused,
-    focusedIndex: newFocusedIndex,
-    isMenuOpen: false,
-    menus: []
-  };
-};
-
 const first = () => {
   return 0;
 };
@@ -5041,33 +5099,6 @@ const focusPrevious = state => {
   return focusIndex(state, indexToFocus);
 };
 
-const LeftClick = 0;
-
-const toggleIndex = async (state, index) => {
-  const {
-    focusedIndex,
-    isMenuOpen
-  } = state;
-  if (isMenuOpen && focusedIndex === index) {
-    return closeMenu(state, /* keepFocus */true);
-  }
-  return openMenuAtIndex(state, index, /* focus */false);
-};
-
-const handleClick = async (state, button, index) => {
-  if (button !== LeftClick) {
-    return state;
-  }
-  if (index === -1) {
-    return state;
-  }
-  const newState = await toggleIndex(state, index);
-  return {
-    ...newState,
-    focused: true
-  };
-};
-
 const handleClickAt = async (state, button, eventX, eventY) => {
   const {
     iconWidth,
@@ -5616,6 +5647,7 @@ const commandMap = {
   'TitleBar.handleButtonsClick': handleClick$1,
   'TitleBar.handleClick': wrapCommand(handleClick),
   'TitleBar.handleClickAt': wrapCommand(handleClickAt),
+  'TitleBar.handleClickByName': wrapCommand(handleClickByName),
   'TitleBar.handleClickClose': wrapCommand(handleClickClose),
   'TitleBar.handleClickMinimize': wrapCommand(handleClickMinimize),
   'TitleBar.handleClickToggleMaximize': wrapCommand(handleClickToggleMaximize),
@@ -5642,7 +5674,8 @@ const commandMap = {
   'TitleBar.handlePointerOut': wrapCommand(handlePointerOut),
   'TitleBar.handlePointerOver': wrapCommand(handlePointerOver),
   'TitleBar.handleTitleBarContextMenu': wrapCommand(handleTitleBarContextMenu),
-  'TitleBar.handleWorkspaceChange': wrapCommand(handleWorkspaceChange),
+  // Workspace actions await this callback while holding the ordinary command queue.
+  'TitleBar.handleWorkspaceChange': wrapNotification(handleWorkspaceChange),
   'TitleBar.hideCommandCenter': wrapCommand(hideCommandCenter),
   'TitleBar.hideMenuBar': wrapCommand(hideMenuBar),
   'TitleBar.hydrateElectronApplicationMenu': wrapCommand(hydrate),

package/package.json

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