@lvce-editor/title-bar-worker 2.27.0 → 2.29.0

package/dist/titleBarWorkerMain.js

@@ -1003,6 +1003,7 @@ const DEFAULT_UID = 1;
 const createDefaultState = (uid = DEFAULT_UID) => ({
   assetDir: '',
   buttons: [],
+  commandCenterEnabled: false,
   controlsOverlayEnabled: false,
   focusedIndex: -1,
   height: 30,
@@ -1013,6 +1014,7 @@ const createDefaultState = (uid = DEFAULT_UID) => ({
   labelFontWeight: 400,
   labelLetterSpacing: 0,
   labelPadding: 8,
+  layoutControlsEnabled: false,
   menus: [],
   platform: Electron,
   title: '',
@@ -1029,9 +1031,7 @@ const createDefaultState = (uid = DEFAULT_UID) => ({
   uid,
   width: 800,
   x: 0,
-  y: 0,
-  layoutControlsEnabled: false,
-  commandCenterEnabled: false
+  y: 0
 });
 
 const emptyObject = {};
@@ -1052,44 +1052,44 @@ const ClearRecentlyOpened = 'Clear Recently Opened';
 const Close = 'Close';
 const MenuBar$1 = 'Menu Bar';
 const CommandCenter = 'Command Center';
-const Edit$1 = 'Edit';
-const File$2 = 'File';
-const Go$1 = 'Go';
-const Help$1 = 'Help';
+const Edit$2 = 'Edit';
+const File$3 = 'File';
+const Go$2 = 'Go';
+const Help$2 = 'Help';
 const Maximize = 'Maximize';
 const Minimize = 'Minimize';
 const MoreDot = 'More ...';
 const NewTerminal = 'New Terminal';
 const OpenProcessExplorer = 'Open Process Explorer';
-const Run$1 = 'Run';
-const Selection$1 = 'Selection';
-const Terminal$1 = 'Terminal';
+const Run$2 = 'Run';
+const Selection$2 = 'Selection';
+const Terminal$2 = 'Terminal';
 const ToggleDeveloperTools = 'Toggle Developer Tools';
-const View$1 = 'View';
+const View$2 = 'View';
 
 const file = () => {
-  return i18nString(File$2);
+  return i18nString(File$3);
 };
 const edit = () => {
-  return i18nString(Edit$1);
+  return i18nString(Edit$2);
 };
 const selection = () => {
-  return i18nString(Selection$1);
+  return i18nString(Selection$2);
 };
 const view = () => {
-  return i18nString(View$1);
+  return i18nString(View$2);
 };
 const go = () => {
-  return i18nString(Go$1);
+  return i18nString(Go$2);
 };
 const run = () => {
-  return i18nString(Run$1);
+  return i18nString(Run$2);
 };
 const terminal = () => {
-  return i18nString(Terminal$1);
+  return i18nString(Terminal$2);
 };
 const help = () => {
-  return i18nString(Help$1);
+  return i18nString(Help$2);
 };
 const minimize$1 = () => {
   return i18nString(Minimize);
@@ -1114,19 +1114,19 @@ const getTitleBarButtonsElectron = (controlsOverlayEnabled, titleBarStyleCustom)
   if (titleBarStyleCustom) {
     // TODO don't render title bar buttons on windows when electron window controls overlay is enabled
     return [{
-      label: minimize$1(),
       icon: 'Minimize',
       id: 'Minimize',
+      label: minimize$1(),
       onClick: 'handleClickMinimize'
     }, {
-      label: maximize$1(),
       icon: 'Maximize',
       id: 'ToggleMaximize',
+      label: maximize$1(),
       onClick: 'handleClickToggleMaximize'
     }, {
-      label: close$1(),
       icon: 'ChromeClose',
       id: 'Close',
+      label: close$1(),
       onClick: 'handleClickClose'
     }];
   }
@@ -1145,10 +1145,10 @@ const getTitleBarButtons = (platform, controlsOverlayEnabled, titleBarStyleCusto
   switch (platform) {
     case Electron:
       return getTitleBarButtonsElectron(controlsOverlayEnabled, titleBarStyleCustom);
-    case Web:
-      return getTitleBarButtonsWeb();
     case Remote:
       return getTitleBarButtonsRemote();
+    case Web:
+      return getTitleBarButtonsWeb();
     default:
       return [];
   }
@@ -1156,9 +1156,9 @@ const getTitleBarButtons = (platform, controlsOverlayEnabled, titleBarStyleCusto
 
 const {
   get: get$1,
-  set: set$3,
   getCommandIds,
   registerCommands,
+  set: set$3,
   wrapCommand,
   wrapGetter
 } = create$2();
@@ -1167,29 +1167,29 @@ const create3 = (id, uri, x, y, width, height, platform, controlsOverlayEnabled,
   const titleBarButtons = getTitleBarButtons(platform, controlsOverlayEnabled, titleBarStyleCustom);
   const state = {
     ...createDefaultState(),
-    uid: id,
-    titleBarEntries: [],
+    assetDir,
+    commandCenterEnabled: false,
+    controlsOverlayEnabled,
     focusedIndex: -1,
+    height,
+    iconWidth: 30,
     isMenuOpen: false,
-    menus: [],
-    labelFontWeight: 400,
-    labelFontSize: 13,
     labelFontFamily: 'system-ui, Ubuntu, Droid Sans, sans-serif',
-    labelPadding: 8,
+    labelFontSize: 13,
+    labelFontWeight: 400,
     labelLetterSpacing: 0,
-    titleBarHeight: height,
-    x,
-    y,
-    width,
-    height,
-    iconWidth: 30,
+    labelPadding: 8,
+    layoutControlsEnabled: false,
+    menus: [],
     platform,
-    controlsOverlayEnabled,
-    titleBarStyleCustom,
     titleBarButtons,
-    assetDir,
-    layoutControlsEnabled: false,
-    commandCenterEnabled: false
+    titleBarEntries: [],
+    titleBarHeight: height,
+    titleBarStyleCustom,
+    uid: id,
+    width,
+    x,
+    y
   };
   set$3(id, state, state);
 };
@@ -1226,8 +1226,8 @@ const diff = (oldState, newState) => {
 
 const diff2 = uid => {
   const {
-    oldState,
-    newState
+    newState,
+    oldState
   } = get$1(uid);
   return diff(oldState, newState);
 };
@@ -1241,8 +1241,8 @@ const numbers = [RenderEntries, RenderFocusedIndex, RenderMenus];
 
 const diff3 = uid => {
   const {
-    oldState,
-    newState
+    newState,
+    oldState
   } = get$1(uid);
   const diffResult = [];
   for (let i = 0; i < modules.length; i++) {
@@ -1545,7 +1545,16 @@ const Script = 2;
 const CtrlCmd = 1 << 11 >>> 0;
 const Shift = 1 << 10 >>> 0;
 
+const Edit$1 = 2;
+const File$2 = 5;
+const Go$1 = 6;
+const Help$1 = 7;
+const OpenRecent$1 = 9;
+const Run$1 = 10;
+const Selection$1 = 11;
+const Terminal$1 = 14;
 const TitleBar$1 = 15;
+const View$1 = 16;
 
 const parseKey = rawKey => {
   const isCtrl = Boolean(rawKey & CtrlCmd);
@@ -1582,36 +1591,36 @@ const text = data => {
 
 const getKeyBindings$1 = () => {
   return [{
-    key: DownArrow$1,
     command: 'TitleBar.handleKeyArrowDown',
+    key: DownArrow$1,
     when: FocusTitleBarMenuBar
   }, {
-    key: UpArrow$1,
     command: 'TitleBar.handleKeyArrowUp',
+    key: UpArrow$1,
     when: FocusTitleBarMenuBar
   }, {
-    key: RightArrow$1,
     command: 'TitleBar.handleKeyArrowRight',
+    key: RightArrow$1,
     when: FocusTitleBarMenuBar
   }, {
-    key: LeftArrow$1,
     command: 'TitleBar.handleKeyArrowLeft',
+    key: LeftArrow$1,
     when: FocusTitleBarMenuBar
   }, {
-    key: Space$1,
     command: 'TitleBar.handleKeySpace',
+    key: Space$1,
     when: FocusTitleBarMenuBar
   }, {
-    key: Home$1,
     command: 'TitleBar.handleKeyHome',
+    key: Home$1,
     when: FocusTitleBarMenuBar
   }, {
-    key: End$1,
     command: 'TitleBar.handleKeyEnd',
+    key: End$1,
     when: FocusTitleBarMenuBar
   }, {
-    key: Escape$1,
     command: 'TitleBar.handleKeyEscape',
+    key: Escape$1,
     when: FocusTitleBarMenuBar
   }];
 };
@@ -1627,25 +1636,25 @@ const Ignore = 7;
 
 const getMenuEntriesTitleBarContextMenu = async state => {
   const {
-    titleBarMenuBarEnabled,
-    commandCenterEnabled
+    commandCenterEnabled,
+    titleBarMenuBarEnabled
   } = state;
   // TODO checked state should be depending on whether or not that feature is currently visible or not
   return [{
-    id: 'MenuBar',
-    label: menuBar(),
+    command: titleBarMenuBarEnabled ? 'TitleBar.hideMenuBar' : 'TitleBar.showMenuBar',
     flags: titleBarMenuBarEnabled ? Checked : Unchecked,
-    command: titleBarMenuBarEnabled ? 'TitleBar.hideMenuBar' : 'TitleBar.showMenuBar'
+    id: 'MenuBar',
+    label: menuBar()
   }, {
-    id: 'Command center',
-    label: commandCenter(),
+    command: commandCenterEnabled ? 'TitleBar.hideCommandCenter' : 'TitleBar.showCommandCenter',
     flags: commandCenterEnabled ? Checked : Unchecked,
-    command: commandCenterEnabled ? 'TitleBar.hideCommandCenter' : 'TitleBar.showCommandCenter'
+    id: 'Command center',
+    label: commandCenter()
   }, {
-    id: 'layout controls',
-    label: 'layout controls',
+    command: '',
     flags: Checked,
-    command: ''
+    id: 'layout controls',
+    label: 'layout controls'
   }];
 };
 
@@ -1664,7 +1673,8 @@ const UiStrings$1 = {
   SelectAll: 'Select All',
   ToggleBlockComment: 'Toggle Block Comment',
   ToggleLineComment: 'Toggle Line Comment',
-  Undo: 'Undo'};
+  Undo: 'Undo'
+};
 const cut = () => {
   return i18nString(UiStrings$1.Cut);
 };
@@ -1714,49 +1724,49 @@ const TitleBar = 15;
 const View = 16;
 
 const menuEntrySeparator = {
-  id: 'separator',
-  label: '',
+  command: '',
   flags: Separator,
-  command: ''
+  id: 'separator',
+  label: ''
 };
 
 const id$9 = Edit;
 const getMenuEntries$d = () => {
   return [{
-    id: 'undo',
-    label: undo(),
+    command: /* TODO */'-1',
     flags: Disabled,
-    command: /* TODO */'-1'
+    id: 'undo',
+    label: undo()
   }, {
-    id: 'redo',
-    label: redo(),
+    command: /* TODO */'-1',
     flags: Disabled,
-    command: /* TODO */'-1'
+    id: 'redo',
+    label: redo()
   }, menuEntrySeparator, {
-    id: 'cut',
-    label: cut(),
+    command: /* Editor.cut */'Editor.cut',
     flags: None,
-    command: /* Editor.cut */'Editor.cut'
+    id: 'cut',
+    label: cut()
   }, {
-    id: 'copy',
-    label: copy(),
+    command: /* Editor.copy */'Editor.copy',
     flags: None,
-    command: /* Editor.copy */'Editor.copy'
+    id: 'copy',
+    label: copy()
   }, {
-    id: 'paste',
-    label: paste(),
+    command: /* Editor.paste */'Editor.paste',
     flags: None,
-    command: /* Editor.paste */'Editor.paste'
+    id: 'paste',
+    label: paste()
   }, menuEntrySeparator, {
-    id: 'toggle-line-comment',
-    label: toggleLineComment(),
+    command: /* Editor.toggleLineComment */'Editor.toggleLineComment',
     flags: None,
-    command: /* Editor.toggleLineComment */'Editor.toggleLineComment'
+    id: 'toggle-line-comment',
+    label: toggleLineComment()
   }, {
-    id: 'toggle-block-comment',
-    label: toggleBlockComment(),
+    command: /* Editor.toggleBlockComment */'Editor.toggleBlockComment',
     flags: None,
-    command: /* Editor.toggleBlockComment */'Editor.toggleBlockComment'
+    id: 'toggle-block-comment',
+    label: toggleBlockComment()
   }];
 };
 
@@ -1770,15 +1780,14 @@ const MenuEntriesEdit = {
  * @enum {string}
  */
 const UiStrings = {
+  Exit: 'Exit',
   NewFile: 'New File',
   NewWindow: 'New Window',
   OpenFile: 'Open File',
   OpenFolder: 'Open Folder',
   OpenRecent: 'Open Recent',
-  Exit: 'Exit',
   Save: 'Save',
-  SaveAll: 'Save All'
-};
+  SaveAll: 'Save All'};
 const newFile = () => {
   return i18nString(UiStrings.NewFile);
 };
@@ -1807,47 +1816,47 @@ const exit = () => {
 const id$8 = File$1;
 const getMenuEntries$c = platform => {
   const entries = [{
-    id: 'newFile',
-    label: newFile(),
+    command: '-1',
     flags: None,
-    command: '-1'
+    id: 'newFile',
+    label: newFile()
   }, {
-    id: 'newWindow',
-    label: newWindow(),
+    command: /* Window.openNew */'Window.openNew',
     flags: None,
-    command: /* Window.openNew */'Window.openNew'
+    id: 'newWindow',
+    label: newWindow()
   }, menuEntrySeparator, {
-    id: 'openFile',
-    label: openFile(),
+    command: 'Dialog.openFile',
     flags: None,
-    command: 'Dialog.openFile'
+    id: 'openFile',
+    label: openFile()
   }, {
-    id: 'openFolder',
-    label: openFolder(),
+    command: 'Dialog.openFolder',
     flags: RestoreFocus,
-    command: 'Dialog.openFolder'
+    id: 'openFolder',
+    label: openFolder()
   }, {
-    id: OpenRecent,
-    label: openRecent(),
+    command: '',
     flags: SubMenu,
-    command: ''
+    id: OpenRecent,
+    label: openRecent()
   }, menuEntrySeparator, {
-    id: 'save',
-    label: save(),
+    command: 'Main.save',
     flags: None,
-    command: 'Main.save'
+    id: 'save',
+    label: save()
   }, {
-    id: 'saveAll',
-    label: saveAll(),
+    command: 'Main.saveAll',
     flags: None,
-    command: 'Main.saveAll'
+    id: 'saveAll',
+    label: saveAll()
   }];
   if (platform === Electron) {
     entries.push(menuEntrySeparator, {
-      id: 'exit',
-      label: exit(),
+      command: 'Chrome.exit',
       flags: Ignore,
-      command: 'Chrome.exit'
+      id: 'exit',
+      label: exit()
     });
   }
   return entries;
@@ -1896,33 +1905,33 @@ const getMenuEntries$a = async platform => {
   const entries = [];
   if (platform !== Web) {
     entries.push({
-      id: 'toggleDeveloperTools',
-      label: toggleDeveloperTools(),
+      command: 'Developer.toggleDeveloperTools',
       flags: None,
-      command: 'Developer.toggleDeveloperTools'
+      id: 'toggleDeveloperTools',
+      label: toggleDeveloperTools()
     }, {
-      id: 'openProcessExplorer',
-      label: openProcessExplorer(),
+      command: 'Developer.openProcessExplorer',
       flags: RestoreFocus,
-      command: 'Developer.openProcessExplorer'
+      id: 'openProcessExplorer',
+      label: openProcessExplorer()
     });
   }
   if (autoUpdateSupported) {
     entries.push(menuEntrySeparator, {
-      id: 'checkForUpdates',
-      label: checkForUpdates(),
+      command: 'AutoUpdater.checkForUpdates',
       flags: RestoreFocus,
-      command: 'AutoUpdater.checkForUpdates'
+      id: 'checkForUpdates',
+      label: checkForUpdates()
     });
   }
   if (entries.length > 0) {
     entries.push(menuEntrySeparator);
   }
   entries.push({
-    id: 'about',
-    label: about(),
+    command: 'About.showAbout',
     flags: None,
-    command: 'About.showAbout'
+    id: 'about',
+    label: about()
   });
   return entries;
 };
@@ -2362,10 +2371,10 @@ const toMenuItem = folder => {
   const homeDir = getHomeDir();
   const label = getTitle$1(homeDir, folder);
   return {
-    label,
-    flags: None,
+    args: [folder],
     command: 'Workspace.setPath',
-    args: [folder]
+    flags: None,
+    label
   };
 };
 const id$5 = OpenRecent;
@@ -2377,15 +2386,15 @@ const getMenuEntries$9 = async () => {
     items.push(...itemsToShow.map(toMenuItem), menuEntrySeparator);
   }
   items.push({
-    id: 'more',
-    label: moreDot(),
+    command: 'QuickPick.showRecent',
     flags: None,
-    command: 'QuickPick.showRecent'
+    id: 'more',
+    label: moreDot()
   }, menuEntrySeparator, {
-    id: 'clearRecentlyOpened',
-    label: clearRecentlyOpened(),
+    command: 'RecentlyOpened.clearRecentlyOpened',
     flags: None,
-    command: 'RecentlyOpened.clearRecentlyOpened'
+    id: 'clearRecentlyOpened',
+    label: clearRecentlyOpened()
   });
   return items;
 };
@@ -2410,30 +2419,30 @@ const MenuEntriesRun = {
 const id$3 = Selection;
 const getMenuEntries$7 = () => {
   return [{
-    id: 'selectAll',
-    label: selectAll(),
+    command: 'Editor.selectAll',
     flags: None,
-    command: 'Editor.selectAll'
+    id: 'selectAll',
+    label: selectAll()
   }, {
-    id: 'copyLineUp',
-    label: copyLineUp(),
+    command: 'Editor.copyLineUp',
     flags: None,
-    command: 'Editor.copyLineUp'
+    id: 'copyLineUp',
+    label: copyLineUp()
   }, {
-    id: 'copyLineDown',
-    label: copyLineDown(),
+    command: 'Editor.copyLineDown',
     flags: None,
-    command: 'Editor.copyLineDown'
+    id: 'copyLineDown',
+    label: copyLineDown()
   }, {
-    id: 'moveLineUp',
-    label: moveLineUp(),
+    command: 'Editor.moveLineUp',
     flags: Disabled,
-    command: 'Editor.moveLineUp'
+    id: 'moveLineUp',
+    label: moveLineUp()
   }, {
-    id: 'moveLineDown',
-    label: moveLineDown(),
+    command: 'Editor.moveLineDown',
     flags: Disabled,
-    command: 'Editor.moveLineDown'
+    id: 'moveLineDown',
+    label: moveLineDown()
   }];
 };
 
@@ -2446,11 +2455,11 @@ const MenuEntriesSelection = {
 const id$2 = Terminal;
 const getMenuEntries$6 = () => {
   return [{
-    id: 'newTerminal',
-    label: i18nString(NewTerminal),
-    flags: None,
+    args: ['Terminal'],
     command: 'Layout.togglePanel',
-    args: ['Terminal']
+    flags: None,
+    id: 'newTerminal',
+    label: i18nString(NewTerminal)
   }];
 };
 
@@ -2462,86 +2471,86 @@ const MenuEntriesTerminal = {
 
 const getMenuEntries$5 = () => {
   return [{
-    id: File$1,
-    label: file(),
+    command: '',
     flags: SubMenu,
-    command: ''
+    id: File$1,
+    label: file()
   }, {
-    id: Edit,
-    label: edit(),
+    command: '',
     flags: SubMenu,
-    command: ''
+    id: Edit,
+    label: edit()
   }, {
-    id: Selection,
-    label: selection(),
+    command: '',
     flags: SubMenu,
-    command: ''
+    id: Selection,
+    label: selection()
   }, {
-    id: View,
-    label: view(),
+    command: '',
     flags: SubMenu,
-    command: ''
+    id: View,
+    label: view()
   }, {
-    id: Go,
-    label: go(),
+    command: '',
     flags: SubMenu,
-    command: ''
+    id: Go,
+    label: go()
   }, {
+    command: '',
+    flags: SubMenu,
     id: Run,
-    label: run(),
     keyboardShortCut: 'Alt+r',
-    flags: SubMenu,
-    command: ''
+    label: run()
   }, {
+    command: '',
+    flags: SubMenu,
     id: Terminal,
-    label: terminal(),
     keyboardShortCut: 'Alt+t',
-    flags: SubMenu,
-    command: ''
+    label: terminal()
   }, {
+    command: '',
+    flags: SubMenu,
     id: Help,
-    label: help(),
     keyboardShortCut: 'Alt+h',
-    flags: SubMenu,
-    command: ''
+    label: help()
   }];
 };
 
 const getMenuEntries$4 = () => {
   return [{
-    id: File$1,
-    label: file(),
+    command: '',
     flags: None,
-    command: ''
+    id: File$1,
+    label: file()
   }, {
-    id: Edit,
-    label: edit(),
+    command: '',
     flags: None,
-    command: ''
+    id: Edit,
+    label: edit()
   }, {
-    id: Selection,
-    label: selection(),
+    command: '',
     flags: None,
-    command: ''
+    id: Selection,
+    label: selection()
   }, {
-    id: View,
-    label: view(),
+    command: '',
     flags: None,
-    command: ''
+    id: View,
+    label: view()
   }, {
-    id: Go,
-    label: go(),
+    command: '',
     flags: None,
-    command: ''
+    id: Go,
+    label: go()
   }, {
-    id: Help,
-    label: help(),
+    command: '',
     flags: None,
-    command: ''
+    id: Help,
+    label: help()
   }];
 };
 
-const getFn = platform => {
+const getFn$1 = platform => {
   switch (platform) {
     case Web:
       return getMenuEntries$4;
@@ -2551,7 +2560,7 @@ const getFn = platform => {
 };
 const id$1 = TitleBar;
 const getMenuEntries$3 = async platform => {
-  const fn = getFn(platform);
+  const fn = getFn$1(platform);
   return fn();
 };
 
@@ -2572,14 +2581,14 @@ const MenuEntriesView = {
   id
 };
 
-const menus$1 = [MenuEntriesEdit, MenuEntriesFile, MenuEntriesGo, MenuEntriesHelp, MenuEntriesRun, MenuEntriesSelection, MenuEntriesTerminal, MenuEntriesTitleBar, MenuEntriesView, MenuEntriesOpenRecent];
+const menus = [MenuEntriesEdit, MenuEntriesFile, MenuEntriesGo, MenuEntriesHelp, MenuEntriesRun, MenuEntriesSelection, MenuEntriesTerminal, MenuEntriesTitleBar, MenuEntriesView, MenuEntriesOpenRecent];
 
 const MenuIdTitleBarContextMenu = 50;
 const getMenuIds = () => {
-  return [...menus$1.map(menu => menu.id), MenuIdTitleBarContextMenu];
+  return [...menus.map(menu => menu.id), MenuIdTitleBarContextMenu];
 };
 const getMenuEntries$1 = async (id, platform) => {
-  const menu = menus$1.find(item => item.id === id);
+  const menu = menus.find(item => item.id === id);
   if (!menu) {
     return [];
   }
@@ -2738,8 +2747,8 @@ const getIndexToFocusPrevious = menu => {
 };
 const canBeFocused = item => {
   switch (item.flags) {
-    case Separator:
     case Disabled:
+    case Separator:
       return false;
     default:
       return true;
@@ -2756,25 +2765,44 @@ const getIndexToFocusNext = menu => {
 
 // TODO more tests
 
-const menus = [MenuEntriesEdit, MenuEntriesFile, MenuEntriesGo, MenuEntriesHelp, MenuEntriesRun, MenuEntriesSelection, MenuEntriesTerminal, MenuEntriesTitleBar, MenuEntriesView, MenuEntriesOpenRecent];
+/**
+ * @deprecated
+ * @returns
+ */
 const getMenus = () => {
-  return menus;
+  return [];
 };
-const getModule = id => {
-  for (const module of menus) {
-    if (module.id === id) {
-      return module;
-    }
+const getFn = id => {
+  switch (id) {
+    case Edit$1:
+      return getMenuEntries$d;
+    case File$2:
+      return getMenuEntries$c;
+    case Go$1:
+      return getMenuEntries$b;
+    case Help$1:
+      return getMenuEntries$a;
+    case OpenRecent$1:
+      return getMenuEntries$9;
+    case Run$1:
+      return getMenuEntries$8;
+    case Selection$1:
+      return getMenuEntries$7;
+    case Terminal$1:
+      return getMenuEntries$6;
+    case TitleBar$1:
+      return getMenuEntries$3;
+    case View$1:
+      return getMenuEntries$2;
+    default:
+      return undefined;
   }
-  return undefined;
 };
 const getMenuEntries = async (id, ...args) => {
   try {
-    const module = getModule(id);
+    const fn = getFn(id);
     // @ts-ignore
-    const inject = module.inject || [];
-    // @ts-ignore
-    return module.getMenuEntries(...args);
+    return fn(...args);
   } catch (error) {
     throw new VError(error, `Failed to load menu entries for id ${id}`);
   }
@@ -2782,10 +2810,10 @@ const getMenuEntries = async (id, ...args) => {
 
 const openMenuAtIndex = async (state, index, shouldBeFocused) => {
   const {
+    iconWidth,
     titleBarEntries,
     titleBarHeight,
-    x,
-    iconWidth
+    x
   } = state;
   // TODO race conditions
   // TODO send renderer process
@@ -2807,20 +2835,20 @@ const openMenuAtIndex = async (state, index, shouldBeFocused) => {
   const height = getMenuHeight(items);
   const menuFocusedIndex = shouldBeFocused ? getIndexToFocusNextStartingAt(items, 0) : -1;
   const menu = {
+    focusedIndex: menuFocusedIndex,
+    height,
     id,
     items,
-    focusedIndex: menuFocusedIndex,
     level: 0,
-    x: menuX,
-    y: menuY,
     width,
-    height
+    x: menuX,
+    y: menuY
   };
   const menus = [menu];
   return {
     ...state,
-    isMenuOpen: true,
     focusedIndex: index,
+    isMenuOpen: true,
     menus
   };
 };
@@ -2829,8 +2857,8 @@ const focusIndex = async (state, index) => {
   object(state);
   number(index);
   const {
-    isMenuOpen,
-    focusedIndex
+    focusedIndex,
+    isMenuOpen
   } = state;
   if (index === focusedIndex) {
     return state;
@@ -2869,9 +2897,9 @@ const handleMouseOut = ifElse(handleMouseOutMenuOpen, handleMouseOutMenuClosed);
 
 const handlePointerOut = (state, clientX, clientY) => {
   const {
-    x,
     iconWidth,
-    titleBarEntries
+    titleBarEntries,
+    x
   } = state;
   const menuX = getMenuOffset(x, clientX, iconWidth);
   const index = getTitleBarIndexFromPosition(titleBarEntries, menuX);
@@ -2983,14 +3011,14 @@ const getTitle = workspaceUri => {
 
 const loadContent2 = async state => {
   const {
-    platform,
     controlsOverlayEnabled,
-    titleBarStyleCustom,
     labelFontFamily,
     labelFontSize,
     labelFontWeight,
     labelLetterSpacing,
-    labelPadding
+    labelPadding,
+    platform,
+    titleBarStyleCustom
   } = state;
   const titleBarEntries = await getMenuEntries(TitleBar$1);
   const withWidths = addWidths(titleBarEntries, labelPadding, labelFontWeight, labelFontSize, labelFontFamily, labelLetterSpacing);
@@ -3001,11 +3029,11 @@ const loadContent2 = async state => {
   const iconWidth = 30;
   return {
     ...state,
-    titleBarEntries: withWidths,
-    titleBarButtons: buttons,
     buttons,
+    iconWidth,
     title,
-    iconWidth
+    titleBarButtons: buttons,
+    titleBarEntries: withWidths
   };
 };
 
@@ -3037,16 +3065,16 @@ const TitleBarTopLevelEntryLabel = 'TitleBarTopLevelEntryLabel';
 const Viewlet = 'Viewlet';
 
 const checkboxChecked = {
-  type: Div,
+  ariaChecked: true,
+  childCount: 2,
   className: mergeClassNames(MenuItem, MenuItemCheckMark),
   role: MenuItemCheckBox,
-  ariaChecked: true,
   tabIndex: -1,
-  childCount: 2
+  type: Div
 };
 const checkMark = {
-  type: Div,
-  className: mergeClassNames(MenuItemCheckmarkIcon, MaskIconCheck)
+  className: mergeClassNames(MenuItemCheckmarkIcon, MaskIconCheck),
+  type: Div
 };
 const getMenuItemCheckedDom = menuItem => {
   const {
@@ -3071,9 +3099,9 @@ const getKeyDom = key => {
   const parsedKey = parseKey(key);
   const keyBindingsString = getKeyBindingString(parsedKey.key, false, parsedKey.isCtrl, parsedKey.isShift);
   return [{
-    type: Span,
+    childCount: 1,
     className: MenuItemKeyBinding,
-    childCount: 1
+    type: Span
   }, text(keyBindingsString)];
 };
 
@@ -3086,29 +3114,29 @@ const getMenuItemClassName = isFocused => {
 };
 const getMenuItemDefaultDom = menuItem => {
   const {
-    label,
     isFocused,
-    key
+    key,
+    label
   } = menuItem;
   const className = getMenuItemClassName(isFocused);
   const keyDom = key ? getKeyDom(key) : [];
   const childCount = key ? 2 : 1;
   return [{
-    type: Div,
+    childCount,
     className,
     role: MenuItem$1,
     tabIndex: -1,
-    childCount
+    type: Div
   }, text(label), ...keyDom];
 };
 
 const disabled = {
-  type: Div,
+  childCount: 1,
   className: MenuItem,
+  disabled: true,
   role: MenuItem$1,
   tabIndex: -1,
-  disabled: true,
-  childCount: 1
+  type: Div
 };
 const getMenuItemDisabledDom = menuItem => {
   const {
@@ -3122,53 +3150,53 @@ const getMenuItemsNoopDom = () => {
 };
 
 const separator = {
-  type: Div,
+  childCount: 1,
   className: MenuItemSeparator,
   role: Separator$1,
-  childCount: 1
+  type: Div
 };
 const separatorLine = {
-  type: Div,
+  childCount: 0,
   className: MenuItemSeparatorLine,
-  childCount: 0
+  type: Div
 };
 const getMenuItemSeparatorDom = menuItem => {
   return [separator, separatorLine];
 };
 
 const arrowRight = {
-  type: Div,
+  childCount: 0,
   className: MenuItemSubMenuArrowRight,
-  childCount: 0
+  type: Div
 };
 const getMenuItemSubMenuDom = menuItem => {
   const {
-    label,
-    isFocused,
     isExpanded,
+    isFocused,
+    label,
     level
   } = menuItem;
   const baseClassName = mergeClassNames(MenuItem, MenuItemSubMenu);
   const className = isFocused ? mergeClassNames(baseClassName, MenuItemFocused) : baseClassName;
   return [{
-    type: Div,
+    ariaExpanded: isExpanded,
+    ariaHasPopup: true,
+    ariaOwns: isExpanded ? `Menu-${level + 1}` : undefined,
+    childCount: 2,
     className,
     role: MenuItem$1,
     tabIndex: -1,
-    ariaHasPopup: true,
-    ariaExpanded: isExpanded,
-    ariaOwns: isExpanded ? `Menu-${level + 1}` : undefined,
-    childCount: 2
+    type: Div
   }, text(label), arrowRight];
 };
 
 const checkboxUnchecked = {
-  type: Div,
+  ariaChecked: false,
+  childCount: 1,
   className: MenuItem,
   role: MenuItemCheckBox,
-  ariaChecked: false,
   tabIndex: -1,
-  childCount: 1
+  type: Div
 };
 const getMenuItemUncheckedDom = menuItem => {
   const {
@@ -3179,20 +3207,20 @@ const getMenuItemUncheckedDom = menuItem => {
 
 const getMenuItemRenderer = flags => {
   switch (flags) {
+    case Checked:
+      return getMenuItemCheckedDom;
+    case Disabled:
+      return getMenuItemDisabledDom;
+    case Ignore:
     case None:
     case RestoreFocus:
-    case Ignore:
       return getMenuItemDefaultDom;
     case Separator:
       return getMenuItemSeparatorDom;
-    case Checked:
-      return getMenuItemCheckedDom;
-    case Unchecked:
-      return getMenuItemUncheckedDom;
-    case Disabled:
-      return getMenuItemDisabledDom;
     case SubMenu:
       return getMenuItemSubMenuDom;
+    case Unchecked:
+      return getMenuItemUncheckedDom;
     default:
       return getMenuItemsNoopDom;
   }
@@ -3208,11 +3236,11 @@ const getMenuItemVirtualDom = menuItem => {
 
 const getMenuVirtualDom = menuItems => {
   const dom = [{
-    type: Div,
+    childCount: menuItems.length,
     className: Menu,
     role: Menu$1,
     tabIndex: -1,
-    childCount: menuItems.length
+    type: Div
   }, ...menuItems.flatMap(getMenuItemVirtualDom)];
   return dom;
 };
@@ -3226,12 +3254,12 @@ const getVisible = (items, focusedIndex, expanded, level) => {
       label
     } = item;
     visibleItems.push({
-      label,
       flags,
-      isFocused: i === focusedIndex,
       isExpanded: i === focusedIndex && expanded,
-      level,
-      key: item.key
+      isFocused: i === focusedIndex,
+      key: item.key,
+      label,
+      level
     });
   }
   return visibleItems;
@@ -3273,50 +3301,50 @@ const getIcon = assetDir => {
 
 const getIconVirtualDom = (icon, type = Div) => {
   return {
-    type,
+    childCount: 0,
     className: `MaskIcon MaskIcon${icon}`,
     role: None$1,
-    childCount: 0
+    type
   };
 };
 
 const createTitleBarButton = button => {
   const {
-    id,
     icon,
+    id,
     label,
     onClick
   } = button;
   const dom = [{
-    type: Button$1,
-    className: `TitleBarButton TitleBarButton${id}`,
     ariaLabel: label,
     childCount: 1,
-    onClick
+    className: `TitleBarButton TitleBarButton${id}`,
+    onClick,
+    type: Button$1
   }, getIconVirtualDom(icon, I)];
   return dom;
 };
 
 const getTitleBarButtonsVirtualDom = buttons => {
   return [{
-    type: Div,
+    childCount: buttons.length,
     className: mergeClassNames(Viewlet, TitleBarButtons),
-    childCount: buttons.length
+    type: Div
   }, ...buttons.flatMap(createTitleBarButton)];
 };
 
 const parentNode$1 = {
-  type: Div,
+  childCount: 1,
   className: mergeClassNames(Viewlet, TitleBarIcon),
-  childCount: 1
+  type: Div
 };
 const getTitleBarIconVirtualDom = iconSrc => {
   return [parentNode$1, {
-    type: Img,
+    alt: '',
+    childCount: 0,
     className: TitleBarIconIcon,
     src: iconSrc,
-    alt: '',
-    childCount: 0
+    type: Img
   }];
 };
 
@@ -3335,21 +3363,22 @@ const HandleContextMenu = 11;
 const getItemVirtualDom = item => {
   // @ts-ignore
   const {
-    keyboardShortCut,
-    label,
+    isFocused,
     isOpen,
-    isFocused
+    keyboardShortCut,
+    label
   } = item;
   // TODO avoid mutation
   const dom = [{
-    type: Button$1,
-    className: TitleBarTopLevelEntry,
-    ariaHasPopup: true,
     ariaExpanded: isOpen,
-    role: MenuItem$1,
-    childCount: 1,
+    ariaHasPopup: true,
     ariaKeyShortcuts: keyboardShortCut,
-    name: label // TODO have separate name attribute
+    childCount: 1,
+    className: TitleBarTopLevelEntry,
+    name: label,
+    // TODO have separate name attribute
+    role: MenuItem$1,
+    type: Button$1
   }];
   if (isOpen) {
     // @ts-ignore
@@ -3360,9 +3389,9 @@ const getItemVirtualDom = item => {
     // @ts-ignore
     dom[0].id = 'TitleBarEntryActive';
     dom.push({
-      type: Div,
+      childCount: 1,
       className: TitleBarTopLevelEntryLabel,
-      childCount: 1
+      type: Div
     });
   }
   dom.push(text(label));
@@ -3376,24 +3405,24 @@ const getTitleBarMenuBarItemsVirtualDom = visibleItems => {
 const activeId = 'TitleBarEntryActive';
 const getTitleBarMenuBarVirtualDom = (visibleItems, focusedIndex) => {
   return [{
-    type: Div,
-    className: mergeClassNames(Viewlet, TitleBarMenuBar),
-    role: MenuBar,
-    tabIndex: 0,
+    ariaActivedescendant: focusedIndex === -1 ? '' : activeId,
     childCount: visibleItems.length,
-    onMouseDown: HandleClick,
-    onFocusOut: HandleFocusOut,
+    className: mergeClassNames(Viewlet, TitleBarMenuBar),
     onFocusIn: HandleFocusIn,
-    onPointerOver: HandlePointerOver,
+    onFocusOut: HandleFocusOut,
+    onMouseDown: HandleClick,
     onPointerOut: HandlePointerOut,
-    ariaActivedescendant: focusedIndex === -1 ? '' : activeId
+    onPointerOver: HandlePointerOver,
+    role: MenuBar,
+    tabIndex: 0,
+    type: Div
   }, ...getTitleBarMenuBarItemsVirtualDom(visibleItems)];
 };
 
 const parentNode = {
-  type: Div,
+  childCount: 1,
   className: 'TitleBarTitle',
-  childCount: 1
+  type: Div
 };
 const getTitleVirtualDom = title => {
   return [parentNode, text(title)];
@@ -3416,8 +3445,8 @@ const getVisibleTitleBarEntries = (entries, width, focusedIndex, isMenuOpen) =>
     const isFocused = i === focusedIndex;
     visible.push({
       ...entry,
-      isOpen,
-      isFocused
+      isFocused,
+      isOpen
     });
   }
   const hasOverflow = visible.length < entries.length;
@@ -3441,21 +3470,21 @@ const getVisibleTitleBarEntries = (entries, width, focusedIndex, isMenuOpen) =>
 
 const getTitleBarVirtualDom = state => {
   const {
-    titleBarEntries,
-    width,
+    assetDir,
     focusedIndex,
     isMenuOpen,
-    assetDir,
     title,
-    titleBarButtons
+    titleBarButtons,
+    titleBarEntries,
+    width
   } = state;
   const dom = [{
-    type: Div,
+    ariaLabel: 'Title Bar',
+    childCount: 4,
     className: 'Viewlet TitleBar',
     id: 'TitleBar',
     role: ContentInfo,
-    ariaLabel: 'Title Bar',
-    childCount: 4
+    type: Div
   }];
 
   // Add icon if enabled
@@ -3506,8 +3535,8 @@ const getRenderer3 = diffType => {
 
 const render3 = async (uid, diffResult) => {
   const {
-    oldState,
-    newState
+    newState,
+    oldState
   } = get$1(uid);
   set$3(uid, newState, newState);
   const commands = [];
@@ -3573,10 +3602,10 @@ const resize = async (state, dimensions) => {
   return {
     ...state,
     ...dimensions,
-    x: menuBarX,
-    y: menuBarY,
+    height: menuBarHeight,
     width: menuBarWidth,
-    height: menuBarHeight
+    x: menuBarX,
+    y: menuBarY
   };
 };
 
@@ -3604,22 +3633,22 @@ const showMenuBar = async state => {
 const create = (id, uri, x, y, width, height) => {
   const state = {
     ...createDefaultState(),
-    uid: id,
-    titleBarEntries: [],
     focusedIndex: -1,
+    height,
+    iconWidth: 30,
     isMenuOpen: false,
-    menus: [],
-    labelFontWeight: 400,
-    labelFontSize: 13,
     labelFontFamily: 'system-ui, Ubuntu, Droid Sans, sans-serif',
-    labelPadding: 8,
+    labelFontSize: 13,
+    labelFontWeight: 400,
     labelLetterSpacing: 0,
+    labelPadding: 8,
+    menus: [],
+    titleBarEntries: [],
     titleBarHeight: height,
-    x,
-    y,
+    uid: id,
     width,
-    height,
-    iconWidth: 30
+    x,
+    y
   };
   set$3(id, state, state);
   return state;
@@ -3635,9 +3664,9 @@ const closeMenu = (state, keepFocus) => {
   const newFocusedIndex = keepFocus ? focusedIndex : -1;
   return {
     ...state,
-    menus: [],
+    focusedIndex: newFocusedIndex,
     isMenuOpen: false,
-    focusedIndex: newFocusedIndex
+    menus: []
   };
 };
 
@@ -3673,8 +3702,8 @@ const focusLast = state => {
 
 const focusNext = state => {
   const {
-    titleBarEntries,
-    focusedIndex
+    focusedIndex,
+    titleBarEntries
   } = state;
   const indexToFocus = next(titleBarEntries, focusedIndex);
   return focusIndex(state, indexToFocus);
@@ -3682,8 +3711,8 @@ const focusNext = state => {
 
 const focusPrevious = state => {
   const {
-    titleBarEntries,
-    focusedIndex
+    focusedIndex,
+    titleBarEntries
   } = state;
   const indexToFocus = previous(titleBarEntries, focusedIndex);
   return focusIndex(state, indexToFocus);
@@ -3693,8 +3722,8 @@ const LeftClick = 0;
 
 const toggleIndex = async (state, index) => {
   const {
-    isMenuOpen,
-    focusedIndex
+    focusedIndex,
+    isMenuOpen
   } = state;
   if (isMenuOpen && focusedIndex === index) {
     return closeMenu(state, /* keepFocus */true);
@@ -3714,9 +3743,9 @@ const handleClick = async (state, button, index) => {
 
 const handleClickAt = async (state, button, eventX, eventY) => {
   const {
+    iconWidth,
     titleBarEntries,
-    x,
-    iconWidth
+    x
   } = state;
   const menuOffset = getMenuOffset(x, eventX, iconWidth);
   const index = getTitleBarIndexFromPosition(titleBarEntries, menuOffset);
@@ -3812,8 +3841,8 @@ const handleKeyArrowRightMenuOpen = async state => {
   // if menu can open sub menu to the right -> do that
   const menu = menus.at(-1);
   const {
-    items,
     focusedIndex,
+    items,
     x,
     y
   } = menu;
@@ -3824,11 +3853,11 @@ const handleKeyArrowRightMenuOpen = async state => {
   if (item.flags === SubMenu) {
     const subMenuEntries = await getMenuEntries(item.id);
     const subMenu = {
-      level: menus.length,
-      items: subMenuEntries,
       focusedIndex: 0,
-      y: y + focusedIndex * 25,
-      x: x + MENU_WIDTH
+      items: subMenuEntries,
+      level: menus.length,
+      x: x + MENU_WIDTH,
+      y: y + focusedIndex * 25
     };
     const newParentMenu = {
       ...menu,
@@ -3954,9 +3983,9 @@ const selectIndexNone = async (state, item) => {
   await executeMenuItemCommand(item);
   return {
     ...state,
-    menus: [],
+    focusedIndex: -1,
     isMenuOpen: false,
-    focusedIndex: -1
+    menus: []
   };
 };
 
@@ -3964,8 +3993,8 @@ const selectIndexRestoreFocus = async (state, item) => {
   await executeMenuItemCommand(item);
   return {
     ...state,
-    menus: [],
-    isMenuOpen: false
+    isMenuOpen: false,
+    menus: []
   };
 };
 
@@ -3975,16 +4004,16 @@ const selectIndexSubMenu = async (state, menu, index) => {
   } = state;
   const {
     items,
+    level,
     x,
-    y,
-    level
+    y
   } = menu;
   const item = items[index];
   const subMenuEntries = await getMenuEntries(item.id);
   const subMenu = {
-    level: menus.length,
-    items: subMenuEntries,
     focusedIndex: -1,
+    items: subMenuEntries,
+    level: menus.length,
     x: x + MENU_WIDTH,
     y: y + index * 25
   };
@@ -4009,14 +4038,14 @@ const handleMenuClick = async (state, level, index) => {
     return state;
   }
   switch (item.flags) {
+    case Ignore:
+      return selectIndexIgnore(state, item);
     case None:
       return selectIndexNone(state, item);
-    case SubMenu:
-      return selectIndexSubMenu(state, menu, index);
     case RestoreFocus:
       return selectIndexRestoreFocus(state, item);
-    case Ignore:
-      return selectIndexIgnore(state, item);
+    case SubMenu:
+      return selectIndexSubMenu(state, menu, index);
     default:
       return state;
   }
@@ -4031,10 +4060,10 @@ const handleMenuMouseOver = async (state, level, index) => {
   } = state;
   const menu = menus[level];
   const {
-    items,
     focusedIndex,
-    y,
-    x
+    items,
+    x,
+    y
   } = menu;
   const item = items[index];
   if (focusedIndex === index) {
@@ -4071,11 +4100,11 @@ const handleMenuMouseOver = async (state, level, index) => {
     const item = items[index];
     const subMenuEntries = await getMenuEntries(item.id);
     const subMenu = {
-      level: menus.length,
-      items: subMenuEntries,
       focusedIndex: -1,
-      y: y + index * 25,
-      x: x + MENU_WIDTH
+      items: subMenuEntries,
+      level: menus.length,
+      x: x + MENU_WIDTH,
+      y: y + index * 25
     };
     const newParentMenu = {
       ...menu,
@@ -4107,6 +4136,7 @@ const toggleMenu = async state => {
   return openMenu(state, /* focus */false);
 };
 
+/* eslint-disable @typescript-eslint/no-deprecated */
 const commandMap = {
   'TitleBar.closeMenu': closeMenu,
   'TitleBar.create': create,