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

package/package.json

@@ -1,14 +1,14 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@league-of-foundry-developers/foundry-vtt-types",
-  "version": "12.331.2-beta",
+  "version": "12.331.3-beta",
   "description": "TypeScript type definitions for Foundry VTT",
   "type": "module",
   "types": "./index.d.mts",
   "scripts": {
-    "lint": "./node_modules/typescript/bin/tsc; eslint .",
-    "lint:fix": "eslint --fix .",
-    "lint:ci": "eslint .",
+    "lint": "./node_modules/typescript/bin/tsc; eslint .; prettier -c .",
+    "lint:fix": "eslint --fix .; prettier -w .",
+    "lint:ci": "eslint .; prettier -c .",
     "eslint:report": "eslint --output-file eslint_report.json --format json .",
     "test": "vitest --typecheck",
     "typecheck": "./node_modules/typescript/bin/tsc",
@@ -94,13 +94,13 @@
     "lint-staged": "^15.2.10",
     "prettier": "^3.0.3",
     "typescript": "~5.7",
-    "vitest": "^2.1.4"
+    "vitest": "^2.1.8"
   },
   "peerDependencies": {
     "typescript": "^5.4"
   },
   "overrides": {
-    "@types/css-font-loading-module": "^0.0.12s"
+    "@types/css-font-loading-module": "^0.0.14"
   },
   "resolutions": {
     "@types/earcut": "patch:@types/earcut@2.1.4#./patches/@types+earcut+2.1.4.patch"
@@ -121,6 +121,5 @@
   ],
   "publishConfig": {
     "access": "public"
-  },
-  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+  }
 }

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

@@ -10,11 +10,7 @@ declare global {
     Options,
     Scene.ConfiguredInstance
   > {
-    constructor(
-      scene: Scene.ConfiguredInstance,
-      sheet: GridConfig["sheet"],
-      options?: Partial<Options>,
-    );
+    constructor(scene: Scene.ConfiguredInstance, sheet: GridConfig["sheet"], options?: Partial<Options>);
 
     /**
      * Track the Scene Configuration sheet reference

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

@@ -84,18 +84,21 @@ declare global {
      * }
      * ```
      */
-    static localizeDataModel(model: foundry.abstract.DataModel.AnyConstructor, options?: InexactPartial<{
-      /**
-       * An array of localization key prefixes to use. If not specified, prefixes
-       * are learned from the DataModel.LOCALIZATION_PREFIXES static property.
-       */
-      prefixes: string[];
-
-      /**
-       * A localization path prefix used to prefix all field names within this model. This is generally not required.
-       */
-      prefixPath: string;
-    }>): void;
+    static localizeDataModel(
+      model: foundry.abstract.DataModel.AnyConstructor,
+      options?: InexactPartial<{
+        /**
+         * An array of localization key prefixes to use. If not specified, prefixes
+         * are learned from the DataModel.LOCALIZATION_PREFIXES static property.
+         */
+        prefixes: string[];
+
+        /**
+         * A localization path prefix used to prefix all field names within this model. This is generally not required.
+         */
+        prefixPath: string;
+      }>,
+    ): void;
 
     /**
      * Set a language as the active translation source for the session

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

@@ -1,4 +1,8 @@
-import type { FormInputConfig, NumberInputConfig, SelectInputConfig } from "../../client-esm/applications/forms/fields.d.mts";
+import type {
+  FormInputConfig,
+  NumberInputConfig,
+  SelectInputConfig,
+} from "../../client-esm/applications/forms/fields.d.mts";
 
 declare global {
   /**

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

@@ -2920,8 +2920,6 @@ declare global {
 
         /** @defaultValue `{ groupClass: OverlayCanvasGroup, parent: "stage" }` */
         overlay: CONFIG.Canvas.GroupDefinition<typeof OverlayCanvasGroup>;
-
-        [key: string]: CONFIG.Canvas.GroupDefinition;
       }
 
       interface Layers {

package/src/foundry/client/core/image.d.mts

@@ -1,4 +1,4 @@
-import type { InexactPartial } from "../../../types/utils.d.mts";
+import type { InexactPartial, NullishProps } from "../../../types/utils.d.mts";
 
 declare global {
   /**
@@ -15,8 +15,15 @@ declare global {
      */
     static createThumbnail(
       src: string | PIXI.DisplayObject,
-      options?: InexactPartial<ImageHelper.CompositeOptions & ImageHelper.TextureToImageOptions>,
-    ): Promise<ImageHelper.ThumbnailReturn>;
+      options?: ImageHelper.CompositeOptions & ImageHelper.TextureToImageOptions,
+    ): Promise<ImageHelper.ThumbnailReturn> | null;
+
+    /**
+     * Test whether a source file has a supported image extension type
+     * @param src - A requested image source path
+     * @returns Does the filename end with a valid image extension?
+     */
+    static hasImageExtension(src: string): boolean;
 
     /**
      * Composite a canvas object by rendering it to a single texture
@@ -25,10 +32,7 @@ declare global {
      *                  (default: `{}`)
      * @returns The composite Texture object
      */
-    static compositeCanvasTexture(
-      object: PIXI.DisplayObject,
-      options?: InexactPartial<ImageHelper.CompositeOptions>,
-    ): PIXI.Texture;
+    static compositeCanvasTexture(object: PIXI.DisplayObject, options?: ImageHelper.CompositeOptions): PIXI.Texture;
 
     /**
      * Extract a texture to a base64 PNG string
@@ -36,10 +40,7 @@ declare global {
      * @param options - (default: `{}`)
      * @returns A base64 png string of the texture
      */
-    static textureToImage(
-      texture: PIXI.Texture,
-      options?: InexactPartial<ImageHelper.TextureToImageOptions>,
-    ): Promise<string>;
+    static textureToImage(texture: PIXI.Texture, options?: ImageHelper.TextureToImageOptions): Promise<string>;
 
     /**
      * Asynchronously convert a DisplayObject container to base64 using Canvas#toBlob and FileReader
@@ -47,12 +48,18 @@ declare global {
      * @param type    - The requested mime type of the output, default is image/png
      * @param quality - A number between 0 and 1 for image quality if image/jpeg or image/webp
      * @returns A processed base64 string
+     * @privateRemarks Foundry doesn't mark `type` or `quality` as optional, but they're passed directly to `this.canvasToBase64`, where they *are* optional.
      */
-    static pixiToBase64(target: PIXI.DisplayObject, type: string, quality: number): Promise<string>;
+    static pixiToBase64(
+      target: PIXI.DisplayObject,
+      type?: foundry.CONST.IMAGE_FILE_EXTENSIONS,
+      quality?: number,
+    ): Promise<string>;
 
     /**
      * Asynchronously convert a canvas element to base64.
-     * @param type    - (default: `["image/png"]`)
+     * @param type    - (default: `"image/png"`)
+     * @param quality - JPEG or WEBP compression from 0 to 1. Default is 0.92.
      * @returns The base64 string of the canvas.
      */
     static canvasToBase64(
@@ -73,14 +80,7 @@ declare global {
       base64: string,
       fileName: string,
       filePath: string,
-      options?: {
-        /** The data storage location to which the file should be uploaded (default: `"data"`) */
-        storage: string;
-        /** The MIME type of the file being uploaded */
-        type?: foundry.CONST.IMAGE_FILE_EXTENSIONS;
-        /** Display a UI notification when the upload is processed. (default: `true`)  */
-        notify: boolean;
-      },
+      options?: ImageHelper.UploadBase64Options,
     ): Promise<ReturnType<(typeof FilePicker)["upload"]>>;
 
     /**
@@ -93,16 +93,18 @@ declare global {
       pixels: Uint8ClampedArray,
       width: number,
       height: number,
-      options: InexactPartial<ImageHelper.PixelsToCanvasOptions>,
+      options: ImageHelper.PixelsToCanvasOptions,
     ): HTMLCanvasElement;
   }
 
   namespace ImageHelper {
     /**
-     * An interface for options for the {@link ImageHelper.createThumbnail} and {@link ImageHelper.compositeCanvasTexture}
-     * methods.
+     * @internal Helper type to simplify NullishProps usage.
+     * @remarks Letting this be NullishProps instead of InexactPartial because despite `tx` and `ty` only
+     * having defaults via `{=0}`, they either get overwritten or `*=`ed which casts null to `0`, their default anyway.
+     *
      */
-    interface CompositeOptions {
+    type _CompositeOptions = NullishProps<{
       /**
        * Center the texture in the rendered frame?
        * @defaultValue `true`
@@ -132,21 +134,61 @@ declare global {
        * @defaultValue The width of the object passed to {@link ImageHelper.compositeCanvasTexture}
        */
       width: number;
-    }
+    }>;
+
+    /**
+     * An interface for options for the {@link ImageHelper.createThumbnail} and {@link ImageHelper.compositeCanvasTexture}
+     * methods.
+     */
+    interface CompositeOptions extends _CompositeOptions {}
 
-    interface TextureToImageOptions {
+    type Format = "image/png" | "image/jpeg" | "image/webp";
+
+    /**
+     * @internal Helper type to simplify NullishProps usage
+     * @remarks Letting this be NullishProps, as, after testing, passing null values to `HTMLCanvasElement#toBlob()`,
+     * where these eventually end up, doesn't break anything and seems to apply the defaults
+     */
+    type _TextureToImageOptions = NullishProps<{
       /**
        * Image format, e.g. "image/jpeg" or "image/webp".
        * @defaultValue `"image/png"`
        */
-      format: string;
+      format: Format;
 
       /**
        * JPEG or WEBP compression from 0 to 1. Default is 0.92.
        * @defaultValue `0.92`
        */
       quality: number;
-    }
+    }>;
+
+    interface TextureToImageOptions extends _TextureToImageOptions {}
+
+    /** @internal Intermediary type to simplify use of optionality- and nullish-permissiveness-modifying helpers */
+    type _UploadBase64Options = InexactPartial<{
+      /**
+       * The data storage location to which the file should be uploaded
+       * @remarks Can't be null because it's passed directly to `FilePicker.upload` and its only default is via signature default value
+       * @defaultValue `"data"`
+       */
+      storage: FilePicker.SourceType;
+    }> &
+      NullishProps<{
+        /**
+         * The MIME type of the file being uploaded
+         * @remarks Will be extracted from the base64 data, if not provided.
+         */
+        type: foundry.CONST.IMAGE_FILE_EXTENSIONS;
+
+        /**
+         * Display a UI notification when the upload is processed.
+         * @defaultValue `true`
+         */
+        notify: boolean;
+      }>;
+
+    interface UploadBase64Options extends _UploadBase64Options {}
 
     /**
      * An interface for return values of the {@link ImageHelper.createThumbnail} method.
@@ -178,13 +220,20 @@ declare global {
       width: number;
     }
 
-    interface PixelsToCanvasOptions {
-      /** The element to use. */
+    type _PixelsToCanvasOptions = NullishProps<{
+      /**
+       * The element to use.
+       * @remarks If not provided, a new HTMLCanvasElement is created.
+       */
       element: HTMLCanvasElement;
+
       /** Specified width for the element (default to buffer image width). */
       ew: number;
+
       /** Specified height for the element (default to buffer image height). */
       eh: number;
-    }
+    }>;
+
+    interface PixelsToCanvasOptions extends _PixelsToCanvasOptions {}
   }
 }

package/src/foundry/client/data/abstract/canvas-document.d.mts

@@ -3,8 +3,7 @@ import type Document from "../../../common/abstract/document.d.mts";
 import type { ClientDocument } from "./client-document.d.mts";
 
 declare class CanvasDocument<
-  // TODO(LukeAbby): Setting this to `Scene.ConfiguredInstance` causes a lot of circular errors.
-  BaseDocument extends Document<any, any, Scene | null>,
+  BaseDocument extends Document<any, any, Scene.ConfiguredInstance | null>,
 > extends ClientDocument<BaseDocument> {
   /** @privateRemarks All mixin classses should accept anything for its constructor. */
   constructor(...args: any[]);

package/src/foundry/client/data/abstract/client-document.d.mts

@@ -336,8 +336,8 @@ declare class ClientDocument<BaseDocument extends Document.Internal.Instance.Any
    */
   static createDialog<T extends Document.AnyConstructor>(
     this: T,
-    data?: DeepPartial<Document.ConstructorDataFor<T> & Record<string, unknown>>,
-    context?: Pick<DatabaseCreateOperation<InstanceType<T>>, "parent" | "pack"> &
+    data?: DeepPartial<Document.ConstructorDataFor<NoInfer<T>> & Record<string, unknown>>,
+    context?: Pick<DatabaseCreateOperation<InstanceType<NoInfer<T>>>, "parent" | "pack"> &
       InexactPartial<
         DialogOptions & {
           /** A restriction the selectable sub-types of the Dialog. */
@@ -378,7 +378,7 @@ declare class ClientDocument<BaseDocument extends Document.Internal.Instance.Any
    */
   static fromDropData<T extends Document.AnyConstructor>(
     this: T,
-    data: DropData<InstanceType<T>>,
+    data: DropData<InstanceType<NoInfer<T>>>,
     options?: FromDropDataOptions,
   ): Promise<Document.ToConfiguredInstance<T> | undefined>;
 

package/src/foundry/client/data/abstract/directory-collection-mixin.d.mts

@@ -32,7 +32,7 @@ declare class DirectoryCollection<T extends DirectoryCollection.DirectoryTypes>
   /**
    * Reference the set of Folders which contain documents in this collection
    */
-  get folders(): Collection<Folder>;
+  get folders(): Collection<Folder.Stored>;
 
   /**
    * The built tree structure of the DocumentCollection

package/src/foundry/client/data/abstract/world-collection.d.mts

@@ -17,7 +17,7 @@ declare global {
     /**
      * Reference the set of Folders which contain documents in this collection
      */
-    get folders(): Collection<Folder>;
+    get folders(): Collection<Folder.Stored>;
 
     /**
      * Return a reference to the SidebarDirectory application for this WorldCollection.

package/src/foundry/client/data/collections/compendium-collection.d.mts

@@ -153,7 +153,9 @@ declare global {
 
     // Note(LukeAbby): The overrides for `get` become unreasonably long and don't add any changes and so have been omitted.
 
-    set(id: string, document: Document.Stored<Document.ConfiguredInstanceForName<T["type"]>>): this;
+    // NOTE(LukeAbby): This override was disabled for the time being because it's erroring.
+    // Thankfully it doesn't actually change its parent class's signature.
+    // set(id: string, document: Document.Stored<Document.ConfiguredInstanceForName<T["type"]>>): this;
 
     delete: (id: string) => boolean;
 
@@ -432,7 +434,7 @@ declare global {
     type ConstructorMetadata<T extends CompendiumCollection.Metadata> = T & {
       index: IndexTypeForMetadata<T>;
       folders: Folder[];
-    }
+    };
 
     // The type that appears in `compendium.metadata` after initialization.
     interface Metadata {
@@ -440,7 +442,7 @@ declare global {
       label: string;
       name: string;
 
-      flags: Record<string, never>;    // created by the server, but always empty and no way to change it in a way that is s
+      flags: Record<string, never>; // created by the server, but always empty and no way to change it in a way that is s
       ownership: InexactPartial<foundry.packages.BasePackage.OwnershipRecord>;
       path: string;
       package: string;

package/src/foundry/client/data/collections/compendium-packs.d.mts

@@ -7,7 +7,7 @@ declare global {
     /**
      * Get a Collection of Folders which contain Compendium Packs
      */
-    get folders(): Collection<Folder>;
+    get folders(): Collection<Folder.Stored>;
 
     protected override _getVisibleTreeContents(): CompendiumCollection<CompendiumCollection.Metadata>[];
 

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

@@ -18,7 +18,13 @@ declare global {
         Item.ConfiguredInstance & {
           type: K;
         } & (DataModelConfig extends { Item: { readonly [_ in K]?: infer SystemData } }
-            ? { system: SystemData }
+            ? {
+                // For backwards compatability both instances and classes are supported for the time being.
+                // Only constructors are valid however.
+                system: SystemData extends abstract new (arg0: never, ...args: never[]) => infer Instance
+                  ? Instance
+                  : SystemData;
+              }
             : // eslint-disable-next-line @typescript-eslint/no-empty-object-type
               {})
       >;
@@ -78,6 +84,9 @@ declare global {
   class Actor extends ClientDocumentMixin(foundry.documents.BaseActor) {
     static override metadata: Actor.Metadata;
 
+    // NOTE(LukeAbby): Helps stymy circularity.
+    // get documentName(): "Actor";
+
     protected override _configure(options?: { pack?: string | null }): void;
 
     /**

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

@@ -180,8 +180,10 @@ declare global {
 
     static createDocuments<T extends Document.AnyConstructor, Temporary extends boolean | undefined>(
       this: T,
-      data: Array<fields.SchemaField.AssignmentType<InstanceType<T>["schema"]["fields"]> & Record<string, unknown>>,
-      operation?: InexactPartial<Omit<DatabaseOperationsFor<T["metadata"]["name"], "create">, "data">> & {
+      data: Array<
+        fields.SchemaField.AssignmentType<InstanceType<NoInfer<T>>["schema"]["fields"]> & Record<string, unknown>
+      >,
+      operation?: InexactPartial<Omit<DatabaseOperationsFor<NoInfer<T>["metadata"]["name"], "create">, "data">> & {
         temporary?: Temporary;
       },
     ): Promise<Document.ToStoredIf<T, Temporary>[] | undefined>;
@@ -341,7 +343,7 @@ declare global {
 
     static override createDialog<T extends Document.AnyConstructor>(
       this: T,
-      data?: DeepPartial<Document.ConstructorDataFor<T> & Record<string, unknown>>,
+      data?: DeepPartial<Document.ConstructorDataFor<NoInfer<T>> & Record<string, unknown>>,
       context?: Pick<DatabaseOperationsFor<Cards["documentName"], "create">, "parent" | "pack"> &
         InexactPartial<
           DialogOptions & {

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

@@ -9,6 +9,7 @@ declare global {
 
     type ConfiguredClass = Document.ConfiguredClassForName<"Folder">;
     type ConfiguredInstance = Document.ConfiguredInstanceForName<"Folder">;
+    type Stored = Document.Stored<ConfiguredInstance>;
 
     interface DatabaseOperations extends DocumentDatabaseOperations<Folder> {}
 
@@ -34,6 +35,10 @@ declare global {
   class Folder extends ClientDocumentMixin(foundry.documents.BaseFolder) {
     static override metadata: Folder.Metadata;
 
+    // TODO(LukeAbby): This random override is a symptom of a greater issue.
+    // Namely that `ClientDocumentMixin` incidentally erases some properties and breaks configuration.
+    documentName: "Folder";
+
     /**
      * The depth of this folder in its sidebar tree
      *
@@ -92,7 +97,7 @@ declare global {
 
     static createDialog<T extends Document.AnyConstructor>(
       this: T,
-      data?: DeepPartial<Document.ConstructorDataFor<T> | (Document.ConstructorDataFor<T> & Record<string, unknown>)>,
+      data?: DeepPartial<Document.ConstructorDataFor<NoInfer<T>>>,
       context?: InexactPartial<Omit<FolderConfig.Options, "resolve">>,
     ): Promise<Document.ToConfiguredInstance<T> | null | undefined>;
 

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

@@ -169,7 +169,7 @@ declare global {
      * @param data - (default: `{}`)
      * @returns The created thumbnail data.
      */
-    createThumbnail(data?: InexactPartial<ThumbnailCreationData>): ReturnType<(typeof ImageHelper)["createThumbnail"]>;
+    createThumbnail(data?: ThumbnailCreationData): ReturnType<typeof ImageHelper.createThumbnail>;
   }
 
   interface SceneDimensions {
@@ -223,10 +223,12 @@ declare global {
   }
 }
 
-interface ThumbnailCreationData extends ImageHelper.TextureToImageOptions {
+interface _ThumbnailCreationData extends ImageHelper.TextureToImageOptions {
   /**
    * A background image to use for thumbnail creation, otherwise the current scene
    * background is used.
+   *
+   * @remarks This cannot be `null` because Foundry writes `const newImage = img !== undefined;`.
    */
   img: string;
 
@@ -234,23 +236,28 @@ interface ThumbnailCreationData extends ImageHelper.TextureToImageOptions {
    * The desired thumbnail width. Default is 300px
    * @defaultValue `300`
    */
-  width: number;
+  width: number | null;
 
   /**
    * The desired thumbnail height. Default is 100px;
    * @defaultValue `100`
    */
-  height: number;
+  height: number | null;
 
   /**
-   * Which image format should be used? image/png, image/jpg, or image/webp
+   * Which image format should be used? image/png, image/jpeg, or image/webp
    * @defaultValue `"image/webp"`
+   *
+   * @remarks Foundry writes `image/jpg` but this functions the same as `image/png  `.
+   * The correct MIME type is `image/jpeg`.
    */
-  format: "image/png" | "image/jpg" | "image/webp";
+  format: ImageHelper.Format | null;
 
   /**
    * What compression quality should be used for jpeg or webp, between 0 and 1
    * @defaultValue `0.8`
    */
-  quality: number;
+  quality: number | null;
 }
+
+interface ThumbnailCreationData extends InexactPartial<_ThumbnailCreationData> {}

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

@@ -9,11 +9,7 @@ declare global {
     type Metadata = Document.MetadataFor<TokenDocument>;
 
     type ConfiguredClass = Document.ConfiguredClassForName<"Token">;
-    type ConfiguredInstance = InstanceType<ConfiguredClass>;
-
-    // TODO(LukeAbby): This causes a circularity that's likely latent.
-    // Look into this.
-    // type ConfiguredInstance = ConfiguredDocumentInstanceForName<"Token">;
+    type ConfiguredInstance = Document.ConfiguredInstanceForName<"Token">;
 
     type ObjectClass = Document.ConfiguredObjectClassForName<"Token">;
     type ObjectInstance = Document.ConfiguredObjectInstanceForName<"Token">;

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

@@ -5,7 +5,7 @@ import type BaseUser from "../../../common/documents/user.d.mts";
 
 declare global {
   namespace User {
-    type Metadata = Document.Metadata<User>;
+    type Metadata = Document.MetadataFor<User>;
 
     type ConfiguredClass = Document.ConfiguredClassForName<"User">;
     type ConfiguredInstance = Document.ConfiguredInstanceForName<"User">;

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

@@ -660,9 +660,14 @@ declare global {
     namespace Model {
       /**
        * Get the configured core and system type names for a specific document type.
+       *
+       * Because of module subtypes, extra types of the form `${moduleName}.${subtype}` are always a possibility.
+       *
        * @typeParam DocumentName - the type of the Document this data is for
        */
-      type TypeNames<DocumentName extends Document.Type> = string & keyof Model[DocumentName];
+      type TypeNames<DocumentName extends Document.Type> =
+        | (string & keyof Model[DocumentName])
+        | (`${string}.${string}` & {});
     }
 
     type Model = {

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

@@ -689,7 +689,7 @@ declare global {
           user: string;
 
           /** The identified speaker data, see {@link ChatMessage.getSpeaker} */
-          speaker: ReturnType<Document.ToConfiguredClass<typeof ChatMessage>["getSpeaker"]>;
+          speaker: ReturnType<ChatMessage.ConfiguredClass["getSpeaker"]>;
         },
       ) => boolean | void;
 

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

@@ -2,6 +2,15 @@ import type { InexactPartial, NullishProps } from "../../../types/utils.d.mts";
 import type Document from "../../common/abstract/document.d.mts";
 import type { CANVAS_PERFORMANCE_MODES } from "../../common/constants.d.mts";
 
+type InternalCanvas = new (
+  arg0: never,
+  ...args: never[]
+) => {
+  readonly [K in keyof CONFIG.Canvas.Groups]?: InstanceType<CONFIG.Canvas.Groups[K]["groupClass"]> | undefined;
+};
+
+declare const _InternalCanvas: InternalCanvas;
+
 declare global {
   /**
    * The virtual tabletop environment is implemented using a WebGL powered HTML 5 canvas using the powerful PIXI.js
@@ -29,7 +38,7 @@ declare global {
    * canvas.recenter(); // Re-center the canvas on the currently controlled Token.
    * ```
    */
-  class Canvas {
+  class Canvas extends _InternalCanvas {
     constructor();
 
     /**
@@ -672,9 +681,6 @@ declare global {
     get colorManager(): this["environment"];
   }
 
-  // Most canvas group properties have explicit type definitions, but some are left off
-  interface Canvas extends CanvasGroups {}
-
   interface CanvasPerformanceSettings {
     /** The performance mode in CONST.CANVAS_PERFORMANCE_MODES */
     mode: CANVAS_PERFORMANCE_MODES;
@@ -807,14 +813,3 @@ interface CollectionNameToLayerMap {
   tokens: Canvas["tokens"];
   walls: Canvas["walls"];
 }
-
-// TODO: Find a way to make this more dynamic
-interface CanvasGroups {
-  // readonly [GroupName in keyof CONFIG.Canvas.Groups]?: CONFIG.Canvas.Groups[GroupName]["groupClass"];
-
-  readonly hidden?: HiddenCanvasGroup;
-
-  readonly rendered?: RenderedCanvasGroup;
-
-  readonly environment?: EnvironmentCanvasGroup;
-}

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

@@ -60,7 +60,6 @@ type _RenderFlags<Flags> = InexactPartial<{
 }>;
 
 declare global {
-
   interface RenderFlag<Flags> extends _RenderFlags<Flags> {}
 
   namespace RenderFlag {

package/src/foundry/client/pixi/core/loader.d.mts

@@ -138,7 +138,7 @@ declare global {
      * @remarks `"TextureLoader.textureBufferDataMap is deprecated without replacement. Use TextureLoader.getTextureAlphaData`
      * `to create a texture data map and cache it automatically, or create your own caching system."`
      */
-    static get textureBufferDataMap(): Map<string, AnyObject>
+    static get textureBufferDataMap(): Map<string, AnyObject>;
 
     /**
      * A global reference to the singleton texture loader