@guidepup/guidepup - npm Package Compare versions

Comparing version 0.10.2 to 0.11.0

lib/CommandOptions.d.ts

 export interface CommandOptions {
+    /**
+     * How long to wait until the command times out in ms.
+     */
     timeout?: number;
+    /**
+     * Number of times to retry.
+     */
     retries?: number;
 }

lib/constants.d.ts

@@ -6,3 +6,5 @@ export declare const DEFAULT_RETRY_COUNT = 3;
 export declare const DEFAULT_MAX_BUFFER: number;
+export declare const DEFAULT_CLICK_BUTTON = "left";
+export declare const DEFAULT_CLICK_COUNT = 1;
 export declare const ERR_WAITING_TIMEOUT = "Timed out waiting.";
-export declare const APPLE_SCRIPT_TIMED_OUT_ERR_SNIPPET = "AppleEvent timed out";
+export declare const ERR_APPLE_SCRIPT_TIMED_OUT = "AppleEvent timed out";

lib/constants.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.APPLE_SCRIPT_TIMED_OUT_ERR_SNIPPET = exports.ERR_WAITING_TIMEOUT = exports.DEFAULT_MAX_BUFFER = exports.DEFAULT_TIMEOUT = exports.DEFAULT_POLL_INTERVAL = exports.DEFAULT_MUTATING_ACTION_RETRY_COUNT = exports.DEFAULT_RETRY_COUNT = void 0;
+exports.ERR_APPLE_SCRIPT_TIMED_OUT = exports.ERR_WAITING_TIMEOUT = exports.DEFAULT_CLICK_COUNT = exports.DEFAULT_CLICK_BUTTON = exports.DEFAULT_MAX_BUFFER = exports.DEFAULT_TIMEOUT = exports.DEFAULT_POLL_INTERVAL = exports.DEFAULT_MUTATING_ACTION_RETRY_COUNT = exports.DEFAULT_RETRY_COUNT = void 0;
 exports.DEFAULT_RETRY_COUNT = 3;
@@ -9,3 +9,5 @@ exports.DEFAULT_MUTATING_ACTION_RETRY_COUNT = 1;
 exports.DEFAULT_MAX_BUFFER = 1000 * 1000 * 100;
+exports.DEFAULT_CLICK_BUTTON = "left";
+exports.DEFAULT_CLICK_COUNT = 1;
 exports.ERR_WAITING_TIMEOUT = "Timed out waiting.";
-exports.APPLE_SCRIPT_TIMED_OUT_ERR_SNIPPET = "AppleEvent timed out";
+exports.ERR_APPLE_SCRIPT_TIMED_OUT = "AppleEvent timed out";

lib/index.d.ts

 export * from "./macOS";
 export * from "./windows";
+export type { ClickOptions } from "./ClickOptions";
 export type { CommandOptions } from "./CommandOptions";
+export type { KeyboardCommand } from "./KeyboardCommand";
+export type { KeyboardOptions } from "./KeyboardOptions";
 export type { KeyCodeCommand } from "./KeyCodeCommand";
 export type { KeystrokeCommand } from "./KeystrokeCommand";
-export type { ScreenReader } from "./ScreenReader";
+export type { ScreenReader, ScreenReaderInstance } from "./ScreenReader";
+export type { ScreenReaderCaption } from "./ScreenReaderCaption";
+export type { ScreenReaderCursor } from "./ScreenReaderCursor";
+export type { ScreenReaderKeyboard } from "./ScreenReaderKeyboard";
+export type { ScreenReaderMouse } from "./ScreenReaderMouse";

lib/macOS/activate.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.activate = void 0;
+const errors_1 = require("./errors");
 const retryIfAppleEventTimeout_1 = require("./retryIfAppleEventTimeout");
 const runAppleScript_1 = require("./runAppleScript");
 const withTransaction_1 = require("./withTransaction");
-const errors_1 = require("./errors");
 async function activate(applicationName, options) {
@@ -9,0 +9,0 @@ const script = `tell application "${applicationName}"\n${(0, withTransaction_1.withTransaction)("activate")}\nend tell`;

lib/macOS/Applications.d.ts

@@ -5,43 +5,43 @@ /**
 export declare enum Applications {
-    APPLESCRIPT_UTILITY = "AppleScript Utility",
-    AUTOMATOR_APPLICATION_STUB = "Automator Application Stub",
-    AUTOMATOR = "Automator",
-    BLUETOOTH_FILE_EXCHANGE = "Bluetooth File Exchange",
-    CALENDAR = "Calendar",
-    CONSOLE = "Console",
-    CONTACTS = "Contacts",
-    DATABASE_EVENTS = "Database Events",
-    DIGITAL_HUB_SCRIPTING = "Digital Hub Scripting",
-    FINDER = "Finder",
-    FOLDER_ACTIONS_SETUP = "Folder Actions Setup",
-    FOLDER_ACTIONS_DISPATCHER = "FolderActionsDispatcher",
-    FONT_BOOK = "Font Book",
-    GARAGE_BAND = "GarageBand",
-    IMAGE_EVENTS = "Image Events",
-    IMOVIE = "iMovie",
-    KEYBOARD_ACCESS_AGENT = "KeyboardAccessAgent",
-    KEYNOTE = "Keynote",
-    MAIL = "Mail",
-    MESSAGES = "Messages",
-    MUSIC = "Music",
-    NOTES = "Notes",
-    NUMBERS = "Numbers",
-    PAGES = "Pages",
-    PHOTO_LIBRARY_MIGRATION_UTILITY = "Photo Library Migration Utility",
-    PHOTOS = "Photos",
-    PREVIEW = "Preview",
-    QUICK_TIME_PLAYER = "QuickTime Player",
-    REMINDERS = "Reminders",
-    SAFARI = "Safari",
-    SCREEN_SHARING = "Screen Sharing",
-    SCRIPT_EDITOR = "Script Editor",
-    SHORTCUTS_EVENTS = "Shortcuts Events",
-    SHORTCUTS = "Shortcuts",
-    SYSTEM_EVENTS = "System Events",
-    SYSTEM_INFORMATION = "System Information",
-    SYSTEM_PREFERENCES = "System Preferences",
-    TERMINAL = "Terminal",
-    TEXT_EDIT = "Text Edit",
-    TV = "TV",
-    VOICE_OVER = "VoiceOver"
+    AppleScriptUtility = "AppleScript Utility",
+    AutomatorApplicationStub = "Automator Application Stub",
+    Automator = "Automator",
+    BluetoothFileExchange = "Bluetooth File Exchange",
+    Calendar = "Calendar",
+    Console = "Console",
+    Contacts = "Contacts",
+    DatabaseEvents = "Database Events",
+    DigitalHubScripting = "Digital Hub Scripting",
+    Finder = "Finder",
+    FolderActionsSetup = "Folder Actions Setup",
+    FolderActionsDispatcher = "FolderActionsDispatcher",
+    FontBook = "Font Book",
+    GarageBand = "GarageBand",
+    ImageEvents = "Image Events",
+    IMovie = "iMovie",
+    KeyboardAccessAgent = "KeyboardAccessAgent",
+    Keynote = "Keynote",
+    Mail = "Mail",
+    Messages = "Messages",
+    Music = "Music",
+    Notes = "Notes",
+    Numbers = "Numbers",
+    Pages = "Pages",
+    PhotoLibraryMigrationUtility = "Photo Library Migration Utility",
+    Photos = "Photos",
+    Preview = "Preview",
+    QuickTimePlayer = "QuickTime Player",
+    Reminders = "Reminders",
+    Safari = "Safari",
+    ScreenSharing = "Screen Sharing",
+    ScriptEditor = "Script Editor",
+    ShortcutEvents = "Shortcuts Events",
+    Shortcuts = "Shortcuts",
+    SystemEvents = "System Events",
+    SystemInformation = "System Information",
+    SystemPreferences = "System Preferences",
+    Terminal = "Terminal",
+    textEdit = "Text Edit",
+    Tv = "TV",
+    VoiceOver = "VoiceOver"
 }

lib/macOS/Applications.js

@@ -9,43 +9,43 @@ "use strict";
 (function (Applications) {
-    Applications["APPLESCRIPT_UTILITY"] = "AppleScript Utility";
-    Applications["AUTOMATOR_APPLICATION_STUB"] = "Automator Application Stub";
-    Applications["AUTOMATOR"] = "Automator";
-    Applications["BLUETOOTH_FILE_EXCHANGE"] = "Bluetooth File Exchange";
-    Applications["CALENDAR"] = "Calendar";
-    Applications["CONSOLE"] = "Console";
-    Applications["CONTACTS"] = "Contacts";
-    Applications["DATABASE_EVENTS"] = "Database Events";
-    Applications["DIGITAL_HUB_SCRIPTING"] = "Digital Hub Scripting";
-    Applications["FINDER"] = "Finder";
-    Applications["FOLDER_ACTIONS_SETUP"] = "Folder Actions Setup";
-    Applications["FOLDER_ACTIONS_DISPATCHER"] = "FolderActionsDispatcher";
-    Applications["FONT_BOOK"] = "Font Book";
-    Applications["GARAGE_BAND"] = "GarageBand";
-    Applications["IMAGE_EVENTS"] = "Image Events";
-    Applications["IMOVIE"] = "iMovie";
-    Applications["KEYBOARD_ACCESS_AGENT"] = "KeyboardAccessAgent";
-    Applications["KEYNOTE"] = "Keynote";
-    Applications["MAIL"] = "Mail";
-    Applications["MESSAGES"] = "Messages";
-    Applications["MUSIC"] = "Music";
-    Applications["NOTES"] = "Notes";
-    Applications["NUMBERS"] = "Numbers";
-    Applications["PAGES"] = "Pages";
-    Applications["PHOTO_LIBRARY_MIGRATION_UTILITY"] = "Photo Library Migration Utility";
-    Applications["PHOTOS"] = "Photos";
-    Applications["PREVIEW"] = "Preview";
-    Applications["QUICK_TIME_PLAYER"] = "QuickTime Player";
-    Applications["REMINDERS"] = "Reminders";
-    Applications["SAFARI"] = "Safari";
-    Applications["SCREEN_SHARING"] = "Screen Sharing";
-    Applications["SCRIPT_EDITOR"] = "Script Editor";
-    Applications["SHORTCUTS_EVENTS"] = "Shortcuts Events";
-    Applications["SHORTCUTS"] = "Shortcuts";
-    Applications["SYSTEM_EVENTS"] = "System Events";
-    Applications["SYSTEM_INFORMATION"] = "System Information";
-    Applications["SYSTEM_PREFERENCES"] = "System Preferences";
-    Applications["TERMINAL"] = "Terminal";
-    Applications["TEXT_EDIT"] = "Text Edit";
-    Applications["TV"] = "TV";
-    Applications["VOICE_OVER"] = "VoiceOver";
+    Applications["AppleScriptUtility"] = "AppleScript Utility";
+    Applications["AutomatorApplicationStub"] = "Automator Application Stub";
+    Applications["Automator"] = "Automator";
+    Applications["BluetoothFileExchange"] = "Bluetooth File Exchange";
+    Applications["Calendar"] = "Calendar";
+    Applications["Console"] = "Console";
+    Applications["Contacts"] = "Contacts";
+    Applications["DatabaseEvents"] = "Database Events";
+    Applications["DigitalHubScripting"] = "Digital Hub Scripting";
+    Applications["Finder"] = "Finder";
+    Applications["FolderActionsSetup"] = "Folder Actions Setup";
+    Applications["FolderActionsDispatcher"] = "FolderActionsDispatcher";
+    Applications["FontBook"] = "Font Book";
+    Applications["GarageBand"] = "GarageBand";
+    Applications["ImageEvents"] = "Image Events";
+    Applications["IMovie"] = "iMovie";
+    Applications["KeyboardAccessAgent"] = "KeyboardAccessAgent";
+    Applications["Keynote"] = "Keynote";
+    Applications["Mail"] = "Mail";
+    Applications["Messages"] = "Messages";
+    Applications["Music"] = "Music";
+    Applications["Notes"] = "Notes";
+    Applications["Numbers"] = "Numbers";
+    Applications["Pages"] = "Pages";
+    Applications["PhotoLibraryMigrationUtility"] = "Photo Library Migration Utility";
+    Applications["Photos"] = "Photos";
+    Applications["Preview"] = "Preview";
+    Applications["QuickTimePlayer"] = "QuickTime Player";
+    Applications["Reminders"] = "Reminders";
+    Applications["Safari"] = "Safari";
+    Applications["ScreenSharing"] = "Screen Sharing";
+    Applications["ScriptEditor"] = "Script Editor";
+    Applications["ShortcutEvents"] = "Shortcuts Events";
+    Applications["Shortcuts"] = "Shortcuts";
+    Applications["SystemEvents"] = "System Events";
+    Applications["SystemInformation"] = "System Information";
+    Applications["SystemPreferences"] = "System Preferences";
+    Applications["Terminal"] = "Terminal";
+    Applications["textEdit"] = "Text Edit";
+    Applications["Tv"] = "TV";
+    Applications["VoiceOver"] = "VoiceOver";
 })(Applications = exports.Applications || (exports.Applications = {}));

lib/macOS/errors.d.ts

@@ -16,3 +16,3 @@ export declare const ERR_VOICE_OVER_NOT_SUPPORTED = "VoiceOver not supported";
 export declare const ERR_PREFIX_ACTIVATE = "Unable to activate application: ";
-export declare const ERR_PREFIX_SEND_KEYS = "Unable to send keys to application: ";
+export declare const ERR_PREFIX_SEND_KEYS = "Unable to send keys ";
 export declare const ERR_PREFIX_QUIT = "Unable to quit application: ";

lib/macOS/errors.js

@@ -19,3 +19,3 @@ "use strict";
 exports.ERR_PREFIX_ACTIVATE = "Unable to activate application: ";
-exports.ERR_PREFIX_SEND_KEYS = "Unable to send keys to application: ";
+exports.ERR_PREFIX_SEND_KEYS = "Unable to send keys ";
 exports.ERR_PREFIX_QUIT = "Unable to quit application: ";

lib/macOS/index.d.ts

 export * from "./VoiceOver";
 export { activate as macOSActivate } from "./activate";
-export { quit as macOSQuit } from "./quit";
-export { sendKeys as macOSSendKeys } from "./sendKeys";
-export { KeyCodes as MacOSKeyCodes } from "./KeyCodes";
-export { Modifiers as MacOSModifiers } from "./Modifiers";
 export { Applications as MacOSApplications } from "./Applications";
+export type { KeyboardCommand as MacOSKeyboardCommand } from "./KeyboardCommand";
 export type { KeyCodeCommand as MacOSKeyCodeCommand } from "./KeyCodeCommand";
+export type { KeyCodes as MacOSKeyCodes } from "./KeyCodes";
 export type { KeystrokeCommand as MacOSKeystrokeCommand } from "./KeystrokeCommand";
+export { Modifiers as MacOSModifiers } from "./Modifiers";
+export { quit as macOSQuit } from "./quit";

lib/macOS/index.js

@@ -13,15 +13,11 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MacOSApplications = exports.MacOSModifiers = exports.MacOSKeyCodes = exports.macOSSendKeys = exports.macOSQuit = exports.macOSActivate = void 0;
+exports.macOSQuit = exports.MacOSModifiers = exports.MacOSApplications = exports.macOSActivate = void 0;
 __exportStar(require("./VoiceOver"), exports);
 var activate_1 = require("./activate");
 Object.defineProperty(exports, "macOSActivate", { enumerable: true, get: function () { return activate_1.activate; } });
+var Applications_1 = require("./Applications");
+Object.defineProperty(exports, "MacOSApplications", { enumerable: true, get: function () { return Applications_1.Applications; } });
+var Modifiers_1 = require("./Modifiers");
+Object.defineProperty(exports, "MacOSModifiers", { enumerable: true, get: function () { return Modifiers_1.Modifiers; } });
 var quit_1 = require("./quit");
 Object.defineProperty(exports, "macOSQuit", { enumerable: true, get: function () { return quit_1.quit; } });
-var sendKeys_1 = require("./sendKeys");
-Object.defineProperty(exports, "macOSSendKeys", { enumerable: true, get: function () { return sendKeys_1.sendKeys; } });
-var KeyCodes_1 = require("./KeyCodes");
-Object.defineProperty(exports, "MacOSKeyCodes", { enumerable: true, get: function () { return KeyCodes_1.KeyCodes; } });
-var Modifiers_1 = require("./Modifiers");
-Object.defineProperty(exports, "MacOSModifiers", { enumerable: true, get: function () { return Modifiers_1.Modifiers; } });
-var Applications_1 = require("./Applications");
-Object.defineProperty(exports, "MacOSApplications", { enumerable: true, get: function () { return Applications_1.Applications; } });

lib/macOS/keyCode.d.ts

@@ -0,3 +1,3 @@
+import type { CommandOptions } from "../CommandOptions";
 import type { KeyCodeCommand } from "./KeyCodeCommand";
-import type { CommandOptions } from "../CommandOptions";
 export declare function keyCode({ keyCode, modifiers }: KeyCodeCommand, options?: CommandOptions): Promise<void>;

lib/macOS/keyCode.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.keyCode = void 0;
+const Applications_1 = require("./Applications");
 const retryIfAppleEventTimeout_1 = require("./retryIfAppleEventTimeout");
 const runAppleScript_1 = require("./runAppleScript");
-const Applications_1 = require("./Applications");
 async function keyCode({ keyCode, modifiers = [] }, options) {
-    const script = `tell application "${Applications_1.Applications.SYSTEM_EVENTS}"\nkey code ${Array.isArray(keyCode) ? `{${keyCode.join(", ")}}` : keyCode}${modifiers.length ? ` using {${modifiers.join(", ")}}` : ""}\nend tell`;
+    const script = `tell application "${Applications_1.Applications.SystemEvents}"\nkey code ${Array.isArray(keyCode) ? `{${keyCode.join(", ")}}` : keyCode}${modifiers.length ? ` using {${modifiers.join(", ")}}` : ""}\nend tell`;
     return await (0, retryIfAppleEventTimeout_1.retryIfAppleEventTimeout)(() => (0, runAppleScript_1.runAppleScript)(script, options), options);
 }
 exports.keyCode = keyCode;

lib/macOS/KeyCodes.d.ts

 /**
- * MacOS key codes.
+ * macOS key codes.
  *
- * Reference: {@link https://eastmanreference.com/complete-list-of-applescript-key-codes}
+ * references:
+ * - {@link https://eastmanreference.com/complete-list-of-applescript-key-codes}
+ * - {@link http://macbiblioblog.blogspot.com/2014/12/key-codes-for-function-and-special-keys.html}
  */
 export declare enum KeyCodes {
     /**
-     * A
+     * a
      */
-    KEY_A = 0,
+    a = 0,
+    A = 0,
+    KeyA = 0,
     /**
-     * S
+     * s
      */
-    KEY_S = 1,
+    s = 1,
+    S = 1,
+    KeyS = 1,
     /**
-     * D
+     * d
      */
-    KEY_D = 2,
+    d = 2,
+    D = 2,
+    KeyD = 2,
     /**
-     * F
+     * f
      */
-    KEY_F = 3,
+    f = 3,
+    F = 3,
+    KeyF = 3,
     /**
-     * H
+     * h
      */
-    KEY_H = 4,
+    h = 4,
+    H = 4,
+    KeyH = 4,
     /**
-     * G
+     * g
      */
-    KEY_G = 5,
+    g = 5,
+    G = 5,
+    KeyG = 5,
     /**
-     * Z
+     * z
      */
-    KEY_Z = 6,
+    z = 6,
+    Z = 6,
+    KeyZ = 6,
     /**
-     * X
+     * x
      */
-    KEY_X = 7,
+    x = 7,
+    X = 7,
+    KeyX = 7,
     /**
-     * C
+     * c
      */
-    KEY_C = 8,
+    c = 8,
+    C = 8,
+    KeyC = 8,
     /**
-     * V
+     * v
      */
-    KEY_V = 9,
+    v = 9,
+    V = 9,
+    KeyV = 9,
     /**
-     * B
+     * §
      */
-    KEY_B = 11,
+    SectionSign = 10,
     /**
-     * Q
+     * b
      */
-    KEY_Q = 12,
+    b = 11,
+    B = 11,
+    KeyB = 11,
     /**
-     * W
+     * q
      */
-    KEY_W = 13,
+    q = 12,
+    Q = 12,
+    KeyQ = 12,
     /**
-     * E
+     * w
      */
-    KEY_E = 14,
+    w = 13,
+    W = 13,
+    KeyW = 13,
     /**
-     * R
+     * e
      */
-    KEY_R = 15,
+    e = 14,
+    E = 14,
+    KeyE = 14,
     /**
-     * Y
+     * r
      */
-    KEY_Y = 16,
+    r = 15,
+    R = 15,
+    KeyR = 15,
     /**
-     * T
+     * y
      */
-    KEY_T = 17,
+    y = 16,
+    Y = 16,
+    KeyY = 16,
     /**
+     * t
+     */
+    t = 17,
+    T = 17,
+    KeyT = 17,
+    /**
      * 1
      */
-    KEY_1 = 18,
+    Digit1 = 18,
     /**
      * 2
      */
-    KEY_2 = 19,
+    Digit2 = 19,
     /**
      * 3
      */
-    KEY_3 = 20,
+    Digit3 = 20,
     /**
      * 4
      */
-    KEY_4 = 21,
+    Digit4 = 21,
     /**
      * 6
      */
-    KEY_6 = 22,
+    Digit6 = 22,
     /**
      * 5
      */
-    KEY_5 = 23,
+    Digit5 = 23,
     /**
      * =
      */
-    KEY_EQUALS = 24,
+    "=" = 24,
+    Equals = 24,
     /**
      * 9
      */
-    KEY_9 = 25,
+    Digit9 = 25,
     /**
      * 7
      */
-    KEY_7 = 26,
+    Digit7 = 26,
     /**
      * -
      */
-    KEY_DASH = 27,
+    "-" = 27,
+    Dash = 27,
+    Minus = 27,
     /**
      * 8
      */
-    KEY_8 = 28,
+    Digit8 = 28,
     /**
      * 0
      */
-    KEY_0 = 29,
+    Digit0 = 29,
     /**
      * ]
      */
-    KEY_RIGHT_SQUARE_BRACKET = 30,
+    "]" = 30,
+    RightSquareBracket = 30,
     /**
-     * O
+     * o
      */
-    KEY_O = 31,
+    o = 31,
+    O = 31,
+    KeyO = 31,
     /**
-     * U
+     * u
      */
-    KEY_U = 32,
+    u = 32,
+    U = 32,
+    KeyU = 32,
     /**
      * [
      */
-    KEY_LEFT_SQUARE_BRACKET = 33,
+    "[" = 33,
+    LeftSquareBracket = 33,
     /**
-     * I
+     * i
      */
-    KEY_I = 34,
+    i = 34,
+    I = 34,
+    KeyI = 34,
     /**
-     * P
+     * p
      */
-    KEY_P = 35,
+    p = 35,
+    P = 35,
+    KeyP = 35,
     /**
-     * ↵
+     * Return ↵
+     *
+     * This is actually the "Return" key for MacOS.
      */
-    KEY_RETURN = 36,
+    Enter = 36,
+    Return = 36,
     /**
-     * L
+     * l
      */
-    KEY_L = 37,
+    l = 37,
+    L = 37,
+    KeyL = 37,
     /**
-     * J
+     * j
      */
-    KEY_J = 38,
+    j = 38,
+    J = 38,
+    KeyJ = 38,
     /**
      * '
      */
-    KEY_SINGLE_QUOTE = 39,
+    "'" = 39,
+    SingleQuote = 39,
     /**
-     * K
+     * k
      */
-    KEY_K = 40,
+    k = 40,
+    K = 40,
+    KeyK = 40,
     /**
      * ;
      */
-    KEY_SEMI_COLON = 41,
+    ";" = 41,
+    SemiColon = 41,
     /**
      * \
      */
-    KEY_BACK_SLASH = 42,
+    "\\" = 42,
+    Backslash = 42,
     /**
      * ,
      */
-    KEY_COMMA = 43,
+    "," = 43,
+    Comma = 43,
     /**
      * /
      */
-    KEY_FORWARD_SLASH = 44,
+    "/" = 44,
+    ForwardSlash = 44,
     /**
-     * N
+     * n
      */
-    KEY_N = 45,
+    n = 45,
+    N = 45,
+    KeyN = 45,
     /**
-     * M
+     * m
      */
-    KEY_M = 46,
+    m = 46,
+    M = 46,
+    KeyM = 46,
     /**
      * .
      */
-    KEY_PERIOD = 47,
+    "." = 47,
+    Period = 47,
+    FullStop = 47,
     /**
-     * ⇥
+     * Tab ⇥
      */
-    KEY_TAB = 48,
+    Tab = 48,
     /**
      * " "
      */
-    KEY_SPACE_BAR = 49,
+    " " = 49,
+    Space = 49,
+    Spacebar = 49,
     /**
      * `
      */
-    KEY_BACK_TICK = 50,
+    "`" = 50,
+    Backtick = 50,
     /**
-     * ←
+     * Backspace ← / ⌫
+     *
+     * Labelled as Delete on Mac keyboards, this is actually
+     * a Backspace key.
      */
-    KEY_DELETE = 51,
+    Backspace = 51,
     /**
-     * esc
+     * Line Feed ␊
      */
-    KEY_ESCAPE = 53,
+    LineFeed = 52,
     /**
-     * cmd ⌘
+     * Escape ⎋
      */
-    KEY_COMMAND = 55,
+    Escape = 53,
     /**
+     * Command ⌘
+     */
+    Command = 55,
+    CommandLeft = 55,
+    CommandRight = 55,
+    Meta = 55,
+    /**
      * ⇧
      */
-    KEY_LEFT_SHIFT = 57,
+    Shift = 56,
+    ShiftLeft = 56,
     /**
+     * Caps Lock ⇪
+     */
+    CapsLock = 57,
+    /**
      * ⌥
      */
-    KEY_LEFT_OPTION = 58,
+    Option = 58,
+    OptionLeft = 58,
+    Alt = 58,
+    AltLeft = 58,
     /**
      * ⌃
      */
-    KEY_CONTROL = 59,
+    Control = 59,
+    ControlLeft = 59,
     /**
      * ⇧
      */
-    KEY_RIGHT_SHIFT = 60,
+    ShiftRight = 60,
     /**
      * ⌥
      */
-    KEY_RIGHT_OPTION = 61,
+    OptionRight = 61,
+    AltRight = 61,
     /**
+     * ⌃
+     */
+    ControlRight = 62,
+    /**
      * fn
      */
-    KEY_FUNCTION = 63,
+    Fn = 63,
     /**
+     * F17
+     */
+    F17 = 64,
+    /**
+     * Numpad .
+     */
+    Decimal = 65,
+    /**
+     * Numpad *
+     */
+    Multiply = 67,
+    /**
+     * Numpad +
+     */
+    Add = 69,
+    /**
+     * Numpad Clear ⌧
+     */
+    Clear = 71,
+    /**
+     * Volume Up
+     */
+    VolumeUp = 72,
+    /**
+     * Volume Down
+     */
+    VolumeDown = 73,
+    /**
+     * Mute
+     */
+    Mute = 74,
+    /**
+     * Numpad /
+     */
+    Divide = 75,
+    /**
      * ⌅
+     *
+     * Not used.
      */
-    KEY_ENTER = 76,
     /**
+     * Numpad -
+     */
+    Subtract = 78,
+    /**
+     * F18
+     */
+    F18 = 79,
+    /**
+     * F19
+     */
+    F19 = 80,
+    /**
+     * Numpad =
+     *
+     * Not used.
+     */
+    /**
+     * Numpad 0
+     *
+     * Not used.
+     */
+    /**
+     * Numpad 1
+     *
+     * Not used.
+     */
+    /**
+     * Numpad 2
+     *
+     * Not used.
+     */
+    /**
+     * Numpad 3
+     *
+     * Not used.
+     */
+    /**
+     * Numpad 4
+     *
+     * Not used.
+     */
+    /**
+     * Numpad 5
+     *
+     * Not used.
+     */
+    /**
+     * Numpad 6
+     *
+     * Not used.
+     */
+    /**
+     * Numpad 7
+     *
+     * Not used.
+     */
+    /**
+     * F20
+     */
+    F20 = 90,
+    /**
+     * Numpad 8
+     *
+     * Not used.
+     */
+    /**
+     * Numpad 9
+     *
+     * Not used.
+     */
+    /**
      * F5
      */
-    KEY_F5 = 96,
+    F5 = 96,
     /**
      * F6
      */
-    KEY_F6 = 97,
+    F6 = 97,
     /**
      * F7
      */
-    KEY_F7 = 98,
+    F7 = 98,
     /**
      * F3
      */
-    KEY_F3 = 99,
+    F3 = 99,
     /**
      * F8
      */
-    KEY_F8 = 100,
+    F8 = 100,
     /**
      * F9
      */
-    KEY_F9 = 101,
+    F9 = 101,
     /**
      * F11
      */
-    KEY_F11 = 103,
+    F11 = 103,
     /**
+     * F13
+     */
+    F13 = 105,
+    /**
+     * F16
+     */
+    F16 = 106,
+    /**
+     * F14
+     */
+    F14 = 107,
+    /**
      * F10
      */
-    KEY_F10 = 109,
+    F10 = 109,
     /**
      * F12
      */
-    KEY_F12 = 111,
+    F12 = 111,
     /**
+     * F15
+     */
+    F15 = 113,
+    /**
+     * Help / Insert
+     */
+    Help = 114,
+    Insert = 114,
+    /**
      * Home
      */
-    KEY_HOME = 115,
+    Home = 115,
     /**
      * Page Up
      */
-    KEY_PAGE_UP = 116,
+    PageUp = 116,
     /**
-     * End
+     * Forward Delete ⌦
      */
-    KEY_END = 119,
+    ForwardDelete = 117,
+    Delete = 117,
     /**
      * F4
      */
-    KEY_F4 = 118,
+    F4 = 118,
     /**
+     * end
+     */
+    End = 119,
+    /**
      * F2
      */
-    KEY_F2 = 120,
+    F2 = 120,
     /**
      * Page Down
      */
-    KEY_PAGE_DOWN = 121,
+    PageDown = 121,
     /**
      * F1
      */
-    KEY_F1 = 122,
+    F1 = 122,
     /**
      * ←
      */
-    KEY_LEFT_ARROW = 123,
+    Left = 123,
+    ArrowLeft = 123,
     /**
      * →
      */
-    KEY_RIGHT_ARROW = 124,
+    Right = 124,
+    ArrowRight = 124,
     /**
      * ↓
      */
-    KEY_DOWN_ARROW = 125,
+    Down = 125,
+    ArrowDown = 125,
     /**
      * ↑
      */
-    KEY_UP_ARROW = 126
+    Up = 126,
+    ArrowUp = 126
 }

lib/macOS/KeyCodes.js

 "use strict";
-// REF: https://eastmanreference.com/complete-list-of-applescript-key-codes
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.KeyCodes = void 0;
 /**
- * MacOS key codes.
+ * macOS key codes.
  *
- * Reference: {@link https://eastmanreference.com/complete-list-of-applescript-key-codes}
+ * references:
+ * - {@link https://eastmanreference.com/complete-list-of-applescript-key-codes}
+ * - {@link http://macbiblioblog.blogspot.com/2014/12/key-codes-for-function-and-special-keys.html}
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KeyCodes = void 0;
 var KeyCodes;
 (function (KeyCodes) {
     /**
-     * A
+     * a
      */
-    KeyCodes[KeyCodes["KEY_A"] = 0] = "KEY_A";
+    KeyCodes[KeyCodes["a"] = 0] = "a";
+    KeyCodes[KeyCodes["A"] = 0] = "A";
+    KeyCodes[KeyCodes["KeyA"] = 0] = "KeyA";
     /**
-     * S
+     * s
      */
-    KeyCodes[KeyCodes["KEY_S"] = 1] = "KEY_S";
+    KeyCodes[KeyCodes["s"] = 1] = "s";
+    KeyCodes[KeyCodes["S"] = 1] = "S";
+    KeyCodes[KeyCodes["KeyS"] = 1] = "KeyS";
     /**
-     * D
+     * d
      */
-    KeyCodes[KeyCodes["KEY_D"] = 2] = "KEY_D";
+    KeyCodes[KeyCodes["d"] = 2] = "d";
+    KeyCodes[KeyCodes["D"] = 2] = "D";
+    KeyCodes[KeyCodes["KeyD"] = 2] = "KeyD";
     /**
-     * F
+     * f
      */
-    KeyCodes[KeyCodes["KEY_F"] = 3] = "KEY_F";
+    KeyCodes[KeyCodes["f"] = 3] = "f";
+    KeyCodes[KeyCodes["F"] = 3] = "F";
+    KeyCodes[KeyCodes["KeyF"] = 3] = "KeyF";
     /**
-     * H
+     * h
      */
-    KeyCodes[KeyCodes["KEY_H"] = 4] = "KEY_H";
+    KeyCodes[KeyCodes["h"] = 4] = "h";
+    KeyCodes[KeyCodes["H"] = 4] = "H";
+    KeyCodes[KeyCodes["KeyH"] = 4] = "KeyH";
     /**
-     * G
+     * g
      */
-    KeyCodes[KeyCodes["KEY_G"] = 5] = "KEY_G";
+    KeyCodes[KeyCodes["g"] = 5] = "g";
+    KeyCodes[KeyCodes["G"] = 5] = "G";
+    KeyCodes[KeyCodes["KeyG"] = 5] = "KeyG";
     /**
-     * Z
+     * z
      */
-    KeyCodes[KeyCodes["KEY_Z"] = 6] = "KEY_Z";
+    KeyCodes[KeyCodes["z"] = 6] = "z";
+    KeyCodes[KeyCodes["Z"] = 6] = "Z";
+    KeyCodes[KeyCodes["KeyZ"] = 6] = "KeyZ";
     /**
-     * X
+     * x
      */
-    KeyCodes[KeyCodes["KEY_X"] = 7] = "KEY_X";
+    KeyCodes[KeyCodes["x"] = 7] = "x";
+    KeyCodes[KeyCodes["X"] = 7] = "X";
+    KeyCodes[KeyCodes["KeyX"] = 7] = "KeyX";
     /**
-     * C
+     * c
      */
-    KeyCodes[KeyCodes["KEY_C"] = 8] = "KEY_C";
+    KeyCodes[KeyCodes["c"] = 8] = "c";
+    KeyCodes[KeyCodes["C"] = 8] = "C";
+    KeyCodes[KeyCodes["KeyC"] = 8] = "KeyC";
     /**
-     * V
+     * v
      */
-    KeyCodes[KeyCodes["KEY_V"] = 9] = "KEY_V";
+    KeyCodes[KeyCodes["v"] = 9] = "v";
+    KeyCodes[KeyCodes["V"] = 9] = "V";
+    KeyCodes[KeyCodes["KeyV"] = 9] = "KeyV";
     /**
-     * B
+     * §
      */
-    KeyCodes[KeyCodes["KEY_B"] = 11] = "KEY_B";
+    KeyCodes[KeyCodes["SectionSign"] = 10] = "SectionSign";
     /**
-     * Q
+     * b
      */
-    KeyCodes[KeyCodes["KEY_Q"] = 12] = "KEY_Q";
+    KeyCodes[KeyCodes["b"] = 11] = "b";
+    KeyCodes[KeyCodes["B"] = 11] = "B";
+    KeyCodes[KeyCodes["KeyB"] = 11] = "KeyB";
     /**
-     * W
+     * q
      */
-    KeyCodes[KeyCodes["KEY_W"] = 13] = "KEY_W";
+    KeyCodes[KeyCodes["q"] = 12] = "q";
+    KeyCodes[KeyCodes["Q"] = 12] = "Q";
+    KeyCodes[KeyCodes["KeyQ"] = 12] = "KeyQ";
     /**
-     * E
+     * w
      */
-    KeyCodes[KeyCodes["KEY_E"] = 14] = "KEY_E";
+    KeyCodes[KeyCodes["w"] = 13] = "w";
+    KeyCodes[KeyCodes["W"] = 13] = "W";
+    KeyCodes[KeyCodes["KeyW"] = 13] = "KeyW";
     /**
-     * R
+     * e
      */
-    KeyCodes[KeyCodes["KEY_R"] = 15] = "KEY_R";
+    KeyCodes[KeyCodes["e"] = 14] = "e";
+    KeyCodes[KeyCodes["E"] = 14] = "E";
+    KeyCodes[KeyCodes["KeyE"] = 14] = "KeyE";
     /**
-     * Y
+     * r
      */
-    KeyCodes[KeyCodes["KEY_Y"] = 16] = "KEY_Y";
+    KeyCodes[KeyCodes["r"] = 15] = "r";
+    KeyCodes[KeyCodes["R"] = 15] = "R";
+    KeyCodes[KeyCodes["KeyR"] = 15] = "KeyR";
     /**
-     * T
+     * y
      */
-    KeyCodes[KeyCodes["KEY_T"] = 17] = "KEY_T";
+    KeyCodes[KeyCodes["y"] = 16] = "y";
+    KeyCodes[KeyCodes["Y"] = 16] = "Y";
+    KeyCodes[KeyCodes["KeyY"] = 16] = "KeyY";
     /**
+     * t
+     */
+    KeyCodes[KeyCodes["t"] = 17] = "t";
+    KeyCodes[KeyCodes["T"] = 17] = "T";
+    KeyCodes[KeyCodes["KeyT"] = 17] = "KeyT";
+    /**
      * 1
      */
-    KeyCodes[KeyCodes["KEY_1"] = 18] = "KEY_1";
+    KeyCodes[KeyCodes["Digit1"] = 18] = "Digit1";
     /**
      * 2
      */
-    KeyCodes[KeyCodes["KEY_2"] = 19] = "KEY_2";
+    KeyCodes[KeyCodes["Digit2"] = 19] = "Digit2";
     /**
      * 3
      */
-    KeyCodes[KeyCodes["KEY_3"] = 20] = "KEY_3";
+    KeyCodes[KeyCodes["Digit3"] = 20] = "Digit3";
     /**
      * 4
      */
-    KeyCodes[KeyCodes["KEY_4"] = 21] = "KEY_4";
+    KeyCodes[KeyCodes["Digit4"] = 21] = "Digit4";
     /**
      * 6
      */
-    KeyCodes[KeyCodes["KEY_6"] = 22] = "KEY_6";
+    KeyCodes[KeyCodes["Digit6"] = 22] = "Digit6";
     /**
      * 5
      */
-    KeyCodes[KeyCodes["KEY_5"] = 23] = "KEY_5";
+    KeyCodes[KeyCodes["Digit5"] = 23] = "Digit5";
     /**
      * =
      */
-    KeyCodes[KeyCodes["KEY_EQUALS"] = 24] = "KEY_EQUALS";
+    KeyCodes[KeyCodes["="] = 24] = "=";
+    KeyCodes[KeyCodes["Equals"] = 24] = "Equals";
     /**
      * 9
      */
-    KeyCodes[KeyCodes["KEY_9"] = 25] = "KEY_9";
+    KeyCodes[KeyCodes["Digit9"] = 25] = "Digit9";
     /**
      * 7
      */
-    KeyCodes[KeyCodes["KEY_7"] = 26] = "KEY_7";
+    KeyCodes[KeyCodes["Digit7"] = 26] = "Digit7";
     /**
      * -
      */
-    KeyCodes[KeyCodes["KEY_DASH"] = 27] = "KEY_DASH";
+    KeyCodes[KeyCodes["-"] = 27] = "-";
+    KeyCodes[KeyCodes["Dash"] = 27] = "Dash";
+    KeyCodes[KeyCodes["Minus"] = 27] = "Minus";
     /**
      * 8
      */
-    KeyCodes[KeyCodes["KEY_8"] = 28] = "KEY_8";
+    KeyCodes[KeyCodes["Digit8"] = 28] = "Digit8";
     /**
      * 0
      */
-    KeyCodes[KeyCodes["KEY_0"] = 29] = "KEY_0";
+    KeyCodes[KeyCodes["Digit0"] = 29] = "Digit0";
     /**
      * ]
      */
-    KeyCodes[KeyCodes["KEY_RIGHT_SQUARE_BRACKET"] = 30] = "KEY_RIGHT_SQUARE_BRACKET";
+    KeyCodes[KeyCodes["]"] = 30] = "]";
+    KeyCodes[KeyCodes["RightSquareBracket"] = 30] = "RightSquareBracket";
     /**
-     * O
+     * o
      */
-    KeyCodes[KeyCodes["KEY_O"] = 31] = "KEY_O";
+    KeyCodes[KeyCodes["o"] = 31] = "o";
+    KeyCodes[KeyCodes["O"] = 31] = "O";
+    KeyCodes[KeyCodes["KeyO"] = 31] = "KeyO";
     /**
-     * U
+     * u
      */
-    KeyCodes[KeyCodes["KEY_U"] = 32] = "KEY_U";
+    KeyCodes[KeyCodes["u"] = 32] = "u";
+    KeyCodes[KeyCodes["U"] = 32] = "U";
+    KeyCodes[KeyCodes["KeyU"] = 32] = "KeyU";
     /**
      * [
      */
-    KeyCodes[KeyCodes["KEY_LEFT_SQUARE_BRACKET"] = 33] = "KEY_LEFT_SQUARE_BRACKET";
+    KeyCodes[KeyCodes["["] = 33] = "[";
+    KeyCodes[KeyCodes["LeftSquareBracket"] = 33] = "LeftSquareBracket";
     /**
-     * I
+     * i
      */
-    KeyCodes[KeyCodes["KEY_I"] = 34] = "KEY_I";
+    KeyCodes[KeyCodes["i"] = 34] = "i";
+    KeyCodes[KeyCodes["I"] = 34] = "I";
+    KeyCodes[KeyCodes["KeyI"] = 34] = "KeyI";
     /**
-     * P
+     * p
      */
-    KeyCodes[KeyCodes["KEY_P"] = 35] = "KEY_P";
+    KeyCodes[KeyCodes["p"] = 35] = "p";
+    KeyCodes[KeyCodes["P"] = 35] = "P";
+    KeyCodes[KeyCodes["KeyP"] = 35] = "KeyP";
     /**
-     * ↵
+     * Return ↵
+     *
+     * This is actually the "Return" key for MacOS.
      */
-    KeyCodes[KeyCodes["KEY_RETURN"] = 36] = "KEY_RETURN";
+    KeyCodes[KeyCodes["Enter"] = 36] = "Enter";
+    KeyCodes[KeyCodes["Return"] = 36] = "Return";
     /**
-     * L
+     * l
      */
-    KeyCodes[KeyCodes["KEY_L"] = 37] = "KEY_L";
+    KeyCodes[KeyCodes["l"] = 37] = "l";
+    KeyCodes[KeyCodes["L"] = 37] = "L";
+    KeyCodes[KeyCodes["KeyL"] = 37] = "KeyL";
     /**
-     * J
+     * j
      */
-    KeyCodes[KeyCodes["KEY_J"] = 38] = "KEY_J";
+    KeyCodes[KeyCodes["j"] = 38] = "j";
+    KeyCodes[KeyCodes["J"] = 38] = "J";
+    KeyCodes[KeyCodes["KeyJ"] = 38] = "KeyJ";
     /**
      * '
      */
-    KeyCodes[KeyCodes["KEY_SINGLE_QUOTE"] = 39] = "KEY_SINGLE_QUOTE";
+    KeyCodes[KeyCodes["'"] = 39] = "'";
+    KeyCodes[KeyCodes["SingleQuote"] = 39] = "SingleQuote";
     /**
-     * K
+     * k
      */
-    KeyCodes[KeyCodes["KEY_K"] = 40] = "KEY_K";
+    KeyCodes[KeyCodes["k"] = 40] = "k";
+    KeyCodes[KeyCodes["K"] = 40] = "K";
+    KeyCodes[KeyCodes["KeyK"] = 40] = "KeyK";
     /**
      * ;
      */
-    KeyCodes[KeyCodes["KEY_SEMI_COLON"] = 41] = "KEY_SEMI_COLON";
+    KeyCodes[KeyCodes[";"] = 41] = ";";
+    KeyCodes[KeyCodes["SemiColon"] = 41] = "SemiColon";
     /**
      * \
      */
-    KeyCodes[KeyCodes["KEY_BACK_SLASH"] = 42] = "KEY_BACK_SLASH";
+    KeyCodes[KeyCodes["\\"] = 42] = "\\";
+    KeyCodes[KeyCodes["Backslash"] = 42] = "Backslash";
     /**
      * ,
      */
-    KeyCodes[KeyCodes["KEY_COMMA"] = 43] = "KEY_COMMA";
+    KeyCodes[KeyCodes[","] = 43] = ",";
+    KeyCodes[KeyCodes["Comma"] = 43] = "Comma";
     /**
      * /
      */
-    KeyCodes[KeyCodes["KEY_FORWARD_SLASH"] = 44] = "KEY_FORWARD_SLASH";
+    KeyCodes[KeyCodes["/"] = 44] = "/";
+    KeyCodes[KeyCodes["ForwardSlash"] = 44] = "ForwardSlash";
     /**
-     * N
+     * n
      */
-    KeyCodes[KeyCodes["KEY_N"] = 45] = "KEY_N";
+    KeyCodes[KeyCodes["n"] = 45] = "n";
+    KeyCodes[KeyCodes["N"] = 45] = "N";
+    KeyCodes[KeyCodes["KeyN"] = 45] = "KeyN";
     /**
-     * M
+     * m
      */
-    KeyCodes[KeyCodes["KEY_M"] = 46] = "KEY_M";
+    KeyCodes[KeyCodes["m"] = 46] = "m";
+    KeyCodes[KeyCodes["M"] = 46] = "M";
+    KeyCodes[KeyCodes["KeyM"] = 46] = "KeyM";
     /**
      * .
      */
-    KeyCodes[KeyCodes["KEY_PERIOD"] = 47] = "KEY_PERIOD";
+    KeyCodes[KeyCodes["."] = 47] = ".";
+    KeyCodes[KeyCodes["Period"] = 47] = "Period";
+    KeyCodes[KeyCodes["FullStop"] = 47] = "FullStop";
     /**
-     * ⇥
+     * Tab ⇥
      */
-    KeyCodes[KeyCodes["KEY_TAB"] = 48] = "KEY_TAB";
+    KeyCodes[KeyCodes["Tab"] = 48] = "Tab";
     /**
      * " "
      */
-    KeyCodes[KeyCodes["KEY_SPACE_BAR"] = 49] = "KEY_SPACE_BAR";
+    KeyCodes[KeyCodes[" "] = 49] = " ";
+    KeyCodes[KeyCodes["Space"] = 49] = "Space";
+    KeyCodes[KeyCodes["Spacebar"] = 49] = "Spacebar";
     /**
      * `
      */
-    KeyCodes[KeyCodes["KEY_BACK_TICK"] = 50] = "KEY_BACK_TICK";
+    KeyCodes[KeyCodes["`"] = 50] = "`";
+    KeyCodes[KeyCodes["Backtick"] = 50] = "Backtick";
     /**
-     * ←
+     * Backspace ← / ⌫
+     *
+     * Labelled as Delete on Mac keyboards, this is actually
+     * a Backspace key.
      */
-    KeyCodes[KeyCodes["KEY_DELETE"] = 51] = "KEY_DELETE";
+    KeyCodes[KeyCodes["Backspace"] = 51] = "Backspace";
+    // Delete = 51,
     /**
-     * esc
+     * Line Feed ␊
      */
-    KeyCodes[KeyCodes["KEY_ESCAPE"] = 53] = "KEY_ESCAPE";
+    KeyCodes[KeyCodes["LineFeed"] = 52] = "LineFeed";
     /**
-     * cmd ⌘
+     * Escape ⎋
      */
-    KeyCodes[KeyCodes["KEY_COMMAND"] = 55] = "KEY_COMMAND";
+    KeyCodes[KeyCodes["Escape"] = 53] = "Escape";
     /**
+     * Command ⌘
+     */
+    KeyCodes[KeyCodes["Command"] = 55] = "Command";
+    KeyCodes[KeyCodes["CommandLeft"] = 55] = "CommandLeft";
+    KeyCodes[KeyCodes["CommandRight"] = 55] = "CommandRight";
+    KeyCodes[KeyCodes["Meta"] = 55] = "Meta";
+    /**
      * ⇧
      */
-    KeyCodes[KeyCodes["KEY_LEFT_SHIFT"] = 57] = "KEY_LEFT_SHIFT";
+    KeyCodes[KeyCodes["Shift"] = 56] = "Shift";
+    KeyCodes[KeyCodes["ShiftLeft"] = 56] = "ShiftLeft";
     /**
+     * Caps Lock ⇪
+     */
+    KeyCodes[KeyCodes["CapsLock"] = 57] = "CapsLock";
+    /**
      * ⌥
      */
-    KeyCodes[KeyCodes["KEY_LEFT_OPTION"] = 58] = "KEY_LEFT_OPTION";
+    KeyCodes[KeyCodes["Option"] = 58] = "Option";
+    KeyCodes[KeyCodes["OptionLeft"] = 58] = "OptionLeft";
+    KeyCodes[KeyCodes["Alt"] = 58] = "Alt";
+    KeyCodes[KeyCodes["AltLeft"] = 58] = "AltLeft";
     /**
      * ⌃
      */
-    KeyCodes[KeyCodes["KEY_CONTROL"] = 59] = "KEY_CONTROL";
+    KeyCodes[KeyCodes["Control"] = 59] = "Control";
+    KeyCodes[KeyCodes["ControlLeft"] = 59] = "ControlLeft";
     /**
      * ⇧
      */
-    KeyCodes[KeyCodes["KEY_RIGHT_SHIFT"] = 60] = "KEY_RIGHT_SHIFT";
+    KeyCodes[KeyCodes["ShiftRight"] = 60] = "ShiftRight";
     /**
      * ⌥
      */
-    KeyCodes[KeyCodes["KEY_RIGHT_OPTION"] = 61] = "KEY_RIGHT_OPTION";
+    KeyCodes[KeyCodes["OptionRight"] = 61] = "OptionRight";
+    KeyCodes[KeyCodes["AltRight"] = 61] = "AltRight";
     /**
+     * ⌃
+     */
+    KeyCodes[KeyCodes["ControlRight"] = 62] = "ControlRight";
+    /**
      * fn
      */
-    KeyCodes[KeyCodes["KEY_FUNCTION"] = 63] = "KEY_FUNCTION";
+    KeyCodes[KeyCodes["Fn"] = 63] = "Fn";
     /**
+     * F17
+     */
+    KeyCodes[KeyCodes["F17"] = 64] = "F17";
+    /**
+     * Numpad .
+     */
+    KeyCodes[KeyCodes["Decimal"] = 65] = "Decimal";
+    /**
+     * Numpad *
+     */
+    KeyCodes[KeyCodes["Multiply"] = 67] = "Multiply";
+    /**
+     * Numpad +
+     */
+    KeyCodes[KeyCodes["Add"] = 69] = "Add";
+    /**
+     * Numpad Clear ⌧
+     */
+    KeyCodes[KeyCodes["Clear"] = 71] = "Clear";
+    /**
+     * Volume Up
+     */
+    KeyCodes[KeyCodes["VolumeUp"] = 72] = "VolumeUp";
+    /**
+     * Volume Down
+     */
+    KeyCodes[KeyCodes["VolumeDown"] = 73] = "VolumeDown";
+    /**
+     * Mute
+     */
+    KeyCodes[KeyCodes["Mute"] = 74] = "Mute";
+    /**
+     * Numpad /
+     */
+    KeyCodes[KeyCodes["Divide"] = 75] = "Divide";
+    /**
      * ⌅
+     *
+     * Not used.
      */
-    KeyCodes[KeyCodes["KEY_ENTER"] = 76] = "KEY_ENTER";
+    // Enter = 76,
     /**
+     * Numpad -
+     */
+    KeyCodes[KeyCodes["Subtract"] = 78] = "Subtract";
+    /**
+     * F18
+     */
+    KeyCodes[KeyCodes["F18"] = 79] = "F18";
+    /**
+     * F19
+     */
+    KeyCodes[KeyCodes["F19"] = 80] = "F19";
+    /**
+     * Numpad =
+     *
+     * Not used.
+     */
+    // Equals = 81,
+    /**
+     * Numpad 0
+     *
+     * Not used.
+     */
+    // Digit0 = 82,
+    /**
+     * Numpad 1
+     *
+     * Not used.
+     */
+    // Digit1 = 83,
+    /**
+     * Numpad 2
+     *
+     * Not used.
+     */
+    // Digit2 = 84,
+    /**
+     * Numpad 3
+     *
+     * Not used.
+     */
+    // Digit3 = 85,
+    /**
+     * Numpad 4
+     *
+     * Not used.
+     */
+    // Digit4 = 86,
+    /**
+     * Numpad 5
+     *
+     * Not used.
+     */
+    // Digit5 = 87,
+    /**
+     * Numpad 6
+     *
+     * Not used.
+     */
+    // Digit6 = 88,
+    /**
+     * Numpad 7
+     *
+     * Not used.
+     */
+    // Digit7 = 89,
+    /**
+     * F20
+     */
+    KeyCodes[KeyCodes["F20"] = 90] = "F20";
+    /**
+     * Numpad 8
+     *
+     * Not used.
+     */
+    // Digit8 = 91,
+    /**
+     * Numpad 9
+     *
+     * Not used.
+     */
+    // Digit9 = 92,
+    /**
      * F5
      */
-    KeyCodes[KeyCodes["KEY_F5"] = 96] = "KEY_F5";
+    KeyCodes[KeyCodes["F5"] = 96] = "F5";
     /**
      * F6
      */
-    KeyCodes[KeyCodes["KEY_F6"] = 97] = "KEY_F6";
+    KeyCodes[KeyCodes["F6"] = 97] = "F6";
     /**
      * F7
      */
-    KeyCodes[KeyCodes["KEY_F7"] = 98] = "KEY_F7";
+    KeyCodes[KeyCodes["F7"] = 98] = "F7";
     /**
      * F3
      */
-    KeyCodes[KeyCodes["KEY_F3"] = 99] = "KEY_F3";
+    KeyCodes[KeyCodes["F3"] = 99] = "F3";
     /**
      * F8
      */
-    KeyCodes[KeyCodes["KEY_F8"] = 100] = "KEY_F8";
+    KeyCodes[KeyCodes["F8"] = 100] = "F8";
     /**
      * F9
      */
-    KeyCodes[KeyCodes["KEY_F9"] = 101] = "KEY_F9";
+    KeyCodes[KeyCodes["F9"] = 101] = "F9";
     /**
      * F11
      */
-    KeyCodes[KeyCodes["KEY_F11"] = 103] = "KEY_F11";
+    KeyCodes[KeyCodes["F11"] = 103] = "F11";
     /**
+     * F13
+     */
+    KeyCodes[KeyCodes["F13"] = 105] = "F13";
+    /**
+     * F16
+     */
+    KeyCodes[KeyCodes["F16"] = 106] = "F16";
+    /**
+     * F14
+     */
+    KeyCodes[KeyCodes["F14"] = 107] = "F14";
+    /**
      * F10
      */
-    KeyCodes[KeyCodes["KEY_F10"] = 109] = "KEY_F10";
+    KeyCodes[KeyCodes["F10"] = 109] = "F10";
     /**
      * F12
      */
-    KeyCodes[KeyCodes["KEY_F12"] = 111] = "KEY_F12";
+    KeyCodes[KeyCodes["F12"] = 111] = "F12";
     /**
+     * F15
+     */
+    KeyCodes[KeyCodes["F15"] = 113] = "F15";
+    /**
+     * Help / Insert
+     */
+    KeyCodes[KeyCodes["Help"] = 114] = "Help";
+    KeyCodes[KeyCodes["Insert"] = 114] = "Insert";
+    /**
      * Home
      */
-    KeyCodes[KeyCodes["KEY_HOME"] = 115] = "KEY_HOME";
+    KeyCodes[KeyCodes["Home"] = 115] = "Home";
     /**
      * Page Up
      */
-    KeyCodes[KeyCodes["KEY_PAGE_UP"] = 116] = "KEY_PAGE_UP";
+    KeyCodes[KeyCodes["PageUp"] = 116] = "PageUp";
     /**
-     * End
+     * Forward Delete ⌦
      */
-    KeyCodes[KeyCodes["KEY_END"] = 119] = "KEY_END";
+    KeyCodes[KeyCodes["ForwardDelete"] = 117] = "ForwardDelete";
+    KeyCodes[KeyCodes["Delete"] = 117] = "Delete";
     /**
      * F4
      */
-    KeyCodes[KeyCodes["KEY_F4"] = 118] = "KEY_F4";
+    KeyCodes[KeyCodes["F4"] = 118] = "F4";
     /**
+     * end
+     */
+    KeyCodes[KeyCodes["End"] = 119] = "End";
+    /**
      * F2
      */
-    KeyCodes[KeyCodes["KEY_F2"] = 120] = "KEY_F2";
+    KeyCodes[KeyCodes["F2"] = 120] = "F2";
     /**
      * Page Down
      */
-    KeyCodes[KeyCodes["KEY_PAGE_DOWN"] = 121] = "KEY_PAGE_DOWN";
+    KeyCodes[KeyCodes["PageDown"] = 121] = "PageDown";
     /**
      * F1
      */
-    KeyCodes[KeyCodes["KEY_F1"] = 122] = "KEY_F1";
+    KeyCodes[KeyCodes["F1"] = 122] = "F1";
     /**
      * ←
      */
-    KeyCodes[KeyCodes["KEY_LEFT_ARROW"] = 123] = "KEY_LEFT_ARROW";
+    KeyCodes[KeyCodes["Left"] = 123] = "Left";
+    KeyCodes[KeyCodes["ArrowLeft"] = 123] = "ArrowLeft";
     /**
      * →
      */
-    KeyCodes[KeyCodes["KEY_RIGHT_ARROW"] = 124] = "KEY_RIGHT_ARROW";
+    KeyCodes[KeyCodes["Right"] = 124] = "Right";
+    KeyCodes[KeyCodes["ArrowRight"] = 124] = "ArrowRight";
     /**
      * ↓
      */
-    KeyCodes[KeyCodes["KEY_DOWN_ARROW"] = 125] = "KEY_DOWN_ARROW";
+    KeyCodes[KeyCodes["Down"] = 125] = "Down";
+    KeyCodes[KeyCodes["ArrowDown"] = 125] = "ArrowDown";
     /**
      * ↑
      */
-    KeyCodes[KeyCodes["KEY_UP_ARROW"] = 126] = "KEY_UP_ARROW";
+    KeyCodes[KeyCodes["Up"] = 126] = "Up";
+    KeyCodes[KeyCodes["ArrowUp"] = 126] = "ArrowUp";
+    /**
+     * F4
+     *
+     * Not used.
+     */
+    // F4 = 131,
+    /**
+     * F3
+     *
+     * Not used.
+     */
+    // F3 = 160,
 })(KeyCodes = exports.KeyCodes || (exports.KeyCodes = {}));

lib/macOS/Modifiers.d.ts

@@ -10,15 +10,27 @@ /**
      */
-    CMD = "command down",
+    Command = "command down",
+    CommandLeft = "command down",
+    CommandRight = "command down",
+    Meta = "command down",
     /**
      * Hold down the Control (alias ctrl, ⌃) key.
      */
-    CONTROL = "control down",
+    Control = "control down",
+    ControlLeft = "control down",
+    ControlRight = "control down",
     /**
      * Hold down the Option (alias alt, ⌥) key.
      */
-    OPTION = "option down",
+    Option = "option down",
+    OptionLeft = "option down",
+    OptionRight = "option down",
+    Alt = "option down",
+    AltLeft = "option down",
+    AltRight = "option down",
     /**
      * Hold down the Shift (alias ⇧) key.
      */
-    SHIFT = "shift down"
+    Shift = "shift down",
+    ShiftLeft = "shift down",
+    ShiftRight = "shift down"
 }

lib/macOS/Modifiers.js

@@ -14,15 +14,27 @@ "use strict";
      */
-    Modifiers["CMD"] = "command down";
+    Modifiers["Command"] = "command down";
+    Modifiers["CommandLeft"] = "command down";
+    Modifiers["CommandRight"] = "command down";
+    Modifiers["Meta"] = "command down";
     /**
      * Hold down the Control (alias ctrl, ⌃) key.
      */
-    Modifiers["CONTROL"] = "control down";
+    Modifiers["Control"] = "control down";
+    Modifiers["ControlLeft"] = "control down";
+    Modifiers["ControlRight"] = "control down";
     /**
      * Hold down the Option (alias alt, ⌥) key.
      */
-    Modifiers["OPTION"] = "option down";
+    Modifiers["Option"] = "option down";
+    Modifiers["OptionLeft"] = "option down";
+    Modifiers["OptionRight"] = "option down";
+    Modifiers["Alt"] = "option down";
+    Modifiers["AltLeft"] = "option down";
+    Modifiers["AltRight"] = "option down";
     /**
      * Hold down the Shift (alias ⇧) key.
      */
-    Modifiers["SHIFT"] = "shift down";
+    Modifiers["Shift"] = "shift down";
+    Modifiers["ShiftLeft"] = "shift down";
+    Modifiers["ShiftRight"] = "shift down";
 })(Modifiers = exports.Modifiers || (exports.Modifiers = {}));

lib/macOS/quit.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.quit = void 0;
+const errors_1 = require("./errors");
 const retryIfAppleEventTimeout_1 = require("./retryIfAppleEventTimeout");
 const runAppleScript_1 = require("./runAppleScript");
 const withTransaction_1 = require("./withTransaction");
-const errors_1 = require("./errors");
 async function quit(applicationName, options) {
@@ -9,0 +9,0 @@ const script = `tell application "${applicationName}"\n${(0, withTransaction_1.withTransaction)("quit")}\nend tell`;

lib/macOS/retryIfAppleEventTimeout.js

@@ -15,3 +15,3 @@ "use strict";
             error = e;
-            if (!e.message.includes(constants_1.APPLE_SCRIPT_TIMED_OUT_ERR_SNIPPET)) {
+            if (!e.message.includes(constants_1.ERR_APPLE_SCRIPT_TIMED_OUT)) {
                 break;
@@ -18,0 +18,0 @@ }

lib/macOS/runAppleScript.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runAppleScript = void 0;
+const constants_1 = require("../constants");
 const child_process_1 = require("child_process");
-const constants_1 = require("../constants");
 async function runAppleScript(script, { timeout = constants_1.DEFAULT_TIMEOUT } = { timeout: constants_1.DEFAULT_TIMEOUT }) {
@@ -7,0 +7,0 @@ const scriptWithTimeout = `with timeout of ${timeout} seconds\n${script}\nend timeout`;

lib/macOS/sendKeys/keystroke.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.keystroke = void 0;
+const Applications_1 = require("../Applications");
 const retryIfAppleEventTimeout_1 = require("../retryIfAppleEventTimeout");
 const runAppleScript_1 = require("../runAppleScript");
-const Applications_1 = require("../Applications");
 async function keystroke({ characters, modifiers = [] }, options) {
-    const script = `tell application "${Applications_1.Applications.SYSTEM_EVENTS}"\nkeystroke "${characters}"${modifiers.length ? ` using {${modifiers.join(", ")}}` : ""}\nend tell`;
+    const script = `tell application "${Applications_1.Applications.SystemEvents}"\nkeystroke "${characters}"${modifiers.length ? ` using {${modifiers.join(", ")}}` : ""}\nend tell`;
     return await (0, retryIfAppleEventTimeout_1.retryIfAppleEventTimeout)(() => (0, runAppleScript_1.runAppleScript)(script, options), options);
 }
 exports.keystroke = keystroke;

lib/macOS/sendKeys/sendKeys.d.ts

@@ -0,4 +1,4 @@
+import type { CommandOptions } from "../../CommandOptions";
 import type { KeyCodeCommand } from "../KeyCodeCommand";
 import type { KeystrokeCommand } from "../KeystrokeCommand";
-import type { CommandOptions } from "../../CommandOptions";
-export declare function sendKeys(applicationName: string, keyCommand: KeyCodeCommand | KeystrokeCommand, options?: CommandOptions): Promise<void>;
+export declare function sendKeys(keyCommand: KeyCodeCommand | KeystrokeCommand, applicationName?: string, options?: CommandOptions): Promise<void>;

lib/macOS/sendKeys/sendKeys.js

@@ -5,8 +5,10 @@ "use strict";
 const activate_1 = require("../activate");
+const errors_1 = require("../errors");
+const isKeyCode_1 = require("../../isKeyCode");
 const keyCode_1 = require("../keyCode");
 const keystroke_1 = require("./keystroke");
-const isKeyCode_1 = require("../../isKeyCode");
-const errors_1 = require("../errors");
-async function sendKeys(applicationName, keyCommand, options) {
-    await (0, activate_1.activate)(applicationName);
+async function sendKeys(keyCommand, applicationName, options) {
+    if (applicationName) {
+        await (0, activate_1.activate)(applicationName);
+    }
     try {
@@ -18,5 +20,5 @@ return (0, isKeyCode_1.isKeyCode)(keyCommand)
     catch (e) {
-        throw new Error(`${errors_1.ERR_PREFIX_SEND_KEYS}${applicationName}\n${e.message}`);
+        throw new Error(`${errors_1.ERR_PREFIX_SEND_KEYS}${applicationName ? `to application: ${applicationName}` : ""}\n${e.message}`);
     }
 }
 exports.sendKeys = sendKeys;

lib/macOS/VoiceOver/click.d.ts

@@ -1,4 +0,2 @@
-import type { CommandOptions } from "../../CommandOptions";
-import type { ClickCount } from "./ClickCount";
-import type { ClickButton } from "./ClickButton";
-export declare function click(clickCount: ClickCount, clickButton?: ClickButton, options?: CommandOptions): Promise<void>;
+import type { ClickOptions } from "../../ClickOptions";
+export declare function click({ button, clickCount, ...options }?: ClickOptions): Promise<void>;

lib/macOS/VoiceOver/click.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.click = void 0;
+const constants_1 = require("../../constants");
 const Applications_1 = require("../Applications");
+const ClickButton_1 = require("./ClickButton");
+const ClickCount_1 = require("./ClickCount");
+const errors_1 = require("../errors");
 const retryIfAppleEventTimeout_1 = require("../retryIfAppleEventTimeout");
 const runAppleScript_1 = require("../runAppleScript");
 const withTransaction_1 = require("../withTransaction");
-const errors_1 = require("../errors");
-async function click(clickCount, clickButton, options) {
-    const clickScript = `tell mouse cursor to click ${clickCount}${clickButton ? ` with ${clickButton}` : ""}`;
-    const script = `tell application "${Applications_1.Applications.VOICE_OVER}"\n${(0, withTransaction_1.withTransaction)(clickScript)}\nend tell`;
+const buttonMap = {
+    left: ClickButton_1.ClickButton.Left,
+    right: ClickButton_1.ClickButton.Right,
+};
+const clickCountMap = {
+    1: ClickCount_1.ClickCount.Once,
+    2: ClickCount_1.ClickCount.Twice,
+    3: ClickCount_1.ClickCount.Thrice,
+};
+async function click({ button = constants_1.DEFAULT_CLICK_BUTTON, clickCount = constants_1.DEFAULT_CLICK_COUNT, ...options } = {
+    button: constants_1.DEFAULT_CLICK_BUTTON,
+    clickCount: constants_1.DEFAULT_CLICK_COUNT,
+}) {
+    const mappedButton = buttonMap[button];
+    const mappedClickCount = clickCountMap[clickCount];
+    const clickScript = `tell mouse cursor to click ${mappedClickCount} with ${mappedButton}`;
+    const script = `tell application "${Applications_1.Applications.VoiceOver}"\n${(0, withTransaction_1.withTransaction)(clickScript)}\nend tell`;
     try {
@@ -13,0 +30,0 @@ return await (0, retryIfAppleEventTimeout_1.retryIfAppleEventTimeout)(() => (0, runAppleScript_1.runAppleScript)(script, options), options);

lib/macOS/VoiceOver/ClickButton.d.ts

 export declare enum ClickButton {
-    LEFT_BUTTON = "left button",
-    RIGHT_BUTTON = "right button"
+    Left = "left button",
+    Right = "right button"
 }

lib/macOS/VoiceOver/ClickButton.js

@@ -6,4 +6,4 @@ "use strict";
 (function (ClickButton) {
-    ClickButton["LEFT_BUTTON"] = "left button";
-    ClickButton["RIGHT_BUTTON"] = "right button";
+    ClickButton["Left"] = "left button";
+    ClickButton["Right"] = "right button";
 })(ClickButton = exports.ClickButton || (exports.ClickButton = {}));

lib/macOS/VoiceOver/ClickCount.d.ts

 export declare enum ClickCount {
-    ONCE = "once",
-    TWICE = "twice",
-    THRICE = "thrice"
+    Once = "once",
+    Twice = "twice",
+    Thrice = "thrice"
 }

lib/macOS/VoiceOver/ClickCount.js

@@ -6,5 +6,5 @@ "use strict";
 (function (ClickCount) {
-    ClickCount["ONCE"] = "once";
-    ClickCount["TWICE"] = "twice";
-    ClickCount["THRICE"] = "thrice";
+    ClickCount["Once"] = "once";
+    ClickCount["Twice"] = "twice";
+    ClickCount["Thrice"] = "thrice";
 })(ClickCount = exports.ClickCount || (exports.ClickCount = {}));

lib/macOS/VoiceOver/Containments.d.ts

@@ -5,4 +5,4 @@ /**
 export declare enum Containments {
-    INTERACT_IN = "into item",
-    INTERACT_OUT = "out of item"
+    InteractIn = "into item",
+    InteractOut = "out of item"
 }

lib/macOS/VoiceOver/Containments.js

@@ -9,4 +9,4 @@ "use strict";
 (function (Containments) {
-    Containments["INTERACT_IN"] = "into item";
-    Containments["INTERACT_OUT"] = "out of item";
+    Containments["InteractIn"] = "into item";
+    Containments["InteractOut"] = "out of item";
 })(Containments = exports.Containments || (exports.Containments = {}));

lib/macOS/VoiceOver/copyLastSpokenPhrase.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyLastSpokenPhrase = void 0;
+const Applications_1 = require("../Applications");
+const errors_1 = require("../errors");
+const retry_1 = require("../../retry");
 const runAppleScript_1 = require("../runAppleScript");
 const withTransaction_1 = require("../withTransaction");
-const retry_1 = require("../../retry");
-const Applications_1 = require("../Applications");
-const errors_1 = require("../errors");
 async function copyLastSpokenPhrase(options) {
-    const script = `tell application "${Applications_1.Applications.VOICE_OVER}"\n${(0, withTransaction_1.withTransaction)("tell last phrase to copy to pasteboard")}\nend tell`;
+    const script = `tell application "${Applications_1.Applications.VoiceOver}"\n${(0, withTransaction_1.withTransaction)("tell last phrase to copy to pasteboard")}\nend tell`;
     try {
@@ -12,0 +12,0 @@ return await (0, retry_1.retry)(() => (0, runAppleScript_1.runAppleScript)(script, options), options);

lib/macOS/VoiceOver/Directions.d.ts

@@ -5,6 +5,6 @@ /**
 export declare enum Directions {
-    UP = "up",
-    DOWN = "down",
-    LEFT = "left",
-    RIGHT = "right"
+    Up = "up",
+    Down = "down",
+    Left = "left",
+    Right = "right"
 }

lib/macOS/VoiceOver/Directions.js

@@ -9,6 +9,6 @@ "use strict";
 (function (Directions) {
-    Directions["UP"] = "up";
-    Directions["DOWN"] = "down";
-    Directions["LEFT"] = "left";
-    Directions["RIGHT"] = "right";
+    Directions["Up"] = "up";
+    Directions["Down"] = "down";
+    Directions["Left"] = "left";
+    Directions["Right"] = "right";
 })(Directions = exports.Directions || (exports.Directions = {}));

lib/macOS/VoiceOver/disableSplashScreen.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.disableSplashScreen = void 0;
+const errors_1 = require("../errors");
 const child_process_1 = require("child_process");
-const errors_1 = require("../errors");
 const DISABLE_VOICE_OVER_DIALOG = "defaults write com.apple.VoiceOverTraining doNotShowSplashScreen -bool true";
@@ -7,0 +7,0 @@ async function disableSplashScreen() {

lib/macOS/VoiceOver/index.d.ts

@@ -1,6 +0,8 @@
-export { VoiceOver } from "./VoiceOver";
 export { CommanderCommands as VoiceOverCommanderCommands } from "./CommanderCommands";
-export { Containments as VoiceOverContainments } from "./Containments";
-export { Directions as VoiceOverDirections } from "./Directions";
-export { Places as VoiceOverPlaces } from "./Places";
 export { keyCodeCommands as voiceOverKeyCodeCommands } from "./keyCodeCommands";
+export { VoiceOver } from "./VoiceOver";
+export { VoiceOverCaption } from "./VoiceOverCaption";
+export { VoiceOverCommander } from "./VoiceOverCommander";
+export { VoiceOverCursor } from "./VoiceOverCursor";
+export { VoiceOverKeyboard } from "./VoiceOverKeyboard";
+export { VoiceOverMouse } from "./VoiceOverMouse";

lib/macOS/VoiceOver/index.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.voiceOverKeyCodeCommands = exports.VoiceOverPlaces = exports.VoiceOverDirections = exports.VoiceOverContainments = exports.VoiceOverCommanderCommands = exports.VoiceOver = void 0;
-var VoiceOver_1 = require("./VoiceOver");
-Object.defineProperty(exports, "VoiceOver", { enumerable: true, get: function () { return VoiceOver_1.VoiceOver; } });
+exports.VoiceOverMouse = exports.VoiceOverKeyboard = exports.VoiceOverCursor = exports.VoiceOverCommander = exports.VoiceOverCaption = exports.VoiceOver = exports.voiceOverKeyCodeCommands = exports.VoiceOverCommanderCommands = void 0;
 var CommanderCommands_1 = require("./CommanderCommands");
 Object.defineProperty(exports, "VoiceOverCommanderCommands", { enumerable: true, get: function () { return CommanderCommands_1.CommanderCommands; } });
-var Containments_1 = require("./Containments");
-Object.defineProperty(exports, "VoiceOverContainments", { enumerable: true, get: function () { return Containments_1.Containments; } });
-var Directions_1 = require("./Directions");
-Object.defineProperty(exports, "VoiceOverDirections", { enumerable: true, get: function () { return Directions_1.Directions; } });
-var Places_1 = require("./Places");
-Object.defineProperty(exports, "VoiceOverPlaces", { enumerable: true, get: function () { return Places_1.Places; } });
 var keyCodeCommands_1 = require("./keyCodeCommands");
 Object.defineProperty(exports, "voiceOverKeyCodeCommands", { enumerable: true, get: function () { return keyCodeCommands_1.keyCodeCommands; } });
+var VoiceOver_1 = require("./VoiceOver");
+Object.defineProperty(exports, "VoiceOver", { enumerable: true, get: function () { return VoiceOver_1.VoiceOver; } });
+var VoiceOverCaption_1 = require("./VoiceOverCaption");
+Object.defineProperty(exports, "VoiceOverCaption", { enumerable: true, get: function () { return VoiceOverCaption_1.VoiceOverCaption; } });
+var VoiceOverCommander_1 = require("./VoiceOverCommander");
+Object.defineProperty(exports, "VoiceOverCommander", { enumerable: true, get: function () { return VoiceOverCommander_1.VoiceOverCommander; } });
+var VoiceOverCursor_1 = require("./VoiceOverCursor");
+Object.defineProperty(exports, "VoiceOverCursor", { enumerable: true, get: function () { return VoiceOverCursor_1.VoiceOverCursor; } });
+var VoiceOverKeyboard_1 = require("./VoiceOverKeyboard");
+Object.defineProperty(exports, "VoiceOverKeyboard", { enumerable: true, get: function () { return VoiceOverKeyboard_1.VoiceOverKeyboard; } });
+var VoiceOverMouse_1 = require("./VoiceOverMouse");
+Object.defineProperty(exports, "VoiceOverMouse", { enumerable: true, get: function () { return VoiceOverMouse_1.VoiceOverMouse; } });

lib/macOS/VoiceOver/isRunning.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isRunning = void 0;
+const activate_1 = require("../activate");
+const Applications_1 = require("../Applications");
 const child_process_1 = require("child_process");
-const Applications_1 = require("../Applications");
-const activate_1 = require("../activate");
 const runAppleScript_1 = require("../runAppleScript");
@@ -22,3 +22,3 @@ async function isRunning(options) {
     }
-    const appleScriptRunning = await (0, runAppleScript_1.runAppleScript)(`tell application "${Applications_1.Applications.VOICE_OVER}"\nreturn running\nend tell`);
+    const appleScriptRunning = await (0, runAppleScript_1.runAppleScript)(`tell application "${Applications_1.Applications.VoiceOver}"\nreturn running\nend tell`);
     if (appleScriptRunning === "false") {
@@ -28,3 +28,3 @@ return false;
     try {
-        await (0, activate_1.activate)(Applications_1.Applications.VOICE_OVER, options);
+        await (0, activate_1.activate)(Applications_1.Applications.VoiceOver, options);
         return true;
@@ -31,0 +31,0 @@ }

lib/macOS/VoiceOver/isSaved.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isSaved = void 0;
-const getLastSpokenPhrase_1 = require("./getLastSpokenPhrase");
+const lastSpokenPhrase_1 = require("./lastSpokenPhrase");
 async function isSaved(options) {
-    const lastPhrase = await (0, getLastSpokenPhrase_1.getLastSpokenPhrase)(options);
+    const lastPhrase = await (0, lastSpokenPhrase_1.lastSpokenPhrase)(options);
     return lastPhrase.startsWith("Last phrase saved to Desktop");
 }
 exports.isSaved = isSaved;

lib/macOS/VoiceOver/keyCodeCommands.d.ts

@@ -1,2 +0,3 @@
-import { KeyCodeCommand } from "../KeyCodeCommand";
+import { KeyCodes } from "../KeyCodes";
+import { Modifiers } from "../Modifiers";
 /**
@@ -7,2 +8,1358 @@ * Object of key code commands for the VoiceOver ScreenReader on MacOS.
  */
-export declare const keyCodeCommands: Record<string, KeyCodeCommand>;
+export declare const keyCodeCommands: {
+    toggleLock: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    openVoiceOverUtility: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    openVoiceOverHelpMenu: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    openVoiceOverQuickStart: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    openVoiceOverOnlineHelp: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    startKeyboardHelp: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    hearItemDescription: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    openCommandsMenu: {
+        keyCode: KeyCodes[];
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    openFindMenu: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    stopAction: {
+        keyCode: KeyCodes;
+        description: string;
+        representation: string;
+    };
+    ignoreNextKeyCombination: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    openVerbosityRotor: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    magnifyItem: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    shrinkItem: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    toggleVoiceOverCursorAndPanels: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    toggleCaptionPanel: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    resizeOrMoveCaptionPanel: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    toggleBraillePanel: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    resizeOrMoveBraillePanel: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    tileVisuals: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    toggleKeyboardCommander: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    toggleScreenCurtain: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    cycleRightThroughSpeechSettings: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    cycleLeftThroughSpeechSettings: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    changeUpCurrentSpeechSettings: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    changeDownCurrentSpeechSettings: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    pressAndReleaseMouse: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    interactWithItem: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    stopInteractingWithItem: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    performDefaultActionForItem: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    selectItem: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    selectMultipleItems: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    toggleStickyMouse: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    doubleClick: {
+        keyCode: KeyCodes[];
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    toggleDisclosureTriangle: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readTableRow: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readTableColumn: {
+        keyCode: KeyCodes[];
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readTableColumnHeader: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readTableRowAndColumnNumbers: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    sortTableColumn: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    interactWithScrollbars: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    resizeObject: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveObject: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveUp: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveDown: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToPrevious: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToNext: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToVisibleAreaTop: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToVisibleAreaBottom: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToAreaTop: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToAreaBottom: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToFirst: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToLast: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToFrontWindow: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    closeWindow: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    openItemChooser: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToDock: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToDesktop: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToMenuBar: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToFirstStatusMenuInMenuBar: {
+        keyCode: KeyCodes[];
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    openSpotlightMenu: {
+        keyCode: KeyCodes[];
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    openShortcutMenu: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpToLinkedItem: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    toggleCursorTrackingOptions: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveCursorToKeyboardFocus: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveKeyboardFocusToCursor: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveCursorToMouseFocus: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveMouseFocusToCursor: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpCommand: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpToTopEdge: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpToRightEdge: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpToBottomEdge: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpToLeftEdge: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpToTopVisibleEdge: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpToRightVisibleEdge: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpToBottomVisibleEdge: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpToLeftVisibleEdge: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpBeforeSplitter: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpAfterSplitter: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findText: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    navigateUp: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    cycleRightThroughNavigationSettings: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    navigateDown: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    cycleLeftThroughNavigationSettings: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    toggleHotSpot1: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    toggleHotSpot2: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    toggleHotSpot3: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    toggleHotSpot4: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    toggleHotSpot5: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    toggleHotSpot6: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    toggleHotSpot7: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    toggleHotSpot8: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    toggleHotSpot9: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    toggleHotSpot0: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpToHotSpot1: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpToHotSpot2: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpToHotSpot3: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpToHotSpot4: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpToHotSpot5: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpToHotSpot6: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpToHotSpot7: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpToHotSpot8: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpToHotSpot9: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpToHotSpot0: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    describeHotSpot1: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    describeHotSpot2: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    describeHotSpot3: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    describeHotSpot4: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    describeHotSpot5: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    describeHotSpot6: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    describeHotSpot7: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    describeHotSpot8: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    describeHotSpot9: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    describeHotSpot0: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    monitorHotSpot1: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    monitorHotSpot2: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    monitorHotSpot3: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    monitorHotSpot4: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    monitorHotSpot5: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    monitorHotSpot6: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    monitorHotSpot7: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    monitorHotSpot8: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    monitorHotSpot9: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    monitorHotSpot0: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    jumpToParentFolder: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    hearApplicationSummary: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    openApplicationChooser: {
+        keyCode: KeyCodes[];
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    hearWindowSummary: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    openWindowChooser: {
+        keyCode: KeyCodes[];
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    describeItem: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    describeItemSize: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    describeItemPosition: {
+        keyCode: KeyCodes[];
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    describeItemWithKeyboardFocus: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    describeLocationOfInsertionPoint: {
+        keyCode: KeyCodes[];
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    describeItemUnderMouseCursor: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    describeLocationOfMouseInCoordinates: {
+        keyCode: KeyCodes[];
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    describeLocationOfMouse: {
+        keyCode: KeyCodes[];
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    describeSelectedItem: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readEverythingInCursor: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readEverythingInWindow: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    repeatLastSpokenPhrase: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    copyLastSpokenPhraseToClipboard: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    saveLastSpokenPhraseToDesktop: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    find: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findNextSearchedText: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findPreviousSearchedText: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findNextList: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findPreviousList: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findNextBoldText: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findPreviousBoldText: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findNextStyleChange: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findPreviousStyleChange: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findNextItalicText: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findPreviousItalicText: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findNextColorChange: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findPreviousColorChange: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findNextFontChange: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findPreviousFontChange: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findNextTable: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findPreviousTable: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findNextUnderlinedText: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findPreviousUnderlinedText: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findNextControl: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findPreviousControl: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findNextDifferentItem: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findPreviousDifferentItem: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findNextItemWithSameTypeAsCurrentItem: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findPreviousItemWithSameTypeAsCurrentItem: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findNextGraphic: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findPreviousGraphic: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findNextHeading: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findPreviousHeading: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findNextLink: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findPreviousLink: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findNextHeadingOfSameLevel: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findPreviousHeadingOfSameLevel: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findNextPlainText: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findPreviousPlainText: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findNextVisitedLink: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findPreviousVisitedLink: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findNextMisspelledWord: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    findPreviousMisspelledWord: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readAllText: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    selectAllText: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    toggleTextSelection: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    speakTextAttributes: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readParagraph: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readNextParagraph: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readPreviousParagraph: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readSentence: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readNextSentence: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readPreviousSentence: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readLine: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readNextLine: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readPreviousLine: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readWord: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readWordSpelled: {
+        keyCode: KeyCodes[];
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readWordPhonetically: {
+        keyCode: KeyCodes[];
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readNextWord: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readPreviousWord: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readCharacter: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readCharacterPhonetically: {
+        keyCode: KeyCodes[];
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readNextCharacter: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readPreviousCharacter: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToFirstVisibleWord: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToLastVisibleWord: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToBeginningOfText: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToEndOfText: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readCurrentWordAndCharacter: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readNumberOfLines: {
+        keyCode: KeyCodes[];
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToNextColumn: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToPreviousColumn: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToNextFrame: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToPreviousFrame: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToNextAutoWebSpot: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToPreviousAutoWebSpot: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToNextWebSpot: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    moveToPreviousWebSpot: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    openWebItemRotor: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readFromBeginningToCurrent: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readLinkAddress: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    readWebpageStatistics: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    removeWebSpot: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    setWebSpot: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    setSweetSpot: {
+        keyCode: KeyCodes[];
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+    toggleGroupingItemsWithinTable: {
+        keyCode: KeyCodes;
+        modifiers: Modifiers[];
+        description: string;
+        representation: string;
+    };
+};

lib/macOS/VoiceOver/keyCodeCommands.js

@@ -7,3 +7,3 @@ "use strict";
 const Modifiers_1 = require("../Modifiers");
-const VO = [Modifiers_1.Modifiers.CONTROL, Modifiers_1.Modifiers.OPTION];
+const VO = [Modifiers_1.Modifiers.Control, Modifiers_1.Modifiers.Option];
 /**
@@ -17,3 +17,3 @@ * Object of key code commands for the VoiceOver ScreenReader on MacOS.
     toggleLock: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_SEMI_COLON,
+        keyCode: KeyCodes_1.KeyCodes.SemiColon,
         modifiers: VO,
@@ -24,3 +24,3 @@ description: "Lock and unlock the VO (Control and Option) keys",
     openVoiceOverUtility: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F8,
+        keyCode: KeyCodes_1.KeyCodes.F8,
         modifiers: VO,
@@ -31,3 +31,3 @@ description: "Open VoiceOver Utility",
     openVoiceOverHelpMenu: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_H,
+        keyCode: KeyCodes_1.KeyCodes.H,
         modifiers: VO,
@@ -38,4 +38,4 @@ description: "Open the VoiceOver Help menu",
     openVoiceOverQuickStart: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F8,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.F8,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Open the VoiceOver Quick Start",
@@ -45,4 +45,4 @@ representation: "VO-Command-F8",
     openVoiceOverOnlineHelp: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_FORWARD_SLASH,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.ForwardSlash,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Open VoiceOver online help",
@@ -52,3 +52,3 @@ representation: "VO-Shift-/",
     startKeyboardHelp: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_K,
+        keyCode: KeyCodes_1.KeyCodes.k,
         modifiers: VO,
@@ -59,4 +59,4 @@ description: "Start keyboard help",
     hearItemDescription: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_N,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.n,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Hear a description of the item in the VoiceOver cursor",
@@ -66,3 +66,3 @@ representation: "VO-Shift-N",
     openCommandsMenu: {
-        keyCode: [KeyCodes_1.KeyCodes.KEY_H, KeyCodes_1.KeyCodes.KEY_H],
+        keyCode: [KeyCodes_1.KeyCodes.h, KeyCodes_1.KeyCodes.h],
         modifiers: VO,
@@ -73,4 +73,4 @@ description: "Open the Commands menu",
     openFindMenu: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.f,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Open the Find menu",
@@ -80,3 +80,3 @@ representation: "VO-Shift-F",
     stopAction: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_ESCAPE,
+        keyCode: KeyCodes_1.KeyCodes.Escape,
         description: "Close a menu or rotor, stop an action, or exit a mode",
@@ -86,3 +86,3 @@ representation: "Escape",
     ignoreNextKeyCombination: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_TAB,
+        keyCode: KeyCodes_1.KeyCodes.Tab,
         modifiers: VO,
@@ -93,3 +93,3 @@ description: "Tell VoiceOver to ignore the next key combination you press",
     openVerbosityRotor: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_V,
+        keyCode: KeyCodes_1.KeyCodes.v,
         modifiers: VO,
@@ -100,4 +100,4 @@ description: "Open the verbosity rotor",
     magnifyItem: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_RIGHT_SQUARE_BRACKET,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.RightSquareBracket,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Magnify the item in the VoiceOver cursor",
@@ -107,4 +107,4 @@ representation: "VO-}",
     shrinkItem: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_LEFT_SQUARE_BRACKET,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.LeftSquareBracket,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Shrink the item in the VoiceOver cursor",
@@ -114,3 +114,3 @@ representation: "VO-{",
     toggleVoiceOverCursorAndPanels: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F11,
+        keyCode: KeyCodes_1.KeyCodes.F11,
         modifiers: VO,
@@ -121,4 +121,4 @@ description: "Temporarily hide or show the VoiceOver cursor and the caption or braille panels",
     toggleCaptionPanel: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F10,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.F10,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Hide or show the caption panel only",
@@ -128,4 +128,4 @@ representation: "VO-Command-F10",
     resizeOrMoveCaptionPanel: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F10,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.F10,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Resize or move the caption panel",
@@ -135,4 +135,4 @@ representation: "VO-Shift-F10",
     toggleBraillePanel: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F9,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.F9,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Hide or show the braille panel only",
@@ -142,4 +142,4 @@ representation: "VO-Command-F9",
     resizeOrMoveBraillePanel: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F9,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.F9,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Resize or move the braille panel",
@@ -149,3 +149,3 @@ representation: "VO-Shift-F9",
     tileVisuals: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F10,
+        keyCode: KeyCodes_1.KeyCodes.F10,
         modifiers: VO,
@@ -156,4 +156,4 @@ description: "Tile visuals (dim the screen, highlight the caption or braille panel, and show the item in the VoiceOver cursor in the center of the screen).",
     toggleKeyboardCommander: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_K,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.k,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Enable or disable the Keyboard Commander",
@@ -163,4 +163,4 @@ representation: "VO-Shift-K",
     toggleScreenCurtain: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F11,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.F11,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Turn the screen black (screen curtain)",
@@ -171,4 +171,4 @@ representation: "VO-Shift-F11",
         // VoiceOver documentation incorrect
-        keyCode: KeyCodes_1.KeyCodes.KEY_RIGHT_ARROW,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.ArrowRight,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Cycle through speech settings (rate, pitch, volume, intonation, voice)",
@@ -179,4 +179,4 @@ representation: "VO-Command-Shift-Right Arrow",
         // VoiceOver documentation incorrect
-        keyCode: KeyCodes_1.KeyCodes.KEY_LEFT_ARROW,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.ArrowLeft,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Cycle through speech settings (rate, pitch, volume, intonation, voice)",
@@ -187,4 +187,4 @@ representation: "VO-Command-Shift-Left Arrow",
         // VoiceOver documentation incorrect
-        keyCode: KeyCodes_1.KeyCodes.KEY_UP_ARROW,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.ArrowUp,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Change the current speech setting (rate, pitch, volume, intonation, voice)",
@@ -195,4 +195,4 @@ representation: "VO-Command-Shift-Up Arrow",
         // VoiceOver documentation incorrect
-        keyCode: KeyCodes_1.KeyCodes.KEY_DOWN_ARROW,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.ArrowDown,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Change the current speech setting (rate, pitch, volume, intonation, voice)",
@@ -202,4 +202,4 @@ representation: "VO-Command-Shift-Down Arrow",
     pressAndReleaseMouse: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_SPACE_BAR,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Space,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Press and release mouse button",
@@ -210,4 +210,4 @@ representation: "VO-Shift-Space bar",
     interactWithItem: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_DOWN_ARROW,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.ArrowDown,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Interact with an item",
@@ -217,4 +217,4 @@ representation: "VO-Shift-Down Arrow",
     stopInteractingWithItem: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_UP_ARROW,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.ArrowUp,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Stop interacting with an item",
@@ -224,3 +224,3 @@ representation: "VO-Shift-Up Arrow",
     performDefaultActionForItem: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_SPACE_BAR,
+        keyCode: KeyCodes_1.KeyCodes.Space,
         modifiers: VO,
@@ -231,3 +231,3 @@ description: "Perform the default action for the item in the VoiceOver cursor",
     selectItem: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_RETURN,
+        keyCode: KeyCodes_1.KeyCodes.Return,
         modifiers: VO,
@@ -238,4 +238,4 @@ description: "Select a menu or list item",
     selectMultipleItems: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_SPACE_BAR,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.Space,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Select multiple items",
@@ -245,4 +245,4 @@ representation: "VO-Command-Space bar",
     toggleStickyMouse: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_SPACE_BAR,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Space,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Perform a sticky mouse down or mouse up (for use when dragging an item from one location to drop in another location)",
@@ -252,4 +252,4 @@ representation: "VO-Command-Shift-Space bar",
     doubleClick: {
-        keyCode: [KeyCodes_1.KeyCodes.KEY_SPACE_BAR, KeyCodes_1.KeyCodes.KEY_SPACE_BAR],
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: [KeyCodes_1.KeyCodes.Space, KeyCodes_1.KeyCodes.Space],
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Click the item under the mouse cursor",
@@ -259,3 +259,3 @@ representation: "VO-Shift-Space bar-Space bar",
     toggleDisclosureTriangle: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_BACK_SLASH,
+        keyCode: KeyCodes_1.KeyCodes.Backslash,
         modifiers: VO,
@@ -266,3 +266,3 @@ description: "Open or close a disclosure triangle",
     readTableRow: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_R,
+        keyCode: KeyCodes_1.KeyCodes.r,
         modifiers: VO,
@@ -273,3 +273,3 @@ description: "Read a row in a table",
     readTableColumn: {
-        keyCode: [KeyCodes_1.KeyCodes.KEY_C, KeyCodes_1.KeyCodes.KEY_C],
+        keyCode: [KeyCodes_1.KeyCodes.c, KeyCodes_1.KeyCodes.c],
         modifiers: VO,
@@ -280,3 +280,3 @@ description: "Read a column in a table",
     readTableColumnHeader: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_C,
+        keyCode: KeyCodes_1.KeyCodes.c,
         modifiers: VO,
@@ -287,4 +287,4 @@ description: "Read the column header in a table",
     readTableRowAndColumnNumbers: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_T,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.t,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Read row and column numbers in a table",
@@ -294,4 +294,4 @@ representation: "VO-Shift-T",
     sortTableColumn: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_BACK_SLASH,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Backslash,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Sort a column in a table",
@@ -301,4 +301,4 @@ representation: "VO-|",
     interactWithScrollbars: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_S,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.s,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Interact with scroll bars",
@@ -308,4 +308,4 @@ representation: "VO-Shift-S",
     resizeObject: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_BACK_TICK,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Backtick,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Resize a window or an object",
@@ -315,3 +315,3 @@ representation: "VO-~",
     moveObject: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_BACK_TICK,
+        keyCode: KeyCodes_1.KeyCodes.Backtick,
         modifiers: VO,
@@ -323,3 +323,3 @@ description: "Move a window or an object",
     moveUp: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_UP_ARROW,
+        keyCode: KeyCodes_1.KeyCodes.ArrowUp,
         modifiers: VO,
@@ -330,3 +330,3 @@ description: "Move up",
     moveDown: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_DOWN_ARROW,
+        keyCode: KeyCodes_1.KeyCodes.ArrowDown,
         modifiers: VO,
@@ -337,3 +337,3 @@ description: "Move down",
     moveToPrevious: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_LEFT_ARROW,
+        keyCode: KeyCodes_1.KeyCodes.ArrowLeft,
         modifiers: VO,
@@ -344,3 +344,3 @@ description: "Move to previous",
     moveToNext: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_RIGHT_ARROW,
+        keyCode: KeyCodes_1.KeyCodes.ArrowRight,
         modifiers: VO,
@@ -351,3 +351,3 @@ description: "Move to next",
     moveToVisibleAreaTop: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_HOME,
+        keyCode: KeyCodes_1.KeyCodes.Home,
         modifiers: VO,
@@ -358,3 +358,3 @@ description: "Move to the top of the visible area (such as a window or text area) where the VoiceOver cursor is located",
     moveToVisibleAreaBottom: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_END,
+        keyCode: KeyCodes_1.KeyCodes.End,
         modifiers: VO,
@@ -365,4 +365,4 @@ description: "Move to the bottom of the visible area (such as a window or text area) where the VoiceOver cursor is located",
     moveToAreaTop: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_HOME,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Home,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Move to the top of the area (such as a window or text area) where the VoiceOver cursor is located, scrolling if necessary",
@@ -372,4 +372,4 @@ representation: "VO-Shift-Home",
     moveToAreaBottom: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_END,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.End,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Move to the bottom of the area (such as a window or text area) where the VoiceOver cursor is located, scrolling if necessary",
@@ -379,4 +379,4 @@ representation: "VO-Shift-End",
     moveToFirst: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_HOME,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.Home,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Move to the top of a window, the first item in the Dock, or the first item on your desktop, depending on your location",
@@ -386,4 +386,4 @@ representation: "VO-Command-Home",
     moveToLast: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_END,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.End,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Move to the lower-right corner of a window, the last item in the Dock, or the last item on your desktop, depending on your location",
@@ -393,4 +393,4 @@ representation: "VO-Command-End",
     moveToFrontWindow: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F2,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.F2,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Move to the front the window where the VoiceOver cursor is located and make it active",
@@ -400,4 +400,4 @@ representation: "VO-Shift-F2",
     closeWindow: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F2,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.F2,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Close the window where the VoiceOver cursor is located",
@@ -407,3 +407,3 @@ representation: "VO-Command-F2",
     openItemChooser: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_I,
+        keyCode: KeyCodes_1.KeyCodes.i,
         modifiers: VO,
@@ -414,3 +414,3 @@ description: "Open the Item Chooser",
     moveToDock: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_D,
+        keyCode: KeyCodes_1.KeyCodes.d,
         modifiers: VO,
@@ -421,4 +421,4 @@ description: "Move to the desktop",
     moveToDesktop: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_D,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.d,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Move to the desktop",
@@ -428,3 +428,3 @@ representation: "VO-D",
     moveToMenuBar: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_M,
+        keyCode: KeyCodes_1.KeyCodes.m,
         modifiers: VO,
@@ -435,3 +435,3 @@ description: "Move to the menu bar",
     moveToFirstStatusMenuInMenuBar: {
-        keyCode: [KeyCodes_1.KeyCodes.KEY_M, KeyCodes_1.KeyCodes.KEY_M],
+        keyCode: [KeyCodes_1.KeyCodes.m, KeyCodes_1.KeyCodes.m],
         modifiers: VO,
@@ -442,3 +442,3 @@ description: "Move to the first status menu in the menu bar",
     openSpotlightMenu: {
-        keyCode: [KeyCodes_1.KeyCodes.KEY_M, KeyCodes_1.KeyCodes.KEY_M, KeyCodes_1.KeyCodes.KEY_M],
+        keyCode: [KeyCodes_1.KeyCodes.m, KeyCodes_1.KeyCodes.m, KeyCodes_1.KeyCodes.m],
         modifiers: VO,
@@ -449,4 +449,4 @@ description: "Open the Spotlight menu",
     openShortcutMenu: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_M,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.m,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Open a shortcut menu",
@@ -456,3 +456,3 @@ representation: "VO-Shift-J",
     jumpToLinkedItem: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_J,
+        keyCode: KeyCodes_1.KeyCodes.j,
         modifiers: VO,
@@ -463,4 +463,4 @@ description: "Jump to a linked item (for example, from a Mail message in the Inbox to its message text)",
     toggleCursorTrackingOptions: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F3,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.F3,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Temporarily disable or enable the cursor tracking options you selected in VoiceOver Utility. The command doesn't change the settings in VoiceOver Utility.",
@@ -470,4 +470,4 @@ representation: "VO-Shift-F3",
     moveCursorToKeyboardFocus: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F4,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.F4,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Move VoiceOver cursor to keyboard focus",
@@ -477,4 +477,4 @@ representation: "VO-Shift-F4",
     moveKeyboardFocusToCursor: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F4,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.F4,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Move keyboard focus to VoiceOver cursor",
@@ -484,4 +484,4 @@ representation: "VO-Command-F4",
     moveCursorToMouseFocus: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F5,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.F5,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Move VoiceOver cursor to mouse cursor",
@@ -491,4 +491,4 @@ representation: "VO-Shift-F5",
     moveMouseFocusToCursor: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F5,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.F5,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Move mouse cursor to VoiceOver cursor",
@@ -498,4 +498,4 @@ representation: "VO-Command-F5",
     jumpCommand: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_J,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.j,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Jump command",
@@ -505,4 +505,4 @@ representation: "VO-Shift-J",
     jumpToTopEdge: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_UP_ARROW,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.ArrowUp,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Jump to the top edge of an area. Used with jump command",
@@ -512,4 +512,4 @@ representation: "VO-Shift-Up Arrow",
     jumpToRightEdge: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_RIGHT_ARROW,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.ArrowRight,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Jump to the right edge of an area. Used with jump command",
@@ -519,4 +519,4 @@ representation: "VO-Shift-Right Arrow",
     jumpToBottomEdge: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_DOWN_ARROW,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.ArrowDown,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Jump to the bottom edge of an area. Used with jump command",
@@ -526,4 +526,4 @@ representation: "VO-Shift-Down Arrow",
     jumpToLeftEdge: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_LEFT_ARROW,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.ArrowLeft,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Jump to the left edge of an area. Used with jump command",
@@ -533,3 +533,3 @@ representation: "VO-Shift-Left Arrow",
     jumpToTopVisibleEdge: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_UP_ARROW,
+        keyCode: KeyCodes_1.KeyCodes.ArrowUp,
         modifiers: VO,
@@ -540,3 +540,3 @@ description: "Jump to the top visible edge of an area. Used with jump command",
     jumpToRightVisibleEdge: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_RIGHT_ARROW,
+        keyCode: KeyCodes_1.KeyCodes.ArrowRight,
         modifiers: VO,
@@ -547,3 +547,3 @@ description: "Jump to the right visible edge of an area. Used with jump command",
     jumpToBottomVisibleEdge: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_DOWN_ARROW,
+        keyCode: KeyCodes_1.KeyCodes.ArrowDown,
         modifiers: VO,
@@ -554,3 +554,3 @@ description: "Jump to the bottom visible edge of an area. Used with jump command",
     jumpToLeftVisibleEdge: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_LEFT_ARROW,
+        keyCode: KeyCodes_1.KeyCodes.ArrowLeft,
         modifiers: VO,
@@ -561,3 +561,3 @@ description: "Jump to the left visible edge of an area. Used with jump command",
     jumpBeforeSplitter: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_LEFT_SQUARE_BRACKET,
+        keyCode: KeyCodes_1.KeyCodes.LeftSquareBracket,
         modifiers: VO,
@@ -568,3 +568,3 @@ description: "Jump to the area that precedes a horizontal or vertical splitter",
     jumpAfterSplitter: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_RIGHT_SQUARE_BRACKET,
+        keyCode: KeyCodes_1.KeyCodes.RightSquareBracket,
         modifiers: VO,
@@ -575,3 +575,3 @@ description: "Jump to the area that follows a horizontal or vertical splitter",
     findText: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F,
+        keyCode: KeyCodes_1.KeyCodes.f,
         modifiers: VO,
@@ -583,4 +583,4 @@ description: "Find text",
         // VoiceOver documentation incorrect
-        keyCode: KeyCodes_1.KeyCodes.KEY_UP_ARROW,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.ArrowUp,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Navigate in given direction, wrapping when necessary",
@@ -591,4 +591,4 @@ representation: "VO-Command-Up Arrow",
         // VoiceOver documentation incorrect
-        keyCode: KeyCodes_1.KeyCodes.KEY_RIGHT_ARROW,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.ArrowRight,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Cycle through navigation settings (Headings, Form Controls, Landmarks, etc.)",
@@ -599,4 +599,4 @@ representation: "VO-Command-Right Arrow",
         // VoiceOver documentation incorrect
-        keyCode: KeyCodes_1.KeyCodes.KEY_DOWN_ARROW,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.ArrowDown,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Navigate in given direction, wrapping when necessary",
@@ -607,4 +607,4 @@ representation: "VO-Command-Down Arrow",
         // VoiceOver documentation incorrect
-        keyCode: KeyCodes_1.KeyCodes.KEY_LEFT_ARROW,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.ArrowLeft,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Cycle through navigation settings (Headings, Form Controls, Landmarks, etc.)",
@@ -614,4 +614,4 @@ representation: "VO-Command-Left Arrow",
     toggleHotSpot1: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_1,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Digit1,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Toggle hot spot 1",
@@ -621,4 +621,4 @@ representation: "VO-Shift-1",
     toggleHotSpot2: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_2,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Digit2,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Toggle hot spot 2",
@@ -628,4 +628,4 @@ representation: "VO-Shift-2",
     toggleHotSpot3: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_3,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Digit3,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Toggle hot spot 3",
@@ -635,4 +635,4 @@ representation: "VO-Shift-3",
     toggleHotSpot4: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_4,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Digit4,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Toggle hot spot 4",
@@ -642,4 +642,4 @@ representation: "VO-Shift-4",
     toggleHotSpot5: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_5,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Digit5,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Toggle hot spot 5",
@@ -649,4 +649,4 @@ representation: "VO-Shift-5",
     toggleHotSpot6: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_6,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Digit6,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Toggle hot spot 6",
@@ -656,4 +656,4 @@ representation: "VO-Shift-6",
     toggleHotSpot7: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_7,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Digit7,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Toggle hot spot 7",
@@ -663,4 +663,4 @@ representation: "VO-Shift-7",
     toggleHotSpot8: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_8,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Digit8,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Toggle hot spot 8",
@@ -670,4 +670,4 @@ representation: "VO-Shift-8",
     toggleHotSpot9: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_9,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Digit9,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Toggle hot spot 9",
@@ -677,4 +677,4 @@ representation: "VO-Shift-9",
     toggleHotSpot0: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_0,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Digit0,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Toggle hot spot 0",
@@ -684,3 +684,3 @@ representation: "VO-Shift-0",
     jumpToHotSpot1: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_1,
+        keyCode: KeyCodes_1.KeyCodes.Digit1,
         modifiers: VO,
@@ -691,3 +691,3 @@ description: "Jump to hot spot 1",
     jumpToHotSpot2: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_2,
+        keyCode: KeyCodes_1.KeyCodes.Digit2,
         modifiers: VO,
@@ -698,3 +698,3 @@ description: "Jump to hot spot 2",
     jumpToHotSpot3: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_3,
+        keyCode: KeyCodes_1.KeyCodes.Digit3,
         modifiers: VO,
@@ -705,3 +705,3 @@ description: "Jump to hot spot 3",
     jumpToHotSpot4: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_4,
+        keyCode: KeyCodes_1.KeyCodes.Digit4,
         modifiers: VO,
@@ -712,3 +712,3 @@ description: "Jump to hot spot 4",
     jumpToHotSpot5: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_5,
+        keyCode: KeyCodes_1.KeyCodes.Digit5,
         modifiers: VO,
@@ -719,3 +719,3 @@ description: "Jump to hot spot 5",
     jumpToHotSpot6: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_6,
+        keyCode: KeyCodes_1.KeyCodes.Digit6,
         modifiers: VO,
@@ -726,3 +726,3 @@ description: "Jump to hot spot 6",
     jumpToHotSpot7: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_7,
+        keyCode: KeyCodes_1.KeyCodes.Digit7,
         modifiers: VO,
@@ -733,3 +733,3 @@ description: "Jump to hot spot 7",
     jumpToHotSpot8: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_8,
+        keyCode: KeyCodes_1.KeyCodes.Digit8,
         modifiers: VO,
@@ -740,3 +740,3 @@ description: "Jump to hot spot 8",
     jumpToHotSpot9: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_9,
+        keyCode: KeyCodes_1.KeyCodes.Digit9,
         modifiers: VO,
@@ -747,3 +747,3 @@ description: "Jump to hot spot 9",
     jumpToHotSpot0: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_0,
+        keyCode: KeyCodes_1.KeyCodes.Digit0,
         modifiers: VO,
@@ -754,4 +754,4 @@ description: "Jump to hot spot 0",
     describeHotSpot1: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_1,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.Digit1,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Hear a description of hot spot 1",
@@ -761,4 +761,4 @@ representation: "VO-Command-1",
     describeHotSpot2: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_2,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.Digit2,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Hear a description of hot spot 2",
@@ -768,4 +768,4 @@ representation: "VO-Command-2",
     describeHotSpot3: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_3,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.Digit3,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Hear a description of hot spot 3",
@@ -775,4 +775,4 @@ representation: "VO-Command-3",
     describeHotSpot4: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_4,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.Digit4,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Hear a description of hot spot 4",
@@ -782,4 +782,4 @@ representation: "VO-Command-4",
     describeHotSpot5: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_5,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.Digit5,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Hear a description of hot spot 5",
@@ -789,4 +789,4 @@ representation: "VO-Command-5",
     describeHotSpot6: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_6,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.Digit6,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Hear a description of hot spot 6",
@@ -796,4 +796,4 @@ representation: "VO-Command-6",
     describeHotSpot7: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_7,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.Digit7,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Hear a description of hot spot 7",
@@ -803,4 +803,4 @@ representation: "VO-Command-7",
     describeHotSpot8: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_8,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.Digit8,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Hear a description of hot spot 8",
@@ -810,4 +810,4 @@ representation: "VO-Command-8",
     describeHotSpot9: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_9,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.Digit9,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Hear a description of hot spot 9",
@@ -817,4 +817,4 @@ representation: "VO-Command-9",
     describeHotSpot0: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_0,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.Digit0,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Hear a description of hot spot 0",
@@ -824,4 +824,4 @@ representation: "VO-Command-0",
     monitorHotSpot1: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_1,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Digit1,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Monitor hot spot 1",
@@ -831,4 +831,4 @@ representation: "VO-Command-Shift-1",
     monitorHotSpot2: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_2,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Digit2,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Monitor hot spot 2",
@@ -838,4 +838,4 @@ representation: "VO-Command-Shift-2",
     monitorHotSpot3: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_3,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Digit3,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Monitor hot spot 3",
@@ -845,4 +845,4 @@ representation: "VO-Command-Shift-3",
     monitorHotSpot4: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_4,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Digit4,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Monitor hot spot 4",
@@ -852,4 +852,4 @@ representation: "VO-Command-Shift-4",
     monitorHotSpot5: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_5,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Digit5,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Monitor hot spot 5",
@@ -859,4 +859,4 @@ representation: "VO-Command-Shift-5",
     monitorHotSpot6: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_6,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Digit6,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Monitor hot spot 6",
@@ -866,4 +866,4 @@ representation: "VO-Command-Shift-6",
     monitorHotSpot7: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_7,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Digit7,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Monitor hot spot 7",
@@ -873,4 +873,4 @@ representation: "VO-Command-Shift-7",
     monitorHotSpot8: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_8,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Digit8,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Monitor hot spot 8",
@@ -880,4 +880,4 @@ representation: "VO-Command-Shift-8",
     monitorHotSpot9: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_9,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Digit9,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Monitor hot spot 9",
@@ -887,4 +887,4 @@ representation: "VO-Command-Shift-9",
     monitorHotSpot0: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_0,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Digit0,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Monitor hot spot 0",
@@ -894,4 +894,4 @@ representation: "VO-Command-Shift-0",
     jumpToParentFolder: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_BACK_SLASH,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.Backslash,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Jump back to a parent folder",
@@ -902,3 +902,3 @@ representation: "VO-Command-\\",
     hearApplicationSummary: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F1,
+        keyCode: KeyCodes_1.KeyCodes.F1,
         modifiers: VO,
@@ -909,3 +909,3 @@ description: "Hear the application summary",
     openApplicationChooser: {
-        keyCode: [KeyCodes_1.KeyCodes.KEY_F1, KeyCodes_1.KeyCodes.KEY_F1],
+        keyCode: [KeyCodes_1.KeyCodes.F1, KeyCodes_1.KeyCodes.F1],
         modifiers: VO,
@@ -916,3 +916,3 @@ description: "Open the Application Chooser",
     hearWindowSummary: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F2,
+        keyCode: KeyCodes_1.KeyCodes.F2,
         modifiers: VO,
@@ -923,3 +923,3 @@ description: "Hear the window summary",
     openWindowChooser: {
-        keyCode: [KeyCodes_1.KeyCodes.KEY_F2, KeyCodes_1.KeyCodes.KEY_F2],
+        keyCode: [KeyCodes_1.KeyCodes.F2, KeyCodes_1.KeyCodes.F2],
         modifiers: VO,
@@ -930,3 +930,3 @@ description: "Open the Window Chooser ",
     describeItem: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F3,
+        keyCode: KeyCodes_1.KeyCodes.F3,
         modifiers: VO,
@@ -937,4 +937,4 @@ description: "Describe the item in the VoiceOver cursor",
     describeItemSize: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F3,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.F3,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Describe the size of the item in the VoiceOver cursor",
@@ -944,4 +944,4 @@ representation: "VO-Command-F3",
     describeItemPosition: {
-        keyCode: [KeyCodes_1.KeyCodes.KEY_F3, KeyCodes_1.KeyCodes.KEY_F3],
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: [KeyCodes_1.KeyCodes.F3, KeyCodes_1.KeyCodes.F3],
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Describe the position of the item in the VoiceOver cursor",
@@ -951,3 +951,3 @@ representation: "VO-Command-F3-F3",
     describeItemWithKeyboardFocus: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F4,
+        keyCode: KeyCodes_1.KeyCodes.F4,
         modifiers: VO,
@@ -958,3 +958,3 @@ description: "Describe the item that has the keyboard focus",
     describeLocationOfInsertionPoint: {
-        keyCode: [KeyCodes_1.KeyCodes.KEY_F4, KeyCodes_1.KeyCodes.KEY_F4],
+        keyCode: [KeyCodes_1.KeyCodes.F4, KeyCodes_1.KeyCodes.F4],
         modifiers: VO,
@@ -965,3 +965,3 @@ description: "Describe the location of the insertion point (from upper-left corner of screen)",
     describeItemUnderMouseCursor: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F5,
+        keyCode: KeyCodes_1.KeyCodes.F5,
         modifiers: VO,
@@ -972,3 +972,3 @@ description: "Describe the item under the mouse cursor",
     describeLocationOfMouseInCoordinates: {
-        keyCode: [KeyCodes_1.KeyCodes.KEY_F5, KeyCodes_1.KeyCodes.KEY_F5],
+        keyCode: [KeyCodes_1.KeyCodes.F5, KeyCodes_1.KeyCodes.F5],
         modifiers: VO,
@@ -979,3 +979,3 @@ description: "Describe the location of the mouse in x, y coordinates (from upper-left corner of screen)",
     describeLocationOfMouse: {
-        keyCode: [KeyCodes_1.KeyCodes.KEY_F5, KeyCodes_1.KeyCodes.KEY_F5, KeyCodes_1.KeyCodes.KEY_F5],
+        keyCode: [KeyCodes_1.KeyCodes.F5, KeyCodes_1.KeyCodes.F5, KeyCodes_1.KeyCodes.F5],
         modifiers: VO,
@@ -986,3 +986,3 @@ description: "Describe the location of the mouse (from upper-left corner of window)",
     describeSelectedItem: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F6,
+        keyCode: KeyCodes_1.KeyCodes.F6,
         modifiers: VO,
@@ -993,3 +993,3 @@ description: "Describe the selected item",
     readEverythingInCursor: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_A,
+        keyCode: KeyCodes_1.KeyCodes.a,
         modifiers: VO,
@@ -1000,4 +1000,4 @@ description: "Read everything in the VoiceOver cursor",
     readEverythingInWindow: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_W,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.w,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Read everything visible in the window or the Dock, or on your desktop, depending on your location",
@@ -1007,3 +1007,3 @@ representation: "VO-Shift-W",
     repeatLastSpokenPhrase: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_Z,
+        keyCode: KeyCodes_1.KeyCodes.z,
         modifiers: VO,
@@ -1014,4 +1014,4 @@ description: "Repeat the last spoken phrase",
     copyLastSpokenPhraseToClipboard: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_C,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.c,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: 'Copy the last spoken phrase to the Clipboard (also called the "Pasteboard")',
@@ -1021,4 +1021,4 @@ representation: "VO-Shift-C",
     saveLastSpokenPhraseToDesktop: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_Z,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.z,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Save the last spoken phrase and the crash log to a file on the desktop for troubleshooting",
@@ -1029,3 +1029,3 @@ representation: "VO-Shift-Z",
     find: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F,
+        keyCode: KeyCodes_1.KeyCodes.f,
         modifiers: VO,
@@ -1036,3 +1036,3 @@ description: "Find",
     findNextSearchedText: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_G,
+        keyCode: KeyCodes_1.KeyCodes.g,
         modifiers: VO,
@@ -1043,4 +1043,4 @@ description: "Find the next searched text",
     findPreviousSearchedText: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_G,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.g,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Find the previous searched text",
@@ -1050,4 +1050,4 @@ representation: "VO-Shift-G",
     findNextList: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_X,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.x,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Find the next list",
@@ -1057,4 +1057,4 @@ representation: "VO-Command-X",
     findPreviousList: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_X,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.x,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Find the previous list",
@@ -1064,4 +1064,4 @@ representation: "VO-Command-Shift-X",
     findNextBoldText: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_B,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.b,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Find the next bold text",
@@ -1071,4 +1071,4 @@ representation: "VO-Command-B",
     findPreviousBoldText: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_B,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.b,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Find the previous bold text",
@@ -1078,4 +1078,4 @@ representation: "VO-Command-Shift-B",
     findNextStyleChange: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_C,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.c,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Find the next style change",
@@ -1085,4 +1085,4 @@ representation: "VO-Command-C",
     findPreviousStyleChange: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_C,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.c,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Find the previous style change",
@@ -1092,4 +1092,4 @@ representation: "VO-Command-Shift-C",
     findNextItalicText: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_I,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.i,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Find the next italic text",
@@ -1099,4 +1099,4 @@ representation: "VO-Command-I",
     findPreviousItalicText: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_I,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.i,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Find the previous italic text",
@@ -1106,4 +1106,4 @@ representation: "VO-Command-Shift-I",
     findNextColorChange: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_K,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.k,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Find the next color change",
@@ -1113,4 +1113,4 @@ representation: "VO-Command-K",
     findPreviousColorChange: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_K,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.k,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Find the previous color change",
@@ -1120,4 +1120,4 @@ representation: "VO-Command-Shift-K",
     findNextFontChange: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_O,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.o,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Find the next font change",
@@ -1127,4 +1127,4 @@ representation: "VO-Command-O",
     findPreviousFontChange: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_O,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.o,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Find the previous font change",
@@ -1134,4 +1134,4 @@ representation: "VO-Command-Shift-O",
     findNextTable: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_T,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.t,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Find the next table",
@@ -1141,4 +1141,4 @@ representation: "VO-Command-T",
     findPreviousTable: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_T,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.t,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Find the previous table",
@@ -1148,4 +1148,4 @@ representation: "VO-Command-Shift-T",
     findNextUnderlinedText: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_U,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.u,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Find the next underlined text",
@@ -1155,4 +1155,4 @@ representation: "VO-Command-U",
     findPreviousUnderlinedText: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_U,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.u,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Find the previous underlined text",
@@ -1162,4 +1162,4 @@ representation: "VO-Command-Shift-U",
     findNextControl: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_J,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.j,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Find the next control",
@@ -1169,4 +1169,4 @@ representation: "VO-Command-J",
     findPreviousControl: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_J,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.j,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Find the previous control",
@@ -1176,4 +1176,4 @@ representation: "VO-Command-Shift-J",
     findNextDifferentItem: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_D,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.d,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Find the next different item",
@@ -1183,4 +1183,4 @@ representation: "VO-Command-D",
     findPreviousDifferentItem: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_D,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.d,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Find the previous different item",
@@ -1190,4 +1190,4 @@ representation: "VO-Command-Shift-D",
     findNextItemWithSameTypeAsCurrentItem: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_S,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.s,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Find the next item that's the same type as the current item",
@@ -1197,4 +1197,4 @@ representation: "VO-Command-S",
     findPreviousItemWithSameTypeAsCurrentItem: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_S,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.s,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Find the previous item that's the same type as the current item",
@@ -1204,4 +1204,4 @@ representation: "VO-Command-Shift-S",
     findNextGraphic: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_G,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.g,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Find the next graphic",
@@ -1211,4 +1211,4 @@ representation: "VO-Command-G",
     findPreviousGraphic: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_G,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.g,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Find the previous graphic",
@@ -1218,4 +1218,4 @@ representation: "VO-Command-Shift-G",
     findNextHeading: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_H,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.h,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Find the next heading",
@@ -1225,4 +1225,4 @@ representation: "VO-Command-H",
     findPreviousHeading: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_H,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.h,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Find the previous heading",
@@ -1232,4 +1232,4 @@ representation: "VO-Command-Shift-H",
     findNextLink: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_L,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.l,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Find the next link",
@@ -1239,4 +1239,4 @@ representation: "VO-Command-L",
     findPreviousLink: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_L,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.l,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Find the previous link",
@@ -1246,4 +1246,4 @@ representation: "VO-Command-Shift-L",
     findNextHeadingOfSameLevel: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_M,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.m,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Find the next heading of the same level",
@@ -1253,4 +1253,4 @@ representation: "VO-Command-M",
     findPreviousHeadingOfSameLevel: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_M,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.m,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Find the previous heading of the same level",
@@ -1260,4 +1260,4 @@ representation: "VO-Command-Shift-M",
     findNextPlainText: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_P,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.p,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Find the next plain text",
@@ -1267,4 +1267,4 @@ representation: "VO-Command-P",
     findPreviousPlainText: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_P,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.p,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Find the previous plain text",
@@ -1274,4 +1274,4 @@ representation: "VO-Command-Shift-P",
     findNextVisitedLink: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_V,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.v,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Find the next visited link",
@@ -1281,4 +1281,4 @@ representation: "VO-Command-V",
     findPreviousVisitedLink: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_V,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.v,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Find the previous visited link",
@@ -1288,4 +1288,4 @@ representation: "VO-Command-Shift-V",
     findNextMisspelledWord: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_E,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.e,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Find the next misspelled word",
@@ -1295,4 +1295,4 @@ representation: "VO-Command-E",
     findPreviousMisspelledWord: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_E,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.e,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Find the previous misspelled word",
@@ -1303,3 +1303,3 @@ representation: "VO-Command-Shift-E",
     readAllText: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_A,
+        keyCode: KeyCodes_1.KeyCodes.a,
         modifiers: VO,
@@ -1310,4 +1310,4 @@ description: "Read all text from the VoiceOver cursor to the end of the text",
     selectAllText: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_A,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.a,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Select all text in the VoiceOver cursor",
@@ -1317,3 +1317,3 @@ representation: "VO-Shift-A",
     toggleTextSelection: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_RETURN,
+        keyCode: KeyCodes_1.KeyCodes.Return,
         modifiers: VO,
@@ -1324,3 +1324,3 @@ description: "Start and stop text selection in a text field (text selection tracking must be on)",
     speakTextAttributes: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_T,
+        keyCode: KeyCodes_1.KeyCodes.t,
         modifiers: VO,
@@ -1331,3 +1331,3 @@ description: "Speak text attributes",
     readParagraph: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_P,
+        keyCode: KeyCodes_1.KeyCodes.p,
         modifiers: VO,
@@ -1338,4 +1338,4 @@ description: "Read paragraph in VoiceOver cursor",
     readNextParagraph: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_PAGE_DOWN,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.PageDown,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Read next paragraph",
@@ -1345,4 +1345,4 @@ representation: "VO-Shift-Page Down",
     readPreviousParagraph: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_PAGE_UP,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.PageUp,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Read previous paragraph",
@@ -1352,3 +1352,3 @@ representation: "VO-Shift-Page Up",
     readSentence: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_S,
+        keyCode: KeyCodes_1.KeyCodes.s,
         modifiers: VO,
@@ -1359,4 +1359,4 @@ description: "Read sentence in VoiceOver cursor",
     readNextSentence: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_PAGE_DOWN,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.PageDown,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Read next sentence",
@@ -1366,4 +1366,4 @@ representation: "VO-Command-Page Down",
     readPreviousSentence: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_PAGE_UP,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.PageUp,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Read previous sentence",
@@ -1373,3 +1373,3 @@ representation: "VO-Command-Page Up",
     readLine: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_L,
+        keyCode: KeyCodes_1.KeyCodes.l,
         modifiers: VO,
@@ -1380,3 +1380,3 @@ description: "Read line in VoiceOver cursor",
     readNextLine: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_PAGE_DOWN,
+        keyCode: KeyCodes_1.KeyCodes.PageDown,
         modifiers: VO,
@@ -1387,3 +1387,3 @@ description: "Read next line",
     readPreviousLine: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_PAGE_UP,
+        keyCode: KeyCodes_1.KeyCodes.PageUp,
         modifiers: VO,
@@ -1394,3 +1394,3 @@ description: "Read previous line",
     readWord: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_W,
+        keyCode: KeyCodes_1.KeyCodes.w,
         modifiers: VO,
@@ -1401,3 +1401,3 @@ description: "Read word in VoiceOver cursor",
     readWordSpelled: {
-        keyCode: [KeyCodes_1.KeyCodes.KEY_W, KeyCodes_1.KeyCodes.KEY_W],
+        keyCode: [KeyCodes_1.KeyCodes.w, KeyCodes_1.KeyCodes.w],
         modifiers: VO,
@@ -1408,3 +1408,3 @@ description: "Read word spelled in VoiceOver cursor",
     readWordPhonetically: {
-        keyCode: [KeyCodes_1.KeyCodes.KEY_W, KeyCodes_1.KeyCodes.KEY_W, KeyCodes_1.KeyCodes.KEY_W],
+        keyCode: [KeyCodes_1.KeyCodes.w, KeyCodes_1.KeyCodes.w, KeyCodes_1.KeyCodes.w],
         modifiers: VO,
@@ -1415,3 +1415,3 @@ description: "Read word spelled phonetically in VoiceOver cursor",
     readNextWord: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_RIGHT_ARROW,
+        keyCode: KeyCodes_1.KeyCodes.ArrowRight,
         modifiers: VO,
@@ -1422,3 +1422,3 @@ description: "Read next word",
     readPreviousWord: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_LEFT_ARROW,
+        keyCode: KeyCodes_1.KeyCodes.ArrowLeft,
         modifiers: VO,
@@ -1429,3 +1429,3 @@ description: "Read previous word",
     readCharacter: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_C,
+        keyCode: KeyCodes_1.KeyCodes.c,
         modifiers: VO,
@@ -1436,3 +1436,3 @@ description: "Read character in VoiceOver cursor",
     readCharacterPhonetically: {
-        keyCode: [KeyCodes_1.KeyCodes.KEY_C, KeyCodes_1.KeyCodes.KEY_C],
+        keyCode: [KeyCodes_1.KeyCodes.c, KeyCodes_1.KeyCodes.c],
         modifiers: VO,
@@ -1443,4 +1443,4 @@ description: "Read character phonetically in VoiceOver cursor",
     readNextCharacter: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_RIGHT_ARROW,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.ArrowRight,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Read next character",
@@ -1450,4 +1450,4 @@ representation: "VO-Shift-Right Arrow",
     readPreviousCharacter: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_LEFT_ARROW,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.ArrowLeft,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Read previous character",
@@ -1457,3 +1457,3 @@ representation: "VO-Shift-Left Arrow",
     moveToFirstVisibleWord: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_HOME,
+        keyCode: KeyCodes_1.KeyCodes.Home,
         modifiers: VO,
@@ -1464,3 +1464,3 @@ description: "Move to first visible word",
     moveToLastVisibleWord: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_END,
+        keyCode: KeyCodes_1.KeyCodes.End,
         modifiers: VO,
@@ -1471,4 +1471,4 @@ description: "Move to last visible word",
     moveToBeginningOfText: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_HOME,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.Home,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Move to beginning of text, scrolling if necessary",
@@ -1478,4 +1478,4 @@ representation: "VO-Shift-Home",
     moveToEndOfText: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_END,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.End,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Move to end of text, scrolling if necessary",
@@ -1485,3 +1485,3 @@ representation: "VO-Shift-End",
     readCurrentWordAndCharacter: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F3,
+        keyCode: KeyCodes_1.KeyCodes.F3,
         modifiers: VO,
@@ -1492,3 +1492,3 @@ description: "Reads the current word and character in the VoiceOver cursor",
     readNumberOfLines: {
-        keyCode: [KeyCodes_1.KeyCodes.KEY_F3, KeyCodes_1.KeyCodes.KEY_F3],
+        keyCode: [KeyCodes_1.KeyCodes.F3, KeyCodes_1.KeyCodes.F3],
         modifiers: VO,
@@ -1500,4 +1500,4 @@ description: "Reads the total number of lines and the number of visible lines in a document",
     moveToNextColumn: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_Y,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.y,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Move to the next column",
@@ -1507,4 +1507,4 @@ representation: "VO-Command-Y",
     moveToPreviousColumn: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_Y,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.y,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Move to the previous column",
@@ -1514,4 +1514,4 @@ representation: "VO-Command-Shift-Y",
     moveToNextFrame: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.f,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Move to the next frame",
@@ -1521,4 +1521,4 @@ representation: "VO-Command-F",
     moveToPreviousFrame: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_F,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.f,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Move to the previous frame",
@@ -1528,4 +1528,4 @@ representation: "VO-Command-Shift-F",
     moveToNextAutoWebSpot: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_N,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.n,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Move to the next auto web spot",
@@ -1535,4 +1535,4 @@ representation: "VO-Command-N",
     moveToPreviousAutoWebSpot: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_N,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.n,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Move to the previous auto web spot",
@@ -1542,4 +1542,4 @@ representation: "VO-Command-Shift-N",
     moveToNextWebSpot: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_LEFT_SQUARE_BRACKET,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.LeftSquareBracket,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Move to the next web spot",
@@ -1549,4 +1549,4 @@ representation: "VO-Command-]",
     moveToPreviousWebSpot: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_RIGHT_SQUARE_BRACKET,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD],
+        keyCode: KeyCodes_1.KeyCodes.RightSquareBracket,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command],
         description: "Move to the previous web spot",
@@ -1556,3 +1556,3 @@ representation: "VO-Command-[",
     openWebItemRotor: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_U,
+        keyCode: KeyCodes_1.KeyCodes.u,
         modifiers: VO,
@@ -1563,3 +1563,3 @@ description: "Open the Web Item rotor",
     readFromBeginningToCurrent: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_B,
+        keyCode: KeyCodes_1.KeyCodes.b,
         modifiers: VO,
@@ -1570,4 +1570,4 @@ description: "Read from the beginning of a webpage to the current location",
     readLinkAddress: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_U,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.u,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Read a link address (URL)",
@@ -1577,4 +1577,4 @@ representation: "VO-Shift-U",
     readWebpageStatistics: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_I,
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.i,
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Read webpage statistics",
@@ -1584,4 +1584,4 @@ representation: "VO-Shift-I",
     removeWebSpot: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_LEFT_SQUARE_BRACKET,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.LeftSquareBracket,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Remove a web spot",
@@ -1591,4 +1591,4 @@ representation: "VO-Command-Shift-{",
     setWebSpot: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_RIGHT_SQUARE_BRACKET,
-        modifiers: [...VO, Modifiers_1.Modifiers.CMD, Modifiers_1.Modifiers.SHIFT],
+        keyCode: KeyCodes_1.KeyCodes.RightSquareBracket,
+        modifiers: [...VO, Modifiers_1.Modifiers.Command, Modifiers_1.Modifiers.Shift],
         description: "Set a web spot",
@@ -1598,7 +1598,4 @@ representation: "VO-Command-Shift-}",
     setSweetSpot: {
-        keyCode: [
-            KeyCodes_1.KeyCodes.KEY_RIGHT_SQUARE_BRACKET,
-            KeyCodes_1.KeyCodes.KEY_RIGHT_SQUARE_BRACKET,
-        ],
-        modifiers: [...VO, Modifiers_1.Modifiers.SHIFT],
+        keyCode: [KeyCodes_1.KeyCodes.RightSquareBracket, KeyCodes_1.KeyCodes.RightSquareBracket],
+        modifiers: [...VO, Modifiers_1.Modifiers.Shift],
         description: "Set the sweet spot",
@@ -1608,3 +1605,3 @@ representation: "VO-Command-Shift-}-}",
     toggleGroupingItemsWithinTable: {
-        keyCode: KeyCodes_1.KeyCodes.KEY_EQUALS,
+        keyCode: KeyCodes_1.KeyCodes.Equals,
         modifiers: VO,
@@ -1611,0 +1608,0 @@ description: "Turn the grouping of items within a table on or off",

lib/macOS/VoiceOver/move.d.ts

@@ -0,5 +1,5 @@
+import type { CommandOptions } from "../../CommandOptions";
+import type { Containments } from "./Containments";
 import type { Directions } from "./Directions";
-import type { Containments } from "./Containments";
 import type { Places } from "./Places";
-import type { CommandOptions } from "../../CommandOptions";
 export declare function move(direction: Directions | Containments, place?: Places, options?: CommandOptions): Promise<void>;

lib/macOS/VoiceOver/move.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.move = void 0;
+const Applications_1 = require("../Applications");
+const errors_1 = require("../errors");
 const retryIfAppleEventTimeout_1 = require("../retryIfAppleEventTimeout");
 const runAppleScript_1 = require("../runAppleScript");
-const Applications_1 = require("../Applications");
-const errors_1 = require("../errors");
 const withTransaction_1 = require("../withTransaction");
 async function move(direction, place, options) {
     const moveScript = `tell vo cursor to move ${direction}${place ? ` to ${place}` : ""}`;
-    const script = `tell application "${Applications_1.Applications.VOICE_OVER}"\n${(0, withTransaction_1.withTransaction)(moveScript)}\nend tell`;
+    const script = `tell application "${Applications_1.Applications.VoiceOver}"\n${(0, withTransaction_1.withTransaction)(moveScript)}\nend tell`;
     try {
@@ -13,0 +13,0 @@ return await (0, retryIfAppleEventTimeout_1.retryIfAppleEventTimeout)(() => (0, runAppleScript_1.runAppleScript)(script, options), options);

lib/macOS/VoiceOver/performAction.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.performAction = void 0;
-const keyCode_1 = require("../keyCode");
-const KeyCodes_1 = require("../KeyCodes");
+const Applications_1 = require("../Applications");
 const errors_1 = require("../errors");
+const retryIfAppleEventTimeout_1 = require("../retryIfAppleEventTimeout");
+const runAppleScript_1 = require("../runAppleScript");
+const withTransaction_1 = require("../withTransaction");
 async function performAction(options) {
+    const actionScript = `tell vo cursor to perform action`;
+    const script = `tell application "${Applications_1.Applications.VoiceOver}"\n${(0, withTransaction_1.withTransaction)(actionScript)}\nend tell`;
     try {
-        return await (0, keyCode_1.keyCode)({ keyCode: KeyCodes_1.KeyCodes.KEY_ENTER }, options);
+        return await (0, retryIfAppleEventTimeout_1.retryIfAppleEventTimeout)(() => (0, runAppleScript_1.runAppleScript)(script, options), options);
     }
@@ -11,0 +15,0 @@ catch (e) {

lib/macOS/VoiceOver/performCommand.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.performCommand = void 0;
+const Applications_1 = require("../Applications");
+const errors_1 = require("../errors");
 const retryIfAppleEventTimeout_1 = require("../retryIfAppleEventTimeout");
 const runAppleScript_1 = require("../runAppleScript");
 const withTransaction_1 = require("../withTransaction");
-const Applications_1 = require("../Applications");
-const errors_1 = require("../errors");
 async function performCommand(command, options) {
     const performCommandScript = `tell commander to perform command "${command}"`;
-    const script = `tell application "${Applications_1.Applications.VOICE_OVER}"\n${(0, withTransaction_1.withTransaction)(performCommandScript)}\nend tell`;
+    const script = `tell application "${Applications_1.Applications.VoiceOver}"\n${(0, withTransaction_1.withTransaction)(performCommandScript)}\nend tell`;
     try {
@@ -13,0 +13,0 @@ return await (0, retryIfAppleEventTimeout_1.retryIfAppleEventTimeout)(() => (0, runAppleScript_1.runAppleScript)(script, options), options);

lib/macOS/VoiceOver/Places.d.ts

@@ -5,10 +5,10 @@ /**
 export declare enum Places {
-    DOCK = "dock",
-    DESKTOP = "desktop",
-    MENUBAR = "menubar",
-    MENU_EXTRAS = "menu extras",
-    SPOTLIGHT = "spotlight",
-    LINKED_ITEM = "linked item",
-    FIRST_ITEM = "first item",
-    LAST_ITEM = "last item"
+    Dock = "dock",
+    Desktop = "desktop",
+    Menubar = "menubar",
+    MenuExtras = "menu extras",
+    Spotlight = "spotlight",
+    LinkedItem = "linked item",
+    FirstItem = "first item",
+    LastItem = "last item"
 }

lib/macOS/VoiceOver/Places.js

@@ -9,10 +9,10 @@ "use strict";
 (function (Places) {
-    Places["DOCK"] = "dock";
-    Places["DESKTOP"] = "desktop";
-    Places["MENUBAR"] = "menubar";
-    Places["MENU_EXTRAS"] = "menu extras";
-    Places["SPOTLIGHT"] = "spotlight";
-    Places["LINKED_ITEM"] = "linked item";
-    Places["FIRST_ITEM"] = "first item";
-    Places["LAST_ITEM"] = "last item";
+    Places["Dock"] = "dock";
+    Places["Desktop"] = "desktop";
+    Places["Menubar"] = "menubar";
+    Places["MenuExtras"] = "menu extras";
+    Places["Spotlight"] = "spotlight";
+    Places["LinkedItem"] = "linked item";
+    Places["FirstItem"] = "first item";
+    Places["LastItem"] = "last item";
 })(Places = exports.Places || (exports.Places = {}));

lib/macOS/VoiceOver/saveLastSpokenPhrase.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.saveLastSpokenPhrase = void 0;
+const Applications_1 = require("../Applications");
+const errors_1 = require("../errors");
+const retry_1 = require("../../retry");
 const runAppleScript_1 = require("../runAppleScript");
 const waitForSaved_1 = require("./waitForSaved");
-const retry_1 = require("../../retry");
 const withTransaction_1 = require("../withTransaction");
-const Applications_1 = require("../Applications");
-const errors_1 = require("../errors");
 async function saveLastSpokenPhrase(options) {
-    const script = `tell application "${Applications_1.Applications.VOICE_OVER}"\n${(0, withTransaction_1.withTransaction)("tell last phrase to save")}\nend tell`;
+    const script = `tell application "${Applications_1.Applications.VoiceOver}"\n${(0, withTransaction_1.withTransaction)("tell last phrase to save")}\nend tell`;
     try {
@@ -13,0 +13,0 @@ await (0, retry_1.retry)(() => (0, runAppleScript_1.runAppleScript)(script, options), options);

lib/macOS/VoiceOver/start.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = void 0;
+const errors_1 = require("../errors");
 const child_process_1 = require("child_process");
-const errors_1 = require("../errors");
 const VOICE_OVER_STARTER = "/System/Library/CoreServices/VoiceOver.app/Contents/MacOS/VoiceOverStarter";
@@ -7,0 +7,0 @@ async function start() {

lib/macOS/VoiceOver/supportsAppleScriptControl/supportsAppleScriptControl.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.supportsAppleScriptControl = void 0;
+const enabledDbFile_1 = require("./enabledDbFile");
 const enabledDefaults_1 = require("./enabledDefaults");
-const enabledDbFile_1 = require("./enabledDbFile");
 async function supportsAppleScriptControl() {
@@ -7,0 +7,0 @@ const results = await Promise.all([(0, enabledDefaults_1.enabledDefaults)(), (0, enabledDbFile_1.enabledDbFile)()]);

lib/macOS/VoiceOver/takeScreenshot.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.takeScreenshot = void 0;
+const Applications_1 = require("../Applications");
+const errors_1 = require("../errors");
+const retry_1 = require("../../retry");
 const runAppleScript_1 = require("../runAppleScript");
-const retry_1 = require("../../retry");
 const withTransaction_1 = require("../withTransaction");
-const Applications_1 = require("../Applications");
-const errors_1 = require("../errors");
 async function takeScreenshot(options) {
-    const script = `tell application "${Applications_1.Applications.VOICE_OVER}"\n${(0, withTransaction_1.withTransaction)("tell vo cursor to grab screenshot")}\nend tell`;
+    const script = `tell application "${Applications_1.Applications.VoiceOver}"\n${(0, withTransaction_1.withTransaction)("tell vo cursor to grab screenshot")}\nend tell`;
     try {
@@ -12,0 +12,0 @@ return await (0, retry_1.retry)(() => (0, runAppleScript_1.runAppleScript)(script, options), options);

lib/macOS/VoiceOver/waitForRunning.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.waitForRunning = void 0;
+const errors_1 = require("../errors");
+const isRunning_1 = require("./isRunning");
 const waitForCondition_1 = require("../../waitForCondition");
-const isRunning_1 = require("./isRunning");
-const errors_1 = require("../errors");
 async function waitForRunning(options) {
@@ -8,0 +8,0 @@ return await (0, waitForCondition_1.waitForCondition)(async () => await (0, isRunning_1.isRunning)(options), {

lib/macOS/VoiceOver/waitForSaved.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.waitForSaved = void 0;
+const errors_1 = require("../errors");
+const isSaved_1 = require("./isSaved");
 const waitForCondition_1 = require("../../waitForCondition");
-const isSaved_1 = require("./isSaved");
-const errors_1 = require("../errors");
 const ONE_SECOND = 1000;
@@ -8,0 +8,0 @@ const TWENTY_SECONDS = 20000;

lib/notImplemented.js

@@ -5,4 +5,4 @@ "use strict";
 function notImplemented() {
-    throw new Error("not implemented");
+    throw new Error("not implemented - consider contributing to Guidepup?");
 }
 exports.notImplemented = notImplemented;

lib/ScreenReader.d.ts

@@ -1,57 +0,38 @@
-import type { KeyCodeCommand } from "./KeyCodeCommand";
-import type { KeystrokeCommand } from "./KeystrokeCommand";
-export interface ScreenReaderBase {
+import type { CommandOptions } from "./CommandOptions";
+import type { ScreenReaderCaption } from "./ScreenReaderCaption";
+import type { ScreenReaderCursor } from "./ScreenReaderCursor";
+import type { ScreenReaderKeyboard } from "./ScreenReaderKeyboard";
+import type { ScreenReaderMouse } from "./ScreenReaderMouse";
+export interface ScreenReaderInstance {
     /**
-     * Turn the ScreenReader on.
+     * ScreenReader caption APIs.
      */
-    start(): Promise<void>;
+    caption: ScreenReaderCaption;
     /**
-     * Turn the ScreenReader off.
+     * ScreenReader cursor APIs.
      */
-    stop(): Promise<void>;
+    cursor: ScreenReaderCursor;
     /**
-     * Send a key code or keystroke to the ScreenReader.
-     *
-     * @param {object} keyCommand Key code or keystroke command to send to the ScreenReader.
+     * ScreenReader keyboard APIs.
      */
-    sendKeys(command: KeyCodeCommand | KeystrokeCommand): Promise<void>;
+    keyboard: ScreenReaderKeyboard;
     /**
-     * Move the ScreenReader cursor to the previous location.
+     * ScreenReader mouse APIs.
      */
-    movePrevious(): Promise<void>;
+    mouse: ScreenReaderMouse;
     /**
-     * Move the ScreenReader cursor to the next location.
-     */
-    moveNext(): Promise<void>;
-    /**
-     * Perform default action.
-     */
-    performAction(): Promise<void>;
-    /**
-     * Get the last spoken phrase.
+     * Turn the ScreenReader on.
      *
-     * @returns {Promise<string>} The last spoken phrase.
+     * @param {object} [options] Additional options.
      */
-    getLastSpokenPhrase(): Promise<string>;
+    start(options?: CommandOptions): Promise<void>;
     /**
-     * Get the log of all spoken phrases for this ScreenReader instance.
+     * Turn the ScreenReader off.
      *
-     * @returns {string[]} The phrase log.
+     * @param {object} [options] Additional options.
      */
-    getSpokenPhraseLog(): string[];
-    /**
-     * Get the text of the item in the ScreenReader cursor.
-     *
-     * @returns {Promise<string>} The item's text.
-     */
-    getItemText(): Promise<string>;
-    /**
-     * Get the log of all visited item text for this ScreenReader instance.
-     *
-     * @returns {string[]} The item text log.
-     */
-    getItemTextLog(): string[];
+    stop(options?: CommandOptions): Promise<void>;
 }
 export interface ScreenReader {
-    new (): ScreenReaderBase;
+    new (): ScreenReaderInstance;
     /**
@@ -58,0 +39,0 @@ * Detect whether the ScreenReader is supported for the current OS.

lib/windows/index.d.ts

 export * from "./NVDA";
-export { sendKeys as windowsSendKeys } from "./sendKeys";
+export type { KeyCodeCommand as WindowsKeyCodeCommand } from "./KeyCodeCommand";
 export { KeyCodes as WindowsKeyCodes } from "./KeyCodes";
+export type { KeystrokeCommand as WindowsKeystrokeCommand } from "./KeystrokeCommand";
 export { Modifiers as WindowsModifiers } from "./Modifiers";
-export type { KeyCodeCommand as WindowsKeyCodeCommand } from "./KeyCodeCommand";
-export type { KeystrokeCommand as WindowsKeystrokeCommand } from "./KeystrokeCommand";

lib/windows/index.js

@@ -13,6 +13,4 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WindowsModifiers = exports.WindowsKeyCodes = exports.windowsSendKeys = void 0;
+exports.WindowsModifiers = exports.WindowsKeyCodes = void 0;
 __exportStar(require("./NVDA"), exports);
-var sendKeys_1 = require("./sendKeys");
-Object.defineProperty(exports, "windowsSendKeys", { enumerable: true, get: function () { return sendKeys_1.sendKeys; } });
 var KeyCodes_1 = require("./KeyCodes");
@@ -19,0 +17,0 @@ Object.defineProperty(exports, "WindowsKeyCodes", { enumerable: true, get: function () { return KeyCodes_1.KeyCodes; } });

lib/windows/NVDA/isNVDAInstalled.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isNVDAInstalled = void 0;
+const fs_1 = require("fs");
 const path_1 = require("path");
-const fs_1 = require("fs");
 const DEFAULT_NVDA_PATH = (0, path_1.join)("C:/", "Program Files (x86)", "NVDA", "nvda.exe");
@@ -7,0 +7,0 @@ let installed;

lib/windows/NVDA/NVDA.d.ts

@@ -1,3 +0,1 @@
-import { KeyCodeCommand } from "../KeyCodeCommand";
-import { KeystrokeCommand } from "../KeystrokeCommand";
 /**
@@ -7,3 +5,2 @@ * Class for controlling the NVDA ScreenReader on MacOS.
 export declare class NVDA {
-    #private;
     /**
@@ -29,44 +26,2 @@ * Detect whether NVDA is supported for the current OS.
     stop(): Promise<void>;
-    /**
-     * Send a key code or keystroke to NVDA.
-     *
-     * @param {object} keyCommand Key code or keystroke command to send to NVDA.
-     */
-    sendKeys(keyCommand: KeyCodeCommand | KeystrokeCommand): Promise<void>;
-    /**
-     * Move the NVDA cursor to the previous location.
-     */
-    movePrevious(): Promise<void>;
-    /**
-     * Move the NVDA cursor to the next location.
-     */
-    moveNext(): Promise<void>;
-    /**
-     * Perform default action.
-     */
-    performAction(): Promise<void>;
-    /**
-     * Get the last spoken phrase.
-     *
-     * @returns {Promise<string>} The last spoken phrase.
-     */
-    getLastSpokenPhrase(): Promise<string>;
-    /**
-     * Get the log of all spoken phrases for this NVDA instance.
-     *
-     * @returns {string[]} The phrase log.
-     */
-    getSpokenPhraseLog(): string[];
-    /**
-     * Get the text of the item in the NVDA cursor.
-     *
-     * @returns {Promise<string>} The item's text.
-     */
-    getItemText(): Promise<string>;
-    /**
-     * Get the log of all visited item text for this NVDA instance.
-     *
-     * @returns {string[]} The item text log.
-     */
-    getItemTextLog(): string[];
 }

lib/windows/NVDA/NVDA.js

 "use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var NVDA_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NVDA = void 0;
-const decorateStaticImplements_1 = require("../../decorateStaticImplements");
+const errors_1 = require("../errors");
+const isNVDAInstalled_1 = require("./isNVDAInstalled");
 const isWindows_1 = require("../isWindows");
-const isNVDAInstalled_1 = require("./isNVDAInstalled");
+const quit_1 = require("./quit");
 const start_1 = require("./start");
-const quit_1 = require("./quit");
-const KeyCodes_1 = require("../KeyCodes");
-const sendKeys_1 = require("../sendKeys");
-const notImplemented_1 = require("../../notImplemented");
-const errors_1 = require("../errors");
 /**
  * Class for controlling the NVDA ScreenReader on MacOS.
  */
-let NVDA = NVDA_1 = class NVDA {
-    #spokenPhraseLog = [];
-    #itemTextLog = [];
-    async #tap(promise) {
-        const result = await promise;
-        // TODO: store last logs
-        return result;
-    }
+class NVDA {
     /**
@@ -51,3 +33,3 @@ * Detect whether NVDA is supported for the current OS.
     async start() {
-        if (!(await NVDA_1.detect())) {
+        if (!(await NVDA.detect())) {
             throw new Error(errors_1.ERR_NVDA_NOT_SUPPORTED);
@@ -63,66 +45,3 @@ }
     }
-    /**
-     * Send a key code or keystroke to NVDA.
-     *
-     * @param {object} keyCommand Key code or keystroke command to send to NVDA.
-     */
-    async sendKeys(keyCommand) {
-        this.#tap((0, sendKeys_1.sendKeys)(keyCommand));
-    }
-    /**
-     * Move the NVDA cursor to the previous location.
-     */
-    async movePrevious() {
-        await this.sendKeys({ keyCode: KeyCodes_1.KeyCodes.KEY_UP_ARROW });
-    }
-    /**
-     * Move the NVDA cursor to the next location.
-     */
-    async moveNext() {
-        await this.sendKeys({ keyCode: KeyCodes_1.KeyCodes.KEY_DOWN_ARROW });
-    }
-    /**
-     * Perform default action.
-     */
-    async performAction() {
-        await this.sendKeys({ keyCode: KeyCodes_1.KeyCodes.KEY_ENTER });
-    }
-    /**
-     * Get the last spoken phrase.
-     *
-     * @returns {Promise<string>} The last spoken phrase.
-     */
-    getLastSpokenPhrase() {
-        // TODO: interact with NVDA (python) console to retrieve last phrase
-        (0, notImplemented_1.notImplemented)();
-    }
-    /**
-     * Get the log of all spoken phrases for this NVDA instance.
-     *
-     * @returns {string[]} The phrase log.
-     */
-    getSpokenPhraseLog() {
-        return this.#spokenPhraseLog;
-    }
-    /**
-     * Get the text of the item in the NVDA cursor.
-     *
-     * @returns {Promise<string>} The item's text.
-     */
-    getItemText() {
-        // TODO: interact with NVDA (python) console to retrieve item text
-        (0, notImplemented_1.notImplemented)();
-    }
-    /**
-     * Get the log of all visited item text for this NVDA instance.
-     *
-     * @returns {string[]} The item text log.
-     */
-    getItemTextLog() {
-        return this.#itemTextLog;
-    }
-};
-NVDA = NVDA_1 = __decorate([
-    (0, decorateStaticImplements_1.decorateStaticImplements)()
-], NVDA);
+}
 exports.NVDA = NVDA;

lib/windows/NVDA/quit.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.quit = void 0;
+const errors_1 = require("../errors");
 const child_process_1 = require("child_process");
-const errors_1 = require("../errors");
 async function quit() {
@@ -7,0 +7,0 @@ return new Promise((resolve, reject) => {

lib/windows/NVDA/start.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = void 0;
+const errors_1 = require("../errors");
 const child_process_1 = require("child_process");
-const errors_1 = require("../errors");
 async function start() {
@@ -7,0 +7,0 @@ return new Promise((resolve, reject) => {

lib/windows/sendKeys.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendKeys = void 0;
+const errors_1 = require("./errors");
+const isKeyCode_1 = require("../isKeyCode");
 const runVbsCode_1 = require("./runVbsCode");
-const isKeyCode_1 = require("../isKeyCode");
-const errors_1 = require("./errors");
 function getKeys(command) {
@@ -8,0 +8,0 @@ const characters = (0, isKeyCode_1.isKeyCode)(command) ? command.keyCode : command.characters;

package.json

 {
   "name": "@guidepup/guidepup",
-  "version": "0.10.2",
+  "version": "0.11.0",
   "description": "Screen-reader driver for automation.",
@@ -24,3 +24,3 @@ "main": "lib/index.js",
   "scripts": {
-    "build": "yarn clean && yarn gen && yarn compile && yarn docs",
+    "build": "yarn clean && yarn compile && yarn docs",
     "ci": "yarn clean && yarn lint && yarn test:coverage && yarn build",
@@ -31,5 +31,3 @@ "clean": "rimraf lib docs",
     "postdocs": "echo 'future: true\nencoding: \"UTF-8\"\ninclude:\n  - \"_*_.html\"\n  - \"_*_.*.html\"' > ./docs/_config.yaml",
-    "gen": "yarn gen:voiceover",
-    "gen:voiceover": "ts-node ./src/macOS/VoiceOver/generateClass.ts",
-    "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
+    "lint": "eslint . --ext .ts",
     "lint:fix": "yarn lint --fix",
@@ -36,0 +34,0 @@ "test": "jest",

README.md

@@ -39,6 +39,6 @@ <h1 align="center">Guidepup</h1>
   // Navigate your environment with screen-readers just as your users do 🏎
-  await vo.moveNext();
+  await vo.cursor.next();
 
   // Assert on what your users really see and hear when using screen-readers 👂
-  console.log(await vo.getLastSpokenPhrase());
+  console.log(await vo.caption.lastSpokenPhrase());
 
@@ -45,0 +45,0 @@ await vo.stop();

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Number of package files

176

increased by17.33%

Number of low supply chain risk alerts

2

decreased by-33.33%

Worsened metrics

Total package byte prevSize

375751

decreased by-29.78%

Lines of code

6958

decreased by-42.3%

Number of medium supply chain risk alerts

10

increased by11.11%

No dependency changes