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

package/src/foundry/client/data/documents/journal-entry.d.mts

@@ -1,8 +1,9 @@
-import type Document from "../../../common/abstract/document.d.mts";
-import type { fields } from "../../../common/data/module.d.mts";
-import type { documents } from "../../../client-esm/client.d.mts";
-import type { DataSchema } from "../../../common/data/fields.d.mts";
-import type { InterfaceToObject, Merge, ValueOf } from "../../../../utils/index.d.mts";
+import type Document from "#common/abstract/document.d.mts";
+import type { documents } from "#client-esm/client.d.mts";
+import type { DataSchema } from "#common/data/fields.d.mts";
+import type { InterfaceToObject, Merge, ValueOf } from "fvtt-types/utils";
+
+import fields = foundry.data.fields;
 
 declare global {
   namespace JournalEntry {
@@ -503,7 +504,7 @@ declare global {
      * Return a reference to the Note instance for this Journal Entry in the current Scene, if any.
      * If multiple notes are placed for this Journal Entry, only the first will be returned.
      */
-    get sceneNote(): Note.Object | null;
+    get sceneNote(): Note.Implementation | null;
 
     /**
      * Show the JournalEntry to connected players.

package/src/foundry/client/data/documents/macro.d.mts

@@ -1,10 +1,11 @@
-import type { ConfiguredMacro } from "../../../../configuration/index.d.mts";
+import type { ConfiguredMacro } from "fvtt-types/configuration";
 import type { InexactPartial, Merge } from "fvtt-types/utils";
-import type { documents } from "../../../client-esm/client.d.mts";
-import type Document from "../../../common/abstract/document.d.mts";
-import type { DataSchema } from "../../../common/data/fields.d.mts";
-import type { fields } from "../../../common/data/module.d.mts";
-import type BaseMacro from "../../../common/documents/macro.d.mts";
+import type { documents } from "#client-esm/client.d.mts";
+import type Document from "#common/abstract/document.d.mts";
+import type { DataSchema } from "#common/data/fields.d.mts";
+import type BaseMacro from "#common/documents/macro.d.mts";
+
+import fields = foundry.data.fields;
 
 declare global {
   namespace Macro {
@@ -448,7 +449,7 @@ declare global {
       actor: Actor.Implementation;
 
       /**  A Token which is the protagonist of the executed action. */
-      token: Token.Object;
+      token: Token.Implementation;
 
       /** An optional event passed to the executed macro. */
       event: Event | RegionDocument.RegionEvent;

package/src/foundry/client/data/documents/measured-template.d.mts

@@ -1,8 +1,9 @@
-import type { Merge } from "../../../../utils/index.d.mts";
-import type { documents } from "../../../client-esm/client.d.mts";
-import type Document from "../../../common/abstract/document.d.mts";
-import type { DataSchema } from "../../../common/data/fields.d.mts";
-import type { fields } from "../../../common/data/module.d.mts";
+import type { Merge } from "fvtt-types/utils";
+import type { documents } from "#client-esm/client.d.mts";
+import type Document from "#common/abstract/document.d.mts";
+import type { DataSchema } from "#common/data/fields.d.mts";
+
+import fields = foundry.data.fields;
 
 declare global {
   namespace MeasuredTemplateDocument {

package/src/foundry/client/data/documents/note.d.mts

@@ -1,9 +1,11 @@
-import type { Merge } from "../../../../utils/index.d.mts";
-import type { documents } from "../../../client-esm/client.d.mts";
-import type Document from "../../../common/abstract/document.d.mts";
-import type { DataSchema } from "../../../common/data/fields.d.mts";
-import type { fields, TextureData } from "../../../common/data/module.d.mts";
-import type BaseNote from "../../../common/documents/note.d.mts";
+import type { Merge } from "fvtt-types/utils";
+import type { documents } from "#client-esm/client.d.mts";
+import type Document from "#common/abstract/document.d.mts";
+import type { DataSchema } from "#common/data/fields.d.mts";
+import type BaseNote from "#common/documents/note.d.mts";
+import type { TextureData } from "#common/data/data.mjs";
+
+import fields = foundry.data.fields;
 
 declare global {
   namespace NoteDocument {

package/src/foundry/client/data/documents/playlist-sound.d.mts

@@ -1,8 +1,9 @@
 import type { InexactPartial, Merge } from "fvtt-types/utils";
-import type Sound from "../../../client-esm/audio/sound.d.mts";
-import type Document from "../../../common/abstract/document.d.mts";
-import type { DataSchema } from "../../../common/data/fields.d.mts";
-import type { fields } from "../../../common/data/module.d.mts";
+import type Sound from "#client-esm/audio/sound.d.mts";
+import type Document from "#common/abstract/document.d.mts";
+import type { DataSchema } from "#common/data/fields.d.mts";
+
+import fields = foundry.data.fields;
 
 declare global {
   namespace PlaylistSound {

package/src/foundry/client/data/documents/playlist.d.mts

@@ -1,8 +1,8 @@
 import type { InexactPartial, Merge } from "fvtt-types/utils";
-import type { documents } from "../../../client-esm/client.d.mts";
-import type { Document } from "../../../common/abstract/module.d.mts";
-import type { DataSchema } from "../../../common/data/fields.d.mts";
-import type { fields } from "../../../common/data/module.d.mts";
+import type { documents } from "#client-esm/client.d.mts";
+import type { Document } from "#common/abstract/_module.d.mts";
+import type { DataSchema } from "#common/data/fields.d.mts";
+import type { fields } from "#common/data/_module.d.mts";
 
 declare global {
   namespace Playlist {

package/src/foundry/client/data/documents/region-behavior.d.mts

@@ -1,9 +1,10 @@
-import type { ConfiguredRegionBehavior } from "../../../../configuration/index.d.mts";
-import type Document from "../../../common/abstract/document.d.mts";
-import type { fields } from "../../../common/data/module.d.mts";
-import type BaseRegionBehavior from "../../../common/documents/region-behavior.d.mts";
-import type { DataSchema } from "../../../common/data/fields.d.mts";
-import type { Merge } from "../../../../utils/index.d.mts";
+import type { ConfiguredRegionBehavior } from "fvtt-types/configuration";
+import type Document from "#common/abstract/document.d.mts";
+import type BaseRegionBehavior from "#common/documents/region-behavior.d.mts";
+import type { DataSchema } from "#common/data/fields.d.mts";
+import type { Merge } from "fvtt-types/utils";
+
+import fields = foundry.data.fields;
 
 declare global {
   namespace RegionBehavior {

package/src/foundry/client/data/documents/region.d.mts

@@ -1,7 +1,9 @@
 import type { InexactPartial, Merge } from "fvtt-types/utils";
-import type { BaseShapeData, fields } from "../../../common/data/module.d.mts";
-import type Document from "../../../common/abstract/document.d.mts";
-import type { DataSchema } from "../../../common/data/fields.d.mts";
+import type Document from "#common/abstract/document.d.mts";
+import type { DataSchema } from "#common/data/fields.d.mts";
+import type { BaseShapeData } from "#common/data/data.mjs";
+
+import fields = foundry.data.fields;
 
 declare global {
   namespace RegionDocument {

package/src/foundry/client/data/documents/scene.d.mts

@@ -1,8 +1,10 @@
 import type { InexactPartial, Merge } from "fvtt-types/utils";
-import type { documents } from "../../../client-esm/client.d.mts";
-import type Document from "../../../common/abstract/document.d.mts";
-import type { DataSchema } from "../../../common/data/fields.d.mts";
-import type { fields, TextureData } from "../../../common/data/module.d.mts";
+import type { documents } from "#client-esm/client.d.mts";
+import type Document from "#common/abstract/document.d.mts";
+import type { DataSchema } from "#common/data/fields.d.mts";
+import type { TextureData } from "#common/data/data.mjs";
+
+import fields = foundry.data.fields;
 
 declare global {
   namespace Scene {

package/src/foundry/client/data/documents/setting.d.mts

@@ -1,7 +1,8 @@
-import type { Merge } from "../../../../utils/index.d.mts";
-import type Document from "../../../common/abstract/document.d.mts";
-import type { DataSchema } from "../../../common/data/fields.d.mts";
-import type { fields } from "../../../common/data/module.d.mts";
+import type { Merge } from "fvtt-types/utils";
+import type Document from "#common/abstract/document.d.mts";
+import type { DataSchema } from "#common/data/fields.d.mts";
+
+import fields = foundry.data.fields;
 
 declare global {
   namespace Setting {

package/src/foundry/client/data/documents/table-result.d.mts

@@ -1,9 +1,10 @@
-import type { ConfiguredTableResult } from "../../../../configuration/index.d.mts";
-import type { Merge } from "../../../../utils/index.d.mts";
-import type Document from "../../../common/abstract/document.d.mts";
-import type { DataSchema } from "../../../common/data/fields.d.mts";
-import type { fields } from "../../../common/data/module.d.mts";
-import type BaseTableResult from "../../../common/documents/table-result.d.mts";
+import type { ConfiguredTableResult } from "fvtt-types/configuration";
+import type { Merge } from "fvtt-types/utils";
+import type Document from "#common/abstract/document.d.mts";
+import type { DataSchema } from "#common/data/fields.d.mts";
+import type BaseTableResult from "#common/documents/table-result.d.mts";
+
+import fields = foundry.data.fields;
 
 declare global {
   namespace TableResult {

package/src/foundry/client/data/documents/table.d.mts

@@ -1,8 +1,9 @@
 import type { InexactPartial, Merge } from "fvtt-types/utils";
-import type { documents } from "../../../client-esm/client.d.mts";
-import type Document from "../../../common/abstract/document.d.mts";
-import type { DataSchema } from "../../../common/data/fields.d.mts";
-import type { fields } from "../../../common/data/module.d.mts";
+import type { documents } from "#client-esm/client.d.mts";
+import type Document from "#common/abstract/document.d.mts";
+import type { DataSchema } from "#common/data/fields.d.mts";
+
+import fields = foundry.data.fields;
 
 declare global {
   namespace RollTable {

package/src/foundry/client/data/documents/tile.d.mts

@@ -1,7 +1,9 @@
-import type { InterfaceToObject, Merge } from "../../../../utils/index.d.mts";
-import type Document from "../../../common/abstract/document.d.mts";
-import type { DataSchema } from "../../../common/data/fields.d.mts";
-import type { fields, TextureData } from "../../../common/data/module.d.mts";
+import type { InterfaceToObject, Merge } from "fvtt-types/utils";
+import type Document from "#common/abstract/document.d.mts";
+import type { DataSchema } from "#common/data/fields.d.mts";
+import type { TextureData } from "#common/data/data.mjs";
+
+import fields = foundry.data.fields;
 
 declare global {
   namespace TileDocument {

package/src/foundry/client/data/documents/token.d.mts

@@ -1,10 +1,12 @@
 import type { AnyObject, DeepPartial, InexactPartial, InterfaceToObject, Merge } from "fvtt-types/utils";
-import type { documents } from "../../../client-esm/client.d.mts";
-import type Document from "../../../common/abstract/document.d.mts";
-import type { DataSchema } from "../../../common/data/fields.d.mts";
-import type { fields, LightData, TextureData } from "../../../common/data/module.d.mts";
-import type { ActorDeltaField } from "../../../common/documents/token.d.mts";
-import type BaseToken from "../../../common/documents/token.d.mts";
+import type { documents } from "#client-esm/client.d.mts";
+import type Document from "#common/abstract/document.d.mts";
+import type { DataSchema } from "#common/data/fields.d.mts";
+import type { ActorDeltaField } from "#common/documents/token.d.mts";
+import type BaseToken from "#common/documents/token.d.mts";
+import type { LightData, TextureData } from "#common/data/data.mjs";
+
+import fields = foundry.data.fields;
 
 declare global {
   namespace TokenDocument {

package/src/foundry/client/data/documents/user.d.mts

@@ -1,9 +1,10 @@
 import type { ConfiguredDocumentClass } from "../../../../types/documentConfiguration.d.mts";
 import type { AnyObject, FixedInstanceType, InexactPartial, Merge, NullishProps } from "fvtt-types/utils";
-import type Document from "../../../common/abstract/document.d.mts";
-import type { DataSchema } from "../../../common/data/fields.d.mts";
-import type { fields } from "../../../common/data/module.d.mts";
-import type { BaseActor } from "../../../common/documents/_module.d.mts";
+import type Document from "#common/abstract/document.d.mts";
+import type { DataSchema } from "#common/data/fields.d.mts";
+import type { BaseActor } from "#common/documents/_module.d.mts";
+
+import fields = foundry.data.fields;
 
 declare global {
   namespace User {

package/src/foundry/client/data/documents/wall.d.mts

@@ -1,7 +1,8 @@
-import type { Merge } from "../../../../utils/index.d.mts";
-import type Document from "../../../common/abstract/document.d.mts";
-import type { DataSchema } from "../../../common/data/fields.d.mts";
-import type { fields } from "../../../common/data/module.d.mts";
+import type { Merge } from "fvtt-types/utils";
+import type Document from "#common/abstract/document.d.mts";
+import type { DataSchema } from "#common/data/fields.d.mts";
+
+import fields = foundry.data.fields;
 
 declare global {
   namespace WallDocument {
@@ -215,6 +216,7 @@ declare global {
           validationError: "must be a length-4 array of integer coordinates";
         },
         // TODO(LukeAbby): Make the array shape easier to override.
+        // eslint-disable-next-line @typescript-eslint/no-deprecated
         fields.ArrayField.AssignmentElementType<fields.NumberField<{ required: true; integer: true; nullable: false }>>,
         fields.ArrayField.InitializedElementType<
           fields.NumberField<{ required: true; integer: true; nullable: false }>

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

@@ -8,8 +8,8 @@ import type {
   InitializationHook,
   InitializedOn,
 } from "fvtt-types/utils";
-import type BasePackage from "../common/packages/base-package.d.mts";
-import type { Document } from "../common/abstract/module.d.mts";
+import type BasePackage from "#common/packages/base-package.d.mts";
+import type { Document } from "#common/abstract/_module.d.mts";
 
 // Must be called with all hooks in a union.
 // Do not increase the complexity of this type. If you do Game related types may get complex enough to complain about not being statically known.

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

@@ -48,7 +48,11 @@ declare global {
    * Critical server-side startup messages which need to be displayed to the client.
    */
   let MESSAGES:
-    | { type: Notifications.Notification["type"]; message: string; options: Notifications.NotifyOptions }[]
+    | {
+        type: foundry.applications.ui.Notifications.Type;
+        message: string;
+        options: foundry.applications.ui.Notifications.NotifyOptions;
+      }[]
     | null;
 
   /**
@@ -60,9 +64,9 @@ declare global {
   let ui: {
     /**
      * @remarks
-     * Initialized whenever a {@link ContextMenu | `ContextMenu`} is opened, deleted when it's closed again.
+     * Initialized whenever a {@link foundry.applications.ux.ContextMenu | `ContextMenu`} is opened, deleted when it's closed again.
      */
-    context?: ContextMenu;
+    context?: foundry.applications.ux.ContextMenu;
 
     /**
      * @defaultValue `{}`

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

@@ -1,16 +1,16 @@
 import type { EditorState, Plugin } from "prosemirror-state";
 import type { DeepPartial, EmptyObject, ValueOf } from "fvtt-types/utils";
-import type Document from "../common/abstract/document.d.mts";
-import type { ProseMirrorDropDown } from "../common/prosemirror/menu.d.mts";
-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 Document from "#common/abstract/document.d.mts";
+import type { ProseMirrorDropDown } from "#common/prosemirror/menu.d.mts";
+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 {
   DatabaseCreateOperation,
   DatabaseDeleteOperation,
   DatabaseUpdateOperation,
-} from "../common/abstract/_types.d.mts";
-import type CompendiumArt from "../client-esm/helpers/compendium-art.d.mts";
+} from "#common/abstract/_types.d.mts";
+import type CompendiumArt from "#client-esm/helpers/compendium-art.d.mts";
 
 declare global {
   /**
@@ -299,7 +299,7 @@ declare global {
        * @param statusId - The status effect ID being applied, from CONFIG.specialStatusEffects.
        * @param active   - Is the special status effect now active?
        */
-      applyTokenStatusEffect: (token: Token.Object, statusId: string, active: boolean) => void;
+      applyTokenStatusEffect: (token: Token.Implementation, statusId: string, active: boolean) => void;
 
       /**
        * A hook event that fires when a chat bubble is initially configured.
@@ -313,7 +313,7 @@ declare global {
        * @see {@link ChatBubbles.say | `ChatBubbles#say`}
        */
       chatBubble: (
-        token: Token.Object,
+        token: Token.Implementation,
         html: JQuery,
         message: string,
         options: {
@@ -368,7 +368,7 @@ declare global {
        * @param options - Options for rendering the associated {@link JournalSheet | `JournalSheet`}
        * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
        */
-      activateNote: (note: Note.Object, options: JournalSheet.RenderOptions) => true | false;
+      activateNote: (note: Note.Implementation, options: JournalSheet.RenderOptions) => true | false;
 
       /** Cards */
 
@@ -790,21 +790,27 @@ 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 app          - The Application instance that the context menu is constructed in
        * @param entryOptions - The context menu entries
        * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
        * @see {@link SceneNavigation.activateListeners | `SceneNavigation#activateListeners`}
        */
-      getSceneNavigationContext: (html: JQuery, entryOptions: ContextMenu.Entry[]) => boolean | void;
+      getSceneNavigationContext: (
+        app: foundry.applications.ui.SceneNavigation,
+        contextOptions: foundry.applications.ux.ContextMenu.Entry<HTMLElement>[],
+      ) => 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
+       * @param app            - The Application instance that the context menu is constructed in
+       * @param contextOptions - The context menu entries
        * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
        * @see {@link PlayerList.activateListeners | `PlayerList#activateListeners`}
        */
-      getUserContextOptions: (html: JQuery, entryOptions: ContextMenu.Entry[]) => boolean | void;
+      getUserContextOptions: (
+        app: foundry.applications.ui.Players,
+        contextOptions: foundry.applications.ux.ContextMenu.Entry<HTMLElement>[],
+      ) => boolean | void;
     }
 
     /** Application */
@@ -1155,36 +1161,45 @@ declare global {
      * A hook event that fires when the context menu for entries in an Application is constructed. Substitute the
      * Application name in the hook event to target a specific Application, for example
      * "getActorDirectoryEntryContext".
-     * @param html         - The HTML element to which the context options are attached
+     * @param app          - The Application instance that the context menu is constructed in
      * @param entryOptions - The context menu entries
      * @remarks This is called by {@link Hooks.call | `Hooks.call`}.
      * @see {@link ContextMenu.create | `ContextMenu.create`}
      */
-    type GetEntryContext = (html: JQuery, entryOptions: ContextMenu.Entry[]) => boolean | void;
+    type GetEntryContext = (
+      app: Application.Any | foundry.applications.api.ApplicationV2.Any,
+      entryOptions: foundry.applications.ux.ContextMenu.Entry<HTMLElement | JQuery>[],
+    ) => boolean | void;
 
     /**
      * A hook event that fires when the context menu for a Sound in the PlaylistDirectory is constructed.
-     * @param html         - The HTML element to which the context options are attached
+     * @param app          - The Application instance that the context menu is constructed in
      * @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 | `Hooks.call`}.
      * @see {@link PlaylistDirectory._contextMenu | `PlaylistDirectory#_contextMenu`}
      */
-    type GetPlaylistDirectorySoundContext = (html: JQuery, entryOptions: ContextMenu.Entry[]) => boolean | void;
+    type GetSoundContextPlaylistDirectory = (
+      app: foundry.applications.sidebar.tabs.PlaylistDirectory,
+      entryOptions: foundry.applications.ux.ContextMenu.Entry<HTMLElement>[],
+    ) => boolean | void;
 
     /**
      * A hook event that fires when the context menu for folders in a SidebarTab
      * is constructed. Substitute the SidebarTab name in the hook event to target
      * a specific SidebarTab, for example "getActorDirectoryFolderContext".
-     * @param html         - The HTML element to which the context options are attached
+     * @param app          - The Application instance that the context menu is constructed in
      * @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 | `Hooks.call`}.
      * @see {@link SidebarDirectory._contextMenu | `SidebarDirectory#_contextMenu`}
      */
-    type GetSidebarDirectoryFolderContext = (html: JQuery, entryOptions: ContextMenu.Entry[]) => boolean | void;
+    type GetSidebarDirectoryFolderContext = (
+      app: foundry.applications.sidebar.DocumentDirectory,
+      entryOptions: foundry.applications.ux.ContextMenu.Entry<HTMLElement>[],
+    ) => boolean | void;
 
     type DynamicCallbacks =
       | RenderApplication
@@ -1209,7 +1224,7 @@ declare global {
       | ActivateLayer
       | DeactivateLayer
       | GetEntryContext
-      | GetPlaylistDirectorySoundContext
+      | GetSoundContextPlaylistDirectory
       | GetSidebarDirectoryFolderContext;
 
     interface ErrorCallbackParameters {

package/src/foundry/client/pixi/board.d.mts

@@ -1,5 +1,5 @@
 import type { InexactPartial, NullishProps, FixedInstanceType } from "fvtt-types/utils";
-import type { CANVAS_PERFORMANCE_MODES } from "../../common/constants.d.mts";
+import type { CANVAS_PERFORMANCE_MODES } from "#common/constants.d.mts";
 
 type InternalCanvas = new (...args: never) => {
   readonly [K in keyof CONFIG.Canvas.Groups]?: FixedInstanceType<CONFIG.Canvas.Groups[K]["groupClass"]> | undefined;

package/src/foundry/client/pixi/core/interaction/render-flags.d.mts

@@ -1,12 +1,14 @@
 import type {
   AnyConstructor,
+  Coalesce,
   ConcreteKeys,
   FixedInstanceType,
   InexactPartial,
   MakeConform,
   Mixin,
+  PhantomConstructor,
 } from "fvtt-types/utils";
-import type { LogCompatibilityWarningOptions } from "../../../../common/utils/logging.d.mts";
+import type { LogCompatibilityWarningOptions } from "#common/utils/logging.d.mts";
 
 declare class RenderFlagObject {
   /** @privateRemarks All mixin classses should accept anything for its constructor. */
@@ -138,22 +140,29 @@ declare global {
   /**
    * Add RenderFlags functionality to some other object.
    * This mixin standardizes the interface for such functionality.
-   * @param Base - The base class being mixed. Normally a PIXI.DisplayObject
+   * @param Base - The base class being mixed: defaults to an anonymous empty class.
    * @returns The mixed class definition
+   *
+   * @remarks `Base` is normally a PIXI.DisplayObject
    */
   // Note(LukeAbby): In theory a similar thing to what happens in `CanvasGroupMixin` could be done.
   // That is passing up a generic to instantiate the generic side. However `RenderFlagsMixin` is
   // only inherited directly by `PerceptionManager` and `PlaceableObject`.
   // Therefore it's mostly the subclasses of `PlaceableObject` that face this problem and that can't
   // be solved here unfortunately.
-  function RenderFlagsMixin<BaseClass extends RenderFlagsMixin.BaseClass>(
-    Base: BaseClass,
-  ): Mixin<typeof RenderFlagObject, BaseClass>;
+  function RenderFlagsMixin<BaseClass extends RenderFlagsMixin.BaseClass | undefined = undefined>(
+    Base?: BaseClass,
+  ): RenderFlagsMixin.Mix<BaseClass>;
 
   namespace RenderFlagsMixin {
     interface AnyMixedConstructor extends ReturnType<typeof RenderFlagsMixin<BaseClass>> {}
     interface AnyMixed extends FixedInstanceType<AnyMixedConstructor> {}
 
+    type Mix<BaseClass extends RenderFlagsMixin.BaseClass | undefined> = Mixin<
+      typeof RenderFlagObject,
+      Coalesce<BaseClass, PhantomConstructor>
+    >;
+
     type BaseClass = AnyConstructor;
 
     type RENDER_FLAGS = Record<string, RenderFlag.Any>;

package/src/foundry/client/pixi/core/interaction/targets.d.mts

@@ -14,7 +14,7 @@ declare global {
    * A subclass of Set which manages the Token ids which the User has targeted.
    * @see {@link User.targets | `User#targets`}
    */
-  class UserTargets extends Set<Token.Object> {
+  class UserTargets extends Set<Token.Implementation> {
     constructor(user: UserTargets["user"]);
 
     user: User.Implementation;
@@ -27,14 +27,14 @@ declare global {
     /**
      * @remarks Returns void, but Set<T>.add returns boolean
      */
-    override add(token: Token.Object): void;
+    override add(token: Token.Implementation): void;
 
     override clear(): void;
 
     /**
      * @remarks Returns void, but Set<T>.delete returns boolean
      */
-    override delete(token: Token.Object): void;
+    override delete(token: Token.Implementation): void;
   }
 
   namespace UserTargets {

package/src/foundry/client/pixi/core/shapes/ray.d.mts

@@ -1,5 +1,5 @@
 import type { Identity } from "fvtt-types/utils";
-import type { LineIntersection } from "../../../../common/utils/geometry.d.mts";
+import type { LineIntersection } from "#common/utils/geometry.d.mts";
 
 declare global {
   /**

package/src/foundry/client/pixi/core/shapes/source-polygon.d.mts

@@ -1,5 +1,5 @@
 import type { Brand, Coalesce, Identity, InexactPartial, NullishProps } from "fvtt-types/utils";
-import type PointEffectSourceMixin from "../../../../client-esm/canvas/sources/point-effect-source.d.mts";
+import type PointEffectSourceMixin from "#client-esm/canvas/sources/point-effect-source.d.mts";
 
 declare global {
   /**

package/src/foundry/client/pixi/extensions/circle.d.mts

@@ -1,5 +1,5 @@
 import type { NullishProps } from "fvtt-types/utils";
-import type { LineCircleIntersection } from "../../../common/utils/geometry.d.mts";
+import type { LineCircleIntersection } from "#common/utils/geometry.d.mts";
 import * as _PIXI from "pixi.js";
 
 declare global {

package/src/foundry/client/pixi/groups/environment.d.mts

@@ -1,5 +1,5 @@
 import type { HandleEmptyObject, Identity, InexactPartial, NullishProps } from "fvtt-types/utils";
-import type { SceneEnvironmentData } from "../../../common/documents/_types.d.mts";
+import type { SceneEnvironmentData } from "#common/documents/_types.d.mts";
 
 declare global {
   /**

package/src/foundry/client/pixi/groups/interface.d.mts

@@ -14,13 +14,13 @@ declare global {
      * @returns The created Graphics instance
      * @remarks
      */
-    addDrawing(drawing: Drawing.Object): PIXI.Graphics;
+    addDrawing(drawing: Drawing.Implementation): PIXI.Graphics;
 
     /**
      * Remove a PrimaryGraphics from the group.
      * @param drawing - The Drawing being removed
      */
-    removeDrawing(drawing: Drawing.Object): void;
+    removeDrawing(drawing: Drawing.Implementation): void;
 
     protected override _draw(options: HandleEmptyObject<DrawOptions>): Promise<void>;