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

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@league-of-foundry-developers/foundry-vtt-types",
-  "version": "12.331.4-beta",
+  "version": "13.340.1",
   "description": "TypeScript type definitions for Foundry VTT",
   "type": "module",
   "types": "./index.d.mts",
@@ -25,6 +25,17 @@
       "types": "./src/foundry/public/scripts/workers/image-compressor.d.mts"
     }
   },
+  "imports": {
+    "#client/*": {
+      "import": "./src/foundry/client/*"
+    },
+    "#client-esm/*": {
+      "import": "./src/foundry/client-esm/*"
+    },
+    "#common/*": {
+      "import": "./src/foundry/common/*"
+    }
+  },
   "scripts": {
     "format": "prettier -l -w .",
     "lint": "npm-run-all -c typecheck eslint prettier",
@@ -82,6 +93,10 @@
     "typescript"
   ],
   "dependencies": {
+    "@codemirror/lang-html": "^6.4.9",
+    "@codemirror/lang-javascript": "^6.2.2",
+    "@codemirror/lang-json": "^6.0.1",
+    "@codemirror/lang-markdown": "^6.3.1",
     "@pixi/basis": "^7.4.2",
     "@pixi/graphics-smooth": "^1.1.0",
     "@pixi/particle-emitter": "^5.0.8",
@@ -90,25 +105,34 @@
     "@types/showdown": "~2.0.6",
     "@types/simple-peer": "~9.11.1",
     "@types/youtube": "~0.0.48",
+    "codemirror": "^6.0.1",
     "earcut": "^3.0.1",
     "handlebars": "^4.7.8",
+    "handlebars-intl": "^1.1.2",
+    "jquery": "^3.7.1",
+    "mime-types": "^3.0.1",
+    "peggy": "^4.2.0",
     "pixi.js": "^7.4.2",
-    "postinstall-postinstall": "^2.1.0",
     "prosemirror-collab": "^1.3.1",
-    "prosemirror-commands": "^1.5.2",
+    "prosemirror-commands": "^1.6.2",
     "prosemirror-dropcursor": "^1.8.1",
     "prosemirror-gapcursor": "^1.3.2",
-    "prosemirror-history": "^1.4.0",
+    "prosemirror-history": "^1.4.1",
     "prosemirror-inputrules": "^1.4.0",
     "prosemirror-keymap": "^1.2.2",
-    "prosemirror-model": "^1.21.0",
-    "prosemirror-schema-list": "^1.3.0",
+    "prosemirror-model": "^1.23.0",
+    "prosemirror-schema-list": "^1.4.1",
     "prosemirror-state": "^1.4.3",
-    "prosemirror-tables": "^1.3.7",
-    "prosemirror-transform": "^1.9.0",
-    "prosemirror-view": "^1.33.6",
-    "socket.io-client": "^4.7.5",
-    "tinymce": "^6.8.3"
+    "prosemirror-tables": "^1.6.1",
+    "prosemirror-transform": "^1.10.2",
+    "prosemirror-view": "^1.36.0",
+    "sanitize-html": "^2.13.1",
+    "showdown": "^2.1.0",
+    "simple-peer": "^9.11.1",
+    "socket.io": "^4.8.1",
+    "socket.io-client": "^4.8.1",
+    "spark-md5": "^3.0.2",
+    "tinymce": "^7.5.1"
   },
   "devDependencies": {
     "@actions/core": "^1.11.1",
@@ -121,10 +145,10 @@
     "@types/debug": "^4.1.12",
     "@types/fvtt-types": "file:.",
     "@types/picomatch": "^4.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.26.1",
-    "@typescript-eslint/parser": "^8.23.0",
-    "@typescript-eslint/scope-manager": "^8.27.0",
-    "@typescript-eslint/utils": "^8.26.1",
+    "@typescript-eslint/eslint-plugin": "^8.31.0",
+    "@typescript-eslint/parser": "^8.31.0",
+    "@typescript-eslint/scope-manager": "^8.31.0",
+    "@typescript-eslint/utils": "^8.31.0",
     "enhanced-resolve": "^5.18.1",
     "eslint": "^9.19.0",
     "eslint-config-prettier": "^10.0.1",
@@ -140,7 +164,7 @@
     "prettier": "^3.0.3",
     "type-fest": "^4.34.0",
     "typescript": "^5.8.2",
-    "typescript-eslint": "^8.26.1",
+    "typescript-eslint": "^8.31.0",
     "vitest": "^3.0.5"
   },
   "peerDependencies": {

package/src/configuration/configuration.d.mts

@@ -1,5 +1,5 @@
 import type { DeepPartial, MaybeEmpty } from "fvtt-types/utils";
-import type { fields } from "../foundry/common/data/module.d.mts";
+import type { fields } from "../foundry/common/data/_module.d.mts";
 import type Document from "../foundry/common/abstract/document.d.mts";
 
 /**
@@ -48,10 +48,10 @@ export interface AssumeHookRan {}
  * // myActor.ts
  * class MyActor extends Actor {}
  *
- * // entryPoint.ts
+ * // index.ts
  * import { MyActor } from "./myActor"
  *
- * hooks.once("init", () => {
+ * Hooks.once("init", () => {
  *   CONFIG.Actor.documentClass = typeof MyActor;
  * });
  *
@@ -77,7 +77,7 @@ export interface DocumentClassConfig {}
  * // myToken.ts
  * class MyToken extends Token {}
  *
- * // entryPoint.ts
+ * // index.ts
  * import { MyToken } from "./myToken"
  *
  * Hooks.once("init", () => {

package/src/configuration/globals.d.mts

@@ -107,7 +107,6 @@ export import Compendium = globalThis.Compendium;
 export import CompendiumCollection = globalThis.CompendiumCollection;
 export import CompendiumDirectory = globalThis.CompendiumDirectory;
 export import CompendiumPacks = globalThis.CompendiumPacks;
-export import ContextMenu = globalThis.ContextMenu;
 export import ControlIcon = globalThis.ControlIcon;
 export import ControlsLayer = globalThis.ControlsLayer;
 export import DarknessLevelContainer = globalThis.DarknessLevelContainer;
@@ -219,7 +218,6 @@ export import Note = globalThis.Note;
 export import NoteConfig = globalThis.NoteConfig;
 export import NoteDocument = globalThis.NoteDocument;
 export import NotesLayer = globalThis.NotesLayer;
-export import Notifications = globalThis.Notifications;
 export import ObservableTransform = globalThis.ObservableTransform;
 export import OccludableSamplerShader = globalThis.OccludableSamplerShader;
 export import OutlineOverlayFilter = globalThis.OutlineOverlayFilter;

package/src/foundry/client/apps/av/av-config.d.mts

@@ -7,8 +7,8 @@ declare global {
    * @typeParam Options - The type of the options object
    */
   class AVConfig<Options extends FormApplication.Options = FormApplication.Options> extends FormApplication<
-    Options,
-    AVMaster
+    AVMaster,
+    Options
   > {
     /**
      * @param object  - The {@link AVMaster | `AVMaster`} instance being configured.

package/src/foundry/client/apps/av/cameras.d.mts

@@ -1,5 +1,5 @@
 import type { GetDataReturnType, MaybePromise, Identity } from "fvtt-types/utils";
-import type Document from "../../../common/abstract/document.d.mts";
+import type Document from "#common/abstract/document.d.mts";
 
 declare global {
   /**

package/src/foundry/client/apps/dice/dice-config.d.mts

@@ -5,8 +5,8 @@ declare global {
    * An application responsible for configuring how dice are rolled and evaluated.
    */
   class DiceConfig<Options extends FormApplication.Options = FormApplication.Options> extends FormApplication<
-    Options,
-    FormApplication.NoObject
+    FormApplication.NoObject,
+    Options
   > {
     /**
      * @defaultValue

package/src/foundry/client/apps/form.d.mts

@@ -1,8 +1,8 @@
 import type { EditorView } from "prosemirror-view";
 import type { Editor } from "tinymce";
 import type { AnyObject, GetDataReturnType, MaybePromise, Identity } from "fvtt-types/utils";
-import type { ProseMirrorKeyMaps, ProseMirrorMenu } from "../../common/prosemirror/_module.d.mts";
-import type Document from "../../common/abstract/document.d.mts";
+import type { ProseMirrorKeyMaps, ProseMirrorMenu } from "#common/prosemirror/_module.d.mts";
+import type Document from "#common/abstract/document.d.mts";
 
 declare global {
   /** @deprecated {@link FormApplication.Options | `FormApplication.Options`} */
@@ -22,9 +22,8 @@ declare global {
    * {@link Document | `Document`} instance or an object in general which is modified by this form
    */
   abstract class FormApplication<
-    // TODO(LukeAbby): The generic parameters here will be swapped.
-    Options extends FormApplication.Options = FormApplication.Options,
     ConcreteObject = unknown,
+    Options extends FormApplication.Options = FormApplication.Options,
   > extends Application<Options> {
     /**
      * @param object  - Some object or entity which is the target to be updated.
@@ -364,9 +363,9 @@ declare global {
    * @typeParam ConcreteDocument - the type of the Document which should be managed by this form sheet
    */
   abstract class DocumentSheet<
-    Options extends DocumentSheet.Options<ConcreteDocument>,
     ConcreteDocument extends foundry.abstract.Document.Any = foundry.abstract.Document.Any,
-  > extends FormApplication<Options, ConcreteDocument> {
+    Options extends DocumentSheet.Options<ConcreteDocument> = DocumentSheet.Options<ConcreteDocument>,
+  > extends FormApplication<ConcreteDocument, Options> {
     /**
      * @param object  - A Document instance which should be managed by this form.
      * @param options - Optional configuration parameters for how the form behaves.
@@ -480,10 +479,10 @@ declare global {
       editable: boolean;
       data: ReturnType<ConcreteDocument["toObject"]>;
       limited: boolean;
-      options: DocumentSheet<Options, ConcreteDocument>["options"];
+      options: DocumentSheet<ConcreteDocument, Options>["options"];
       owner: boolean;
-      title: DocumentSheet<Options, ConcreteDocument>["title"];
-      document: DocumentSheet<Options, ConcreteDocument>["document"];
+      title: DocumentSheet<ConcreteDocument, Options>["title"];
+      document: DocumentSheet<ConcreteDocument, Options>["document"];
     }
 
     interface Options<ConcreteDocument extends Document.Internal.Instance.Any = Document.Internal.Instance.Any>
@@ -505,8 +504,8 @@ declare abstract class AnyFormApplication extends FormApplication<any, any> {
 }
 
 declare abstract class AnyDocumentSheet extends DocumentSheet<
-  DocumentSheet.Options<foundry.abstract.Document.Any>,
-  foundry.abstract.Document.Any
+  foundry.abstract.Document.Any,
+  DocumentSheet.Options<foundry.abstract.Document.Any>
 > {
   constructor(...args: never);
 }

package/src/foundry/client/apps/forms/actor.d.mts

@@ -1,5 +1,5 @@
 import type { GetDataReturnType, MaybePromise, Identity } from "fvtt-types/utils";
-import type Document from "../../../common/abstract/document.d.mts";
+import type Document from "#common/abstract/document.d.mts";
 
 declare global {
   /**
@@ -11,8 +11,8 @@ declare global {
    * @typeParam Options - the type of the options object
    */
   class ActorSheet<Options extends ActorSheet.Options = ActorSheet.Options> extends DocumentSheet<
-    Options,
-    Actor.Implementation
+    Actor.Implementation,
+    Options
   > {
     /**
      * @defaultValue

package/src/foundry/client/apps/forms/adventure-exporter.d.mts

@@ -7,8 +7,8 @@ declare global {
    * An interface for packaging Adventure content and loading it to a compendium pack.
    */
   class AdventureExporter<Options extends AdventureExporter.Options = AdventureExporter.Options> extends DocumentSheet<
-    Options,
-    Adventure.Implementation
+    Adventure.Implementation,
+    Options
   > {
     constructor(object?: Adventure.Implementation & { pack: string }, options?: Partial<Options>);
 

package/src/foundry/client/apps/forms/adventure-importer.d.mts

@@ -5,8 +5,8 @@ declare global {
    * An interface for importing an adventure from a compendium pack.
    */
   class AdventureImporter<Options extends AdventureImporter.Options = AdventureImporter.Options> extends DocumentSheet<
-    Options,
-    Adventure.Implementation
+    Adventure.Implementation,
+    Options
   > {
     /**
      * An alias for the Adventure document

package/src/foundry/client/apps/forms/base-sheet.d.mts

@@ -8,7 +8,7 @@ declare global {
   class BaseSheet<
     ConcreteDocument extends Document.Any = Document.Any,
     Options extends BaseSheet.Options<ConcreteDocument> = BaseSheet.Options<ConcreteDocument>,
-  > extends DocumentSheet<Options, ConcreteDocument> {
+  > extends DocumentSheet<ConcreteDocument, Options> {
     /**
      * @defaultValue
      * ```typescript

package/src/foundry/client/apps/forms/card-config.d.mts

@@ -7,8 +7,8 @@ declare global {
    * @typeParam Options - The type of the options object
    */
   class CardConfig<Options extends CardConfig.Options = CardConfig.Options> extends DocumentSheet<
-    Options,
-    Card.Implementation
+    Card.Implementation,
+    Options
   > {
     /**
      * @defaultValue

package/src/foundry/client/apps/forms/cards-config.d.mts

@@ -1,5 +1,4 @@
 import type { GetDataReturnType, MaybePromise } from "fvtt-types/utils";
-import type Document from "../../../common/abstract/document.d.mts";
 
 declare global {
   /**
@@ -8,10 +7,10 @@ declare global {
    * @typeParam Options - The type of the options object
    */
   class CardsConfig<Options extends CardsConfig.Options = CardsConfig.Options> extends DocumentSheet<
-    Options,
-    Cards.Implementation
+    Cards.Implementation,
+    Options
   > {
-    constructor(object: Document.ImplementationClassFor<"Cards">, options?: Options);
+    constructor(object: Cards.Implementation, options?: Options);
 
     /**
      * The allowed sorting methods which can be used for this sheet

package/src/foundry/client/apps/forms/combat-config.d.mts

@@ -6,8 +6,8 @@ declare global {
    * @typeParam Options - The type of the options object
    */
   class CombatTrackerConfig<Options extends FormApplication.Options = FormApplication.Options> extends FormApplication<
-    Options,
-    FormApplication.NoObject
+    FormApplication.NoObject,
+    Options
   > {
     /**
      * @defaultValue

package/src/foundry/client/apps/forms/combatant-config.d.mts

@@ -7,8 +7,8 @@ declare global {
    * @typeParam Options - the type of the options object
    */
   class CombatantConfig<Options extends CombatantConfig.Options = CombatantConfig.Options> extends DocumentSheet<
-    Options,
-    Combatant.Implementation
+    Combatant.Implementation,
+    Options
   > {
     /**
      * @defaultValue

package/src/foundry/client/apps/forms/effect-config.d.mts

@@ -9,7 +9,7 @@ declare global {
   class ActiveEffectConfig<
     Options extends
       DocumentSheet.Options<ActiveEffect.Implementation> = DocumentSheet.Options<ActiveEffect.Implementation>,
-  > extends DocumentSheet<Options, ActiveEffect.Implementation> {
+  > extends DocumentSheet<ActiveEffect.Implementation, Options> {
     /**
      * @defaultValue
      * ```typescript

package/src/foundry/client/apps/forms/folder-config.d.mts

@@ -7,8 +7,8 @@ declare global {
    * @typeParam Options - the type of the options object
    */
   class FolderConfig<Options extends FolderConfig.Options = FolderConfig.Options> extends DocumentSheet<
-    Options,
-    Folder.Implementation
+    Folder.Implementation,
+    Options
   > {
     /**
      * @defaultValue

package/src/foundry/client/apps/forms/fonts.d.mts

@@ -2,8 +2,8 @@ import type { GetDataReturnType, MaybePromise } from "fvtt-types/utils";
 
 declare global {
   class FontConfig<Options extends FontConfig.Options = FontConfig.Options> extends FormApplication<
-    Options,
-    FontConfig.NewFontDefinition
+    FontConfig.NewFontDefinition,
+    Options
   > {
     constructor(object?: FontConfig.NewFontDefinition, options?: Options);
 

package/src/foundry/client/apps/forms/grid-config.d.mts

@@ -6,8 +6,8 @@ declare global {
    * @typeParam Options - the type of the options object
    */
   class GridConfig<Options extends FormApplication.Options = FormApplication.Options> extends FormApplication<
-    Options,
-    Scene.Implementation
+    Scene.Implementation,
+    Options
   > {
     constructor(scene: Scene.Implementation, sheet: GridConfig["sheet"], options?: Partial<Options>);
 

package/src/foundry/client/apps/forms/image-popout.d.mts

@@ -28,8 +28,8 @@ declare global {
    * ```
    */
   class ImagePopout<Options extends ImagePopout.Options = ImagePopout.Options> extends FormApplication<
-    Options,
-    string
+    string,
+    Options
   > {
     constructor(src: string, options?: Partial<ImagePopout.Options>);
 

package/src/foundry/client/apps/forms/item.d.mts

@@ -11,7 +11,7 @@ declare global {
    */
   class ItemSheet<
     Options extends DocumentSheet.Options<Item.Implementation> = DocumentSheet.Options<Item.Implementation>,
-  > extends DocumentSheet<Options, Item.Implementation> {
+  > extends DocumentSheet<Item.Implementation, Options> {
     /**
      * @defaultValue
      * ```typescript

package/src/foundry/client/apps/forms/journal-page-sheet.d.mts

@@ -8,8 +8,8 @@ declare global {
    * The Application responsible for displaying and editing a single JournalEntryPage document.
    */
   class JournalPageSheet<Options extends JournalPageSheet.Options = JournalPageSheet.Options> extends DocumentSheet<
-    Options,
-    JournalEntryPage.Implementation
+    JournalEntryPage.Implementation,
+    Options
   > {
     /**
      * @defaultValue

package/src/foundry/client/apps/forms/journal-sheet.d.mts

@@ -9,8 +9,8 @@ declare global {
    * @typeParam Options - the type of the options object
    */
   class JournalSheet<Options extends JournalSheet.Options = JournalSheet.Options> extends DocumentSheet<
-    Options,
-    JournalEntry.Implementation
+    JournalEntry.Implementation,
+    Options
   > {
     /**
      * @defaultValue
@@ -249,7 +249,7 @@ declare global {
      * Get the set of ContextMenu options which should be used for JournalEntryPages in the sidebar.
      * @returns The Array of context options passed to the ContextMenu instance.
      */
-    protected _getEntryContextOptions(): ContextMenu.Entry[];
+    protected _getEntryContextOptions(): foundry.applications.ux.ContextMenu.Entry<JQuery>[];
 
     protected override _updateObject(event: Event, formData: JournalSheet.FormData): Promise<unknown>;
 

package/src/foundry/client/apps/forms/macro-config.d.mts

@@ -8,7 +8,7 @@ declare global {
    */
   class MacroConfig<
     Options extends DocumentSheet.Options<Macro.Implementation> = DocumentSheet.Options<Macro.Implementation>,
-  > extends DocumentSheet<Options, Macro.Implementation> {
+  > extends DocumentSheet<Macro.Implementation, Options> {
     /**
      * @defaultValue
      * ```typescript

package/src/foundry/client/apps/forms/measure-template.d.mts

@@ -8,7 +8,7 @@ declare global {
   class MeasuredTemplateConfig<
     Options extends
       DocumentSheet.Options<MeasuredTemplateDocument.Implementation> = DocumentSheet.Options<MeasuredTemplateDocument.Implementation>,
-  > extends DocumentSheet<Options, MeasuredTemplateDocument.Implementation> {
+  > extends DocumentSheet<MeasuredTemplateDocument.Implementation, Options> {
     /**
      * @defaultValue
      * ```typescript

package/src/foundry/client/apps/forms/ownership.d.mts

@@ -9,7 +9,7 @@ declare global {
   class DocumentOwnershipConfig<
     Options extends DocumentSheet.Options<ConcreteDocument>,
     ConcreteDocument extends foundry.abstract.Document.Any = foundry.abstract.Document.Any,
-  > extends DocumentSheet<Options, ConcreteDocument> {
+  > extends DocumentSheet<ConcreteDocument, Options> {
     /**
      * @defaultValue
      * ```typescript

package/src/foundry/client/apps/forms/playlist-config.d.mts

@@ -7,7 +7,7 @@ declare global {
    */
   class PlaylistConfig<
     Options extends DocumentSheet.Options<Playlist.Implementation> = DocumentSheet.Options<Playlist.Implementation>,
-  > extends DocumentSheet<Options, Playlist.Implementation> {
+  > extends DocumentSheet<Playlist.Implementation, Options> {
     /**
      * @defaultValue
      * ```typescript

package/src/foundry/client/apps/forms/playlist-sound-config.d.mts

@@ -11,7 +11,7 @@ declare global {
   class PlaylistSoundConfig<
     Options extends
       DocumentSheet.Options<PlaylistSound.Implementation> = DocumentSheet.Options<PlaylistSound.Implementation>,
-  > extends DocumentSheet<Options, PlaylistSound.Implementation> {
+  > extends DocumentSheet<PlaylistSound.Implementation, Options> {
     /**
      * @defaultValue
      * ```typescript

package/src/foundry/client/apps/forms/roll-table-config.d.mts

@@ -7,7 +7,7 @@ declare global {
    */
   class RollTableConfig<
     Options extends DocumentSheet.Options<RollTable.Implementation> = DocumentSheet.Options<RollTable.Implementation>,
-  > extends DocumentSheet<Options, RollTable.Implementation> {
+  > extends DocumentSheet<RollTable.Implementation, Options> {
     /**
      * @defaultValue
      * ```typescript

package/src/foundry/client/apps/forms/scene-config.d.mts

@@ -1,5 +1,5 @@
 import type { MaybePromise } from "fvtt-types/utils";
-import type Document from "../../../common/abstract/document.d.mts";
+import type Document from "#common/abstract/document.d.mts";
 
 declare global {
   /**
@@ -8,7 +8,7 @@ declare global {
    */
   class SceneConfig<
     Options extends DocumentSheet.Options<Scene.Implementation> = DocumentSheet.Options<Scene.Implementation>,
-  > extends DocumentSheet<Options, Scene.Implementation> {
+  > extends DocumentSheet<Scene.Implementation, Options> {
     /**
      * @defaultValue
      * ```typescript

package/src/foundry/client/apps/forms/sheet-config.d.mts

@@ -1,6 +1,6 @@
 import type { GetDataReturnType, MaybePromise } from "fvtt-types/utils";
-import type DocumentSheetV2 from "../../../client-esm/applications/api/document-sheet.d.mts";
-import type { Document } from "../../../common/abstract/module.d.mts";
+import type DocumentSheetV2 from "#client-esm/applications/api/document-sheet.d.mts";
+import type { Document } from "#common/abstract/_module.d.mts";
 
 declare global {
   /**
@@ -9,9 +9,9 @@ declare global {
    * @typeParam ConcreteDocument - The type of the Document which is being managed
    */
   class DocumentSheetConfig<
-    Options extends FormApplication.Options = FormApplication.Options,
     ConcreteDocument extends foundry.abstract.Document.Any = foundry.abstract.Document.Any,
-  > extends FormApplication<Options, ConcreteDocument> {
+    Options extends FormApplication.Options = FormApplication.Options,
+  > extends FormApplication<ConcreteDocument, Options> {
     /**
      * @defaultValue
      * ```typescript
@@ -85,7 +85,7 @@ declare global {
     static unregisterSheet(
       documentClass: Document.AnyConstructor,
       scope: string,
-      sheetClass: typeof FormApplication<FormApplication.Options, any>,
+      sheetClass: typeof FormApplication<any, FormApplication.Options>,
       { types }?: { types?: string[] },
     ): void;
 
@@ -104,7 +104,7 @@ declare global {
   }
 
   namespace DocumentSheetConfig {
-    interface Any extends DocumentSheetConfig<any> {}
+    interface Any extends DocumentSheetConfig<any, any> {}
 
     interface SheetRegistration {
       action: "register";

package/src/foundry/client/apps/forms/user-config.d.mts

@@ -6,8 +6,8 @@ declare global {
    * @typeParam Options - the type of the options object
    */
   class UserConfig<Options extends UserConfig.Options = UserConfig.Options> extends DocumentSheet<
-    Options,
-    User.Implementation
+    User.Implementation,
+    Options
   > {
     /**
      * @defaultValue

package/src/foundry/client/apps/hud/chatbubble.d.mts

@@ -28,7 +28,7 @@ declare global {
      * @defaultValue `null`
      * @internal
      */
-    protected _panned: Token.Object | null;
+    protected _panned: Token.Implementation | null;
 
     /**
      * A reference to the chat bubbles HTML container in which rendered bubbles should live
@@ -54,7 +54,7 @@ declare global {
      * @param emote   - Whether to style the speech bubble as an emote
      * @returns A Promise which resolves once the chat bubble has been created
      */
-    say(token: Token.Object, message: string, { emote }?: { emote?: boolean }): Promise<void>;
+    say(token: Token.Implementation, message: string, { emote }?: { emote?: boolean }): Promise<void>;
 
     /**
      * Activate Socket event listeners which apply to the ChatBubbles UI.
@@ -66,7 +66,7 @@ declare global {
      * Clear any existing chat bubble for a certain Token
      * @internal
      */
-    protected _clearBubble(token: Token.Object): Promise<void>;
+    protected _clearBubble(token: Token.Implementation): Promise<void>;
 
     /**
      * Render the HTML template for the chat bubble
@@ -74,7 +74,7 @@ declare global {
      * @returns The rendered HTML
      * @internal
      */
-    protected _renderHTML(data: { token: Token.Object; message: string; emote: boolean }): Promise<string>;
+    protected _renderHTML(data: { token: Token.Implementation; message: string; emote: boolean }): Promise<string>;
 
     /**
      * Before displaying the chat message, determine it's constrained and unconstrained dimensions
@@ -88,7 +88,7 @@ declare global {
      * Assign styling parameters to the chat bubble, toggling either a left or right display (randomly)
      * @internal
      */
-    protected _setPosition(token: Token.Object, html: JQuery, dimensions: ChatBubbles.Dimensions): void;
+    protected _setPosition(token: Token.Implementation, html: JQuery, dimensions: ChatBubbles.Dimensions): void;
 
     /**
      * Determine the length of time for which to display a chat bubble.

package/src/foundry/client/apps/hud/hotbar.d.mts

@@ -103,7 +103,7 @@ declare global {
      * @returns The Macro entry context options
      * @internal
      */
-    protected _getEntryContextOptions(): ContextMenu.Entry[];
+    protected _getEntryContextOptions(): foundry.applications.ux.ContextMenu.Entry<JQuery>[];
 
     /**
      * Handle left-click events to