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

package/src/foundry/common/grid/gridless.d.mts

@@ -1,9 +1,9 @@
 import type BaseGrid from "./base.d.mts";
 
-import type { InexactPartial } from "../../../types/utils.d.mts";
+import type { InexactPartial } from "fvtt-types/utils";
 
 declare class Gridless extends BaseGrid {
-  override type: number;
+  override type: typeof CONST.GRID_TYPES.GRIDLESS;
 
   calculateDimensions(sceneWidth: number, sceneHeight: number, padding: number): Gridless.Dimensions;
 

package/src/foundry/common/grid/hexagonal.d.mts

@@ -1,6 +1,6 @@
 import type BaseGrid from "./base.d.mts";
 
-import type { InexactPartial } from "../../../types/utils.d.mts";
+import type { InexactPartial } from "fvtt-types/utils";
 
 declare class HexagonalGrid extends BaseGrid {
   /**
@@ -8,6 +8,13 @@ declare class HexagonalGrid extends BaseGrid {
    */
   constructor(config: HexagonalGrid.Configuration);
 
+  // declared here for type-checking, but values are limited to these in constructor
+  override type:
+    | typeof CONST.GRID_TYPES.HEXEVENQ
+    | typeof CONST.GRID_TYPES.HEXODDQ
+    | typeof CONST.GRID_TYPES.HEXEVENR
+    | typeof CONST.GRID_TYPES.HEXODDR;
+
   /** Is this grid column-based (flat-topped) or row-based (pointy-topped)yy? */
   columns: boolean;
 
@@ -31,7 +38,7 @@ declare class HexagonalGrid extends BaseGrid {
    * @param coords - The coordinates
    * @returns The cube coordinates
    */
-  getCube(coords: HexagonalGrid.Configuration): HexagonalGrid.Cube;
+  getCube(coords: HexagonalGrid.Coordinates): HexagonalGrid.Cube;
 
   /**
    * Returns the cube coordinates of grid spaces adjacent to the one corresponding to the given coordinates.
@@ -163,7 +170,7 @@ declare class HexagonalGrid extends BaseGrid {
    * Special border polygons for different token sizes.
    * @deprecated Since v12 until v14. No Replacement
    */
-  static get POINTY_HEX_BORDERS(): Record<number, Canvas.PointArray[]>;
+  static get POINTY_HEX_BORDERS(): Record<number, Canvas.PointTuple[]>;
 
   /**
    * @deprecated Since v12 until v14. No Replacement
@@ -174,25 +181,25 @@ declare class HexagonalGrid extends BaseGrid {
    * Special border polygons for different token sizes.
    * @deprecated Since v12 until v14. No Replacement
    */
-  static get FLAT_HEX_BORDERS(): Record<number, Canvas.PointArray[]>;
+  static get FLAT_HEX_BORDERS(): Record<number, Canvas.PointTuple[]>;
 
   /**
    * A matrix of x and y offsets which is multiplied by the width/height vector to get pointy-top polygon coordinates
    * @deprecated Since v12 until v14. No Replacement
    */
-  static get pointyHexPoints(): Canvas.PointArray[];
+  static get pointyHexPoints(): Canvas.PointTuple[];
 
   /**
    * A matrix of x and y offsets which is multiplied by the width/height vector to get flat-top polygon coordinates
    * @deprecated Since v12 until v14. No Replacement
    */
-  static get flatHexPoints(): Canvas.PointArray[];
+  static get flatHexPoints(): Canvas.PointTuple[];
 
   /**
    * An array of the points which define a hexagon for this grid shape
    * @deprecated Since v12 until v14. No Replacement
    */
-  get hexPoints(): Canvas.PointArray[];
+  get hexPoints(): Canvas.PointTuple[];
 
   /**
    * A convenience method for getting all the polygon points relative to a top-left [x,y] coordinate pair
@@ -204,12 +211,12 @@ declare class HexagonalGrid extends BaseGrid {
    * @deprecated Since v12 until v14. You can get the shape of the hex with {@link HexagonalGrid#getShape}
    *             and the polygon with {@link HexagonalGrid#getVertices}.
    */
-  getPolygon(x: number, y: number, w?: number, h?: number, points?: Canvas.PointArray[]): Canvas.PointArray[];
+  getPolygon(x: number, y: number, w?: number, h?: number, points?: Canvas.PointTuple[]): Canvas.PointTuple[];
 
   /**
    * @deprecated Since v12 until v14. If you need the shape of a Token, use {@link Token#getShape} instead.
    */
-  getBorderPolygon(w: number, h: number, p: number): Canvas.PointArray[];
+  getBorderPolygon(w: number, h: number, p: number): Canvas.PointTuple[];
 
   /**
    * @deprecated Since v12 until v14. If you need the size of a Token, use {@link Token#getSize} instead.
@@ -320,7 +327,11 @@ declare class HexagonalGrid extends BaseGrid {
    * @returns The offset coordinate
    * @deprecated Since v12 until v14. No Replacement
    */
-  static pixelsToOffset(point: Canvas.Point, config: HexagonalGrid.Configuration, method?: keyof Math): HexagonalGrid.Coordinates;
+  static pixelsToOffset(
+    point: Canvas.Point,
+    config: HexagonalGrid.Configuration,
+    method?: keyof Math,
+  ): HexagonalGrid.Coordinates;
 
   /**
    * Compute the shortest path between two hexagons using the A-star algorithm.

package/src/foundry/common/grid/square.d.mts

@@ -1,6 +1,6 @@
 import type BaseGrid from "./base.d.mts";
 
-import type { InexactPartial } from "../../../types/utils.d.mts";
+import type { InexactPartial } from "fvtt-types/utils";
 
 declare class SquareGrid extends BaseGrid {
   /**
@@ -8,7 +8,7 @@ declare class SquareGrid extends BaseGrid {
    */
   constructor(config: SquareGrid.Configuration);
 
-  override type: number;
+  override type: typeof CONST.GRID_TYPES.SQUARE;
 
   diagonals: number;
 

package/src/foundry/common/packages/{module.d.mts → _module.d.mts}

@@ -1,7 +1,7 @@
 // In Foundry itself this file contains re-exports of these other modules.
 // Therefore it has a runtime effect and uses `.mjs` instead of `.d.mts`.
-// While `.mts` could work, to avoid `import/no-unresolved` from erroring `.mjs` is used.
-/* eslint-disable import/extensions */
+// While `.mts` could work, to avoid `import-x/no-unresolved` from erroring `.mjs` is used.
+/* eslint-disable import-x/extensions */
 
 import type { SchemaField } from "../data/fields.d.mts";
 

package/src/foundry/common/packages/_types.d.mts

@@ -0,0 +1,25 @@
+// After seeing that none of these types add anything or are even exported a
+// very reasonable question may be: Why on earth does this file exist?
+//
+// Well this is the file in which Foundry defines these types. We don't house
+// them here because it has poor discoverability. The names Foundry has chosen
+// also overlaps with other existing names, such as SettingConfig vs. ClientSetting.SettingConfig
+
+// TODO: Stubs
+export {};
+
+type PackageAuthorData = unknown;
+
+type PackageCompendiumData = unknown;
+
+type PackageLanguageData = unknown;
+
+type RelatedPackageData = unknown;
+
+type PackageCompatibilityData = unknown;
+
+type PackageRelationshipsData = unknown;
+
+type PackageManifestData = unknown;
+
+type DocumentTypesConfiguration = unknown;

package/src/foundry/common/packages/base-package.d.mts

@@ -1,6 +1,4 @@
-import type { GetKey } from "../../../types/helperTypes.d.mts";
-import type { AnyObject, InexactPartial } from "../../../types/utils.d.mts";
-// eslint-disable-next-line import/no-named-as-default
+import type { GetKey, AnyObject, InexactPartial, AnyMutableObject } from "fvtt-types/utils";
 import type DataModel from "../abstract/data.d.mts";
 import type { ReleaseData } from "../config.d.mts";
 import type * as fields from "../data/fields.d.mts";
@@ -8,6 +6,8 @@ import type { DataModelValidationFailure } from "../data/validation-failure.d.mt
 import type { BaseFolder } from "../documents/_module.d.mts";
 import type { LogCompatibilityWarningOptions } from "../utils/logging.d.mts";
 
+type DataSchema = foundry.data.fields.DataSchema;
+
 declare const __BasePackageBrand: unique symbol;
 
 declare const __PackageSchema: unique symbol;
@@ -381,7 +381,7 @@ declare namespace BasePackage {
 
   interface LogOptions extends InexactPartial<LogCompatibilityWarningOptions> {
     /** Is the package installed? */
-    installed?: unknown | undefined;
+    installed?: unknown;
   }
 }
 
@@ -626,11 +626,11 @@ declare class BasePackage<
   static migratedKeys: Set<string>;
 
   static migrateData(
-    data: AnyObject,
+    data: AnyMutableObject,
     logOptions?: InexactPartial<{
       installed: boolean;
     }>,
-  ): AnyObject;
+  ): AnyMutableObject;
 
   protected static _migrateNameToId(data: AnyObject, logOptions: BasePackage.LogOptions): void;
 

package/src/foundry/common/packages/base-system.d.mts

@@ -30,16 +30,31 @@ declare namespace BaseSystem {
      */
     grid: fields.SchemaField<{
       /** A default grid type to use for Scenes in this system */
-      type: fields.NumberField;
+      type: fields.NumberField<{
+        required: true;
+        choices: typeof foundry.CONST.GRID_TYPES;
+        initial: typeof foundry.CONST.GRID_TYPES.SQUARE;
+      }>;
 
       /** A default distance measurement to use for Scenes in this system */
-      distance: fields.NumberField;
+      distance: fields.NumberField<{
+        required: true;
+        nullable: false;
+        positive: true;
+        initial: 1;
+      }>;
 
       /** A default unit of measure to use for distance measurement in this system */
-      units: fields.StringField;
+      units: fields.StringField<{
+        required: true;
+      }>;
 
       /** The default rule used by this system for diagonal measurement on square grids */
-      diagonals: fields.NumberField;
+      diagonals: fields.NumberField<{
+        required: true;
+        choices: typeof foundry.CONST.GRID_DIAGONALS;
+        initial: typeof foundry.CONST.GRID_DIAGONALS.EQUIDISTANT;
+      }>;
     }>;
 
     /**

package/src/foundry/common/packages/base-world.d.mts

@@ -1,6 +1,6 @@
 import type BasePackage from "./base-package.d.mts";
 import type * as fields from "../data/fields.d.mts";
-import type { AnyObject, InexactPartial, Merge } from "../../../types/utils.d.mts";
+import type { AnyMutableObject, InexactPartial, Merge } from "fvtt-types/utils";
 import type { ReleaseData } from "../config.d.mts";
 
 type BaseWorldSchema = Merge<
@@ -80,7 +80,7 @@ declare class BaseWorld extends BasePackage<BaseWorld.Schema> {
    */
   static icon: string;
 
-  static migrateData(data: AnyObject): AnyObject;
+  static migrateData(data: AnyMutableObject): AnyMutableObject;
 
   static testAvailability(
     data: InexactPartial<PackageManifestData>,

package/src/foundry/common/packages/sub-types.d.mts

@@ -1,4 +1,4 @@
-import type { AnyObject, Merge } from "../../../types/utils.d.mts";
+import type { AnyObject, Merge } from "fvtt-types/utils";
 import type Document from "../abstract/document.d.mts";
 import type { DataField, ObjectField } from "../data/fields.d.mts";
 

package/src/foundry/common/primitives/array.d.mts

@@ -1,4 +1,4 @@
-import type { OverlapsWith } from "../../../types/helperTypes.d.mts";
+import type { OverlapsWith } from "fvtt-types/utils";
 
 declare global {
   namespace Array {

package/src/foundry/common/primitives/number.d.mts

@@ -86,6 +86,6 @@ declare global {
      * @param n - The value to convert; typically a string, but may already be a number.
      * @returns The number that the string represents, or NaN if no number could be determined.
      */
-    fromString(str: string | number): number;
+    fromString(str: string | number): Number;
   }
 }

package/src/foundry/common/primitives/string.d.mts

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

package/src/foundry/common/prosemirror/_module.d.mts

@@ -1,28 +1,28 @@
 import { EditorState, AllSelection, TextSelection, Plugin, PluginKey } from "prosemirror-state";
 import { EditorView } from "prosemirror-view";
 import { Schema, DOMSerializer } from "prosemirror-model";
-// eslint-disable-next-line import/no-named-as-default
-import type ProseMirrorInputRules from "./input-rules.d.mts";
 import { keymap } from "prosemirror-keymap";
-// eslint-disable-next-line import/no-named-as-default
-import type ProseMirrorKeyMaps from "./keymaps.d.mts";
-// eslint-disable-next-line import/no-named-as-default
-import type ProseMirrorMenu from "./menu.d.mts";
 import "./extensions.d.mts";
 import * as collab from "prosemirror-collab";
-import type { Step } from "prosemirror-transform";
 import type { parseHTMLString, serializeHTMLString } from "./util.d.mts";
 
 // A const is being imported here. It can't be `import type`.
-// eslint-disable-next-line import/extensions
+/* eslint-disable import-x/extensions */
 import { schema as defaultSchema } from "./schema.mjs";
-import type ProseMirrorPlugin from "./plugin.d.mts";
-import type ProseMirrorImagePlugin from "./image-plugin.d.mts";
-import type ProseMirrorDirtyPlugin from "./dirty-plugin.d.mts";
-import type ProseMirrorContentLinkPlugin from "./content-link-plugin.d.mts";
-import type ProseMirrorHighlightMatchesPlugin from "./highlight-matches-plugin.d.mts";
-import type ProseMirrorClickHandler from "./click-handler.d.mts";
-import type DOMParser from "./dom-parser.d.mts";
+
+// and these are classes that are available as properties of ProseMirror
+import ProseMirrorPlugin from "./plugin.mjs";
+import ProseMirrorImagePlugin from "./image-plugin.mjs";
+import ProseMirrorDirtyPlugin from "./dirty-plugin.mjs";
+import ProseMirrorContentLinkPlugin from "./content-link-plugin.mjs";
+import ProseMirrorHighlightMatchesPlugin from "./highlight-matches-plugin.mjs";
+import ProseMirrorClickHandler from "./click-handler.mjs";
+import DOMParser from "./dom-parser.mjs";
+import ProseMirrorInputRules from "./input-rules.mjs";
+import ProseMirrorKeyMaps from "./keymaps.mjs";
+import ProseMirrorMenu from "./menu.mjs";
+import { Step } from "prosemirror-transform";
+/* eslint-enable */
 
 declare const dom: {
   parser: DOMParser;

package/src/foundry/common/prosemirror/_types.d.mts

@@ -0,0 +1,29 @@
+// After seeing that none of these types add anything or are even exported a
+// very reasonable question may be: Why on earth does this file exist?
+//
+// Well this is the file in which Foundry defines these types. We don't house
+// them here because it has poor discoverability. The names Foundry has chosen
+// also overlaps with other existing names, such as SettingConfig vs. ClientSetting.SettingConfig
+
+// TODO: Stubs
+export {};
+
+type ProseMirrorContentLinkOptions = unknown;
+
+type ProseMirrorMenuOptions = unknown;
+
+type ProseMirrorMenuItem = unknown;
+
+type ProseMirrorDropDownEntry = unknown;
+
+type ProseMirrorDropDownConfig = unknown;
+
+type ProseMirrorCommand = unknown;
+
+type MenuToggleBlockWrapCommand = unknown;
+
+type ProseMirrorNodeOutput = unknown;
+
+type ProseMirrorMarkOutput = unknown;
+
+type ProseMirrorSliceTransformer = unknown;

package/src/foundry/common/prosemirror/dirty-plugin.d.mts

@@ -1,7 +1,7 @@
 import type { Schema } from "prosemirror-model";
 import type { Plugin } from "prosemirror-state";
 import type ProseMirrorPlugin from "./plugin.d.mts";
-import type { EmptyObject } from "../../../types/utils.d.mts";
+import type { EmptyObject } from "fvtt-types/utils";
 
 export default ProseMirrorDirtyPlugin;
 

package/src/foundry/common/prosemirror/dom-parser.d.mts

@@ -1,9 +1,10 @@
 import { DOMParser as BaseDOMParser, Node, ParseOptions, Schema } from "prosemirror-model";
+import type { FixedInstanceType } from "fvtt-types/utils";
 
 export default DOMParser;
 
 declare class DOMParser extends BaseDOMParser {
-  override parse(dom: InstanceType<typeof window.Node>, options?: ParseOptions | undefined): Node;
+  override parse(dom: FixedInstanceType<typeof window.Node>, options?: ParseOptions): Node;
 
   static override fromSchema(schema: Schema): BaseDOMParser;
 }

package/src/foundry/common/prosemirror/highlight-matches-plugin.d.mts

@@ -3,7 +3,7 @@ import type ProseMirrorPlugin from "./plugin.d.mts";
 import type { ProseMirrorMenu } from "./menu.d.mts";
 import { EditorState, Plugin } from "prosemirror-state";
 import { EditorView } from "prosemirror-view";
-import type { EmptyObject, InexactPartial } from "../../../types/utils.d.mts";
+import type { EmptyObject, InexactPartial } from "fvtt-types/utils";
 
 declare namespace ProseMirrorHighlightMatchesPlugin {
   /**

package/src/foundry/common/prosemirror/image-plugin.d.mts

@@ -2,7 +2,7 @@ import type { Schema, Slice } from "prosemirror-model";
 import type { Plugin } from "prosemirror-state";
 import type { EditorView } from "prosemirror-view";
 import type ProseMirrorPlugin from "./plugin.d.mts";
-import type { EmptyObject } from "../../../types/utils.d.mts";
+import type { EmptyObject } from "fvtt-types/utils";
 
 export default ProseMirrorImagePlugin;
 /**

package/src/foundry/common/prosemirror/paste-transformer.d.mts

@@ -2,7 +2,7 @@ import type { Schema, Slice } from "prosemirror-model";
 import type ProseMirrorPlugin from "./plugin.d.mts";
 import type { Plugin } from "prosemirror-state";
 import type { EditorView } from "prosemirror-view";
-import type { EmptyObject } from "../../../types/utils.d.mts";
+import type { EmptyObject } from "fvtt-types/utils";
 
 export default ProseMirrorPasteTransformer;
 

package/src/foundry/common/prosemirror/plugin.d.mts

@@ -1,6 +1,6 @@
 import type { Schema } from "prosemirror-model";
 import type { Plugin } from "prosemirror-state";
-import type { AnyObject } from "../../../types/utils.d.mts";
+import type { AnyObject } from "fvtt-types/utils";
 
 export default ProseMirrorPlugin;
 declare abstract class ProseMirrorPlugin {

package/src/foundry/common/prosemirror/schema/index.d.mts

@@ -9,4 +9,4 @@ import "./other.d.mts";
 import "./schema-definition.d.mts";
 import "./secret-node.d.mts";
 import "./tables.d.mts";
-import "./utils.d.mts";
+import "../../../../utils/index.d.mts";

package/src/foundry/common/prosemirror/schema/lists.d.mts

@@ -1,3 +1,5 @@
+import { Node } from "prosemirror-model";
+
 export declare const ol: {
   content: string;
   managed: Record<string, unknown>;

package/src/foundry/common/utils/{module.d.mts → _module.d.mts}

@@ -1,7 +1,7 @@
 // In Foundry itself this file contains re-exports of these other modules.
 // Therefore it has a runtime effect and uses `.mjs` instead of `.d.mts`.
-// While `.mts` could work, to avoid `import/no-unresolved` from erroring `.mjs` is used.
-/* eslint-disable import/extensions */
+// While `.mts` could work, to avoid `import-x/no-unresolved` from erroring `.mjs` is used.
+/* eslint-disable import-x/extensions */
 
 export * from "./geometry.mjs";
 export * from "./helpers.mjs";

package/src/foundry/common/utils/_types.d.mts

@@ -0,0 +1 @@
+export {};

package/src/foundry/common/utils/bitmask.d.mts

@@ -1,9 +1,9 @@
-export default class BitMask extends Number {
+declare class InternalBitMask<T extends Record<string, boolean>> extends Number {
   /**
    * Create a new BitMask instance.
    * @param states    - An object containing valid states and their corresponding initial boolean values (default is null).
    */
-  constructor(states?: Record<string, boolean> | null);
+  constructor(states?: T | null);
 
   // a placeholder private method to help subclassing
   #bitmask: true;
@@ -12,7 +12,7 @@ export default class BitMask extends Number {
    * The enum associated with this structure.
    * @readonly
    */
-  states: Record<string, string>;
+  states: Readonly<{ [K in keyof T]: K }>;
 
   /**
    * True if this bitmask is empty (no active states).
@@ -24,33 +24,33 @@ export default class BitMask extends Number {
    * @param state   - The state to check.
    * @returns True if the state is active, false otherwise.
    */
-  hasState(state: string): boolean;
+  hasState(state: keyof T): boolean;
 
   /**
    * Add a state to the bitmask.
    * @param state - The state to add. Throws an error if the provided state is not valid.
    */
-  addState(state: string): void;
+  addState(state: keyof T): void;
 
   /**
    * Remove a state from the bitmask.
    * @param state   - The state to remove. Throws an error if the provided state is not valid.
    */
-  removeState(state: string): void;
+  removeState(state: keyof T): void;
 
   /**
    * Toggle the state of a specific state in the bitmask.
    * @param state   - The state to toggle. Throws an error if the provided state is not valid.
    * @param enabled - Toggle on (true) or off (false)? If undefined, the state is switched automatically.
    */
-  toggleState(state: string, enabled: boolean): void;
+  toggleState(state: keyof T, enabled: boolean): void;
 
   /**
    * Toggle the state of a specific state in the bitmask.
    * @param state - The state to toggle.
    * @returns  The updated bitmask. Throws an error if the provided state is not valid.
    */
-  toggleState(state: string): number;
+  toggleState(state: keyof T): number;
 
   /**
    * Clear the bitmask, setting all states to inactive.
@@ -74,7 +74,7 @@ export default class BitMask extends Number {
    * @param otherBitMask  - The bitmask structure to compare with.
    * @returns True if the two bitmasks have the same structure, false otherwise.
    */
-  isCompatible(otherBitMask: BitMask): boolean;
+  isCompatible(otherBitMask: BitMask.Any): boolean;
 
   /**
    * Serializes the bitmask to a JSON string.
@@ -87,7 +87,7 @@ export default class BitMask extends Number {
    * @param jsonString    - The JSON string representing the bitmask.
    * @returns A new BitMask instance created from the JSON string.
    */
-  static fromJSON(jsonString: string): BitMask;
+  static fromJSON(jsonString: string): BitMask.Any;
 
   /**
    * Convert value of this BitMask to object representation according to structure.
@@ -99,7 +99,7 @@ export default class BitMask extends Number {
    * Creates a clone of this BitMask instance.
    * @returns A new BitMask instance with the same value and valid states as this instance.
    */
-  clone(): BitMask;
+  clone(): this;
 
   /**
    * Generates shader constants based on the provided states.
@@ -108,3 +108,12 @@ export default class BitMask extends Number {
    */
   static generateShaderBitMaskConstants(states: string[]): string;
 }
+
+declare namespace BitMask {
+  export type Any = InternalBitMask<Record<string, boolean>>;
+}
+
+declare const BitMask: typeof InternalBitMask & (new (...args: any) => number);
+type BitMask = BitMask.Any & number;
+
+export default BitMask;

package/src/foundry/common/utils/collection.d.mts

@@ -1,23 +1,11 @@
-interface MapReplacementMembers<K, V> {
-  set(key: K, value: V): this;
+// This class exists make it as sound as possible to override these parts of the class and make them
+// completely unrelated. It's done this way specifically to avoid situations with broken inheritance.
+declare class LenientMap<K, V> extends globalThis.Map<K, V> {
+  [Symbol.iterator](): any;
+  forEach(...args: any[]): any;
 }
 
-type PatchedMap<K, V> = Omit<Map<K, V>, "forEach" | typeof Symbol.iterator | "get" | "set"> &
-  MapReplacementMembers<K, V>;
-
-declare namespace PatchedMap {
-  type Any = PatchedMap<any, any>;
-}
-
-interface PatchedMapConstructor {
-  new (): PatchedMap.Any;
-  new <K, V>(entries?: readonly (readonly [K, V])[] | null): PatchedMap<K, V>;
-  new <K, V>(iterable: Iterable<readonly [K, V]>): PatchedMap<K, V>;
-  readonly [Symbol.species]: PatchedMapConstructor;
-  readonly prototype: PatchedMap.Any;
-}
-
-declare const Map: PatchedMapConstructor;
+declare const Map: typeof LenientMap;
 
 /**
  * A reusable storage concept which blends the functionality of an Array with the efficient key-based lookup of a Map.
@@ -25,7 +13,7 @@ declare const Map: PatchedMapConstructor;
  * @typeParam T - The type of the objects contained in the Collection
  */
 declare class Collection<V> extends Map<string, V> {
-  constructor(entries?: readonly (readonly [string, V])[] | null);
+  constructor(entries?: Iterable<readonly [string, V]> | null);
 
   /**
    * When iterating over a Collection, we should iterate over its values instead of over its entries

package/src/foundry/common/utils/color.d.mts

@@ -1,10 +1,15 @@
 export default Color;
+
+// `Color#fromString` breaks inheritance
+declare class PatchedNumber extends Number {
+  static fromString(color: string): any;
+}
+
 /**
  * A representation of a color in hexadecimal format.
  * This class provides methods for transformations and manipulations of colors.
  */
-// @ts-expect-error 2417: Override of Color.fromString does not match Number.fromString
-declare class Color extends Number {
+declare class InternalColor extends PatchedNumber {
   /**
    * Is this a valid color?
    */
@@ -263,6 +268,15 @@ declare class Color extends Number {
    */
   static fromRGB(rgb: Color.RGBColorVector): Color;
 
+  /**
+   * Create a Color instance from an RGB normalized values.
+   * @param r - The red value
+   * @param g - The green value
+   * @param b - The blue value
+   * @returns The hex color instance
+   */
+  static fromRGBvalues(r: number, g: number, b: number): Color;
+
   /**
    * Create a Color instance from an HSV array.
    * Conversion formula adapted from {@link http://en.wikipedia.org/wiki/HSV_color_space}.
@@ -290,8 +304,12 @@ declare class Color extends Number {
   static fromLinearRGB(linear: Color.RGBColorVector): Color;
 }
 
+declare const Color: typeof InternalColor & (new (...args: any) => number);
+type Color = InternalColor & number;
+
 declare namespace Color {
   type RGBColorVector = [r: number, g: number, b: number];
+  type RGBAColorVector = [r: number, g: number, b: number, a: number];
   type HSVColorVector = [h: number, s: number, v: number];
   type HSLColorVector = [h: number, s: number, l: number];
 

package/src/foundry/common/utils/event-emitter.d.mts

@@ -1,4 +1,4 @@
-import type { InexactPartial, Mixin } from "../../../types/utils.d.mts";
+import type { InexactPartial, Mixin } from "fvtt-types/utils";
 
 /**
  * A mixin class which implements the behavior of EventTarget.