I hate testing mappings so much

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moonlight-mod/mappings",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "license": "MIT",
   "repository": {
     "type": "git",

src/mappings/discord/actions/ContextMenuActionCreators.ts

@@ -4,7 +4,10 @@ import register from "../../../registry";
 type ContextMenuActionCreators = {
   closeContextMenu: () => void;
   // TODO: these have some extra args
-  openContextMenu: (event: Event, element: () => React.ReactNode) => void;
+  openContextMenu: (
+    event: React.SyntheticEvent,
+    element: () => React.ReactNode
+  ) => void;
   openContextMenuLazy: Function;
 };
 

src/mappings/discord/components/common/index.ts

@@ -14,58 +14,39 @@ import type {
 } from "react";
 import * as CSS from "csstype";
 
+type Modify<T, R> = Pick<T, Exclude<keyof T, keyof R>> & R;
+
 // #region TextInput
 export enum TextInputSizes {
   DEFAULT = "inputDefault",
   MINI = "inputMini"
 }
 
+export type TextInputProps = Modify<
+  React.InputHTMLAttributes<HTMLInputElement>,
+  {
+    value?: string;
+    name?: string;
+    className?: string;
+    inputClassName?: string;
+    inputPrefix?: string;
+    disabled?: boolean;
+    size?: TextInputSizes;
+    editable?: boolean;
+    inputRef?: Ref<any>;
+    prefixElement?: Component;
+    focusProps?: PropsWithoutRef<any>;
+    error?: string;
+    minLength?: number;
+    maxLength?: number;
+    onChange?: (value: string, name: string) => void;
+    onFocus?: (event: any, name: string) => void;
+    onBlur?: (event: any, name: string) => void;
+  }
+>;
+
 export interface TextInput
-  extends ComponentClass<
-    PropsWithoutRef<{
-      value?: string;
-      name?: string;
-      className?: string;
-      inputClassName?: string;
-      inputPrefix?: string;
-      disabled?: boolean;
-      size?: TextInputSizes;
-      editable?: boolean;
-      inputRef?: Ref<any>;
-      prefixElement?: Component;
-      focusProps?: PropsWithoutRef<any>;
-      error?: string;
-      minLength?: number;
-      maxLength?: number;
-      onChange?: (value: string, name: string) => void;
-      onFocus?: (event: any, name: string) => void;
-      onBlur?: (event: any, name: string) => void;
-      // this is literally just the input element's type field
-      type?:
-        | "button"
-        | "checkbox"
-        | "color"
-        | "date"
-        | "datetime-local"
-        | "email"
-        | "file"
-        | "hidden"
-        | "image"
-        | "month"
-        | "number"
-        | "password"
-        | "radio"
-        | "range"
-        | "reset"
-        | "search"
-        | "submit"
-        | "tel"
-        | "text"
-        | "time"
-        | "url"
-        | "week";
-    }>
-  > {
+  extends ComponentClass<PropsWithoutRef<TextInputProps>> {
   Sizes: typeof TextInputSizes;
 }
 // #endregion
@@ -624,17 +605,22 @@ export type TextVariant =
   | "code";
 
 export type Text = ComponentType<
-  PropsWithChildren<{
-    className?: string;
-    style?: CSSProperties;
-    variant: TextVariant;
-    tag?: string;
-    selectable?: boolean;
-    lineClamp?: number;
-    color?: string;
-    tabularNumbers?: boolean;
-    scaleFontToUserSettings?: boolean;
-  }>
+  PropsWithChildren<
+    Modify<
+      React.HTMLAttributes<HTMLDivElement>,
+      {
+        className?: string;
+        style?: CSSProperties;
+        variant: TextVariant;
+        tag?: string;
+        selectable?: boolean;
+        lineClamp?: number;
+        color?: string;
+        tabularNumbers?: boolean;
+        scaleFontToUserSettings?: boolean;
+      }
+    >
+  >
 >;
 // #endregion
 

src/mappings/discord/utils/HTTPUtils.ts

@@ -19,14 +19,18 @@ export type HTTPUtilsFunction = (
   data: HTTPUtilsRequest
 ) => Promise<HTTPUtilsResponse>;
 
-type HTTPUtils = {
+type HTTP = {
   get: HTTPUtilsFunction;
   post: HTTPUtilsFunction;
   put: HTTPUtilsFunction;
   patch: HTTPUtilsFunction;
   del: HTTPUtilsFunction;
 };
 
+type HTTPUtils = {
+  HTTP: HTTP;
+};
+
 register((moonmap) => {
   const name = "discord/utils/HTTPUtils";
   moonmap.register({