@league-of-foundry-developers/foundry-vtt-types 13.346.0-beta.20250708062241 → 13.346.0-beta.20250708122847

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@league-of-foundry-developers/foundry-vtt-types",
-  "version": "13.346.0-beta.20250708062241",
+  "version": "13.346.0-beta.20250708122847",
   "description": "TypeScript type definitions for Foundry VTT",
   "type": "module",
   "types": "./src/index.d.mts",

package/src/foundry/client/applications/api/dialog.d.mts

@@ -559,7 +559,7 @@ declare namespace DialogV2 {
       ? never
       : "close" extends keyof Options
         ? Options["close"] extends (...args: never) => infer Return
-          ? Return | null
+          ? NullishCoalesce<Return, null>
           : null
         : null;
 

package/src/foundry/client/canvas/placeables/token.d.mts

@@ -1077,7 +1077,7 @@ declare namespace Token {
     | "disabled"
   >;
 
-  // TODO: (LukeAbby) possible candidate for `-=` key handling
+  // TODO(LukeAbby) possible candidate for `-=` key handling
   interface BlindedStates extends Record<string, boolean> {
     blind: boolean;
     burrow: boolean;

package/src/foundry/client/documents/active-effect.d.mts

@@ -114,7 +114,12 @@ declare namespace ActiveEffect {
   /**
    * @internal
    */
-  interface _SystemMap extends Document.Internal.SystemMap<"ActiveEffect"> {}
+  interface _ModelMap extends Document.Internal.ModelMap<Name> {}
+
+  /**
+   * @internal
+   */
+  interface _SystemMap extends Document.Internal.SystemMap<Name> {}
 
   /**
    * A document's parent is something that can contain it.
@@ -236,13 +241,7 @@ declare namespace ActiveEffect {
      * The name of the ActiveEffect
      * @defaultValue `""`
      */
-    name: fields.StringField<
-      { required: true; blank: false; textSearch: true },
-      // Note(LukeAbby): Field override because `blank: false` isn't fully accounted for or something.
-      string,
-      string,
-      string
-    >;
+    name: fields.StringField<{ required: true; blank: false; textSearch: true }>;
 
     /**
      * An image path used to depict the ActiveEffect as an icon
@@ -340,8 +339,7 @@ declare namespace ActiveEffect {
         integer: true;
         initial: typeof CONST.ACTIVE_EFFECT_MODES.ADD;
       },
-      // TODO: (LukeAbby): fix this when redoing DataField
-      // FIXME: Overrides required to enforce the branded type
+      // Note(LukeAbby): This will always need an override since there's no validation.
       CONST.ACTIVE_EFFECT_MODES | null | undefined,
       CONST.ACTIVE_EFFECT_MODES,
       CONST.ACTIVE_EFFECT_MODES

package/src/foundry/client/documents/actor-delta.d.mts

@@ -109,7 +109,14 @@ declare namespace ActorDelta {
   /**
    * @internal
    */
-  interface _SystemMap extends Document.Internal.SystemMap<"ActorDelta"> {}
+  // Actor and ActorDelta have the same subtype setup.
+  interface _ModelMap extends Actor._ModelMap {}
+
+  /**
+   * @internal
+   */
+  // Actor and ActorDelta have the same subtype setup.
+  interface _SystemMap extends Actor._SystemMap {}
 
   /**
    * A document's parent is something that can contain it.

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

@@ -120,7 +120,12 @@ declare namespace Actor {
   /**
    * @internal
    */
-  interface _SystemMap extends Document.Internal.SystemMap<"Actor"> {}
+  interface _ModelMap extends Document.Internal.ModelMap<Name> {}
+
+  /**
+   * @internal
+   */
+  interface _SystemMap extends Document.Internal.SystemMap<Name> {}
 
   /**
    * A document's parent is something that can contain it.
@@ -294,13 +299,7 @@ declare namespace Actor {
     _id: fields.DocumentIdField;
 
     /** The name of this Actor */
-    name: fields.StringField<
-      { required: true; blank: false; textSearch: true },
-      // Note(LukeAbby): Field override because `blank: false` isn't fully accounted for or something.
-      string,
-      string,
-      string
-    >;
+    name: fields.StringField<{ required: true; blank: false; textSearch: true }>;
 
     /** An Actor subtype which configures the system data model applied */
     // eslint-disable-next-line @typescript-eslint/no-empty-object-type
@@ -543,7 +542,8 @@ declare namespace Actor {
   }
 
   type ItemTypes = {
-    [SubType in Item.SubType]: Array<Item.OfType<SubType>>;
+    // Note(LukeAbby): `keyof Item._SystemMap` is used to preserve optional modifiers
+    [SubType in keyof Item._SystemMap]: Array<Item.OfType<SubType>>;
   };
 
   type GetActiveTokensReturn<Document extends boolean | undefined> = Document extends true

package/src/foundry/client/documents/adventure.d.mts

@@ -171,17 +171,11 @@ declare namespace Adventure {
     /**
      * The human-readable name of the Adventure
      */
-    name: fields.StringField<
-      {
-        required: true;
-        blank: false;
-        textSearch: true;
-      },
-      // Note(LukeAbby): Field override because `blank: false` isn't fully accounted for or something.
-      string,
-      string,
-      string
-    >;
+    name: fields.StringField<{
+      required: true;
+      blank: false;
+      textSearch: true;
+    }>;
 
     /**
      * The file path for the primary image of the adventure

package/src/foundry/client/documents/card.d.mts

@@ -110,7 +110,12 @@ declare namespace Card {
   /**
    * @internal
    */
-  interface _SystemMap extends Document.Internal.SystemMap<"Card"> {}
+  interface _ModelMap extends Document.Internal.ModelMap<Name> {}
+
+  /**
+   * @internal
+   */
+  interface _SystemMap extends Document.Internal.SystemMap<Name> {}
 
   /**
    * A document's parent is something that can contain it.
@@ -229,13 +234,7 @@ declare namespace Card {
     _id: fields.DocumentIdField;
 
     /** The text name of this card */
-    name: fields.StringField<
-      { required: true; blank: false; textSearch: true },
-      // Note(LukeAbby): Field override because `blank: false` isn't fully accounted for or something.
-      string,
-      string,
-      string
-    >;
+    name: fields.StringField<{ required: true; blank: false; textSearch: true }>;
 
     /**
      * A text description of this card which applies to all faces

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

@@ -115,7 +115,12 @@ declare namespace Cards {
   /**
    * @internal
    */
-  interface _SystemMap extends Document.Internal.SystemMap<"Cards"> {}
+  interface _ModelMap extends Document.Internal.ModelMap<Name> {}
+
+  /**
+   * @internal
+   */
+  interface _SystemMap extends Document.Internal.SystemMap<Name> {}
 
   /**
    * A document's parent is something that can contain it.

package/src/foundry/client/documents/chat-message.d.mts

@@ -109,7 +109,12 @@ declare namespace ChatMessage {
   /**
    * @internal
    */
-  interface _SystemMap extends Document.Internal.SystemMap<"ChatMessage"> {}
+  interface _ModelMap extends Document.Internal.ModelMap<Name> {}
+
+  /**
+   * @internal
+   */
+  interface _SystemMap extends Document.Internal.SystemMap<Name> {}
 
   /**
    * A document's parent is something that can contain it.

package/src/foundry/client/documents/combat.d.mts

@@ -116,7 +116,12 @@ declare namespace Combat {
   /**
    * @internal
    */
-  interface _SystemMap extends Document.Internal.SystemMap<"Combat"> {}
+  interface _ModelMap extends Document.Internal.ModelMap<Name> {}
+
+  /**
+   * @internal
+   */
+  interface _SystemMap extends Document.Internal.SystemMap<Name> {}
 
   /**
    * A document's parent is something that can contain it.

package/src/foundry/client/documents/combatant-group.d.mts

@@ -95,7 +95,12 @@ declare namespace CombatantGroup {
   /**
    * @internal
    */
-  interface _SystemMap extends Document.Internal.SystemMap<"CombatantGroup"> {}
+  interface _ModelMap extends Document.Internal.ModelMap<Name> {}
+
+  /**
+   * @internal
+   */
+  interface _SystemMap extends Document.Internal.SystemMap<Name> {}
 
   /**
    * A document's parent is something that can contain it.

package/src/foundry/client/documents/combatant.d.mts

@@ -110,7 +110,12 @@ declare namespace Combatant {
   /**
    * @internal
    */
-  interface _SystemMap extends Document.Internal.SystemMap<"Combatant"> {}
+  interface _ModelMap extends Document.Internal.ModelMap<Name> {}
+
+  /**
+   * @internal
+   */
+  interface _SystemMap extends Document.Internal.SystemMap<Name> {}
 
   /**
    * A document's parent is something that can contain it.

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

@@ -211,13 +211,7 @@ declare namespace Folder {
     _id: fields.DocumentIdField;
 
     /** The name of this Folder */
-    name: fields.StringField<
-      { required: true; blank: false; textSearch: true },
-      // Note(LukeAbby): Field override because `blank: false` isn't fully accounted for or something.
-      string,
-      string,
-      string
-    >;
+    name: fields.StringField<{ required: true; blank: false; textSearch: true }>;
 
     /** The document type which this Folder contains, from {@linkcode CONST.FOLDER_DOCUMENT_TYPES} */
     // eslint-disable-next-line @typescript-eslint/no-empty-object-type

package/src/foundry/client/documents/item.d.mts

@@ -117,7 +117,12 @@ declare namespace Item {
   /**
    * @internal
    */
-  interface _SystemMap extends Document.Internal.SystemMap<"Item"> {}
+  interface _ModelMap extends Document.Internal.ModelMap<Name> {}
+
+  /**
+   * @internal
+   */
+  interface _SystemMap extends Document.Internal.SystemMap<Name> {}
 
   /**
    * A document's parent is something that can contain it.
@@ -291,13 +296,7 @@ declare namespace Item {
     _id: fields.DocumentIdField;
 
     /** The name of this Item */
-    name: fields.StringField<
-      { required: true; blank: false; textSearch: true },
-      // Note(LukeAbby): Field override because `blank: false` isn't fully accounted for or something.
-      string,
-      string,
-      string
-    >;
+    name: fields.StringField<{ required: true; blank: false; textSearch: true }>;
 
     /** An Item subtype which configures the system data model applied */
     // eslint-disable-next-line @typescript-eslint/no-empty-object-type

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

@@ -112,7 +112,12 @@ declare namespace JournalEntryPage {
   /**
    * @internal
    */
-  interface _SystemMap extends Document.Internal.SystemMap<"JournalEntryPage"> {}
+  interface _ModelMap extends Document.Internal.ModelMap<Name> {}
+
+  /**
+   * @internal
+   */
+  interface _SystemMap extends Document.Internal.SystemMap<Name> {}
 
   /**
    * A document's parent is something that can contain it.
@@ -235,13 +240,7 @@ declare namespace JournalEntryPage {
     /**
      * The text name of this page.
      */
-    name: fields.StringField<
-      { required: true; blank: false; label: "JOURNALENTRYPAGE.PageTitle"; textSearch: true },
-      // Note(LukeAbby): Field override because `blank: false` isn't fully accounted for or something.
-      string,
-      string,
-      string
-    >;
+    name: fields.StringField<{ required: true; blank: false; label: "JOURNALENTRYPAGE.PageTitle"; textSearch: true }>;
 
     /**
      * The type of this page, in {@linkcode BaseJournalEntryPage.TYPES}.

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

@@ -248,13 +248,7 @@ declare namespace JournalEntry {
     /**
      * The name of this JournalEntry
      */
-    name: fields.StringField<
-      { required: true; blank: false; textSearch: true },
-      // Note(LukeAbby): Field override because `blank: false` isn't fully accounted for or something.
-      string,
-      string,
-      string
-    >;
+    name: fields.StringField<{ required: true; blank: false; textSearch: true }>;
 
     /**
      * The pages contained within this JournalEntry document

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

@@ -224,13 +224,7 @@ declare namespace Macro {
      * The name of this Macro
      * @defaultValue `""`
      */
-    name: fields.StringField<
-      { required: true; blank: false; textSearch: true },
-      // Note(LukeAbby): Field override because `blank: false` isn't fully accounted for or something.
-      string,
-      string,
-      string
-    >;
+    name: fields.StringField<{ required: true; blank: false; textSearch: true }>;
 
     /**
      * A Macro subtype from CONST.MACRO_TYPES

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

@@ -183,13 +183,7 @@ declare namespace PlaylistSound {
     /**
      * The name of this sound
      */
-    name: fields.StringField<
-      { required: true; blank: false; textSearch: true },
-      // Note(LukeAbby): Field override because `blank: false` isn't fully accounted for or something.
-      string,
-      string,
-      string
-    >;
+    name: fields.StringField<{ required: true; blank: false; textSearch: true }>;
 
     /**
      * The description of this sound

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

@@ -242,13 +242,7 @@ declare namespace Playlist {
     /**
      * The name of this playlist
      */
-    name: fields.StringField<
-      { required: true; blank: false; textSearch: true },
-      // Note(LukeAbby): Field override because `blank: false` isn't fully accounted for or something.
-      string,
-      string,
-      string
-    >;
+    name: fields.StringField<{ required: true; blank: false; textSearch: true }>;
 
     /**
      * The description of this playlist

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

@@ -121,7 +121,12 @@ declare namespace RegionBehavior {
   /**
    * @internal
    */
-  interface _SystemMap extends Document.Internal.SystemMap<"RegionBehavior"> {}
+  interface _ModelMap extends Document.Internal.ModelMap<Name> {}
+
+  /**
+   * @internal
+   */
+  interface _SystemMap extends Document.Internal.SystemMap<Name> {}
 
   /**
    * A document's parent is something that can contain it.

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

@@ -517,13 +517,7 @@ declare namespace RegionDocument {
     /**
      * The name used to describe the Region
      */
-    name: fields.StringField<
-      { required: true; blank: false; textSearch: true },
-      // Note(LukeAbby): Field override because `blank: false` isn't fully accounted for or something.
-      string,
-      string,
-      string
-    >;
+    name: fields.StringField<{ required: true; blank: false; textSearch: true }>;
 
     /**
      * The color used to highlight the Region

package/src/foundry/client/documents/roll-table.d.mts

@@ -238,13 +238,7 @@ declare namespace RollTable {
      * The name of this RollTable
      * @defaultValue `""`
      */
-    name: fields.StringField<
-      { required: true; blank: false; textSearch: true },
-      // Note(LukeAbby): Field override because `blank: false` isn't fully accounted for or something.
-      string,
-      string,
-      string
-    >;
+    name: fields.StringField<{ required: true; blank: false; textSearch: true }>;
 
     /**
      * An image file path which provides the thumbnail artwork for this RollTable

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

@@ -413,13 +413,7 @@ declare namespace Scene {
      * The name of this scene
      * @defaultValue `""`
      */
-    name: fields.StringField<
-      { required: true; blank: false; textSearch: true },
-      // Note(LukeAbby): Field override because `blank: false` isn't fully accounted for or something.
-      string,
-      string,
-      string
-    >;
+    name: fields.StringField<{ required: true; blank: false; textSearch: true }>;
 
     /**
      * Is this scene currently active? Only one scene may be active at a given time

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

@@ -184,13 +184,7 @@ declare namespace User {
     /**
      * The user's name.
      */
-    name: fields.StringField<
-      { required: true; blank: false; textSearch: true },
-      // Note(LukeAbby): Field override because `blank: false` isn't fully accounted for or something.
-      string,
-      string,
-      string
-    >;
+    name: fields.StringField<{ required: true; blank: false; textSearch: true }>;
 
     /**
      * The user's role, see CONST.USER_ROLES.

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

@@ -1,12 +1,11 @@
 import type { Socket } from "socket.io-client";
 import type {
   ConfiguredModule,
-  GetKey,
-  EmptyObject,
   ValueOf,
   FixedInstanceType,
   InitializationHook,
   InitializedOn,
+  EmptyObject,
 } from "#utils";
 import type BasePackage from "#common/packages/base-package.d.mts";
 import type { Document } from "#common/abstract/_module.d.mts";
@@ -88,7 +87,7 @@ declare class InternalGame<RunEvents extends InitializationHook> {
   /**
    * A registry of document sub-types and their respective data models.
    */
-  get model(): Game.Data["model"];
+  get model(): Game.Model;
 
   /**
    * @deprecated since v12, will be removed in v14
@@ -652,13 +651,26 @@ declare namespace Game {
 
   /** @internal */
   type _Model = {
-    [DocumentType in Document.Type]: {
-      // The `& string` is helpful even though there should never be any numeric/symbol keys.
-      // This is because when `keyof Config<...>` is deferred then TypeScript does a bunch of proofs under the assumption that `SystemTypeNames` could be a `string | number` until proven otherwise.
-      // This causes issues where there shouldn't be, for example it has been observed to obstruct the resolution of the `Actor` class.
-      [SubType in Model.TypeNames<DocumentType>]: GetKey<GetKey<SourceConfig, DocumentType>, SubType, EmptyObject>;
-    };
+    [DocumentType in Document.Type]: DocumentType extends Document.WithSystem
+      ? _ModelType<DocumentType>
+      : { base: EmptyObject };
   };
+
+  /** @internal */
+  type _ModelType<DocumentType extends Document.WithSystem> =
+    | (DocumentType extends "ActiveEffect" ? ActiveEffect._ModelMap : never)
+    | (DocumentType extends "ActorDelta" ? ActorDelta._ModelMap : never)
+    | (DocumentType extends "Actor" ? Actor._ModelMap : never)
+    | (DocumentType extends "Card" ? Card._ModelMap : never)
+    | (DocumentType extends "Cards" ? Cards._ModelMap : never)
+    | (DocumentType extends "ChatMessage" ? ChatMessage._ModelMap : never)
+    | (DocumentType extends "Combat" ? Combat._ModelMap : never)
+    | (DocumentType extends "Combatant" ? Combatant._ModelMap : never)
+    | (DocumentType extends "CombatantGroup" ? CombatantGroup._ModelMap : never)
+    | (DocumentType extends "Item" ? Item._ModelMap : never)
+    | (DocumentType extends "JournalEntryPage" ? JournalEntryPage._ModelMap : never)
+    | (DocumentType extends "RegionBehavior" ? RegionBehavior._ModelMap : never);
+
   interface Model extends _Model {}
 
   interface PackageWarning {

package/src/foundry/common/abstract/document.d.mts

@@ -22,6 +22,8 @@ import type {
   AnyMutableObject,
   MaybePromise,
   Override,
+  SimpleMerge,
+  PrettifyType,
 } from "#utils";
 import type * as CONST from "../constants.mts";
 import type {
@@ -1132,30 +1134,65 @@ declare namespace Document {
       ? Configured["document"]
       : ReturnType<LazyDocument>;
 
-    type SystemMap<Name extends Document.WithSystem> = _SystemMap<
+    type ModelMap<Name extends Document.WithSubTypes> = _ModelMap<
       Name,
-      GetKey<DataModelConfig, Name>,
-      GetKey<SourceConfig, Name>
+      // `{}` is used to avoid `keyof never` issues.
+      // eslint-disable-next-line @typescript-eslint/no-empty-object-type
+      GetKey<DataModelConfig, Name, {}>,
+      // eslint-disable-next-line @typescript-eslint/no-empty-object-type
+      GetKey<SourceConfig, Name, {}>
+    > &
+      // `Document.ModuleSubType` has to be accounted for specially because of its perculiar nature.
+      Record<Document.ModuleSubType, UnknownSystem>;
+
+    // Note(LukeAbby): This is written this way to preserve any optional modifiers.
+    type _ModelMap<Name extends Document.WithSubTypes, DataModel, Config> = PrettifyType<
+      SimpleMerge<
+        {
+          [SubType in keyof DataModel]: EmptyObject;
+        } & {
+          [SubType in Document.CoreTypesForName<Name>]: EmptyObject;
+        },
+        {
+          [SubType in keyof Config]: EmptyObject;
+        }
+      >
     >;
 
-    type _SystemMap<Name extends Document.WithSystem, DataModel, SourceData> = {
-      [SubType in SubTypesOf<Name>]: DataModel extends {
-        [K in SubType]: abstract new (...args: infer _) => infer Model;
-      }
-        ? Model
-        : SourceData extends {
-              [K in SubType]: infer Source;
-            }
-          ? Source
-          : SubType extends Document.ModuleSubType
-            ? // eslint-disable-next-line @typescript-eslint/no-empty-object-type
-              {}
-            : UnknownSystem;
-    };
+    type SystemMap<Name extends Document.WithSubTypes> = _SystemMap<
+      Name,
+      // `{}` is used to avoid `keyof never` issues.
+      // eslint-disable-next-line @typescript-eslint/no-empty-object-type
+      GetKey<DataModelConfig, Name, {}>,
+      // eslint-disable-next-line @typescript-eslint/no-empty-object-type
+      GetKey<DataConfig, Name, {}>
+    > &
+      // `Document.ModuleSubType` has to be accounted for specially because of its perculiar nature.
+      Record<Document.ModuleSubType, UnknownSystem>;
+
+    // Note(LukeAbby): This is written this way to preserve any optional modifiers.
+    type _SystemMap<Name extends Document.WithSubTypes, DataModel, Config> = PrettifyType<
+      SimpleMerge<
+        {
+          [SubType in keyof DataModel]: DataModel[SubType] extends
+            | (abstract new (...args: never) => infer Model extends DataModel.Any)
+            | undefined
+            ? Model
+            : never;
+        } & {
+          [SubType in Document.CoreTypesForName<Name>]: EmptyObject;
+        },
+        {
+          [SubType in keyof Config]: Config[SubType];
+        }
+      >
+    >;
 
-    type SystemOfType<SystemMap extends Record<SubType, object>, SubType extends string> =
-      | DiscriminatedUnion<SystemMap[SubType]>
-      | (SubType extends ModuleSubType | "base" ? UnknownSystem : never);
+    type SystemOfType<SystemMap extends Record<SubType, object | undefined>, SubType extends string> = SubType extends
+      | ModuleSubType
+      | "base"
+      ? UnknownSystem
+      : DiscriminatedUnion<NonNullable<SystemMap[SubType]>>;
 
     // TODO(LukeAbby): Improve the type display with a helper here.
     // TODO(LukeAbby): Add `StoredSource` for a better type display there.

package/src/foundry/common/data/fields.d.mts

@@ -5158,9 +5158,10 @@ declare namespace TypeDataField {
 
   /** @internal */
   type _Schemas<T> = {
-    [K in keyof T]: T[K] extends (abstract new (...args: never) => infer U extends DataModel.Any)
+    // This `NonNullable` is necessary because a subtype can be optional.
+    [K in keyof T]-?: T[K] extends (abstract new (...args: never) => infer U extends DataModel.Any) | undefined
       ? // eslint-disable-next-line @typescript-eslint/no-deprecated
-        U | SchemaField.AssignmentData<U["schema"]["fields"]>
+        SchemaField.AssignmentData<U["schema"]["fields"]>
       : never;
   }[keyof T];
 
@@ -5179,7 +5180,9 @@ declare namespace TypeDataField {
 
   /** @internal */
   type _Instances<T> = {
-    [K in keyof T]: T[K] extends (abstract new (...args: never) => infer U extends DataModel.Any) ? U : never;
+    [K in keyof T]-?: T[K] extends (abstract new (...args: never) => infer U extends DataModel.Any) | undefined
+      ? U
+      : never;
   }[keyof T];
 
   /**
@@ -5207,7 +5210,7 @@ declare namespace TypeDataField {
 
   /** @internal */
   type _Source<T> = {
-    [K in keyof T]: T[K] extends (abstract new (...args: never) => infer U extends DataModel.Any)
+    [K in keyof T]-?: T[K] extends (abstract new (...args: never) => infer U extends DataModel.Any) | undefined
       ? U["_source"]
       : never;
   }[keyof T];

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

@@ -1,3 +1,5 @@
+import type { Identity } from "#utils";
+
 export default Color;
 
 // `Color#fromString` breaks inheritance
@@ -306,7 +308,9 @@ declare class InternalColor extends PatchedNumber {
   static fromLinearRGB(linear: Color.RGBColorVector): Color;
 }
 
-declare const Color: typeof InternalColor & (new (...args: any) => number);
+interface ColorConstructor extends Identity<typeof InternalColor & (new (...args: any) => number)> {}
+
+declare const Color: ColorConstructor;
 type Color = InternalColor & number;
 
 declare namespace Color {

package/tsconfig.json

@@ -5,5 +5,5 @@
   "include": ["**/*", ".*", ".**/**/*"],
   // `src/index-lenient.d.mts` is skipped because it sets `AssumeHookRan` which has some pretty global effects that would make it easy to write broken code.
   // `tests` are excluded to speed up typechecking.
-  "exclude": ["src/index-lenient.d.mts", "tests", "test"]
+  "exclude": ["src/index-lenient.d.mts", "tests"]
 }