Bikeshed some types

src/commandline_frame.ts

@@ -52,7 +52,7 @@ import * as genericParser from "@src/parsers/genericmode"
 import * as perf from "@src/perf"
 import state, * as State from "@src/state"
 import * as R from "ramda"
-import { MinimalKey, minimalKeyFromKeyboardEvent } from "@src/lib/keyseq"
+import { MinimalKey, minimalKeyFromKeyboardEventLike } from "@src/lib/keyseq"
 import { TabGroupCompletionSource } from "@src/completions/TabGroup"
 
 /** @hidden **/
@@ -186,7 +186,9 @@ commandline_state.clInput.addEventListener(
     "keydown",
     function (keyevent: KeyboardEvent) {
         if (!keyevent.isTrusted) return
-        commandline_state.keyEvents.push(minimalKeyFromKeyboardEvent(keyevent))
+        commandline_state.keyEvents.push(
+            minimalKeyFromKeyboardEventLike(keyevent),
+        )
         const response = keyParser(commandline_state.keyEvents)
         if (response.isMatch) {
             keyevent.preventDefault()

src/content/controller_content.ts

@@ -5,7 +5,7 @@ import * as controller from "@src/lib/controller"
 import {
     KeyEventLike,
     ParserResponse,
-    minimalKeyFromKeyboardEvent,
+    minimalKeyFromKeyboardEventLike,
     MinimalKey,
 } from "@src/lib/keyseq"
 import { deepestShadowRoot } from "@src/lib/dom"
@@ -138,7 +138,7 @@ function* ParserController() {
                     // binding, so it can't grow indefinitely unless you
                     // have a combination of maps that permits bindings of
                     // unbounded length.
-                    keyEvents.push(minimalKeyFromKeyboardEvent(keyevent))
+                    keyEvents.push(minimalKeyFromKeyboardEventLike(keyevent))
                 } else {
                     keyEvents.push(keyevent)
                 }

src/lib/keyseq.ts

@@ -480,11 +480,9 @@ export function translateKeysUsingKeyTranslateMap(
         // almost certainly mean oscillations and other super-weird
         // breakage.
         if (!keyEvent.translated && newkey !== undefined) {
-            keyEvents[index] = new MinimalKey(newkey, {
-                altKey: keyEvent.altKey,
-                ctrlKey: keyEvent.ctrlKey,
-                metaKey: keyEvent.metaKey,
-                shiftKey: keyEvent.shiftKey,
+            keyEvents[index] = minimalKeyFromKeyboardEventLike({
+                ...keyEvent,
+                key: newkey,
             })
             keyEvents[index].translated = true
         }
@@ -495,9 +493,13 @@ export function translateKeysUsingKeyTranslateMap(
  * for further use. Key is obtained through layout-independent
  * code if config says so.
  */
-export function minimalKeyFromKeyboardEvent(
-    keyEvent: KeyboardEvent,
-): MinimalKey {
+export function minimalKeyFromKeyboardEventLike(keyEvent: {
+    key: string
+    altKey: boolean
+    ctrlKey: boolean
+    metaKey: boolean
+    shiftKey: boolean
+}): MinimalKey {
     return new MinimalKey(keyEvent.key, {
         altKey: keyEvent.altKey,
         ctrlKey: keyEvent.ctrlKey,