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

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.20250708122847",
+  "version": "13.346.0-beta.20250708124359",
   "description": "TypeScript type definitions for Foundry VTT",
   "type": "module",
   "types": "./src/index.d.mts",

package/src/foundry/client/canvas/groups/canvas-group-mixin.d.mts

@@ -5,7 +5,7 @@ import type { CanvasLayer } from "#client/canvas/layers/_module.d.mts";
 
 declare const DynamicClass: new <_Computed extends object>(...args: never) => _Computed;
 
-// @ts-expect-error - This is a workaround to allow for dynamic top level properties in a class.
+// @ts-expect-error This is a workaround to allow for dynamic top level properties in a class.
 declare class LayersClass<
   Group extends CanvasGroupMixin.LayerGroup | NoLayerGroup,
   Instance extends object = RemoveIndexSignatures<CanvasGroupMixin.LayersFor<Group>>,

package/src/foundry/client/canvas/rendering/shaders/weather/base-weather.d.mts

@@ -11,7 +11,7 @@ interface InternalAbstractWeatherShader_Interface extends AbstractBaseShaderClas
 
 declare const InternalAbstractWeatherShader_Const: InternalAbstractWeatherShader_Interface;
 
-// @ts-expect-error - This pattern inherently requires a ts-expect-error as the base class is dynamic.
+// @ts-expect-error This pattern inherently requires a ts-expect-error as the base class is dynamic.
 class InternalAbstractWeatherShader<
   DefaultUniforms extends AbstractBaseShader.Uniforms,
   _ComputedUniforms extends object = RemoveIndexSignatures<DefaultUniforms>,

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

@@ -1,6 +1,7 @@
 import type { ConfiguredActiveEffect } from "fvtt-types/configuration";
 import type {
   AnyMutableObject,
+  Identity,
   InexactPartial,
   IntentionalPartial,
   InterfaceToObject,
@@ -100,11 +101,18 @@ declare namespace ActiveEffect {
    * builtin `ActiveEffect` class or a custom subclass if that is set up in
    * {@link ConfiguredActiveEffect | `fvtt-types/configuration/ConfiguredActiveEffect`}.
    */
-  type OfType<Type extends SubType> = Document.Internal.OfType<
-    ConfiguredActiveEffect<Type>,
-    // eslint-disable-next-line @typescript-eslint/no-restricted-types
-    () => ActiveEffect<Type>
-  >;
+  type OfType<Type extends SubType> = _OfType[Type];
+
+  /** @internal */
+  interface _OfType
+    extends Identity<{
+      [Type in SubType]: Type extends unknown
+        ? ConfiguredActiveEffect<Type> extends { document: infer Document }
+          ? Document
+          : // eslint-disable-next-line @typescript-eslint/no-restricted-types
+            ActiveEffect<Type>
+        : never;
+    }> {}
 
   /**
    * `SystemOfType` returns the system property for a specific `ActiveEffect` subtype.
@@ -177,7 +185,7 @@ declare namespace ActiveEffect {
    * An instance of `ActiveEffect` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `ActiveEffect` that comes from the database.

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

@@ -98,8 +98,18 @@ declare namespace ActorDelta {
    * builtin `ActorDelta` class or a custom subclass if that is set up in
    * {@link ConfiguredActorDelta | `fvtt-types/configuration/ConfiguredActorDelta`}.
    */
-  // eslint-disable-next-line @typescript-eslint/no-restricted-types
-  type OfType<Type extends SubType> = Document.Internal.OfType<ConfiguredActorDelta<Type>, () => ActorDelta<Type>>;
+  type OfType<Type extends SubType> = _OfType[Type];
+
+  /** @internal */
+  interface _OfType
+    extends Identity<{
+      [Type in SubType]: Type extends unknown
+        ? ConfiguredActorDelta<Type> extends { document: infer Document }
+          ? Document
+          : // eslint-disable-next-line @typescript-eslint/no-restricted-types
+            ActorDelta<Type>
+        : never;
+    }> {}
 
   /**
    * `SystemOfType` returns the system property for a specific `ActorDelta` subtype.
@@ -229,7 +239,7 @@ declare namespace ActorDelta {
    * An instance of `ActorDelta` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<ActorDelta.Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `ActorDelta` that comes from the database.

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

@@ -1,4 +1,4 @@
-import type { AnyObject, InexactPartial, NullishProps, Merge } from "#utils";
+import type { AnyObject, InexactPartial, NullishProps, Merge, Identity } from "#utils";
 import type { documents } from "#client/client.d.mts";
 import type Document from "#common/abstract/document.d.mts";
 import type BaseActor from "#common/documents/actor.d.mts";
@@ -109,8 +109,18 @@ declare namespace Actor {
    * builtin `Actor` class or a custom subclass if that is set up in
    * {@link ConfiguredActor | `fvtt-types/configuration/ConfiguredActor`}.
    */
-  // eslint-disable-next-line @typescript-eslint/no-restricted-types
-  type OfType<Type extends SubType> = Document.Internal.OfType<ConfiguredActor<Type>, () => Actor<Type>>;
+  type OfType<Type extends SubType> = _OfType[Type];
+
+  /** @internal */
+  interface _OfType
+    extends Identity<{
+      [Type in SubType]: Type extends unknown
+        ? ConfiguredActor<Type> extends { document: infer Document }
+          ? Document
+          : // eslint-disable-next-line @typescript-eslint/no-restricted-types
+            Actor<Type>
+        : never;
+    }> {}
 
   /**
    * `SystemOfType` returns the system property for a specific `Actor` subtype.
@@ -238,7 +248,7 @@ declare namespace Actor {
    * An instance of `Actor` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `Actor` that comes from the database.
@@ -303,7 +313,7 @@ declare namespace Actor {
 
     /** An Actor subtype which configures the system data model applied */
     // eslint-disable-next-line @typescript-eslint/no-empty-object-type
-    type: fields.DocumentTypeField<typeof BaseActor, {}, Actor.SubType, Actor.SubType, Actor.SubType>;
+    type: fields.DocumentTypeField<typeof BaseActor, {}>;
 
     /**
      * An image file path which provides the artwork for this Actor

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

@@ -108,7 +108,7 @@ declare namespace Adventure {
    * An instance of `Adventure` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<Adventure.Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `Adventure` that comes from the database.

package/src/foundry/client/documents/ambient-light.d.mts

@@ -108,7 +108,7 @@ declare namespace AmbientLightDocument {
    * An instance of `AmbientLightDocument` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<AmbientLightDocument.Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `AmbientLightDocument` that comes from the database.

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

@@ -108,7 +108,7 @@ declare namespace AmbientSoundDocument {
    * An instance of `AmbientSoundDocument` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<AmbientSoundDocument.Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `AmbientSoundDocument` that comes from the database.

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

@@ -1,5 +1,5 @@
 import type { ConfiguredCard } from "fvtt-types/configuration";
-import type { AnyObject, DeepPartial, InexactPartial, Merge } from "#utils";
+import type { AnyObject, DeepPartial, Identity, InexactPartial, Merge } from "#utils";
 import type { documents } from "#client/client.d.mts";
 import type Document from "#common/abstract/document.d.mts";
 import type { DataSchema } from "#common/data/fields.d.mts";
@@ -99,8 +99,18 @@ declare namespace Card {
    * builtin `Card` class or a custom subclass if that is set up in
    * {@link ConfiguredCard | `fvtt-types/configuration/ConfiguredCard`}.
    */
-  // eslint-disable-next-line @typescript-eslint/no-restricted-types
-  type OfType<Type extends SubType> = Document.Internal.OfType<ConfiguredCard<Type>, () => Card<Type>>;
+  type OfType<Type extends SubType> = _OfType[Type];
+
+  /** @internal */
+  interface _OfType
+    extends Identity<{
+      [Type in SubType]: Type extends unknown
+        ? ConfiguredCard<Type> extends { document: infer Document }
+          ? Document
+          : // eslint-disable-next-line @typescript-eslint/no-restricted-types
+            Card<Type>
+        : never;
+    }> {}
 
   /**
    * `SystemOfType` returns the system property for a specific `Card` subtype.
@@ -173,7 +183,7 @@ declare namespace Card {
    * An instance of `Card` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `Card` that comes from the database.

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

@@ -1,5 +1,5 @@
 import type { ConfiguredCards } from "fvtt-types/configuration";
-import type { InexactPartial, Merge, NullishProps } from "#utils";
+import type { Identity, InexactPartial, Merge, NullishProps } from "#utils";
 import type Document from "#common/abstract/document.d.mts";
 import type { DataSchema } from "#common/data/fields.d.mts";
 import type BaseCards from "#common/documents/cards.d.mts";
@@ -104,8 +104,18 @@ declare namespace Cards {
    * builtin `Cards` class or a custom subclass if that is set up in
    * {@link ConfiguredCards | `fvtt-types/configuration/ConfiguredCards`}.
    */
-  // eslint-disable-next-line @typescript-eslint/no-restricted-types
-  type OfType<Type extends SubType> = Document.Internal.OfType<ConfiguredCards<Type>, () => Cards<Type>>;
+  type OfType<Type extends SubType> = _OfType[Type];
+
+  /** @internal */
+  interface _OfType
+    extends Identity<{
+      [Type in SubType]: Type extends unknown
+        ? ConfiguredCards<Type> extends { document: infer Document }
+          ? Document
+          : // eslint-disable-next-line @typescript-eslint/no-restricted-types
+            Cards<Type>
+        : never;
+    }> {}
 
   /**
    * `SystemOfType` returns the system property for a specific `Cards` subtype.
@@ -233,7 +243,7 @@ declare namespace Cards {
    * An instance of `Cards` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `Cards` that comes from the database.
@@ -301,7 +311,7 @@ declare namespace Cards {
      * @defaultValue `BaseCards.TYPES[0]`
      */
     // eslint-disable-next-line @typescript-eslint/no-empty-object-type
-    type: fields.DocumentTypeField<typeof BaseCards, {}, Cards.SubType, Cards.SubType, Cards.SubType>;
+    type: fields.DocumentTypeField<typeof BaseCards, {}>;
 
     /**
      * A text description of this stack

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

@@ -1,5 +1,5 @@
 import type { ConfiguredChatMessage } from "fvtt-types/configuration";
-import type { AnyObject, InexactPartial, InterfaceToObject, Merge, NullishProps } from "#utils";
+import type { AnyObject, Identity, InexactPartial, InterfaceToObject, Merge, NullishProps } from "#utils";
 import type { documents } from "#client/client.d.mts";
 import type Document from "#common/abstract/document.d.mts";
 import type { DataSchema, SchemaField } from "#common/data/fields.d.mts";
@@ -98,8 +98,18 @@ declare namespace ChatMessage {
    * builtin `ChatMessage` class or a custom subclass if that is set up in
    * {@link ConfiguredChatMessage | `fvtt-types/configuration/ConfiguredChatMessage`}.
    */
-  // eslint-disable-next-line @typescript-eslint/no-restricted-types
-  type OfType<Type extends SubType> = Document.Internal.OfType<ConfiguredChatMessage<Type>, () => ChatMessage<Type>>;
+  type OfType<Type extends SubType> = _OfType[Type];
+
+  /** @internal */
+  interface _OfType
+    extends Identity<{
+      [Type in SubType]: Type extends unknown
+        ? ConfiguredChatMessage<Type> extends { document: infer Document }
+          ? Document
+          : // eslint-disable-next-line @typescript-eslint/no-restricted-types
+            ChatMessage<Type>
+        : never;
+    }> {}
 
   /**
    * `SystemOfType` returns the system property for a specific `ChatMessage` subtype.
@@ -172,7 +182,7 @@ declare namespace ChatMessage {
    * An instance of `ChatMessage` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `ChatMessage` that comes from the database.

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

@@ -1,5 +1,5 @@
 import type { ConfiguredCombat } from "fvtt-types/configuration";
-import type { InexactPartial, Merge, NullishProps } from "#utils";
+import type { Identity, InexactPartial, Merge, NullishProps } from "#utils";
 import type { documents } from "#client/client.d.mts";
 import type Document from "#common/abstract/document.d.mts";
 import type { DataSchema } from "#common/data/fields.d.mts";
@@ -105,8 +105,18 @@ declare namespace Combat {
    * builtin `Combat` class or a custom subclass if that is set up in
    * {@link ConfiguredCombat | `fvtt-types/configuration/ConfiguredCombat`}.
    */
-  // eslint-disable-next-line @typescript-eslint/no-restricted-types
-  type OfType<Type extends SubType> = Document.Internal.OfType<ConfiguredCombat<Type>, () => Combat<Type>>;
+  type OfType<Type extends SubType> = _OfType[Type];
+
+  /** @internal */
+  interface _OfType
+    extends Identity<{
+      [Type in SubType]: Type extends unknown
+        ? ConfiguredCombat<Type> extends { document: infer Document }
+          ? Document
+          : // eslint-disable-next-line @typescript-eslint/no-restricted-types
+            Combat<Type>
+        : never;
+    }> {}
 
   /**
    * `SystemOfType` returns the system property for a specific `Combat` subtype.
@@ -240,7 +250,7 @@ declare namespace Combat {
    * An instance of `Combat` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `Combat` that comes from the database.

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

@@ -1,5 +1,5 @@
 import type { ConfiguredCombatantGroup } from "fvtt-types/configuration";
-import type { InexactPartial, Merge } from "#utils";
+import type { Identity, InexactPartial, Merge } from "#utils";
 import type Document from "#common/abstract/document.mjs";
 import type { DataSchema } from "#common/data/fields.d.mts";
 import type BaseCombatantGroup from "#common/documents/combatant-group.d.mts";
@@ -81,11 +81,18 @@ declare namespace CombatantGroup {
    * builtin `CombatantGroup` class or a custom subclass if that is set up in
    * {@link ConfiguredCombatantGroup | `fvtt-types/configuration/ConfiguredCombatantGroup`}.
    */
-  type OfType<Type extends SubType> = Document.Internal.OfType<
-    ConfiguredCombatantGroup<Type>,
-    // eslint-disable-next-line @typescript-eslint/no-restricted-types
-    () => CombatantGroup<Type>
-  >;
+  type OfType<Type extends SubType> = _OfType[Type];
+
+  /** @internal */
+  interface _OfType
+    extends Identity<{
+      [Type in SubType]: Type extends unknown
+        ? ConfiguredCombatantGroup<Type> extends { document: infer Document }
+          ? Document
+          : // eslint-disable-next-line @typescript-eslint/no-restricted-types
+            CombatantGroup<Type>
+        : never;
+    }> {}
 
   /**
    * `SystemOfType` returns the system property for a specific `CombatantGroup` subtype.
@@ -158,14 +165,16 @@ declare namespace CombatantGroup {
    * An instance of `CombatantGroup` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid<out SubType extends CombatantGroup.SubType = CombatantGroup.SubType>
-    extends Document.Internal.Invalid<OfType<SubType>> {}
+  type Invalid<SubType extends CombatantGroup.SubType = CombatantGroup.SubType> = Document.Internal.Invalid<
+    OfType<SubType>
+  >;
 
   /**
    * An instance of `CombatantGroup` that comes from the database.
    */
-  interface Stored<out SubType extends CombatantGroup.SubType = CombatantGroup.SubType>
-    extends Document.Internal.Stored<OfType<SubType>> {}
+  type Stored<SubType extends CombatantGroup.SubType = CombatantGroup.SubType> = Document.Internal.Stored<
+    OfType<SubType>
+  >;
 
   /**
    * The data put in {@link CombatantGroup._source | `CombatantGroup#_source`}. This data is what was

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

@@ -1,5 +1,5 @@
 import type { ConfiguredCombatant } from "fvtt-types/configuration";
-import type { InexactPartial, Merge, RequiredProps } from "#utils";
+import type { Identity, InexactPartial, Merge, RequiredProps } from "#utils";
 import type { documents } from "#client/client.d.mts";
 import type Document from "#common/abstract/document.d.mts";
 import type { DataSchema } from "#common/data/fields.d.mts";
@@ -99,8 +99,18 @@ declare namespace Combatant {
    * builtin `Combatant` class or a custom subclass if that is set up in
    * {@link ConfiguredCombatant | `fvtt-types/configuration/ConfiguredCombatant`}.
    */
-  // eslint-disable-next-line @typescript-eslint/no-restricted-types
-  type OfType<Type extends SubType> = Document.Internal.OfType<ConfiguredCombatant<Type>, () => Combatant<Type>>;
+  type OfType<Type extends SubType> = _OfType[Type];
+
+  /** @internal */
+  interface _OfType
+    extends Identity<{
+      [Type in SubType]: Type extends unknown
+        ? ConfiguredCombatant<Type> extends { document: infer Document }
+          ? Document
+          : // eslint-disable-next-line @typescript-eslint/no-restricted-types
+            Combatant<Type>
+        : never;
+    }> {}
 
   /**
    * `SystemOfType` returns the system property for a specific `Combatant` subtype.
@@ -173,7 +183,7 @@ declare namespace Combatant {
    * An instance of `Combatant` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `Combatant` that comes from the database.

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

@@ -119,7 +119,7 @@ declare namespace DrawingDocument {
    * An instance of `DrawingDocument` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<DrawingDocument.Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `DrawingDocument` that comes from the database.

package/src/foundry/client/documents/fog-exploration.d.mts

@@ -120,7 +120,7 @@ declare namespace FogExploration {
    * An instance of `FogExploration` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<FogExploration.Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `FogExploration` that comes from the database.

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

@@ -1,5 +1,5 @@
 import type { ConfiguredFolder } from "fvtt-types/configuration";
-import type { InexactPartial, IntentionalPartial, Merge, NullishProps } from "#utils";
+import type { Identity, InexactPartial, IntentionalPartial, Merge, NullishProps } from "#utils";
 import type Document from "#common/abstract/document.d.mts";
 import type { DataSchema } from "#common/data/fields.d.mts";
 import type BaseFolder from "#common/documents/folder.d.mts";
@@ -91,8 +91,18 @@ declare namespace Folder {
    * Note that `Folder` does not have a `system` property and therefore there is no way for a user
    * to configure custom subtypes. See {@linkcode Folder.SubType} for more information.
    */
-  // eslint-disable-next-line @typescript-eslint/no-restricted-types
-  type OfType<Type extends SubType> = Document.Internal.OfType<ConfiguredFolder<Type>, () => Folder<Type>>;
+  type OfType<Type extends SubType> = _OfType[Type];
+
+  /** @internal */
+  interface _OfType
+    extends Identity<{
+      [Type in SubType]: Type extends unknown
+        ? ConfiguredFolder<Type> extends { document: infer Document }
+          ? Document
+          : // eslint-disable-next-line @typescript-eslint/no-restricted-types
+            Folder<Type>
+        : never;
+    }> {}
 
   /**
    * A document's parent is something that can contain it.
@@ -150,7 +160,7 @@ declare namespace Folder {
    * An instance of `Folder` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `Folder` that comes from the database.
@@ -215,7 +225,7 @@ declare namespace Folder {
 
     /** The document type which this Folder contains, from {@linkcode CONST.FOLDER_DOCUMENT_TYPES} */
     // eslint-disable-next-line @typescript-eslint/no-empty-object-type
-    type: fields.DocumentTypeField<typeof BaseFolder, {}, Folder.SubType, Folder.SubType, Folder.SubType>;
+    type: fields.DocumentTypeField<typeof BaseFolder, {}>;
 
     /**
      * An HTML description of the contents of this folder

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

@@ -2,7 +2,7 @@ import type { ConfiguredItem } from "fvtt-types/configuration";
 import type { documents } from "#client/client.d.mts";
 import type Document from "#common/abstract/document.d.mts";
 import type { DataSchema } from "#common/data/fields.d.mts";
-import type { AnyObject, InexactPartial, Merge } from "#utils";
+import type { AnyObject, Identity, InexactPartial, Merge } from "#utils";
 import type BaseItem from "#common/documents/item.mjs";
 
 import fields = foundry.data.fields;
@@ -106,8 +106,18 @@ declare namespace Item {
    * builtin `Item` class or a custom subclass if that is set up in
    * {@link ConfiguredItem | `fvtt-types/configuration/ConfiguredItem`}.
    */
-  // eslint-disable-next-line @typescript-eslint/no-restricted-types
-  type OfType<Type extends SubType> = Document.Internal.OfType<ConfiguredItem<Type>, () => Item<Type>>;
+  type OfType<Type extends SubType> = _OfType[Type];
+
+  /** @internal */
+  interface _OfType
+    extends Identity<{
+      [Type in SubType]: Type extends unknown
+        ? ConfiguredItem<Type> extends { document: infer Document }
+          ? Document
+          : // eslint-disable-next-line @typescript-eslint/no-restricted-types
+            Item<Type>
+        : never;
+    }> {}
 
   /**
    * `SystemOfType` returns the system property for a specific `Item` subtype.
@@ -235,7 +245,7 @@ declare namespace Item {
    * An instance of `Item` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `Item` that comes from the database.
@@ -300,7 +310,7 @@ declare namespace Item {
 
     /** An Item subtype which configures the system data model applied */
     // eslint-disable-next-line @typescript-eslint/no-empty-object-type
-    type: fields.DocumentTypeField<typeof documents.BaseItem, {}, Item.SubType, Item.SubType, Item.SubType>;
+    type: fields.DocumentTypeField<typeof documents.BaseItem, {}>;
 
     /**
      * An image file path which provides the artwork for this Item

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

@@ -102,12 +102,12 @@ declare namespace JournalEntryCategory {
    * An instance of `JournalEntryCategory` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<JournalEntryCategory.Implementation> {}
+  type Invalid = Document.Internal.Invalid<JournalEntryCategory.Implementation>;
 
   /**
    * An instance of `JournalEntryCategory` that comes from the database.
    */
-  interface Stored extends Document.Internal.Stored<JournalEntryCategory.Implementation> {}
+  type Stored = Document.Internal.Stored<JournalEntryCategory.Implementation>;
 
   /**
    * The data put in {@link JournalEntryCategory._source | `JournalEntryCategory#_source`}. This data is what was

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

@@ -1,5 +1,5 @@
 import type { ConfiguredJournalEntryPage } from "fvtt-types/configuration";
-import type { AnyObject, InexactPartial, Merge, NullishProps } from "#utils";
+import type { AnyObject, Identity, InexactPartial, Merge, NullishProps } from "#utils";
 import type Document from "#common/abstract/document.d.mts";
 import type { DataSchema } from "#common/data/fields.d.mts";
 import type BaseJournalEntryPage from "#common/documents/journal-entry-page.d.mts";
@@ -98,11 +98,18 @@ declare namespace JournalEntryPage {
    * {@link ConfiguredJournalEntryPage | `fvtt-types/configuration/ConfiguredJournalEntryPage`}.
    * up.
    */
-  type OfType<Type extends SubType> = Document.Internal.OfType<
-    ConfiguredJournalEntryPage<Type>,
-    // eslint-disable-next-line @typescript-eslint/no-restricted-types
-    () => JournalEntryPage<Type>
-  >;
+  type OfType<Type extends SubType> = _OfType[Type];
+
+  /** @internal */
+  interface _OfType
+    extends Identity<{
+      [Type in SubType]: Type extends unknown
+        ? ConfiguredJournalEntryPage<Type> extends { document: infer Document }
+          ? Document
+          : // eslint-disable-next-line @typescript-eslint/no-restricted-types
+            JournalEntryPage<Type>
+        : never;
+    }> {}
 
   /**
    * `SystemOfType` returns the system property for a specific `JournalEntryPage` subtype.
@@ -175,7 +182,7 @@ declare namespace JournalEntryPage {
    * An instance of `JournalEntryPage` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `JournalEntryPage` that comes from the database.

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

@@ -185,7 +185,7 @@ declare namespace JournalEntry {
    * An instance of `JournalEntry` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<JournalEntry.Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `JournalEntry` that comes from the database.

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

@@ -1,5 +1,5 @@
 import type { ConfiguredMacro } from "fvtt-types/configuration";
-import type { InexactPartial, Merge, NullishProps } from "#utils";
+import type { Identity, InexactPartial, Merge, NullishProps } from "#utils";
 import type { documents } from "#client/client.d.mts";
 import type Document from "#common/abstract/document.d.mts";
 import type { DataSchema } from "#common/data/fields.d.mts";
@@ -101,8 +101,18 @@ declare namespace Macro {
    * Note that `Macro` does not have a `system` property and therefore there is no way for a user
    * to configure custom subtypes. See {@linkcode Macro.SubType} for more information.
    */
-  // eslint-disable-next-line @typescript-eslint/no-restricted-types
-  type OfType<Type extends SubType> = Document.Internal.OfType<ConfiguredMacro<Type>, () => Macro<Type>>;
+  type OfType<Type extends SubType> = _OfType[Type];
+
+  /** @internal */
+  interface _OfType
+    extends Identity<{
+      [Type in SubType]: Type extends unknown
+        ? ConfiguredMacro<Type> extends { document: infer Document }
+          ? Document
+          : // eslint-disable-next-line @typescript-eslint/no-restricted-types
+            Macro<Type>
+        : never;
+    }> {}
 
   /**
    * A document's parent is something that can contain it.
@@ -160,7 +170,7 @@ declare namespace Macro {
    * An instance of `Macro` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<OfType<SubType>> {}
+  type Invalid = Document.Internal.Invalid<OfType<SubType>>;
 
   /**
    * An instance of `Macro` that comes from the database.

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

@@ -118,7 +118,7 @@ declare namespace MeasuredTemplateDocument {
    * An instance of `MeasuredTemplateDocument` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<MeasuredTemplateDocument.Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `MeasuredTemplateDocument` that comes from the database.

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

@@ -118,7 +118,7 @@ declare namespace NoteDocument {
    * An instance of `NoteDocument` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<NoteDocument.Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `NoteDocument` that comes from the database.

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

@@ -120,7 +120,7 @@ declare namespace PlaylistSound {
    * An instance of `PlaylistSound` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<PlaylistSound.Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `PlaylistSound` that comes from the database.

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

@@ -179,7 +179,7 @@ declare namespace Playlist {
    * An instance of `Playlist` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<Playlist.Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `Playlist` that comes from the database.

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

@@ -2,7 +2,7 @@ import type { ConfiguredRegionBehavior } from "fvtt-types/configuration";
 import type Document from "#common/abstract/document.d.mts";
 import type BaseRegionBehavior from "#common/documents/region-behavior.d.mts";
 import type { DataSchema } from "#common/data/fields.d.mts";
-import type { InexactPartial, Merge } from "#utils";
+import type { Identity, InexactPartial, Merge } from "#utils";
 
 import fields = foundry.data.fields;
 
@@ -107,11 +107,18 @@ declare namespace RegionBehavior {
    * builtin `RegionBehavior` class or a custom subclass if that is set up in
    * {@link ConfiguredRegionBehavior | `fvtt-types/configuration/ConfiguredRegionBehavior`}.
    */
-  type OfType<Type extends SubType> = Document.Internal.OfType<
-    ConfiguredRegionBehavior<Type>,
-    // eslint-disable-next-line @typescript-eslint/no-restricted-types
-    () => RegionBehavior<Type>
-  >;
+  type OfType<Type extends SubType> = _OfType[Type];
+
+  /** @internal */
+  interface _OfType
+    extends Identity<{
+      [Type in SubType]: Type extends unknown
+        ? ConfiguredRegionBehavior<Type> extends { document: infer Document }
+          ? Document
+          : // eslint-disable-next-line @typescript-eslint/no-restricted-types
+            RegionBehavior<Type>
+        : never;
+    }> {}
 
   /**
    * `SystemOfType` returns the system property for a specific `RegionBehavior` subtype.
@@ -184,7 +191,7 @@ declare namespace RegionBehavior {
    * An instance of `RegionBehavior` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `RegionBehavior` that comes from the database.
@@ -255,14 +262,8 @@ declare namespace RegionBehavior {
     /**
      * An RegionBehavior subtype which configures the system data model applied
      */
-    type: fields.DocumentTypeField<
-      typeof BaseRegionBehavior,
-      // eslint-disable-next-line @typescript-eslint/no-empty-object-type
-      {},
-      RegionBehavior.SubType,
-      RegionBehavior.SubType,
-      RegionBehavior.SubType
-    >;
+    // eslint-disable-next-line @typescript-eslint/no-empty-object-type
+    type: fields.DocumentTypeField<typeof BaseRegionBehavior, {}>;
 
     /**
      * Data for a RegionBehavior subtype, defined by a System or Module

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

@@ -454,7 +454,7 @@ declare namespace RegionDocument {
    * An instance of `Region` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<RegionDocument.Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `Region` that comes from the database.

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

@@ -174,7 +174,7 @@ declare namespace RollTable {
    * An instance of `RollTable` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<RollTable.Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `RollTable` that comes from the database.

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

@@ -199,7 +199,7 @@ declare namespace Scene {
    * An instance of `Scene` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<Scene.Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `Scene` that comes from the database.

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

@@ -117,7 +117,7 @@ declare namespace Setting {
    * An instance of `Setting` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<Setting.Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `Setting` that comes from the database.

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

@@ -1,5 +1,5 @@
 import type { ConfiguredTableResult } from "fvtt-types/configuration";
-import type { InexactPartial, Merge } from "#utils";
+import type { Identity, InexactPartial, Merge } from "#utils";
 import type Document from "#common/abstract/document.d.mts";
 import type { DataSchema } from "#common/data/fields.d.mts";
 import type BaseTableResult from "#common/documents/table-result.d.mts";
@@ -95,8 +95,18 @@ declare namespace TableResult {
    * Note that `TableResult` does not have a `system` property and therefore there is no way for a user
    * to configure custom subtypes. See {@linkcode TableResult.SubType} for more information.
    */
-  // eslint-disable-next-line @typescript-eslint/no-restricted-types
-  type OfType<Type extends SubType> = Document.Internal.OfType<ConfiguredTableResult<Type>, () => TableResult<Type>>;
+  type OfType<Type extends SubType> = _OfType[Type];
+
+  /** @internal */
+  interface _OfType
+    extends Identity<{
+      [Type in SubType]: Type extends unknown
+        ? ConfiguredTableResult<Type> extends { document: infer Document }
+          ? Document
+          : // eslint-disable-next-line @typescript-eslint/no-restricted-types
+            TableResult<Type>
+        : never;
+    }> {}
 
   /**
    * A document's parent is something that can contain it.
@@ -153,8 +163,7 @@ declare namespace TableResult {
    * An instance of `TableResult` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid<out SubType extends TableResult.SubType = TableResult.SubType>
-    extends Document.Internal.Invalid<OfType<SubType>> {}
+  type Invalid<SubType extends TableResult.SubType = TableResult.SubType> = Document.Internal.Invalid<OfType<SubType>>;
 
   /**
    * An instance of `TableResult` that comes from the database.

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

@@ -107,7 +107,7 @@ declare namespace TileDocument {
    * An instance of `TileDocument` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<TileDocument.Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `TileDocument` that comes from the database.

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

@@ -191,7 +191,7 @@ declare namespace TokenDocument {
    * An instance of `TokenDocument` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<TokenDocument.Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `TokenDocument` that comes from the database.

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

@@ -121,7 +121,7 @@ declare namespace User {
    * An instance of `User` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<User.Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `User` that comes from the database.

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

@@ -115,7 +115,7 @@ declare namespace WallDocument {
    * An instance of `WallDocument` that comes from the database but failed validation meaning that
    * its `system` and `_source` could theoretically be anything.
    */
-  interface Invalid extends Document.Internal.Invalid<WallDocument.Implementation> {}
+  type Invalid = Document.Internal.Invalid<Implementation>;
 
   /**
    * An instance of `WallDocument` that comes from the database.

package/src/foundry/client/utils/helpers.d.mts

@@ -72,6 +72,7 @@ export function fromUuidSync<
 >(
   uuid: FromUuidValidate<ConcreteDocument, Uuid> | null | undefined,
   options?: FromUuidSyncOptions,
+  // TODO(LukeAbby): `AnyObject` is actually a stand in for a compendium index entry which should be typed.
 ): (__UnsetDocument extends ConcreteDocument ? FromUuid<Uuid> : ConcreteDocument) | AnyObject | null;
 
 declare const __Unset: unique symbol;
@@ -88,15 +89,9 @@ type FromUuid<Uuid extends string> = Uuid extends `${string}.${string}.${infer R
     ? Document.ImplementationFor<DocumentType>
     : InvalidUuid;
 
-// TODO(LukeAbby): The usage of `Document.Type` when it's unset will not be necessary once `Document.Any` is more type safe.
-type FromUuidValidate<
-  ConcreteDocument extends Document.Any,
-  Uuid extends string,
-> = __UnsetDocument extends ConcreteDocument
-  ? MustBeValidUuid<Uuid, Document.Type>
-  : string extends Uuid
-    ? string
-    : MustBeValidUuid<Uuid, ConcreteDocument["documentName"]>;
+type FromUuidValidate<ConcreteDocument extends Document.Any, Uuid extends string> = string extends Uuid
+  ? string
+  : MustBeValidUuid<Uuid, ConcreteDocument["documentName"]>;
 
 /**
  * Return a reference to the Document class implementation which is configured for use.

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

@@ -7,7 +7,7 @@ type DataSchema = fields.DataSchema;
 
 declare const DynamicClass: new <_Computed extends object>(...args: never) => _Computed;
 
-// @ts-expect-error - This is a workaround to allow for dynamic top level properties in a class.
+// @ts-expect-error This is a workaround to allow for dynamic top level properties in a class.
 declare class _InternalDataModel<
   out Schema extends DataSchema,
   // Do not inline. Being a type parameter is an important part of the circumvention of TypeScript's detection of dynamic classes.

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

@@ -1126,14 +1126,6 @@ declare namespace Document {
       type Complete<T extends Any> = T extends Document.Any ? T : never;
     }
 
-    // Note(LukeAbby): `Configured` is not checked for validity. This means that it's easy to
-    // accidently misconfigure without warning. However it helps stymy some circularities this way.
-    // This is also why `LazyDocument` takes a callback.
-    // See: https://gist.github.com/LukeAbby/a7892327633587ba89e760b599572322
-    type OfType<Configured, LazyDocument extends () => unknown> = "document" extends keyof Configured
-      ? Configured["document"]
-      : ReturnType<LazyDocument>;
-
     type ModelMap<Name extends Document.WithSubTypes> = _ModelMap<
       Name,
       // `{}` is used to avoid `keyof never` issues.
@@ -1206,7 +1198,7 @@ declare namespace Document {
       }
     >;
 
-    // @ts-expect-error - This pattern is inherently an error.
+    // @ts-expect-error This pattern is inherently an error.
     interface Invalid<D extends Document.Any> extends _Invalid, D {}
 
     /** @internal */

package/src/foundry/common/abstract/type-data.d.mts

@@ -31,7 +31,7 @@ interface _InternalTypeDataModelInterface extends DataModel.AnyConstructor {
 // is used instead. it doesn't work.
 //
 // See: https://gist.github.com/LukeAbby/b9fd57eeba778a25297721e88b3e6bdd
-// @ts-expect-error - This pattern is inherently an error.
+// @ts-expect-error This pattern is inherently an error.
 interface DataModelOverride<Schema extends DataSchema, Parent extends Document.Any, _ComputedInstance extends object>
   extends _ComputedInstance,
     DataModel<Schema, Parent> {}

package/src/utils/index.d.mts

@@ -682,7 +682,7 @@ interface _MergeComplexObject<T extends object, U extends object> extends _Overr
  */
 export type Override<T extends object, U extends object> = T extends unknown ? _Override<T, U> : never;
 
-// @ts-expect-error - This pattern is inherently an error.
+// @ts-expect-error This pattern is inherently an error.
 interface _Override<T extends object, U extends object> extends U, T {}
 
 /**
@@ -1317,7 +1317,7 @@ type _DeepReadonly<T> = T extends object ? DeepReadonly<T> : T;
 
 interface DeepReadonlyComplex<T extends object> extends _DeepReadonlyComplex<T> {}
 
-// @ts-expect-error - This pattern is intrinsically an error.
+// @ts-expect-error This pattern is intrinsically an error.
 // Note(LukeAbby): The two levels here, `DeepReadonlyComplex` and `_DeepReadonlyComplex`, could just be one.
 // However it gives a better type display as two levels.
 interface _DeepReadonlyComplex<T extends object, R extends object = { readonly [K in keyof T]: _DeepReadonly<T[K]> }>