@league-of-foundry-developers/foundry-vtt-types 12.331.3-beta → 12.331.4-beta

package/src/foundry/client/hooks.d.mts

@@ -1,25 +1,26 @@
 import type { EditorState, Plugin } from "prosemirror-state";
-import type { DeepPartial, EmptyObject, ValueOf } from "../../types/utils.d.mts";
+import type { DeepPartial, EmptyObject, ValueOf } from "fvtt-types/utils";
 import type Document from "../common/abstract/document.d.mts";
-import type { EffectChangeData } from "../common/documents/_types.d.mts";
 import type { ProseMirrorDropDown } from "../common/prosemirror/menu.d.mts";
-import type { DropData } from "./data/abstract/client-document.d.mts";
-
-// eslint-disable-next-line import/no-named-as-default
 import type ProseMirrorMenu from "../common/prosemirror/menu.d.mts";
 import type PointVisionSource from "../client-esm/canvas/sources/point-vision-source.d.mts";
 import type RenderedEffectSource from "../client-esm/canvas/sources/rendered-effect-source.d.mts";
-import type { CompendiumArtInfo } from "../client-esm/helpers/_types.d.mts";
+import type {
+  DatabaseCreateOperation,
+  DatabaseDeleteOperation,
+  DatabaseUpdateOperation,
+} from "../common/abstract/_types.d.mts";
+import type CompendiumArt from "../client-esm/helpers/compendium-art.d.mts";
 
 declare global {
   /**
-   * This namespace contains typescript specific type definitions for the {@link Hooks} callback functions. It contains an
-   * interface ({@link Hooks.StaticCallbacks}) for callbacks with static names. There are more function types in the
+   * This namespace contains typescript specific type definitions for the {@link Hooks | `Hooks`} callback functions. It contains an
+   * interface ({@link Hooks.StaticCallbacks | `Hooks.StaticCallbacks`}) for callbacks with static names. There are more function types in the
    * namespace for the dynamic hooks, whose names are generated at runtime. There is also a union of all of the dynamic
-   * hooks ({@link Hooks.DynamicCallbacks}).
+   * hooks ({@link Hooks.DynamicCallbacks | `Hooks.DynamicCallbacks`}).
    *
-   * Callback types remarked to be called with {@link Hooks.callAll} do not care about the return value of the callback.
-   * Callback types remarked to be called with {@link Hooks.call} do care about the return value and will stop executing
+   * Callback types remarked to be called with {@link Hooks.callAll | `Hooks.callAll`} do not care about the return value of the callback.
+   * Callback types remarked to be called with {@link Hooks.call | `Hooks.call`} do care about the return value and will stop executing
    * remaining callbacks if `false` is returned. If a callback type does not have such a remark, pay attention to the
    * return value documentation.
    *
@@ -56,20 +57,37 @@ declare global {
       once?: boolean;
     }
 
+    interface HotReloadData {
+      /** The type of package which was modified */
+      packageType: string;
+
+      /** The id of the package which was modified */
+      packageId: string;
+
+      /** The updated stringified file content */
+      content: string;
+
+      /** The relative file path which was modified */
+      path: string;
+
+      /** The file extension which was modified, e.g. "js", "css", "html" */
+      extension: string;
+    }
+
     interface StaticCallbacks {
       /** Core lifecycle */
 
       /**
        * A hook event that fires as Foundry is initializing, right before any initialization tasks have begun.
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link Game#initialize}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link Game.initialize | `Game#initialize`}
        */
       init: () => void;
 
       /**
        * A hook event that fires once Localization translations have been loaded and are ready for use.
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link Localization#initialize}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link Localization.initialize | `Localization#initialize`}
        */
       i18nInit: () => void;
 
@@ -77,15 +95,15 @@ declare global {
        * A hook event that fires when Foundry has finished initializing but
        * before the game state has been set up. Fires before any Documents, UI
        * applications, or the Canvas have been initialized.
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link Game#setupGame}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link Game.setupGame | `Game#setupGame`}
        */
       setup: () => void;
 
       /**
        * A hook event that fires when the game is fully ready.
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link Game#setupGame}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link Game.setupGame | `Game#setupGame`}
        */
       ready: () => void;
 
@@ -96,8 +114,8 @@ declare global {
        * @param err      - The error.
        * @param data     - Additional data that might be provided, based on the nature of the error.
        *                   (default: `{}`)
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link Hooks.onError}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link Hooks.onError | `Hooks.onError`}
        */
       error: (...args: ValueOf<ErrorCallbackParameters>) => void;
 
@@ -106,8 +124,8 @@ declare global {
       /**
        * A hook event that fires when the game is paused or un-paused.
        * @param paused - Is the game now paused (true) or un-paused (false)
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link Game#togglePause}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link Game.togglePause | `Game#togglePause`}
        */
       pauseGame: (paused: boolean) => void;
 
@@ -115,8 +133,8 @@ declare global {
        * A hook event that fires when the World time has been updated.
        * @param worldTime - The new canonical World time
        * @param delta     - The time delta
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link GameTime#onUpdateWorldTime}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link GameTime.onUpdateWorldTime | `GameTime#onUpdateWorldTime`}
        */
       updateWorldTime: (worldTime: number, delta: number) => void;
 
@@ -125,15 +143,15 @@ declare global {
       /**
        * A hook event that fires immediately prior to PIXI Application construction with the configuration parameters.
        * @param canvasConfig - Canvas configuration parameters that will be used to initialize the PIXI.Application
-       * @remarks This is called by {@link Hooks.callAll}.
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
        */
       canvasConfig: (canvasConfig: ConstructorParameters<typeof PIXI.Application>[0]) => void;
 
       /**
        * A hook event that fires when the Canvas is initialized.
        * @param canvas - the Canvas instance being initialized
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link Canvas#draw}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link Canvas.draw | `Canvas#draw`}
        */
       canvasInit: (canvas: Canvas) => void;
 
@@ -142,31 +160,31 @@ declare global {
        * @param canvas - The Canvas instance
        * @param view   - The applied camera position
        * @remarks When called during animated panning, the callback is called on every tick.
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link Canvas#pan}
-       * @see {@link Canvas#animatePan}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link Canvas.pan | `Canvas#pan`}
+       * @see {@link Canvas.animatePan | `Canvas#animatePan`}
        */
       canvasPan: (canvas: Canvas, view: Canvas.ViewPosition) => void;
 
       /**
        * A hook event that fires when the Canvas is ready.
        * @param canvas - The Canvas which is now ready for use
-       * @remarks This is called by {@link Hooks.call}.
-       * @see {@link Canvas#draw}
+       * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
+       * @see {@link Canvas.draw | `Canvas#draw`}
        */
       canvasReady: (canvas: Canvas) => boolean | void;
 
       /**
        * A hook event that fires when the Canvas is deactivated.
        * @param canvas - The Canvas instance being deactivated
-       * @remarks This is called by {@link Hooks.callAll}.
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
        */
       canvasTearDown: (canvas: Canvas) => void;
 
       /**
        * A hook event that fires when the Canvas is beginning to draw the canvas groups.
        * @param canvas - The Canvas instance being drawn
-       * @remarks This is called by {@link Hooks.callAll}.
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
        */
       canvasDraw: (canvas: Canvas) => void;
 
@@ -174,17 +192,20 @@ declare global {
        * A hook event that fires when some useful data is dropped onto the Canvas.
        * @param canvas - The Canvas
        * @param data   - The data that has been dropped onto the Canvas
-       * @remarks This is called by {@link Hooks.call}.
+       * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
        * @remarks An explicit return value of `false` prevents the Document being created.
-       * @see {@link Canvas#_onDrop}
+       * @see {@link Canvas._onDrop | `Canvas#_onDrop`}
        */
-      dropCanvasData: (canvas: Canvas, data: TokenLayer.DropData | NotesLayer.DropData) => boolean | void;
+      dropCanvasData: (
+        canvas: Canvas,
+        data: TokenLayer.DropData | NotesLayer.DropData | SoundsLayer.DropData | TilesLayer.DropData,
+      ) => boolean | void;
 
       /**
        * A hook event that fires when objects are highlighted on the canvas.
        * Callers may use this hook to apply their own modifications or enhancements to highlighted objects.
        * @param active - Is the highlight state now active
-       * @see {@link Canvas#highlightObjects}
+       * @see {@link Canvas.highlightObjects | `Canvas#highlightObjects``}
        */
       highlightObjects: (active: boolean) => void;
 
@@ -193,10 +214,10 @@ declare global {
       /**
        * A hook event that fires when the Scene controls are initialized.
        * @param controls - The SceneControl configurations
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link SceneControls#_getControlButtons}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link SceneControls._getControlButtons | `SceneControls#_getControlButtons`}
        */
-      getSceneControlButtons: (controls: SceneControl[]) => void;
+      getSceneControlButtons: (controls: SceneControls.Control[]) => void;
 
       /**
        * A hook event that fires whenever data is dropped into a Hotbar slot.
@@ -205,19 +226,19 @@ declare global {
        * @param hotbar - The Hotbar application instance
        * @param data   - The dropped data object
        * @param slot   - The target hotbar slot
-       * @remarks This is called by {@link Hooks.call}.
+       * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
        * @remarks An explicit return value of `false` prevents the Document being created.
-       * @see {@link Hotbar#_onDrop}
+       * @see {@link Hotbar._onDrop | `Hotbar#_onDrop`}
        */
-      hotbarDrop: (hotbar: Hotbar, data: DropData<Macro.ConfiguredInstance>, slot: number) => boolean | void;
+      hotbarDrop: (hotbar: Hotbar, data: Document.DropData<Macro.Implementation>, slot: number) => boolean | void;
 
       /**
        * A hook event that fires when the SceneNavigation menu is expanded or collapsed.
        * @param nav       - The SceneNavigation application
        * @param collapsed - Whether the navigation is now collapsed or not
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link SceneNavigation#expand}
-       * @see {@link SceneNavigation#collapse}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link SceneNavigation.expand | `SceneNavigation#expand`}
+       * @see {@link SceneNavigation.collapse | `SceneNavigation#collapse`}
        */
       collapseSceneNavigation: (nav: SceneNavigation, collapsed: boolean) => void;
 
@@ -225,17 +246,17 @@ declare global {
        * A hook event that fires when the Sidebar is collapsed or expanded.
        * @param sidebar   - The Sidebar application
        * @param collapsed - Whether the Sidebar is now collapsed or not
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link Sidebar#expand}
-       * @see {@link Sidebar#collapse}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link Sidebar.expand | `Sidebar#expand`}
+       * @see {@link Sidebar.collapse | `Sidebar#collapse`}
        */
       collapseSidebar: (sidebar: Sidebar, collapsed: boolean) => void;
 
       /**
        * A hook event that fires when the Sidebar tab is changed.
        * @param app - The SidebarTab application which is now active
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link Sidebar#_onChangeTab}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link Sidebar._onChangeTab | `Sidebar#_onChangeTab`}
        */
       changeSidebarTab: (app: SidebarTab) => void;
 
@@ -245,10 +266,10 @@ declare global {
        * A hook event that fires when a custom active effect is applied.
        * @param actor  - The actor the active effect is being applied to
        * @param change - The change data being applied
-       * @remarks This is called by {@link Hooks.call}.
-       * @see {@link ActiveEffect#_applyCustom}
+       * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
+       * @see {@link ActiveEffect._applyCustom | `ActiveEffect#_applyCustom`}
        */
-      applyActiveEffect: (actor: Actor.ConfiguredInstance, change: EffectChangeData) => boolean | void;
+      applyActiveEffect: (actor: Actor.Implementation, change: ActiveEffect.EffectChangeData) => boolean | void;
 
       /** Compendium */
 
@@ -260,25 +281,25 @@ declare global {
        * @param documents - The locally-cached Documents which were modified in the operation
        * @param options   - Additional options which modified the modification request
        * @param userId    - The ID of the User who triggered the modification workflow
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link CompendiumCollection#_onModifyContents}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link CompendiumCollection._onModifyContents | `CompendiumCollection#_onModifyContents`}
        */
       updateCompendium: (
         pack: CompendiumCollection.Any,
         documents: Document.Any[],
-        options: Document.OnUpdateOptions<Document.Any["documentName"]>,
+        options: Document.Database.UpdateOptions<DatabaseUpdateOperation>,
         userId: string,
       ) => void;
 
       /** Token */
 
       /**
-       * A hook event that fires when a token {@link Token} should apply a specific status effect.
+       * A hook event that fires when a token {@link Token | `Token`} should apply a specific status effect.
        * @param token    - The token affected
        * @param statusId - The status effect ID being applied, from CONFIG.specialStatusEffects.
        * @param active   - Is the special status effect now active?
        */
-      applyTokenStatusEffect: (token: Token.ConfiguredInstance, statusId: string, active: boolean) => void;
+      applyTokenStatusEffect: (token: Token.Object, statusId: string, active: boolean) => void;
 
       /**
        * A hook event that fires when a chat bubble is initially configured.
@@ -286,13 +307,13 @@ declare global {
        * @param html    - The HTML for the chat bubble
        * @param message - The spoken message text
        * @param options - additional options
-       * @remarks This is called when creating a {@link ChatBubble}, but before displaying it.
-       * @remarks This is called by {@link Hooks.call}.
+       * @remarks This is called when creating a {@link ChatBubble | `ChatBubble`}, but before displaying it.
+       * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
        * @remarks An explicit return value of `false` prevents the chat bubble being shown.
-       * @see {@link ChatBubbles#say}
+       * @see {@link ChatBubbles.say | `ChatBubbles#say`}
        */
       chatBubble: (
-        token: Token,
+        token: Token.Object,
         html: JQuery,
         message: string,
         options: {
@@ -306,9 +327,9 @@ declare global {
        * @param data    - A object describing the modification
        * @param updates - The update delta that will be applied to the Token's actor
        * @returns whether the Actor should be updated
-       * @remarks This is called by {@link Hooks.call}.
-       * @see {@link Actor#modifyTokenAttribute}
-       * @see {@link Actor#update}
+       * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
+       * @see {@link Actor.modifyTokenAttribute | `Actor#modifyTokenAttribute`}
+       * @see {@link Actor.update | `Actor#update`}
        */
       modifyTokenAttribute: (
         data: {
@@ -332,26 +353,22 @@ declare global {
        * @param user     - The User doing the targeting
        * @param token    - The targeted Token
        * @param targeted - Whether the Token has been targeted or untargeted
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link UserTargets#_hook}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link UserTargets._hook | `UserTargets#_hook`}
        */
-      targetToken: (
-        user: User.ConfiguredInstance,
-        token: Document.ConfiguredObjectClassForName<"Token">,
-        targeted: boolean,
-      ) => void;
+      targetToken: (user: User.Implementation, token: Document.ObjectClassFor<"Token">, targeted: boolean) => void;
 
       /** Note */
 
       /**
        * A hook event that fires whenever a map note is double-clicked.
-       * The hook provides the note placeable and the arguments passed to the associated {@link JournalSheet} render call.
+       * The hook provides the note placeable and the arguments passed to the associated {@link JournalSheet | `JournalSheet`} render call.
        * Hooked functions may modify the render arguments or cancel the render by returning false.
        * @param note    - The note that was activated
-       * @param options - Options for rendering the associated {@link JournalSheet}
-       * @remarks This is called by {@link Hooks.call}.
+       * @param options - Options for rendering the associated {@link JournalSheet | `JournalSheet`}
+       * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
        */
-      activateNote: (note: Note.ConfiguredInstance, options: JournalSheet.RenderOptions) => boolean | false;
+      activateNote: (note: Note.Object, options: JournalSheet.RenderOptions) => true | false;
 
       /** Cards */
 
@@ -360,12 +377,12 @@ declare global {
        * @param origin             - The origin Cards document
        * @param destinations       - An array of destination Cards documents
        * @param context            - Additional context which describes the operation
-       * @remarks This is called by {@link Hooks.call}.
+       * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
        * @remarks An explicit return value of `false` prevents the operation.
        */
       dealCards: (
-        origin: Cards.ConfiguredInstance,
-        destinations: Cards.ConfiguredInstance[],
+        origin: Cards.Implementation,
+        destinations: Cards.Implementation[],
         context: Cards.DealContext,
       ) => boolean | void;
 
@@ -374,12 +391,12 @@ declare global {
        * @param origin      - The origin Cards document
        * @param destination - The destination Cards document
        * @param context     - Additional context which describes the operation
-       * @remarks This is called by {@link Hooks.call}.
+       * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
        * @remarks An explicit return value of `false` prevents the operation.
        */
       passCards: (
-        origin: Cards.ConfiguredInstance,
-        destination: Cards.ConfiguredInstance,
+        origin: Cards.Implementation,
+        destination: Cards.Implementation,
         context: Cards.DealContext,
       ) => boolean | void;
 
@@ -390,8 +407,8 @@ declare global {
        * @param context  - Additional context which describes the operation.
        */
       returnCards: (
-        origin: Cards.ConfiguredInstance,
-        returned: Card.ConfiguredInstance[],
+        origin: Cards.Implementation,
+        returned: Card.Implementation[],
         context: Cards.ReturnContext,
       ) => boolean | void;
 
@@ -405,13 +422,13 @@ declare global {
        * @param art           - The art being applied.
        * @remarks Called as part of _initializeSource, after data migration, cleaning, and shims
        * @remarks Currently only called by Actor but comments are more generic
-       * @remarks This is called by {@link Hooks.callAll}.
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
        */
       applyCompendiumArt: (
-        documentClass: Actor.ConfiguredClass,
-        source: foundry.documents.BaseActor.ConstructorData,
+        documentClass: Actor.ImplementationClass,
+        source: foundry.documents.BaseActor.CreateData,
         pack: CompendiumCollection.Any,
-        art: CompendiumArtInfo,
+        art: CompendiumArt.Info,
       ) => void;
 
       /** ActorSheet */
@@ -421,37 +438,33 @@ declare global {
        * @param actor - The Actor
        * @param sheet - The ActorSheet application
        * @param data  - The data that has been dropped onto the sheet
-       * @remarks This is called by {@link Hooks.call}.
+       * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
        * @remarks An explicit return value of `false` prevents the Document being created.
-       * @see {@link ActorSheet#_onDrop}
+       * @see {@link ActorSheet._onDrop | `ActorSheet#_onDrop`}
        */
-      dropActorSheetData: (
-        actor: Actor.ConfiguredInstance,
-        sheet: ActorSheet,
-        data: ActorSheet.DropData,
-      ) => boolean | void;
+      dropActorSheetData: (actor: Actor.Implementation, sheet: ActorSheet, data: ActorSheet.DropData) => boolean | void;
 
       /** CanvasVisibility */
 
       /**
        * A hook event that fires when the set of vision sources are initialized.
        * @param sources - The collection of current vision sources
-       * @remarks This is called by {@link Hooks.call}.
+       * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
        */
       initializeVisionSources: (sources: Collection<PointVisionSource.Any>) => void;
 
       /**
        * A hook event that fires when the LightingLayer is refreshed.
        * @param layer - the LightingLayer
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link LightingLayer#refresh}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link LightingLayer.refresh | `LightingLayer#refresh`}
        */
       lightingRefresh: (layer: LightingLayer) => void;
 
       /**
        * A hook event that fires when visibility is refreshed.
        * @param visibility - The CanvasVisibility instance
-       * @remarks This is called by {@link Hooks.callAll}.
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
        */
       visibilityRefresh: (visibility: CanvasVisibility) => void;
 
@@ -459,8 +472,8 @@ declare global {
        * A hook event that fires during light source initialization.
        * This hook can be used to add programmatic light sources to the Scene.
        * @param source - The EffectsCanvasGroup where light sources are initialized
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link EffectsCanvasGroup#initializeLightSources}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link EffectsCanvasGroup.initializeLightSources | `EffectsCanvasGroup#initializeLightSources`}
        */
       initializeLightSources: (group: EffectsCanvasGroup) => void;
 
@@ -468,15 +481,15 @@ declare global {
        * A hook event that fires during darkness source initialization.
        * This hook can be used to add programmatic darkness sources to the Scene.
        * @param group - The EffectsCanvasGroup where darkness sources are initialized
-       * @remarks This is called by {@link Hooks.callAll}.
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
        */
       initializeDarknessSources: (group: EffectsCanvasGroup) => void;
 
       /**
        * A hook event that fires when the CanvasVisibility layer has been refreshed.
        * @param visibility - The CanvasVisibility layer
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link CanvasVisibility#restrictVisibility}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link CanvasVisibility.restrictVisibility | `CanvasVisibility#restrictVisibility`}
        */
       sightRefresh: (visibility: CanvasVisibility) => void;
 
@@ -486,11 +499,11 @@ declare global {
        * Initialize the weather container from a weather config object.
        * @param weatherEffect        - The weather effects canvas layer
        * @param weatherEffectsConfig - The weather effects config object
-       * @remarks This is called by {@link Hooks.callAll}.
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
        */
       initializeWeatherEffects: (
         weatherEffect: WeatherEffects,
-        weatherEffectsConfig?: WeatherEffects.WeatherEffectsConfig | null,
+        weatherEffectsConfig?: WeatherEffects.EffectConfiguration | null,
       ) => void;
 
       /** Adventure */
@@ -503,13 +516,13 @@ declare global {
        * @param toCreate  - Adventure data which needs to be created in the World
        * @param toUpdate  - Adventure data which needs to be updated in the World
        * @returns False to prevent the core software from handling the import
-       * @remarks This is called by {@link Hooks.call}.
+       * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
        */
       preImportAdventure: (
-        adventure: Adventure.ConfiguredInstance,
+        adventure: Adventure.Implementation,
         formData: object, // TODO: Improve this. Also relevant to `AdventureImporter#_updateObject`
-        toCreate: AdventureImportData["toCreate"],
-        toUpdate: AdventureImportData["toUpdate"],
+        toCreate: Adventure.ImportData["toCreate"],
+        toUpdate: Adventure.ImportData["toUpdate"],
       ) => boolean | void;
 
       /**
@@ -519,13 +532,13 @@ declare global {
        * @param toCreate  - Adventure data which needs to be created in the World
        * @param toUpdate  - Adventure data which needs to be updated in the World
        * @returns False to prevent the core software from handling the import
-       * @remarks This is called by {@link Hooks.callAll}.
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
        */
       importAdventure: (
-        adventure: Adventure.ConfiguredInstance,
+        adventure: Adventure.Implementation,
         formData: object, // TODO: Improve this. Also relevant to `AdventureImporter#_updateObject`
-        toCreate: AdventureImportData["toCreate"],
-        toUpdate: AdventureImportData["toUpdate"],
+        toCreate: Adventure.ImportData["toCreate"],
+        toUpdate: Adventure.ImportData["toUpdate"],
       ) => void;
 
       /** Socket */
@@ -534,9 +547,9 @@ declare global {
        * A hook event that fires whenever some other User joins or leaves the game session.
        * @param user      - The User who connected or disconnected
        * @param connected - Is the user now connected (true) or disconnected (false)
-       * @remarks This is called by {@link Hooks.callAll}.
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
        */
-      userConnected: (user: User.ConfiguredInstance, connected: boolean) => void;
+      userConnected: (user: User.Implementation, connected: boolean) => void;
 
       /** Combat */
 
@@ -546,13 +559,9 @@ declare global {
        * @param combat  - The Combat encounter for which the turn order has changed
        * @param prior   - The prior turn state
        * @param current - The new turn state
-       * @remarks This is called by {@link Hooks.callAll}.
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
        */
-      combatTurnChange: (
-        combat: Combat.ConfiguredInstance,
-        prior: Combat.HistoryData,
-        current: Combat.HistoryData,
-      ) => void;
+      combatTurnChange: (combat: Combat.Implementation, prior: Combat.HistoryData, current: Combat.HistoryData) => void;
 
       /**
        * A hook event that fires when a Combat encounter is started.
@@ -561,7 +570,7 @@ declare global {
        * @param updateData - An object which contains Combat properties that will be updated. Can be mutated.
        */
       combatStart: (
-        combat: Combat.ConfiguredInstance,
+        combat: Combat.Implementation,
         updateData: {
           /** The initial round */
           round: number;
@@ -578,7 +587,7 @@ declare global {
        * @param updateOptions - An object which contains options provided to the update method. Can be mutated.
        */
       combatTurn: (
-        combat: Combat.ConfiguredInstance,
+        combat: Combat.Implementation,
         updateData: {
           /** The current round of combat */
           round: number;
@@ -600,7 +609,7 @@ declare global {
        * @param updateOptions - An object which contains options provided to the update method. Can be mutated.
        */
       combatRound: (
-        combat: Combat.ConfiguredInstance,
+        combat: Combat.Implementation,
         updateData: {
           /** The new round of combat */
           round: number;
@@ -623,7 +632,7 @@ declare global {
        * Hooked functions may append their own drop-downs or append entries to existing drop-downs.
        * @param menu   - The ProseMirrorMenu instance.
        * @param config - The drop-down config.
-       * @remarks This is called by {@link Hooks.callAll}.
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
        */
       getProseMirrorMenuDropdowns: (
         menu: ProseMirrorMenu,
@@ -639,7 +648,7 @@ declare global {
        * Hooked functions may append their own buttons to the list.
        * @param menu   - The ProseMirrorMenu instance
        * @param config - The button configuration objects
-       * @remarks This is called by {@link Hooks.callAll}.
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
        */
       // TODO: Having trouble finding the appropriate typing for the menu items? Also, where is this even called?
       getProseMirrorMenuItems: (menu: ProseMirrorMenu, config: unknown[]) => void;
@@ -654,8 +663,8 @@ declare global {
        * @param uuid    - A UUID that uniquely identifies this ProseMirror instance.
        * @param plugins - A list of plugins that will be loaded.
        * @param options - The provisional EditorState and ProseMirrorMenuPlugin.
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link ProseMirrorEditor.create}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link ProseMirrorEditor.create | `ProseMirrorEditor.create`}
        */
       createProseMirrorEditor: (uuid: string, plugins: Record<string, Plugin>, options: { state: EditorState }) => void;
 
@@ -666,7 +675,7 @@ declare global {
        * The hook provides the hot reload data related to the file change.
        * Hooked functions may intercept the hot reload and prevent the core software from handling it by returning false.
        * @param data - The hot reload data
-       * @remarks This is called by {@link Hooks.call}.
+       * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
        */
       hotReload: (data: HotReloadData) => boolean | void;
 
@@ -677,9 +686,9 @@ declare global {
        * @param chatLog  - The ChatLog instance
        * @param message  - The trimmed message content
        * @param chatData - The basic chat data
-       * @remarks This is called by {@link Hooks.call}.
+       * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
        * @remarks An explicit return value of `false` prevents the chat message from being created.
-       * @see {@link ChatLog#processMessage}
+       * @see {@link ChatLog.processMessage | `ChatLog#processMessage`}
        */
       chatMessage: (
         chatLog: ChatLog,
@@ -688,8 +697,8 @@ declare global {
           /** The id of the User sending the message */
           user: string;
 
-          /** The identified speaker data, see {@link ChatMessage.getSpeaker} */
-          speaker: ReturnType<ChatMessage.ConfiguredClass["getSpeaker"]>;
+          /** The identified speaker data, see {@link ChatMessage.getSpeaker | `ChatMessage.getSpeaker`} */
+          speaker: ReturnType<ChatMessage.ImplementationClass["getSpeaker"]>;
         },
       ) => boolean | void;
 
@@ -699,17 +708,17 @@ declare global {
        * @param message        - The ChatMessage document being rendered
        * @param html           - The pending HTML as a jQuery object
        * @param messageData    - The input data provided for template rendering
-       * @remarks This is called by {@link Hooks.call}.
-       * @see {@link ChatMessage#render}
+       * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
+       * @see {@link ChatMessage.render | `ChatMessage#render`}
        */
       renderChatMessage: (
-        message: ChatMessage,
+        message: ChatMessage.Implementation,
         html: JQuery,
         messageData: {
-          message: Document.ToObjectFalseType<ChatMessage.ConfiguredInstance>;
+          message: ChatMessage.Source;
           user: Game["user"];
-          author: ChatMessage.ConfiguredInstance["user"];
-          alias: ChatMessage.ConfiguredInstance["alias"];
+          author: User.Implementation | null;
+          alias: string;
           cssClass: string;
           isWhisper: boolean;
           canDelete: boolean;
@@ -725,22 +734,22 @@ declare global {
       /**
        * A hook event that fires when the user modifies a global volume slider.
        * @param volume - The new volume level
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link AudioHelper#_onChangeGlobalVolume}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link AudioHelper._onChangeGlobalVolume | `AudioHelper#_onChangeGlobalVolume`}
        */
       globalAmbientVolumeChanged: (volume: number) => void;
       /**
        * A hook event that fires when the user modifies a global volume slider.
        * @param volume - The new volume level
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link AudioHelper#_onChangeGlobalVolume}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link AudioHelper._onChangeGlobalVolume | `AudioHelper#_onChangeGlobalVolume`}
        */
       globalInterfaceVolumeChanged: (volume: number) => void;
       /**
        * A hook event that fires when the user modifies a global volume slider.
        * @param volume - The new volume level
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link AudioHelper#_onChangeGlobalVolume}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link AudioHelper._onChangeGlobalVolume | `AudioHelper#_onChangeGlobalVolume`}
        */
       globalPlaylistVolumeChanged: (volume: number) => void;
 
@@ -748,8 +757,8 @@ declare global {
        * A hook event that fires when the AV settings are changed.
        * @param settings - The AVSettings manager
        * @param changed  - The delta of the settings that have been changed
-       * @remarks This is called by {@link Hooks.callAll}.
-       * @see {@link AVSettings#_onSettingsChanged}
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+       * @see {@link AVSettings._onSettingsChanged | `AVSettings#_onSettingsChanged`}
        */
       rtcSettingsChanged: (settings: AVSettings, changed: DeepPartial<AVSettings.Settings>) => void;
 
@@ -760,12 +769,12 @@ declare global {
        * @param table  - The RollTable
        * @param config - The RollTableConfig application
        * @param data   - The data dropped onto the RollTableConfig
-       * @remarks This is called by {@link Hooks.call}.
+       * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
        * @remarks An explicit return value of `false` prevents the Document being created.
-       * @see {@link RollTableConfig#_onDrop}
+       * @see {@link RollTableConfig._onDrop | `RollTableConfig#_onDrop`}
        */
       dropRollTableSheetData: (
-        table: RollTable.ConfiguredInstance,
+        table: RollTable.Implementation,
         config: RollTableConfig,
         data: object,
       ) => boolean | void;
@@ -773,7 +782,7 @@ declare global {
       /**
        * A hook event that allows to pass custom dynamic ring configurations.
        * @param ringConfig - The ring configuration instance
-       * @remarks This is called by {@link Hooks.callAll}.
+       * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
        */
       initializeDynamicTokenRingConfig: (ringConfig: foundry.canvas.tokens.TokenRingConfig) => void;
 
@@ -783,19 +792,19 @@ declare global {
        * A hook event that fires when the context menu for a SceneNavigation entry is constructed.
        * @param html         - The HTML element to which the context options are attached
        * @param entryOptions - The context menu entries
-       * @remarks This is called by {@link Hooks.call}.
-       * @see {@link SceneNavigation#activateListeners}
+       * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
+       * @see {@link SceneNavigation.activateListeners | `SceneNavigation#activateListeners`}
        */
-      getSceneNavigationContext: (html: JQuery, entryOptions: ContextMenuEntry[]) => boolean | void;
+      getSceneNavigationContext: (html: JQuery, entryOptions: ContextMenu.Entry[]) => boolean | void;
 
       /**
        * A hook event that fires when the context menu for a PlayersList entry is constructed.
        * @param html         - The HTML element to which the context options are attached
        * @param entryOptions - The context menu entries
-       * @remarks This is called by {@link Hooks.call}.
-       * @see {@link PlayerList#activateListeners}
+       * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
+       * @see {@link PlayerList.activateListeners | `PlayerList#activateListeners`}
        */
-      getUserContextOptions: (html: JQuery, entryOptions: ContextMenuEntry[]) => boolean | void;
+      getUserContextOptions: (html: JQuery, entryOptions: ContextMenu.Entry[]) => boolean | void;
     }
 
     /** Application */
@@ -810,14 +819,14 @@ declare global {
      * @param data  - The object of data used when rendering the application
      * @typeParam A - the type of the Application
      * @remarks The name for this hook is dynamically created by joining "render" with the type name of the Application.
-     * @remarks This is called by {@link Hooks.callAll}.
-     * @see {@link Application#_render}
+     * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+     * @see {@link Application._render | `Application#_render`}
      */
-    type RenderApplication<A extends Application = Application> = (
+    type RenderApplication<A extends Application.Any = Application.Any> = (
       app: A,
       html: JQuery,
       data: ReturnType<A["getData"]> extends Promise<infer T> ? T : ReturnType<A["getData"]>,
-    ) => boolean | void;
+    ) => void;
 
     /**
      * A hook event that fires whenever this Application is first rendered to add buttons to its header.
@@ -826,10 +835,10 @@ declare global {
      * @typeParam A   - the type of the Application
      * @remarks The name for this hook is dynamically created by joining "get" with the type name of the Application and
      * "HeaderButtons".
-     * @remarks This is called by {@link Hooks.call}.
-     * @see {@link Application#_getHeaderButtons}
+     * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
+     * @see {@link Application._getHeaderButtons | `Application#_getHeaderButtons`}
      */
-    type GetApplicationHeaderButtons<A extends Application = Application> = (
+    type GetApplicationHeaderButtons<A extends Application.Any = Application.Any> = (
       app: A,
       buttons: Application.HeaderButton[],
     ) => boolean | void;
@@ -840,35 +849,43 @@ declare global {
      * @param html  - The application HTML when it is closed
      * @typeParam A - the type of the Application
      * @remarks The name for this hook is dynamically created by joining "close" with the type name of the Application.
-     * @remarks This is called by {@link Hooks.call}.
-     * @see {@link Application#close}
+     * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+     * @see {@link Application.close | `Application#close`}
      */
-    type CloseApplication<A extends Application = Application> = (app: A, html: JQuery) => boolean | void;
+    type CloseApplication<A extends Application.Any = Application.Any> = (app: A, html: JQuery) => void;
+
+    /** ApplicationV2 */
+
+    // Not explicitly typed in Foundry v12 but still fires
+    type RenderApplicationV2<
+      A extends foundry.applications.api.ApplicationV2.Any = foundry.applications.api.ApplicationV2.Any,
+    > = (app: A, element: HTMLElement) => void;
+
+    // Not explicitly typed in Foundry v12 but still fires
+    type CloseApplicationV2<
+      A extends foundry.applications.api.ApplicationV2.Any = foundry.applications.api.ApplicationV2.Any,
+    > = (app: A) => void;
 
     /** EffectsCanvasGroup */
 
     /**
-     * A hook event that fires when a {@link CanvasGroup} is drawn.
+     * A hook event that fires when a {@link CanvasGroup | `CanvasGroup`} is drawn.
      * The dispatched event name replaces "Group" with the named CanvasGroup subclass, i.e. "drawPrimaryCanvasGroup".
      * @param group - The group being drawn
      */
-    type DrawGroup<
-      G extends ReturnType<typeof CanvasGroupMixin> = ReturnType<typeof CanvasGroupMixin<CanvasGroupMixin.BaseClass>>,
-    > = (group: G) => void;
+    type DrawGroup<G extends CanvasGroupMixin.AnyMixed = CanvasGroupMixin.AnyMixed> = (group: G) => void;
 
     /**
-     * A hook event that fires when a {@link CanvasGroup} is deconstructed.
+     * A hook event that fires when a {@link CanvasGroup | `CanvasGroup`} is deconstructed.
      * The dispatched event name replaces "Group" with the named CanvasGroup subclass, i.e. "tearDownPrimaryCanvasGroup".
      * @param group - The group being deconstructed
      */
-    type TearDownGroup<
-      G extends ReturnType<typeof CanvasGroupMixin> = ReturnType<typeof CanvasGroupMixin<CanvasGroupMixin.BaseClass>>,
-    > = (group: G) => void;
+    type TearDownGroup<G extends CanvasGroupMixin.AnyMixed = CanvasGroupMixin.AnyMixed> = (group: G) => void;
 
     /** CanvasLayer */
 
     /**
-     * A hook event that fires when a {@link CanvasLayer} is initially drawn.
+     * A hook event that fires when a {@link CanvasLayer | `CanvasLayer`} is initially drawn.
      * The dispatched event name replaces "Layer" with the named CanvasLayer subclass, i.e. "drawTokensLayer".
      * @param layer - The layer being drawn
      * @typeParam L - the type of the CanvasLayer
@@ -876,7 +893,7 @@ declare global {
     type DrawLayer<L extends CanvasLayer = CanvasLayer> = (layer: L) => void;
 
     /**
-     * A hook event that fires when a {@link CanvasLayer} is deconstructed.
+     * A hook event that fires when a {@link CanvasLayer | `CanvasLayer`} is deconstructed.
      * The dispatched event name replaces "Layer" with the named CanvasLayer subclass, i.e. "tearDownTokensLayer".
      * @param layer - The layer being deconstructed
      * @typeParam L - the type of the CanvasLayer
@@ -892,8 +909,8 @@ declare global {
      * @typeParam P      - the type of the PlaceableObject
      * @remarks The name for this hook is dynamically created by joining "paste" with the type name of the
      * PlaceableObject.
-     * @remarks This is called by {@link Hooks.call}.
-     * @see {@link PlaceablesLayer#pasteObjects}
+     * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
+     * @see {@link PlaceablesLayer.pasteObjects | `PlaceablesLayer#pasteObjects`}
      */
     type PastePlaceableObject<P extends PlaceableObject = PlaceableObject> = (
       copied: P[],
@@ -904,29 +921,29 @@ declare global {
     /** PlaceableObject */
 
     /**
-     * A hook event that fires when a {@link PlaceableObject} is initially drawn.
+     * A hook event that fires when a {@link PlaceableObject | `PlaceableObject`} is initially drawn.
      * The dispatched event name replaces "Object" with the named PlaceableObject subclass, i.e. "drawToken".
      * @param object - The object instance being drawn
      * @typeParam P  - the type of the PlaceableObject
-     * @remarks This is called by {@link Hooks.callAll}
+     * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}
      */
     type DrawObject<P extends PlaceableObject = PlaceableObject> = (object: P) => void;
 
     /**
-     * A hook event that fires when a {@link PlaceableObject} is incrementally refreshed.
+     * A hook event that fires when a {@link PlaceableObject | `PlaceableObject`} is incrementally refreshed.
      * The dispatched event name replaces "Object" with the named PlaceableObject subclass, i.e. "refreshToken".
      * @param object - The object instance being refreshed
      * @typeParam P  - the type of the PlaceableObject
-     * @remarks This is called by {@link Hooks.callAll}
+     * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}
      */
     type RefreshObject<P extends PlaceableObject = PlaceableObject> = (object: P) => void;
 
     /**
-     * A hook event that fires when a {@link PlaceableObject} is destroyed.
+     * A hook event that fires when a {@link PlaceableObject | `PlaceableObject`} is destroyed.
      * The dispatched event name replaces "Object" with the named PlaceableObject subclass, i.e. "destroyToken".
      * @param object - The object instance being destroyed
      * @typeParam P  - the type of the PlaceableObject
-     * @remarks This is called by {@link Hooks.callAll}
+     * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}
      */
     type DestroyObject<P extends PlaceableObject = PlaceableObject> = (object: P) => void;
 
@@ -939,9 +956,9 @@ declare global {
      * @typeParam P      - the type of the PlaceableObject
      * @remarks The name for this hook is dynamically created by joining "control" and the type name of the
      * PlaceableObject.
-     * @remarks This is called by {@link Hooks.callAll}.
-     * @see {@link PlaceableObject#control}
-     * @see {@link PlaceableObject#release}
+     * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+     * @see {@link PlaceableObject.control | `PlaceableObject#control`}
+     * @see {@link PlaceableObject.release | `PlaceableObject#release`}
      */
     type ControlObject<P extends PlaceableObject = PlaceableObject> = (object: P, controlled: boolean) => void;
 
@@ -953,9 +970,9 @@ declare global {
      * @param hover  - Whether the PlaceableObject is hovered over or not
      * @typeParam P  - the type of the PlaceableObject
      * @remarks The name for this hook is dynamically created by joining "hover" and the type name of the PlaceableObject.
-     * @remarks This is called by {@link Hooks.callAll}.
-     * @see {@link PlaceableObject#_onHoverIn}
-     * @see {@link PlaceableObject#_onHoverOut}
+     * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+     * @see {@link PlaceableObject._onHoverIn | `PlaceableObject#_onHoverIn`}
+     * @see {@link PlaceableObject._onHoverOut | `PlaceableObject#_onHoverOut`}
      */
     type HoverObject<P extends PlaceableObject = PlaceableObject> = (object: P, hover: boolean) => void;
 
@@ -976,14 +993,14 @@ declare global {
      * @typeParam D    - the type of the Document constructor
      * @returns Explicitly return false to prevent creation of this Document
      * @remarks The name for this hook is dynamically created by joining "preCreate" with the name of the Document.
-     * @remarks This is called by {@link Hooks.call}.
-     * @see {@link ClientDatabaseBackend#_preCreateDocumentArray}
-     * @see {@link TokenDocument#_preUpdateTokenActor}
+     * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
+     * @see {@link ClientDatabaseBackend._preCreateDocumentArray | `ClientDatabaseBackend#_preCreateDocumentArray`}
+     * @see {@link TokenDocument._preUpdateTokenActor | `TokenDocument#_preUpdateTokenActor`}
      */
     type PreCreateDocument<D extends Document.AnyConstructor = Document.AnyConstructor> = (
       document: Document.ToConfiguredInstance<D>,
       data: ConstructorParameters<D>[0],
-      options: Document.PreCreateOptions<InstanceType<D>["documentName"]>,
+      options: Document.Database.PreCreateOptions<DatabaseCreateOperation>,
       userId: string,
     ) => boolean | void;
 
@@ -1002,14 +1019,16 @@ declare global {
      * @typeParam D    - the type of the Document constructor
      * @returns Explicitly return false to prevent update of this Document
      * @remarks The name for this hook is dynamically created by joining "preUpdate" with the type name of the Document.
-     * @remarks This is called {@link Hooks.call}.
-     * @see {@link ClientDatabaseBackend#_preUpdateDocumentArray}
-     * @see {@link TokenDocument#_preUpdateTokenActor}
+     * @remarks This is called {@link Hooks.call | `Hooks.call`}.
+     * @see {@link ClientDatabaseBackend._preUpdateDocumentArray | `ClientDatabaseBackend#_preUpdateDocumentArray`}
+     * @see {@link TokenDocument._preUpdateTokenActor | `TokenDocument#_preUpdateTokenActor`}
      */
     type PreUpdateDocument<D extends Document.AnyConstructor = Document.AnyConstructor> = (
       document: Document.ToConfiguredInstance<D>,
-      changed: DeepPartial<ConstructorParameters<D>[0]>,
-      options: Document.PreUpdateOptions<InstanceType<D>["documentName"]>,
+      changed: DeepPartial<
+        D extends abstract new (arg0: infer Data extends object, ...args: infer _1) => unknown ? Data : never
+      >,
+      options: Document.Database.PreUpdateOptions<DatabaseUpdateOperation>,
       userId: string,
     ) => boolean | void;
 
@@ -1027,13 +1046,13 @@ declare global {
      * @typeParam D    - the type of the Document constructor
      * @returns Explicitly return false to prevent deletion of this Document
      * @remarks The name for this hook is dynamically created by joining "preDelete" with the type name of the Document.
-     * @remarks This is called by {@link Hooks.call}.
-     * @see {@link ClientDatabaseBackend#_preDeleteDocumentArray}.
-     * @see {@link TokenDocument#_preUpdateTokenActor}
+     * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
+     * @see {@link ClientDatabaseBackend._preDeleteDocumentArray | `ClientDatabaseBackend#_preDeleteDocumentArray`}.
+     * @see {@link TokenDocument._preUpdateTokenActor | `TokenDocument#_preUpdateTokenActor`}
      */
     type PreDeleteDocument<D extends Document.AnyConstructor = Document.AnyConstructor> = (
       document: Document.ToConfiguredInstance<D>,
-      options: Document.PreDeleteOptions<InstanceType<D>["documentName"]>,
+      options: Document.Database.PreDeleteOperationInstance<DatabaseDeleteOperation>,
       userId: string,
     ) => boolean | void;
 
@@ -1047,13 +1066,13 @@ declare global {
      * @param userId   - The ID of the User who triggered the creation workflow
      * @typeParam D    - the type of the Document constructor
      * @remarks The name for this hook is dynamically created by joining "create" and the type name of the Document.
-     * @remarks This is called by {@link Hooks.callAll}.
-     * @see {@link ClientDatabaseBackend#_postCreateDocumentCallbacks}
-     * @see {@link TokenDocument#_onUpdateTokenActor}
+     * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+     * @see {@link ClientDatabaseBackend._postCreateDocumentCallbacks | `ClientDatabaseBackend#_postCreateDocumentCallbacks`}
+     * @see {@link TokenDocument._onUpdateTokenActor | `TokenDocument#_onUpdateTokenActor`}
      */
     type CreateDocument<D extends Document.AnyConstructor = Document.AnyConstructor> = (
       document: Document.ToConfiguredInstance<D>,
-      options: Document.OnCreateOptions<InstanceType<D>["documentName"]>,
+      options: Document.Database.CreateOptions<DatabaseCreateOperation>,
       userId: string,
     ) => void;
 
@@ -1068,14 +1087,16 @@ declare global {
      * @param userId   - The ID of the User who triggered the update workflow
      * @typeParam D    - the type of the Document constructor
      * @remarks The name for this hook is dynamically created by joining "update" with the type name of the Document.
-     * @remarks This is called by {@link Hooks.callAll}.
-     * @see {@link ClientDatabaseBackend#_postUpdateDocumentCallbacks}
-     * @see {@link TokenDocument#_onUpdateTokenActor}
+     * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+     * @see {@link ClientDatabaseBackend._postUpdateDocumentCallbacks | `ClientDatabaseBackend#_postUpdateDocumentCallbacks`}
+     * @see {@link TokenDocument._onUpdateTokenActor | `TokenDocument#_onUpdateTokenActor`}
      */
     type UpdateDocument<D extends Document.AnyConstructor = Document.AnyConstructor> = (
       document: Document.ToConfiguredInstance<D>,
-      change: DeepPartial<ConstructorParameters<D>[0]>,
-      options: Document.OnUpdateOptions<InstanceType<D>["documentName"]>,
+      change: DeepPartial<
+        D extends abstract new (arg0: infer Data extends object, ...args: infer _1) => unknown ? Data : never
+      >,
+      options: Document.Database.UpdateOptions<DatabaseUpdateOperation>,
       userId: string,
     ) => void;
 
@@ -1089,13 +1110,13 @@ declare global {
      * @param userId   - The ID of the User who triggered the deletion workflow
      * @typeParam D    - the type of the Document constructor
      * @remarks The name for this hook is dynamically created by joining "delete" with the type name of the Document.
-     * @remarks This is called by {@link Hooks.callAll}.
-     * @see {@link ClientDatabaseBackend#_postDeleteDocumentCallbacks}
-     * @see {@link TokenDocument#_onUpdateTokenActor}
+     * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
+     * @see {@link ClientDatabaseBackend._postDeleteDocumentCallbacks | `ClientDatabaseBackend#_postDeleteDocumentCallbacks`}
+     * @see {@link TokenDocument._onUpdateTokenActor | `TokenDocument#_onUpdateTokenActor`}
      */
     type DeleteDocument<D extends Document.AnyConstructor = Document.AnyConstructor> = (
       document: Document.ToConfiguredInstance<D>,
-      options: Document.OnDeleteOptions<InstanceType<D>["documentName"]>,
+      options: Document.Database.DeleteOptions<DatabaseDeleteOperation>,
       userId: string,
     ) => void;
 
@@ -1106,7 +1127,7 @@ declare global {
      * @param source - The RenderedEffectSource instance being initialized
      * @typeParam RPS - the type of the RenderedPointSource
      * @remarks The name for this hook is dynamically created by wrapping the type name of the shader in `initialize` and `Shaders`.
-     * @remarks This is called by {@link Hooks.callAll}.
+     * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
      */
     type InitializeRenderedEffectSourceShaders<RPS extends RenderedEffectSource.Any = RenderedEffectSource.Any> = (
       source: RPS,
@@ -1115,18 +1136,18 @@ declare global {
     /** InteractionLayer */
 
     /**
-     * A hook event that fires with a {@link InteractionLayer} becomes active.
+     * A hook event that fires with a {@link InteractionLayer | `InteractionLayer`} becomes active.
      * The dispatched event name replaces "Layer" with the named InteractionLayer subclass, i.e. "activateTokensLayer".
      * @param layer - The layer becoming active
-     * @remarks This is called by {@link Hooks.callAll}.
+     * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
      */
     type ActivateLayer<L extends InteractionLayer = InteractionLayer> = (layer: L) => void;
 
     /**
-     * A hook event that fires with a {@link InteractionLayer} becomes inactive.
+     * A hook event that fires with a {@link InteractionLayer | `InteractionLayer`} becomes inactive.
      * The dispatched event name replaces "Layer" with the named InteractionLayer subclass, i.e. "deactivateTokensLayer".
      * @param layer - The layer becoming inactive
-     * @remarks This is called by {@link Hooks.callAll}.
+     * @remarks This is called by {@link Hooks.callAll | `Hooks.callAll`}.
      */
     type DeactivateLayer<L extends InteractionLayer = InteractionLayer> = (layer: L) => void;
 
@@ -1136,10 +1157,10 @@ declare global {
      * "getActorDirectoryEntryContext".
      * @param html         - The HTML element to which the context options are attached
      * @param entryOptions - The context menu entries
-     * @remarks This is called by {@link Hooks.call}.
-     * @see {@link ContextMenu.create}
+     * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
+     * @see {@link ContextMenu.create | `ContextMenu.create`}
      */
-    type GetEntryContext = (html: JQuery, entryOptions: ContextMenuEntry[]) => boolean | void;
+    type GetEntryContext = (html: JQuery, entryOptions: ContextMenu.Entry[]) => boolean | void;
 
     /**
      * A hook event that fires when the context menu for a Sound in the PlaylistDirectory is constructed.
@@ -1147,10 +1168,10 @@ declare global {
      * @param entryOptions - The context menu entries
      * @remarks The name for this hook is dynamically created by joining "get" with the type name of the PlaylistDirectory
      * and "SoundContext".
-     * @remarks This is called by {@link Hooks.call}.
-     * @see {@link PlaylistDirectory#_contextMenu}
+     * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
+     * @see {@link PlaylistDirectory._contextMenu | `PlaylistDirectory#_contextMenu`}
      */
-    type GetPlaylistDirectorySoundContext = (html: JQuery, entryOptions: ContextMenuEntry[]) => boolean | void;
+    type GetPlaylistDirectorySoundContext = (html: JQuery, entryOptions: ContextMenu.Entry[]) => boolean | void;
 
     /**
      * A hook event that fires when the context menu for folders in a SidebarTab
@@ -1160,10 +1181,10 @@ declare global {
      * @param entryOptions - The context menu entries
      * @remarks The name for this hook is dynamically created by joining "get" with the type name of the SidebarDirectory
      * and "FolderContext".
-     * @remarks This is called by {@link Hooks.call}.
-     * @see {@link SidebarDirectory#_contextMenu}
+     * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
+     * @see {@link SidebarDirectory._contextMenu | `SidebarDirectory#_contextMenu`}
      */
-    type GetSidebarDirectoryFolderContext = (html: JQuery, entryOptions: ContextMenuEntry[]) => boolean | void;
+    type GetSidebarDirectoryFolderContext = (html: JQuery, entryOptions: ContextMenu.Entry[]) => boolean | void;
 
     type DynamicCallbacks =
       | RenderApplication
@@ -1189,8 +1210,7 @@ declare global {
       | DeactivateLayer
       | GetEntryContext
       | GetPlaylistDirectorySoundContext
-      | GetSidebarDirectoryFolderContext
-      | HoverObject;
+      | GetSidebarDirectoryFolderContext;
 
     interface ErrorCallbackParameters {
       "Canvas#draw": [location: "Canvas#draw", err: Error, data: { layer: CanvasLayer }];