@lvce-editor/static-server 0.45.4 → 0.45.6

package/static/{7884c64 → 4dd4fcf}/packages/keybindings-view-worker/dist/keyBindingsViewWorkerMain.js

@@ -89,27 +89,6 @@ const number = value => {
   }
 };
 
-const walkValue = (value, transferrables, isTransferrable) => {
-  if (!value) {
-    return;
-  }
-  if (isTransferrable(value)) {
-    transferrables.push(value);
-    return;
-  }
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      walkValue(item, transferrables, isTransferrable);
-    }
-    return;
-  }
-  if (typeof value === 'object') {
-    for (const property of Object.values(value)) {
-      walkValue(property, transferrables, isTransferrable);
-    }
-    return;
-  }
-};
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
 };
@@ -134,6 +113,27 @@ const isTransferrable = value => {
   }
   return false;
 };
+const walkValue = (value, transferrables, isTransferrable) => {
+  if (!value) {
+    return;
+  }
+  if (isTransferrable(value)) {
+    transferrables.push(value);
+    return;
+  }
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      walkValue(item, transferrables, isTransferrable);
+    }
+    return;
+  }
+  if (typeof value === 'object') {
+    for (const property of Object.values(value)) {
+      walkValue(property, transferrables, isTransferrable);
+    }
+    return;
+  }
+};
 const getTransferrables = value => {
   const transferrables = [];
   walkValue(value, transferrables, isTransferrable);
@@ -166,30 +166,35 @@ const NewLine$1 = '\n';
 const joinLines$1 = lines => {
   return lines.join(NewLine$1);
 };
-const splitLines$1 = lines => {
-  return lines.split(NewLine$1);
-};
-const isModuleNotFoundMessage = line => {
-  return line.includes('[ERR_MODULE_NOT_FOUND]');
+const RE_AT = /^\s+at/;
+const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/;
+const isNormalStackLine = line => {
+  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line);
 };
-const getModuleNotFoundError = stderr => {
-  const lines = splitLines$1(stderr);
-  const messageIndex = lines.findIndex(isModuleNotFoundMessage);
-  const message = lines[messageIndex];
+const getDetails = lines => {
+  const index = lines.findIndex(isNormalStackLine);
+  if (index === -1) {
+    return {
+      actualMessage: joinLines$1(lines),
+      rest: []
+    };
+  }
+  let lastIndex = index - 1;
+  while (++lastIndex < lines.length) {
+    if (!isNormalStackLine(lines[lastIndex])) {
+      break;
+    }
+  }
   return {
-    message,
-    code: ERR_MODULE_NOT_FOUND
+    actualMessage: lines[index - 1],
+    rest: lines.slice(index, lastIndex)
   };
 };
-const RE_NATIVE_MODULE_ERROR = /^innerError Error: Cannot find module '.*.node'/;
-const RE_NATIVE_MODULE_ERROR_2 = /was compiled against a different Node.js version/;
+const splitLines$1 = lines => {
+  return lines.split(NewLine$1);
+};
 const RE_MESSAGE_CODE_BLOCK_START = /^Error: The module '.*'$/;
 const RE_MESSAGE_CODE_BLOCK_END = /^\s* at/;
-const RE_AT = /^\s+at/;
-const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/;
-const isUnhelpfulNativeModuleError = stderr => {
-  return RE_NATIVE_MODULE_ERROR.test(stderr) && RE_NATIVE_MODULE_ERROR_2.test(stderr);
-};
 const isMessageCodeBlockStartIndex = line => {
   return RE_MESSAGE_CODE_BLOCK_START.test(line);
 };
@@ -204,51 +209,46 @@ const getMessageCodeBlock = stderr => {
   const relevantMessage = relevantLines.join(' ').slice('Error: '.length);
   return relevantMessage;
 };
-const getNativeModuleErrorMessage = stderr => {
-  const message = getMessageCodeBlock(stderr);
+const isModuleNotFoundMessage = line => {
+  return line.includes('[ERR_MODULE_NOT_FOUND]');
+};
+const getModuleNotFoundError = stderr => {
+  const lines = splitLines$1(stderr);
+  const messageIndex = lines.findIndex(isModuleNotFoundMessage);
+  const message = lines[messageIndex];
   return {
-    message: `Incompatible native node module: ${message}`,
-    code: E_INCOMPATIBLE_NATIVE_MODULE
+    message,
+    code: ERR_MODULE_NOT_FOUND
   };
 };
-const isModulesSyntaxError = stderr => {
+const isModuleNotFoundError = stderr => {
   if (!stderr) {
     return false;
   }
-  return stderr.includes('SyntaxError: Cannot use import statement outside a module');
-};
-const getModuleSyntaxError = () => {
-  return {
-    message: `ES Modules are not supported in electron`,
-    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
-  };
+  return stderr.includes('ERR_MODULE_NOT_FOUND');
 };
-const isModuleNotFoundError = stderr => {
+const isModulesSyntaxError = stderr => {
   if (!stderr) {
     return false;
   }
-  return stderr.includes('ERR_MODULE_NOT_FOUND');
+  return stderr.includes('SyntaxError: Cannot use import statement outside a module');
 };
-const isNormalStackLine = line => {
-  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line);
+const RE_NATIVE_MODULE_ERROR = /^innerError Error: Cannot find module '.*.node'/;
+const RE_NATIVE_MODULE_ERROR_2 = /was compiled against a different Node.js version/;
+const isUnhelpfulNativeModuleError = stderr => {
+  return RE_NATIVE_MODULE_ERROR.test(stderr) && RE_NATIVE_MODULE_ERROR_2.test(stderr);
 };
-const getDetails = lines => {
-  const index = lines.findIndex(isNormalStackLine);
-  if (index === -1) {
-    return {
-      actualMessage: joinLines$1(lines),
-      rest: []
-    };
-  }
-  let lastIndex = index - 1;
-  while (++lastIndex < lines.length) {
-    if (!isNormalStackLine(lines[lastIndex])) {
-      break;
-    }
-  }
+const getNativeModuleErrorMessage = stderr => {
+  const message = getMessageCodeBlock(stderr);
   return {
-    actualMessage: lines[index - 1],
-    rest: lines.slice(index, lastIndex)
+    message: `Incompatible native node module: ${message}`,
+    code: E_INCOMPATIBLE_NATIVE_MODULE
+  };
+};
+const getModuleSyntaxError = () => {
+  return {
+    message: `ES Modules are not supported in electron`,
+    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
   };
 };
 const getHelpfulChildProcessError = (stdout, stderr) => {
@@ -267,7 +267,7 @@ const getHelpfulChildProcessError = (stdout, stderr) => {
     rest
   } = getDetails(lines);
   return {
-    message: `${actualMessage}`,
+    message: actualMessage,
     code: '',
     stack: rest
   };
@@ -309,7 +309,7 @@ const listen$7 = () => {
   }
   return globalThis;
 };
-const signal$7 = global => {
+const signal$8 = global => {
   global.postMessage(readyMessage);
 };
 class IpcChildWithModuleWorker extends Ipc {
@@ -335,7 +335,7 @@ class IpcChildWithModuleWorker extends Ipc {
     this._rawIpc.addEventListener('message', callback);
   }
 }
-const wrap$e = global => {
+const wrap$f = global => {
   return new IpcChildWithModuleWorker(global);
 };
 const withResolvers = () => {
@@ -344,6 +344,7 @@ const withResolvers = () => {
     _resolve = resolve;
   });
   return {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     resolve: _resolve,
     promise
   };
@@ -362,8 +363,8 @@ const waitForFirstMessage = async port => {
 };
 const listen$6 = async () => {
   const parentIpcRaw = listen$7();
-  signal$7(parentIpcRaw);
-  const parentIpc = wrap$e(parentIpcRaw);
+  signal$8(parentIpcRaw);
+  const parentIpc = wrap$f(parentIpcRaw);
   const firstMessage = await waitForFirstMessage(parentIpc);
   if (firstMessage.method !== 'initialize') {
     throw new IpcError('unexpected first message');
@@ -382,9 +383,6 @@ const listen$6 = async () => {
   return globalThis;
 };
 class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
-  constructor(port) {
-    super(port);
-  }
   getData(event) {
     return getData$2(event);
   }
@@ -408,13 +406,13 @@ class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
     this._rawIpc.start();
   }
 }
-const wrap$d = port => {
+const wrap$e = port => {
   return new IpcChildWithModuleWorkerAndMessagePort(port);
 };
 const IpcChildWithModuleWorkerAndMessagePort$1 = {
   __proto__: null,
   listen: listen$6,
-  wrap: wrap$d
+  wrap: wrap$e
 };
 
 const Two = '2.0';
@@ -426,10 +424,10 @@ const create$4 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set = (id, fn) => {
+const set$2 = (id, fn) => {
   callbacks[id] = fn;
 };
-const get = id => {
+const get$2 = id => {
   return callbacks[id];
 };
 const remove = id => {
@@ -439,32 +437,19 @@ let id = 0;
 const create$3 = () => {
   return ++id;
 };
-const warn = (...args) => {
-  console.warn(...args);
-};
 const registerPromise = () => {
   const id = create$3();
   const {
     resolve,
     promise
   } = Promise.withResolvers();
-  set(id, resolve);
+  set$2(id, resolve);
   return {
     id,
     promise
   };
 };
-const resolve = (id, response) => {
-  const fn = get(id);
-  if (!fn) {
-    console.log(response);
-    warn(`callback ${id} may already be disposed`);
-    return;
-  }
-  fn(response);
-  remove(id);
-};
-const create$2 = (method, params) => {
+const create$2$1 = (method, params) => {
   const {
     id,
     promise
@@ -611,6 +596,19 @@ const unwrapJsonRpcResult = responseMessage => {
   }
   throw new JsonRpcError('unexpected response message');
 };
+const warn = (...args) => {
+  console.warn(...args);
+};
+const resolve = (id, response) => {
+  const fn = get$2(id);
+  if (!fn) {
+    console.log(response);
+    warn(`callback ${id} may already be disposed`);
+    return;
+  }
+  fn(response);
+  remove(id);
+};
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
   if (prettyError && prettyError.type) {
@@ -641,7 +639,7 @@ const getErrorProperty = (error, prettyError) => {
     }
   };
 };
-const create$1 = (message, error) => {
+const create$1$1 = (message, error) => {
   return {
     jsonrpc: Two,
     id: message.id,
@@ -652,7 +650,7 @@ const getErrorResponse = (message, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
-  return create$1(message, errorProperty);
+  return create$1$1(message, errorProperty);
 };
 const create$5 = (message, result) => {
   return {
@@ -743,7 +741,7 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   const {
     message,
     promise
-  } = create$2(method, params);
+  } = create$2$1(method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -780,6 +778,8 @@ const execute = (command, ...args) => {
 
 const createRpc = ipc => {
   const rpc = {
+    // @ts-ignore
+    ipc,
     /**
      * @deprecated
      */
@@ -806,7 +806,8 @@ const logError = () => {
 };
 const handleMessage = event => {
   const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
-  return handleJsonRpcMessage(event.target, event.data, execute, resolve, preparePrettyError, logError, actualRequiresSocket);
+  const actualExecute = event?.target?.execute || execute;
+  return handleJsonRpcMessage(event.target, event.data, actualExecute, resolve, preparePrettyError, logError, actualRequiresSocket);
 };
 const handleIpc = ipc => {
   if ('addEventListener' in ipc) {
@@ -824,7 +825,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create = async ({
+const create$2 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -836,7 +837,60 @@ const create = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create
+  create: create$2
+};
+
+const create$1 = () => {
+  const states = Object.create(null);
+  return {
+    get(uid) {
+      return states[uid];
+    },
+    set(uid, oldState, newState) {
+      states[uid] = {
+        oldState,
+        newState
+      };
+    }
+  };
+};
+
+const {
+  get: get$1,
+  set: set$1
+} = create$1();
+
+// TODO uri and platform might not be needed
+const create = (uid, uri, x, y, width, height, platform) => {
+  const state = {
+    parsedKeyBindings: [],
+    filteredKeyBindings: [],
+    minLineY: 0,
+    maxLineY: 0,
+    maxVisibleItems: 0,
+    rowHeight: 24,
+    x,
+    y,
+    width,
+    height,
+    value: '',
+    selectedIndex: -1,
+    focusedIndex: -1,
+    finalDeltaY: 0,
+    deltaY: 0,
+    uri,
+    columnWidth1: 0,
+    columnWidth2: 0,
+    columnWidth3: 0,
+    contentPadding: 30,
+    resizerDownId: 0,
+    defineKeyBindingsId: -1,
+    editIconSize: 22,
+    padding: 15,
+    searchHeaderHeight: 50,
+    tableHeaderHeight: 24
+  };
+  set$1(uid, state, state);
 };
 
 const Diagonal = 1;
@@ -1233,6 +1287,15 @@ const When = 'When';
 const Key = 'Key';
 const TypeToSearchKeyBindings = 'Type to search in keybindings';
 const ResultsWillUpdateAsYouType = 'Results will update as you type';
+const Copy = 'Copy';
+const CopyCommandId = 'Copy Command ID';
+const CopyCommandTitle = 'Copy Command Title';
+const ChangeKeyBinding = 'Change Keybinding...';
+const AddKeyBinding = 'Add Keybinding...';
+const RemoveKeyBinding = 'Remove Keybinding...';
+const ResetKeyBinding = 'Reset Keybinding';
+const ChangeWhenExpression = 'Change When Expression';
+const ShowSameKeyBindings = 'Show Same Keybindings';
 
 const keyBindings = () => {
   return i18nString(KeyBindings);
@@ -1252,6 +1315,33 @@ const typeToSearchKeyBindings = () => {
 const resultsWillUpdateAsYouType = () => {
   return i18nString(ResultsWillUpdateAsYouType);
 };
+const copy = () => {
+  return i18nString(Copy);
+};
+const copyCommandId = () => {
+  return i18nString(CopyCommandId);
+};
+const copyCommandTitle = () => {
+  return i18nString(CopyCommandTitle);
+};
+const changeKeyBinding = () => {
+  return i18nString(ChangeKeyBinding);
+};
+const addKeyBinding = () => {
+  return i18nString(AddKeyBinding);
+};
+const removeKeyBinding = () => {
+  return i18nString(RemoveKeyBinding);
+};
+const resetKeyBinding = () => {
+  return i18nString(ResetKeyBinding);
+};
+const changeWhenExpression = () => {
+  return i18nString(ChangeWhenExpression);
+};
+const showSameKeyBindings = () => {
+  return i18nString(ShowSameKeyBindings);
+};
 
 const Button = 1;
 const Col = 2;
@@ -1350,13 +1440,13 @@ const getKeyBindingsTableCellCommandDom = keyBinding => {
   return dom;
 };
 
-const None = 'none';
+const None$1 = 'none';
 
 const getIconVirtualDom = (icon, type = Div) => {
   return {
     type,
     className: `MaskIcon MaskIcon${icon}`,
-    role: None,
+    role: None$1,
     childCount: 0
   };
 };
@@ -1572,17 +1662,74 @@ const getKeyBindingsVirtualDom = (filteredKeyBindings, displayKeyBindings, colum
   }, ...getKeyBindingsHeaderVirtualDom(), ...getKeyBindingsTableWrapperVirtualDom(filteredKeyBindings, displayKeyBindings, columnWidth1, columnWidth2, columnWidth3, scrollBarThumbHeight, scrollBarThumbTop)];
 };
 
-const state = {
-  rpc: undefined
+const KeyBindingsTable = 26;
+
+const None = 0;
+
+const getMenuEntries = () => {
+  return [{
+    id: 'copy',
+    label: copy(),
+    flags: None,
+    command: 'KeyBindings.copy'
+  }, {
+    id: 'copyCommandId',
+    label: copyCommandId(),
+    flags: None,
+    command: 'KeyBindings.copyCommandId'
+  }, {
+    id: 'copyCommandTitle',
+    label: copyCommandTitle(),
+    flags: None,
+    command: 'KeyBindings.copyCommandTitle'
+  }, {
+    id: 'changeKeyBinding',
+    label: changeKeyBinding(),
+    flags: None,
+    command: 'KeyBindings.changeKeyBinding'
+  }, {
+    id: 'addKeyBinding',
+    label: addKeyBinding(),
+    flags: None,
+    command: 'KeyBindings.addKeyBinding'
+  }, {
+    id: 'removeKeyBinding',
+    label: removeKeyBinding(),
+    flags: None,
+    command: 'KeyBindings.removeKeyBinding'
+  }, {
+    id: 'resetKeyBinding',
+    label: resetKeyBinding(),
+    flags: None,
+    command: 'KeyBindings.resetKeyBinding'
+  }, {
+    id: 'changeWhenExpression',
+    label: changeWhenExpression(),
+    flags: None,
+    command: 'KeyBindings.changeWhenExpression'
+  }, {
+    id: 'showSameKeyBindings',
+    label: showSameKeyBindings(),
+    flags: None,
+    command: 'KeyBindings.showSameKeyBindings'
+  }];
 };
+
+const RendererWorker = 1;
+
+const rpcs = Object.create(null);
+const set = (id, rpc) => {
+  rpcs[id] = rpc;
+};
+const get = id => {
+  return rpcs[id];
+};
+
 const invoke = (method, ...params) => {
-  const rpc = state.rpc;
+  const rpc = get(RendererWorker);
   // @ts-ignore
   return rpc.invoke(method, ...params);
 };
-const setRpc = rpc => {
-  state.rpc = rpc;
-};
 
 const setFocus = focusKey => {
   return invoke('Focus.setFocus', focusKey);
@@ -1632,8 +1779,6 @@ const show = async (x, y, id, ...args) => {
   await invoke('ContextMenu.show', x, y, id, ...args);
 };
 
-const KeyBindingsTable = 26;
-
 const handleContextMenu = async (state, button, x, y) => {
   await show(x, y, KeyBindingsTable);
   return state;
@@ -1641,6 +1786,7 @@ const handleContextMenu = async (state, button, x, y) => {
 
 const handleDoubleClick = async (state, eventX, eventY) => {
   const selectedIndex = getIndex(state, eventX, eventY);
+  await showDefineKeyBinding();
   // TODO wait promise?
   // showDefineWidget(state, selectedIndex)
   return {
@@ -1666,6 +1812,13 @@ const handleInput = (state, value) => {
   };
 };
 
+const handleResizerClick = (state, id, x) => {
+  return {
+    ...state,
+    resizerDownId: id
+  };
+};
+
 const handleResizerMove = (state, eventX) => {
   const {
     resizerDownId,
@@ -1694,12 +1847,40 @@ const handleResizerMove = (state, eventX) => {
   };
 };
 
+const setDeltaY = (state, deltaY) => {
+  const {
+    maxVisibleItems,
+    rowHeight,
+    filteredKeyBindings
+  } = state;
+  const tableHeight = maxVisibleItems * rowHeight;
+  const minDeltaY = 0;
+  const maxDeltaY = Math.max(filteredKeyBindings.length * rowHeight - tableHeight, 0);
+  if (deltaY < minDeltaY) {
+    deltaY = minDeltaY;
+  } else if (deltaY > maxDeltaY) {
+    deltaY = Math.max(maxDeltaY);
+  }
+  const minLineY = Math.floor(deltaY / rowHeight);
+  const maxLineY = minLineY + Math.round(tableHeight / rowHeight);
+  return {
+    ...state,
+    deltaY,
+    minLineY,
+    maxLineY
+  };
+};
+
+const handleWheel = (state, deltaMode, deltaY) => {
+  return setDeltaY(state, state.deltaY + deltaY);
+};
+
 const getMaxVisibleItems = (height, searchHeaderHeight, tableHeaderHeight, rowHeight) => {
   return Math.floor((height - searchHeaderHeight - tableHeaderHeight) / rowHeight);
 };
 
 const getSavedValue = savedState => {
-  if (savedState && savedState.value) {
+  if (savedState && typeof savedState === 'object' && 'value' in savedState && typeof savedState.value === 'string') {
     return savedState.value;
   }
   return '';
@@ -1709,13 +1890,6 @@ const getKeyBindings = () => {
   return invoke('KeyBindingsInitial.getKeyBindings');
 };
 
-const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
-  if (size >= contentSize) {
-    return 0;
-  }
-  return Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize);
-};
-
 const Unknown = 'Unknown';
 const Backspace = 'Backspace';
 const Tab = 'Tab';
@@ -1924,7 +2098,7 @@ const parseKey = rawKey => {
   number(rawKey);
   const isCtrl = Boolean(rawKey & CtrlCmd);
   const isShift = Boolean(rawKey & Shift);
-  const keyCode = rawKey & 0x000000ff;
+  const keyCode = rawKey & 0x00_00_00_FF;
   const key = getKeyCodeString(keyCode);
   return {
     key,
@@ -1945,6 +2119,13 @@ const parseKeyBindings = keyBindings => {
   return keyBindings.map(parseKeyBinding);
 };
 
+const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
+  if (size >= contentSize) {
+    return 0;
+  }
+  return Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize);
+};
+
 const loadContent = async (state, savedState) => {
   const {
     height,
@@ -2071,6 +2252,14 @@ const getRenderCommands = (oldState, newState) => {
   return commands;
 };
 
+const render2 = uid => {
+  const {
+    oldState,
+    newState
+  } = get$1(uid);
+  return getRenderCommands(oldState, newState);
+};
+
 const saveState = state => {
   const {
     value
@@ -2080,60 +2269,57 @@ const saveState = state => {
   };
 };
 
-const setDeltaY = (state, deltaY) => {
-  const {
-    maxVisibleItems,
-    rowHeight,
-    filteredKeyBindings
-  } = state;
-  const tableHeight = maxVisibleItems * rowHeight;
-  const minDeltaY = 0;
-  const maxDeltaY = Math.max(filteredKeyBindings.length * rowHeight - tableHeight, 0);
-  if (deltaY < minDeltaY) {
-    deltaY = minDeltaY;
-  } else if (deltaY > maxDeltaY) {
-    deltaY = Math.max(maxDeltaY);
-  }
-  const minLineY = Math.floor(deltaY / rowHeight);
-  const maxLineY = minLineY + Math.round(tableHeight / rowHeight);
-  return {
-    ...state,
-    deltaY,
-    minLineY,
-    maxLineY
+const wrapCommand = fn => {
+  const wrapped = async (uid, ...args) => {
+    if (typeof uid === 'number') {
+      const {
+        newState
+      } = get$1(uid);
+      const newerState = await fn(newState, ...args);
+      set$1(uid, newState, newerState);
+    } else {
+      // deprecated
+      const newerState = await fn(uid, ...args);
+      return newerState;
+    }
   };
+  return wrapped;
 };
 
 const commandMap = {
-  // deprecated
-  'FilterKeyBindings.filterKeyBindings': getFilteredKeyBindings,
-  'GetKeyBindingsVirtualDom.getKeyBindingsVirtualDom': getKeyBindingsVirtualDom,
-  'ParseKeyBindings.parseKeyBindings': parseKeyBindings,
-  // new
-  'KeyBindings.filter': getFilteredKeyBindings,
-  'KeyBindings.focusFirst': focusFirst,
-  'KeyBindings.focusLast': focusLast,
-  'KeyBindings.focusNext': focusNext,
-  'KeyBindings.focusPrevious': focusPrevious,
+  'KeyBindings.create': create,
+  'KeyBindings.focusFirst': wrapCommand(focusFirst),
+  'KeyBindings.focusLast': wrapCommand(focusLast),
+  'KeyBindings.focusNext': wrapCommand(focusNext),
+  'KeyBindings.focusPrevious': wrapCommand(focusPrevious),
   'KeyBindings.getDom': getKeyBindingsVirtualDom,
   'KeyBindings.getKeyBindings': getKeyBindings$1,
+  'KeyBindings.getMenuEntries': getMenuEntries,
   'KeyBindings.handleClick': handleClick,
-  'KeyBindings.handleContextMenu': handleContextMenu,
-  'KeyBindings.handleDoubleClick': handleDoubleClick,
-  'KeyBindings.handleInput': handleInput,
+  'KeyBindings.handleContextMenu': wrapCommand(handleContextMenu),
+  'KeyBindings.handleDoubleClick': wrapCommand(handleDoubleClick),
+  'KeyBindings.handleInput': wrapCommand(handleInput),
+  'KeyBindings.handleResizerClick': wrapCommand(handleResizerClick),
   'KeyBindings.handleResizerMove': handleResizerMove,
-  'KeyBindings.loadContent': loadContent,
-  'KeyBindings.parse': parseKeyBindings,
+  'KeyBindings.handleWheel': wrapCommand(handleWheel),
+  'KeyBindings.loadContent': wrapCommand(loadContent),
   'KeyBindings.render': getRenderCommands,
+  'KeyBindings.render2': render2,
   'KeyBindings.saveState': saveState,
-  'KeyBindings.setDeltaY': setDeltaY
+  'KeyBindings.setDeltaY': wrapCommand(setDeltaY),
+  // deprecated
+  'KeyBindings.filter': getFilteredKeyBindings,
+  'KeyBindings.parse': parseKeyBindings,
+  'FilterKeyBindings.filterKeyBindings': getFilteredKeyBindings,
+  'GetKeyBindingsVirtualDom.getKeyBindingsVirtualDom': getKeyBindingsVirtualDom,
+  'ParseKeyBindings.parseKeyBindings': parseKeyBindings
 };
 
 const listen = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
-  setRpc(rpc);
+  set(RendererWorker, rpc);
 };
 
 const main = async () => {