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

package/src/foundry/client/pixi/layers/base/placeables-layer.d.mts

@@ -1,5 +1,11 @@
-import type { ArrayOverlaps } from "../../../../../types/helperTypes.d.mts";
-import type { ConstructorOf, InexactPartial, NullishProps, ValueOf } from "../../../../../types/utils.d.mts";
+import type {
+  ArrayOverlaps,
+  InexactPartial,
+  NullishProps,
+  ValueOf,
+  FixedInstanceType,
+  HandleEmptyObject,
+} from "../../../../../utils/index.d.mts";
 import type Document from "../../../../common/abstract/document.d.mts";
 import type EmbeddedCollection from "../../../../common/abstract/embedded-collection.d.mts";
 
@@ -12,11 +18,7 @@ declare global {
    * @typeParam DocumentName - The key of the configuration which defines the object and document class.
    * @typeParam Options      - The type of the options in this layer.
    */
-  class PlaceablesLayer<
-    DocumentName extends PlaceablesLayer.Type,
-    DrawOptions extends PlaceablesLayer.DrawOptions = PlaceablesLayer.DrawOptions,
-    TearDownOptions extends PlaceablesLayer.TearDownOptions = PlaceablesLayer.TearDownOptions,
-  > extends InteractionLayer<DrawOptions, TearDownOptions> {
+  class PlaceablesLayer<DocumentName extends PlaceablesLayer.Type> extends InteractionLayer {
     constructor();
 
     /**
@@ -52,7 +54,7 @@ declare global {
     /**
      * A Quadtree which partitions and organizes Walls into quadrants for efficient target identification.
      */
-    quadtree: Quadtree<
+    quadtree: CanvasQuadtree<
       ConcretePlaceableOrPlaceableObject<Document.ConfiguredObjectInstanceForName<DocumentName>>
     > | null;
 
@@ -98,7 +100,7 @@ declare global {
     /**
      * Define a Container implementation used to render placeable objects contained in this layer
      */
-    static get placeableClass(): ConstructorOf<PlaceableObject>;
+    static get placeableClass(): PlaceableObject.AnyConstructor;
 
     /**
      * If objects on this PlaceablesLayer have a HUD UI, provide a reference to its instance
@@ -121,7 +123,7 @@ declare global {
      * @remarks yields A placeable object
      */
     // TODO: Update remark with proper @yields tag https://github.com/microsoft/tsdoc/issues/234
-    controllableObjects(): Generator<PlaceableObject>;
+    controllableObjects(): Generator<PlaceableObject.Any>;
 
     /**
      * Track the set of PlaceableObjects on this layer which are currently controlled.
@@ -166,9 +168,9 @@ declare global {
      */
     getDocuments():
       | Exclude<this["documentCollection"], null>
-      | InstanceType<Document.ConfiguredClassForName<DocumentName>>[];
+      | FixedInstanceType<Document.ConfiguredClassForName<DocumentName>>[];
 
-    protected override _draw(options?: DrawOptions): Promise<void>;
+    protected override _draw(options: HandleEmptyObject<PlaceablesLayer.DrawOptions>): Promise<void>;
 
     /**
      * Draw a single placeable object
@@ -178,7 +180,7 @@ declare global {
       document: Document.ConfiguredInstanceForName<DocumentName>,
     ): Document.ConfiguredObjectInstanceForName<DocumentName>;
 
-    protected override _tearDown(options?: TearDownOptions): Promise<void>;
+    protected override _tearDown(options: HandleEmptyObject<PlaceablesLayer.TearDownOptions>): Promise<void>;
 
     protected override _activate(): void;
 
@@ -226,8 +228,9 @@ declare global {
      * @throws An error if explicitly provided id is not valid
      * @remarks Overload is necessary to ensure that one of `angle` or `delta` are numeric in `options`
      */
-    rotateMany(options?: RotationOptionsWithAngle): Promise<Document.ConfiguredObjectInstanceForName<DocumentName>[]>;
-    rotateMany(options?: RotationOptionsWithDelta): Promise<Document.ConfiguredObjectInstanceForName<DocumentName>[]>;
+    rotateMany(
+      options?: PlaceablesLayer.RotationOptions,
+    ): Promise<Document.ConfiguredObjectInstanceForName<DocumentName>[]>;
 
     /**
      * Simultaneously move multiple PlaceableObjects via keyboard movement offsets.
@@ -239,8 +242,7 @@ declare global {
      * @throws An error if explicitly provided id is not valid
      */
     moveMany(
-      /** @remarks can't be NullishProps becuase `dx` and `dy` must be in `[-1, 0, 1]` */
-      options?: InexactPartial<MovementOptions>,
+      options?: PlaceablesLayer.MovementOptions,
     ): Promise<Document.ConfiguredObjectInstanceForName<DocumentName>[]> | undefined;
 
     /**
@@ -447,6 +449,7 @@ declare global {
 
     protected override _onClickRight(event: PIXI.FederatedEvent): void;
 
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     protected override _onMouseWheel(event: WheelEvent): ReturnType<this["rotateMany"]>;
 
     protected override _onDeleteKey(event: KeyboardEvent): Promise<void>;
@@ -479,7 +482,7 @@ declare global {
     /**
      * The data corresponding to the action which may later be un-done
      */
-    data: InstanceType<Document.ConfiguredClassForName<DocumentName>>["_source"][];
+    data: FixedInstanceType<Document.ConfiguredClassForName<DocumentName>>["_source"][];
   }
 
   type PlaceablesLayerOptions<DocumentName extends Document.PlaceableType> = PlaceablesLayer.LayerOptions<DocumentName>;
@@ -547,97 +550,82 @@ declare global {
     namespace LayerOptions {
       type Any = LayerOptions<any>;
     }
-  }
-}
 
-declare abstract class AnyPlaceablesLayer extends PlaceablesLayer<any> {
-  constructor(arg0: never, ...args: never[]);
-}
+    interface RotationOptions {
+      /**
+       * A target angle of rotation (in degrees) where zero faces "south"
+       *
+       * @remarks If both `angle` and `delta` are provided then `angle` is used.
+       */
+      angle?: number | null | undefined;
 
-interface RotationOptionsWithDelta {
-  /**
-   * A target angle of rotation (in degrees) where zero faces "south"
-   */
-  angle?: number | null | undefined;
+      /**
+       * An incremental angle of rotation (in degrees)
+       *
+       * @remarks If both `angle` and `delta` are provided then `angle` is used.
+       */
+      delta?: number | null | undefined;
 
-  /**
-   * An incremental angle of rotation (in degrees)
-   */
-  delta: number;
+      /**
+       * Snap the resulting angle to a multiple of some increment (in degrees)
+       */
+      snap?: number | null | undefined;
 
-  /**
-   * Snap the resulting angle to a multiple of some increment (in degrees)
-   */
-  snap?: number | null | undefined;
+      /**
+       * An Array of object IDs to target for rotation
+       */
+      ids?: string[] | null | undefined;
 
-  /**
-   * An Array of object IDs to target for rotation
-   */
-  ids?: string[] | null | undefined;
+      /**
+       * Rotate objects whose documents are locked?
+       * @defaultValue `false`
+       */
+      includeLocked?: boolean | null | undefined;
+    }
 
-  /**
-   * Rotate objects whose documents are locked?
-   * @defaultValue `false`
-   */
-  includeLocked?: boolean | null | undefined;
-}
+    interface _MovementOptions {
+      /**
+       * Horizontal movement direction
+       * @defaultValue `0`
+       *
+       * @remarks dx cannot be `null` because it must be in `[-1, 0, 1]`. However it may be
+       * `undefined` because it has a parameter default of `0`.
+       */
+      dx?: -1 | 0 | 1 | undefined;
 
-interface RotationOptionsWithAngle {
-  /**
-   * A target angle of rotation (in degrees) where zero faces "south"
-   */
-  angle: number;
+      /**
+       * Vertical movement direction
+       * @defaultValue `0`
+       *
+       * @remarks dx cannot be `null` because it must be in `[-1, 0, 1]`. However it may be
+       * `undefined` because it has a parameter default of `0`.
+       */
+      dy?: -1 | 0 | 1 | undefined;
 
-  /**
-   * An incremental angle of rotation (in degrees)
-   */
-  delta?: number | null | undefined;
+      /**
+       * Rotate the placeable to the keyboard direction instead of moving
+       * @defaultValue
+       */
+      rotate?: boolean | null | undefined;
 
-  /**
-   * Snap the resulting angle to a multiple of some increment (in degrees)
-   */
-  snap?: number | null | undefined;
+      /**
+       * An Array of object IDs to target for movement. The default is the IDs of controlled objects.
+       * @defaultValue `this.controlled.filter(o => !o.data.locked).map(o => o.id)`
+       */
+      ids?: string[] | null | undefined;
 
-  /**
-   * An Array of object IDs to target for rotation
-   */
-  ids?: string[] | null | undefined;
+      /**
+       * Move objects whose documents are locked?
+       * @defaultValue `false`
+       */
+      includeLocked?: boolean | null | undefined;
+    }
 
-  /**
-   * Rotate objects whose documents are locked?
-   * @defaultValue `false`
-   */
-  includeLocked?: boolean | null | undefined;
+    /** @remarks can't be NullishProps because `dx` and `dy` must be in `[-1, 0, 1]` */
+    interface MovementOptions extends InexactPartial<_MovementOptions> {}
+  }
 }
 
-interface MovementOptions {
-  /**
-   * Horizontal movement direction
-   * @defaultValue `0`
-   */
-  dx: -1 | 0 | 1;
-
-  /**
-   * Vertical movement direction
-   * @defaultValue `0`
-   */
-  dy: -1 | 0 | 1;
-
-  /**
-   * Rotate the placeable to the keyboard direction instead of moving
-   * @defaultValue
-   */
-  rotate: boolean;
-
-  /**
-   * An Array of object IDs to target for movement. The default is the IDs of controlled objects.
-   * @defaultValue `this.controlled.filter(o => !o.data.locked).map(o => o.id)`
-   */
-  ids: string[];
-
-  /**
-   * Move objects whose documents are locked?
-   * @defaultValue `false`
-   */
-  includeLocked: boolean;
+declare abstract class AnyPlaceablesLayer extends PlaceablesLayer<any> {
+  constructor(arg0: never, ...args: never[]);
 }

package/src/foundry/client/pixi/layers/controls/cursor.d.mts

@@ -28,6 +28,6 @@ declare global {
      */
     protected _animate(): void;
 
-    override destroy(options?: PIXI.DisplayObject.DestroyOptions): void;
+    override destroy(options?: PIXI.IDestroyOptions | boolean): void;
   }
 }

package/src/foundry/client/pixi/layers/controls/door.d.mts

@@ -65,4 +65,13 @@ declare global {
      */
     protected _onRightDown(event: PIXI.FederatedEvent): undefined | Promise<WallDocument.ConfiguredInstance>;
   }
+
+  namespace DoorControl {
+    type Any = AnyDoorControl;
+    type AnyConstructor = typeof AnyDoorControl;
+  }
+}
+
+declare abstract class AnyDoorControl extends DoorControl {
+  constructor(arg0: never, ...args: never[]);
 }

package/src/foundry/client/pixi/layers/controls/layer.d.mts

@@ -1,5 +1,10 @@
-import type { IntentionalPartial } from "../../../../../types/helperTypes.d.mts";
-import type { InexactPartial, NullishProps, RemoveIndexSignatures } from "../../../../../types/utils.d.mts";
+import type {
+  IntentionalPartial,
+  InexactPartial,
+  NullishProps,
+  RemoveIndexSignatures,
+  HandleEmptyObject,
+} from "../../../../../utils/index.d.mts";
 import type { LineIntersection } from "../../../../common/utils/geometry.d.mts";
 
 declare global {
@@ -11,10 +16,7 @@ declare global {
    * 2) Ruler measurement
    * 3) Map pings
    */
-  class ControlsLayer<
-    DrawOptions extends ControlsLayer.DrawOptions = ControlsLayer.DrawOptions,
-    TearDownOptions extends ControlsLayer.TearDownOptions = ControlsLayer.TearDownOptions,
-  > extends InteractionLayer<DrawOptions, TearDownOptions> {
+  class ControlsLayer extends InteractionLayer {
     constructor();
 
     /**
@@ -101,9 +103,9 @@ declare global {
      */
     getRulerForUser(userId: string): Ruler | null;
 
-    override _draw(options?: DrawOptions): Promise<void>;
+    override _draw(options: HandleEmptyObject<ControlsLayer.DrawOptions>): Promise<void>;
 
-    override _tearDown(options?: TearDownOptions): Promise<void>;
+    override _tearDown(options: HandleEmptyObject<ControlsLayer.TearDownOptions>): Promise<void>;
 
     /**
      * Draw the cursors container

package/src/foundry/client/pixi/layers/controls/ruler.d.mts

@@ -1,4 +1,4 @@
-import type { NullishProps, ValueOf } from "../../../../../types/utils.d.mts";
+import type { NullishProps, ValueOf } from "fvtt-types/utils";
 
 declare global {
   /**

package/src/foundry/client/pixi/layers/effects/background-effects.d.mts

@@ -1,14 +1,10 @@
-export {};
+import type { HandleEmptyObject } from "../../../../../utils/index.d.mts";
 
 declare global {
   /**
    * A layer of background alteration effects which change the appearance of the primary group render texture.
    */
-  class CanvasBackgroundAlterationEffects<
-    DrawOptions extends CanvasBackgroundAlterationEffects.DrawOptions = CanvasBackgroundAlterationEffects.DrawOptions,
-    TearDownOptions extends
-      CanvasBackgroundAlterationEffects.TearDownOptions = CanvasBackgroundAlterationEffects.TearDownOptions,
-  > extends CanvasLayer<DrawOptions, TearDownOptions> {
+  class CanvasBackgroundAlterationEffects extends CanvasLayer {
     /**
      * A collection of effects which provide background vision alterations.
      * @defaultValue `vision.sortableChildren = true`
@@ -26,9 +22,11 @@ declare global {
      */
     lighting: PIXI.Container;
 
-    protected override _draw(options?: DrawOptions): Promise<void>;
+    protected override _draw(options: HandleEmptyObject<CanvasBackgroundAlterationEffects.DrawOptions>): Promise<void>;
 
-    protected override _tearDown(options?: TearDownOptions): Promise<void>;
+    protected override _tearDown(
+      options: HandleEmptyObject<CanvasBackgroundAlterationEffects.TearDownOptions>,
+    ): Promise<void>;
 
     /**
      * Clear background alteration effects vision and lighting containers

package/src/foundry/client/pixi/layers/effects/coloration-effects.d.mts

@@ -1,13 +1,10 @@
-export {};
+import type { HandleEmptyObject } from "../../../../../utils/index.d.mts";
 
 declare global {
   /**
    * A CanvasLayer for displaying coloration visual effects
    */
-  class CanvasColorationEffects<
-    DrawOptions extends CanvasColorationEffects.DrawOptions = CanvasColorationEffects.DrawOptions,
-    TearDownOptions extends CanvasColorationEffects.TearDownOptions = CanvasColorationEffects.TearDownOptions,
-  > extends CanvasLayer<DrawOptions, TearDownOptions> {
+  class CanvasColorationEffects extends CanvasLayer {
     /**
      * @defaultValue `true`
      */
@@ -23,9 +20,9 @@ declare global {
      */
     clear(): void;
 
-    protected override _draw(options?: DrawOptions): Promise<void>;
+    protected override _draw(options: HandleEmptyObject<CanvasColorationEffects.DrawOptions>): Promise<void>;
 
-    protected override _tearDown(options?: TearDownOptions): Promise<void>;
+    protected override _tearDown(options: HandleEmptyObject<CanvasColorationEffects.TearDownOptions>): Promise<void>;
   }
 
   namespace CanvasColorationEffects {

package/src/foundry/client/pixi/layers/effects/darkness-effects.d.mts

@@ -1,13 +1,10 @@
-export {};
+import type { HandleEmptyObject } from "../../../../../utils/index.d.mts";
 
 declare global {
   /**
    * A layer of background alteration effects which change the appearance of the primary group render texture.
    */
-  class CanvasDarknessEffects<
-    DrawOptions extends CanvasDarknessEffects.DrawOptions = CanvasDarknessEffects.DrawOptions,
-    TearDownOptions extends CanvasLayer.TearDownOptions = CanvasLayer.TearDownOptions,
-  > extends CanvasLayer<DrawOptions, TearDownOptions> {
+  class CanvasDarknessEffects extends CanvasLayer {
     /**
      * @defaultValue `true`
      */
@@ -18,7 +15,7 @@ declare global {
      */
     clear(): void;
 
-    override _draw(options: DrawOptions): Promise<void>;
+    override _draw(options: HandleEmptyObject<CanvasDarknessEffects.DrawOptions>): Promise<void>;
   }
 
   namespace CanvasDarknessEffects {

package/src/foundry/client/pixi/layers/effects/illumination-effects.d.mts

@@ -1,13 +1,10 @@
-import type { NullishProps } from "../../../../../types/utils.d.mts";
+import type { HandleEmptyObject, NullishProps } from "fvtt-types/utils";
 
 declare global {
   /**
    * A CanvasLayer for displaying illumination visual effects
    */
-  class CanvasIlluminationEffects<
-    DrawOptions extends CanvasIlluminationEffects.DrawOptions = CanvasIlluminationEffects.DrawOptions,
-    TearDownOptions extends CanvasIlluminationEffects.TearDownOptions = CanvasIlluminationEffects.TearDownOptions,
-  > extends CanvasLayer<DrawOptions, TearDownOptions> {
+  class CanvasIlluminationEffects extends CanvasLayer {
     /**
      * The filter used to mask visual effects on this layer
      */
@@ -79,9 +76,9 @@ declare global {
 
     override render(renderer: PIXI.Renderer): void;
 
-    protected override _draw(options?: DrawOptions): Promise<void>;
+    protected override _draw(options: HandleEmptyObject<CanvasIlluminationEffects.DrawOptions>): Promise<void>;
 
-    protected override _tearDown(options?: TearDownOptions): Promise<void>;
+    protected override _tearDown(options: HandleEmptyObject<CanvasIlluminationEffects.TearDownOptions>): Promise<void>;
 
     /**
      * @deprecated since v11, will be removed in v13

package/src/foundry/client/pixi/layers/effects/visibility.d.mts

@@ -1,4 +1,4 @@
-import type { EmptyObject, InexactPartial, ValueOf } from "../../../../../types/utils.d.mts";
+import type { EmptyObject, HandleEmptyObject, InexactPartial, ValueOf } from "fvtt-types/utils";
 
 declare global {
   /**
@@ -6,10 +6,7 @@ declare global {
    * This layer uses an event-driven workflow to perform the minimal required calculation in response to changes.
    * @see {@link PointSource}
    */
-  class CanvasVisibility<
-    DrawOptions extends CanvasVisibility.DrawOptions = CanvasVisibility.DrawOptions,
-    TearDownOptions extends CanvasVisibility.TearDownOptions = CanvasVisibility.TearDownOptions,
-  > extends CanvasLayer<DrawOptions, TearDownOptions> {
+  class CanvasVisibility extends CanvasLayer {
     /**
      * The currently revealed vision.
      */
@@ -74,7 +71,8 @@ declare global {
     /**
      * Does the currently viewed Scene support Token field of vision?
      */
-    get tokenVision(): Scene.ConfiguredInstance["tokenVision"];
+    // TODO: make `Scene.Implementation["tokenVision"]` when docs v2 is done
+    get tokenVision(): boolean;
 
     /**
      * The configured options used for the saved fog-of-war texture.
@@ -100,9 +98,9 @@ declare global {
      */
     initializeVisionMode(): void;
 
-    protected override _draw(options?: DrawOptions): Promise<void>;
+    protected override _draw(options: HandleEmptyObject<CanvasVisibility.DrawOptions>): Promise<void>;
 
-    protected override _tearDown(options?: TearDownOptions): Promise<void>;
+    protected override _tearDown(options: HandleEmptyObject<CanvasVisibility.TearDownOptions>): Promise<void>;
 
     /**
      * Update the display of the sight layer.
@@ -185,6 +183,7 @@ declare global {
   }
 
   namespace CanvasVisibility {
+    interface Any extends AnyCanvasVisibility {}
     type AnyConstructor = typeof AnyCanvasVisibility;
 
     type LightingVisibility = ValueOf<typeof VisionMode.LIGHTING_VISIBILITY>;
@@ -211,11 +210,15 @@ declare global {
 
   interface CanvasVisibilityTest {
     point: PIXI.Point;
+    elevation: number;
     los: Map<foundry.canvas.sources.PointVisionSource.Any, boolean>;
   }
 
   interface CanvasVisibilityTestConfig {
+    /** The target object */
     object: PlaceableObject | null;
+
+    /** An array of visibility tests */
     tests: CanvasVisibilityTest[];
   }
 }

package/src/foundry/client/pixi/layers/effects/weather/particles/effect.d.mts

@@ -32,7 +32,7 @@ declare global {
      */
     getParticleEmitters(options: PIXI.particles.EmitterConfigV3): PIXI.particles.Emitter[];
 
-    override destroy(options?: PIXI.DisplayObject.DestroyOptions): void;
+    override destroy(options?: PIXI.IDestroyOptions | boolean): void;
 
     /**
      * Begin animation for the configured emitters.

package/src/foundry/client/pixi/layers/effects/weather-effects.d.mts

@@ -1,13 +1,10 @@
-import type { InexactPartial } from "../../../../../types/utils.d.mts";
+import type { HandleEmptyObject, InexactPartial } from "fvtt-types/utils";
 
 declare global {
   /**
    * A CanvasLayer for displaying visual effects like weather, transitions, flashes, or more
    */
-  class WeatherEffects<
-    DrawOptions extends WeatherEffects.DrawOptions = WeatherEffects.DrawOptions,
-    TearDownOptions extends WeatherEffects.TearDownOptions = WeatherEffects.TearDownOptions,
-  > extends FullCanvasObjectMixin(CanvasLayer) {
+  class WeatherEffects extends FullCanvasObjectMixin(CanvasLayer) {
     /**
      * @privateRemarks This is not overridden in foundry but reflects the real behavior.
      */
@@ -104,9 +101,9 @@ declare global {
 
     set zIndex(value: number);
 
-    protected override _draw(options?: DrawOptions): Promise<void>;
+    protected override _draw(options: HandleEmptyObject<WeatherEffects.DrawOptions>): Promise<void>;
 
-    protected override _tearDown(options?: TearDownOptions): Promise<void>;
+    protected override _tearDown(options: HandleEmptyObject<WeatherEffects.TearDownOptions>): Promise<void>;
 
     /**
      * Initialize the weather container from a weather config object.
@@ -114,7 +111,7 @@ declare global {
      *
      * @privateRemarks Foundry has this typed as just `object`, but explicitly calls it with null and implicitly with undefined
      */
-    initializeEffects(weatherEffectsConfig?: WeatherEffects.WeatherEffectsConfig | null | undefined): void;
+    initializeEffects(weatherEffectsConfig?: WeatherEffects.WeatherEffectsConfig | null): void;
 
     /**
      * Clear the weather container.

package/src/foundry/client/pixi/layers/grid/highlight.d.mts

@@ -28,6 +28,6 @@ declare global {
     override clear(): this;
 
     /** @privateRemarks Foundry handles this by passing `(...args)` directly to super, but it only takes the one */
-    override destroy(options?: PIXI.DisplayObject.DestroyOptions): void;
+    override destroy(options?: PIXI.IDestroyOptions | boolean): void;
   }
 }

package/src/foundry/client/pixi/layers/grid/layer.d.mts

@@ -1,13 +1,10 @@
-import type { InexactPartial, NullishProps } from "../../../../../types/utils.d.mts";
+import type { HandleEmptyObject, InexactPartial, NullishProps } from "fvtt-types/utils";
 
 declare global {
   /**
    * A CanvasLayer responsible for drawing a square grid
    */
-  class GridLayer<
-    DrawOptions extends GridLayer.DrawOptions = GridLayer.DrawOptions,
-    TearDownOptions extends CanvasLayer.TearDownOptions = CanvasLayer.TearDownOptions,
-  > extends CanvasLayer<DrawOptions, TearDownOptions> {
+  class GridLayer extends CanvasLayer {
     /**
      * @remarks Due to the grid rework in v12 this points to a BaseGrid subclass rather than a GridLayer instance,
      *          however to avoid inheritance-based issues this is left as the intended GridLayer instance
@@ -47,7 +44,7 @@ declare global {
      * Draw the grid
      * @param options - Override settings used in place of those saved to the Scene data
      */
-    _draw(options?: DrawOptions): Promise<void>;
+    _draw(options: HandleEmptyObject<GridLayer.DrawOptions>): Promise<void>;
 
     /**
      * Creates the grid mesh.
@@ -153,13 +150,13 @@ declare global {
      * @deprecated since v12, will be removed in v14
      * @remarks `"GridLayer#getTopLeft is deprecated. Use canvas.grid.getTopLeftPoint instead."`
      */
-    getTopLeft(x: number, y: number): Canvas.PointArray;
+    getTopLeft(x: number, y: number): Canvas.PointTuple;
 
     /**
      * @deprecated since v12, will be removed in v14
      * @remarks `"GridLayer#getCenter is deprecated. Use canvas.grid.getCenterPoint instead."`
      */
-    getCenter(x: number, y: number): Canvas.PointArray;
+    getCenter(x: number, y: number): Canvas.PointTuple;
 
     /**
      * @deprecated since v12, will be removed in v14
@@ -190,6 +187,7 @@ declare global {
         x: number;
         y: number;
       },
+      // eslint-disable-next-line @typescript-eslint/no-deprecated
       options?: GridLayer.MeasureDistancesOptions,
     ): number;
   }

package/src/foundry/client/pixi/layers/grid/mesh.d.mts

@@ -1,4 +1,4 @@
-import type { InexactPartial } from "../../../../../types/utils.d.mts";
+import type { InexactPartial } from "fvtt-types/utils";
 
 declare global {
   /**

package/src/foundry/client/pixi/layers/masks/depth.d.mts

@@ -23,16 +23,12 @@ declare global {
      * }
      * ```
      */
-    static override textureConfiguration: {
-      scaleMode: PIXI.SCALE_MODES;
-      format: PIXI.FORMATS;
-      multisample: PIXI.MSAA_QUALITY;
-    };
+    static override textureConfiguration: CachedContainer.TextureConfiguration;
 
     /**
      * @defaultValue `[0, 0, 0, 0]`
      */
-    override clearColor: [r: number, g: number, b: number, a: number];
+    override clearColor: Color.RGBAColorVector;
 
     /**
      * Update the elevation-to-depth mapping?
@@ -59,4 +55,13 @@ declare global {
      */
     clear(): void;
   }
+
+  namespace CanvasDepthMask {
+    interface Any extends AnyCanvasDepthMask {}
+    type AnyConstructor = typeof AnyCanvasDepthMask;
+  }
+}
+
+declare abstract class AnyCanvasDepthMask extends CanvasDepthMask {
+  constructor(arg0: never, ...args: never[]);
 }