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

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

@@ -1,6 +1,5 @@
-import type { DeepPartial, InexactPartial } from "../../../../types/utils.d.mts";
+import type { DeepPartial, InexactPartial } from "fvtt-types/utils";
 import type Document from "../../../common/abstract/document.d.mts";
-import type { DocumentDatabaseOperations } from "../../../common/abstract/document.d.mts";
 import type BaseActor from "../../../common/documents/actor.d.mts";
 
 declare global {
@@ -10,7 +9,7 @@ declare global {
     type ConfiguredClass = Document.ConfiguredClassForName<"Actor">;
     type ConfiguredInstance = Document.ConfiguredInstanceForName<"Actor">;
 
-    interface DatabaseOperations extends DocumentDatabaseOperations<Actor> {}
+    interface DatabaseOperations extends Document.Database.Operations<Actor> {}
 
     type ItemTypes = {
       [K in Game.Model.TypeNames<"Item">]: Array<
@@ -19,11 +18,7 @@ declare global {
           type: K;
         } & (DataModelConfig extends { Item: { readonly [_ in K]?: infer SystemData } }
             ? {
-                // For backwards compatability both instances and classes are supported for the time being.
-                // Only constructors are valid however.
-                system: SystemData extends abstract new (arg0: never, ...args: never[]) => infer Instance
-                  ? Instance
-                  : SystemData;
+                system: SystemData;
               }
             : // eslint-disable-next-line @typescript-eslint/no-empty-object-type
               {})
@@ -84,8 +79,7 @@ declare global {
   class Actor extends ClientDocumentMixin(foundry.documents.BaseActor) {
     static override metadata: Actor.Metadata;
 
-    // NOTE(LukeAbby): Helps stymy circularity.
-    // get documentName(): "Actor";
+    static get implementation(): Actor.ConfiguredClass;
 
     protected override _configure(options?: { pack?: string | null }): void;
 

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

@@ -1,12 +1,11 @@
-import type { FolderDocumentTypes } from "../../../../types/helperTypes.d.mts";
-import type { InexactPartial } from "../../../../types/utils.d.mts";
-// eslint-disable-next-line import/no-named-as-default
+import type { FolderDocumentTypes, InexactPartial, FixedInstanceType } from "fvtt-types/utils";
 import type DataModel from "../../../common/abstract/data.d.mts";
-import type { fields } from "../../../common/data/module.d.mts";
-import type { DocumentDatabaseOperations } from "../../../common/abstract/document.d.mts";
+import type { fields } from "../../../common/data/_module.d.mts";
 import type Document from "../../../common/abstract/document.d.mts";
 import type BaseAdventure from "../../../common/documents/adventure.d.mts";
 
+type DataSchema = foundry.data.fields.DataSchema;
+
 declare global {
   namespace Adventure {
     type Metadata = Document.MetadataFor<Adventure>;
@@ -14,7 +13,7 @@ declare global {
     type ConfiguredClass = Document.ConfiguredClassForName<"Adventure">;
     type ConfiguredInstance = Document.ConfiguredInstanceForName<"Adventure">;
 
-    interface DatabaseOperations extends DocumentDatabaseOperations<Adventure> {}
+    interface DatabaseOperations extends Document.Database.Operations<Adventure> {}
 
     // Helpful aliases
     type ConstructorData = BaseAdventure.ConstructorData;
@@ -45,12 +44,14 @@ declare global {
   class Adventure extends ClientDocumentMixin(foundry.documents.BaseAdventure) {
     static override metadata: Adventure.Metadata;
 
+    static get implementation(): Adventure.ConfiguredClass;
+
     static fromSource<Schema extends DataSchema>(
       source: fields.SchemaField.InnerAssignmentType<Schema>,
       {
         strict,
         ...context
-      }?: DataModel.ConstructorOptions & {
+      }?: DataModel.DataValidationOptions & {
         /**
          * Models created from trusted source data are validated non-strictly
          * @defaultValue `false`
@@ -99,7 +100,7 @@ type DocumentDataRecord = {
 };
 
 type DocumentResult = {
-  [K in AdventureDocumentTypes]?: InstanceType<Document.ConfiguredClassForName<K>>[];
+  [K in AdventureDocumentTypes]?: FixedInstanceType<Document.ConfiguredClassForName<K>>[];
 };
 
 type AdventureDocumentTypes = Exclude<FolderDocumentTypes, "Adventure"> | "Folder";

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

@@ -1,5 +1,4 @@
 import type Document from "../../../common/abstract/document.d.mts";
-import type { DocumentDatabaseOperations } from "../../../common/abstract/document.d.mts";
 import type BaseAmbientLight from "../../../common/documents/ambient-light.d.mts";
 
 declare global {
@@ -11,7 +10,7 @@ declare global {
 
     /* eslint-disable @typescript-eslint/no-empty-object-type */
     interface DatabaseOperations
-      extends DocumentDatabaseOperations<AmbientLightDocument, {}, { animate: boolean }, {}> {}
+      extends Document.Database.Operations<AmbientLightDocument, {}, { animate: boolean }, {}> {}
     /* eslint-enable @typescript-eslint/no-empty-object-type */
 
     // Helpful aliases
@@ -30,6 +29,8 @@ declare global {
   class AmbientLightDocument extends CanvasDocumentMixin(foundry.documents.BaseAmbientLight) {
     static override metadata: AmbientLightDocument.Metadata;
 
+    static get implementation(): AmbientLightDocument.ConfiguredClass;
+
     /**
      * @privateRemarks _onUpdate is overridden but with no signature changes.
      * For type simplicity it is left off. These methods historically have been the source of a large amount of computation from tsc.

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

@@ -1,5 +1,4 @@
 import type Document from "../../../common/abstract/document.d.mts";
-import type { DocumentDatabaseOperations } from "../../../common/abstract/document.d.mts";
 import type BaseAmbientSound from "../../../common/documents/ambient-sound.d.mts";
 
 declare global {
@@ -9,7 +8,7 @@ declare global {
     type ConfiguredClass = Document.ConfiguredClassForName<"AmbientSound">;
     type ConfiguredInstance = Document.ConfiguredInstanceForName<"AmbientSound">;
 
-    interface DatabaseOperations extends DocumentDatabaseOperations<AmbientSoundDocument> {}
+    interface DatabaseOperations extends Document.Database.Operations<AmbientSoundDocument> {}
 
     // Helpful aliases
     type ConstructorData = BaseAmbientSound.ConstructorData;
@@ -26,5 +25,7 @@ declare global {
    */
   class AmbientSoundDocument extends CanvasDocumentMixin(foundry.documents.BaseAmbientSound) {
     static override metadata: AmbientSoundDocument.Metadata;
+
+    static get implementation(): AmbientSoundDocument.ConfiguredClass;
   }
 }

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

@@ -1,6 +1,5 @@
-import type { DeepPartial, InexactPartial } from "../../../../types/utils.d.mts";
+import type { DeepPartial, InexactPartial } from "fvtt-types/utils";
 import type Document from "../../../common/abstract/document.d.mts";
-import type { DocumentDatabaseOperations } from "../../../common/abstract/document.d.mts";
 import type { CardFaceData } from "../../../common/documents/_types.d.mts";
 import type BaseCard from "../../../common/documents/card.d.mts";
 
@@ -11,7 +10,7 @@ declare global {
     type ConfiguredClass = Document.ConfiguredClassForName<"Card">;
     type ConfiguredInstance = Document.ConfiguredInstanceForName<"Card">;
 
-    interface DatabaseOperations extends DocumentDatabaseOperations<Card> {}
+    interface DatabaseOperations extends Document.Database.Operations<Card> {}
 
     // Helpful aliases
     type TypeNames = BaseCard.TypeNames;
@@ -29,6 +28,8 @@ declare global {
   class Card extends ClientDocumentMixin(foundry.documents.BaseCard) {
     static override metadata: Card.Metadata;
 
+    static get implementation(): Card.ConfiguredClass;
+
     /**
      * The current card face
      */

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

@@ -1,7 +1,5 @@
-import type { DatabaseOperationsFor } from "../../../../types/helperTypes.d.mts";
-import type { DeepPartial, InexactPartial } from "../../../../types/utils.d.mts";
-import type { fields } from "../../../common/data/module.d.mts";
-import type { DocumentDatabaseOperations } from "../../../common/abstract/document.d.mts";
+import type { DeepPartial, InexactPartial, FixedInstanceType } from "fvtt-types/utils";
+import type { fields } from "../../../common/data/_module.d.mts";
 import type Document from "../../../common/abstract/document.d.mts";
 import type BaseCards from "../../../common/documents/cards.d.mts";
 
@@ -12,7 +10,7 @@ declare global {
     type ConfiguredClass = Document.ConfiguredClassForName<"Cards">;
     type ConfiguredInstance = Document.ConfiguredInstanceForName<"Cards">;
 
-    interface DatabaseOperations extends DocumentDatabaseOperations<Cards> {}
+    interface DatabaseOperations extends Document.Database.Operations<Cards> {}
 
     // Helpful aliases
     type TypeNames = BaseCards.TypeNames;
@@ -153,6 +151,8 @@ declare global {
   class Cards extends ClientDocumentMixin(foundry.documents.BaseCards) {
     static override metadata: Cards.Metadata;
 
+    static get implementation(): Cards.ConfiguredClass;
+
     /**
      * Provide a thumbnail image path used to represent this document.
      */
@@ -181,9 +181,11 @@ declare global {
     static createDocuments<T extends Document.AnyConstructor, Temporary extends boolean | undefined>(
       this: T,
       data: Array<
-        fields.SchemaField.AssignmentType<InstanceType<NoInfer<T>>["schema"]["fields"]> & Record<string, unknown>
+        fields.SchemaField.AssignmentType<FixedInstanceType<NoInfer<T>>["schema"]["fields"]> & Record<string, unknown>
       >,
-      operation?: InexactPartial<Omit<DatabaseOperationsFor<NoInfer<T>["metadata"]["name"], "create">, "data">> & {
+      operation?: InexactPartial<
+        Omit<Document.Database.OperationOf<NoInfer<T>["metadata"]["name"], "create">, "data">
+      > & {
         temporary?: Temporary;
       },
     ): Promise<Document.ToStoredIf<T, Temporary>[] | undefined>;
@@ -238,15 +240,6 @@ declare global {
      */
     shuffle(options?: InexactPartial<Cards.ShuffleOptions>): Promise<Cards.ConfiguredInstance>;
 
-    /**
-     * Reset the Cards stack, retrieving all original cards from other stacks where they may have been drawn if this is a
-     * deck, otherwise returning all the cards in this stack to the decks where they originated.
-     * @param options - Options which modify the reset operation
-     *                  (default: `{}`)
-     * @returns The Cards document after the reset operation has completed
-     */
-    reset(options?: InexactPartial<Cards.ResetOptions>): Promise<Cards.ConfiguredInstance>;
-
     /**
      * Perform a reset operation for a deck, retrieving all original cards from other stacks where they may have been
      * drawn.
@@ -339,14 +332,14 @@ declare global {
      */
     resetDialog(): Promise<Cards.ConfiguredInstance | false | null>;
 
-    override deleteDialog(options?: Partial<DialogOptions>): Promise<this | false | null | undefined>;
+    override deleteDialog(options?: Partial<Dialog.Options>): Promise<this | false | null | undefined>;
 
     static override createDialog<T extends Document.AnyConstructor>(
       this: T,
       data?: DeepPartial<Document.ConstructorDataFor<NoInfer<T>> & Record<string, unknown>>,
-      context?: Pick<DatabaseOperationsFor<Cards["documentName"], "create">, "parent" | "pack"> &
+      context?: Pick<Document.Database.OperationOf<Cards["documentName"], "create">, "parent" | "pack"> &
         InexactPartial<
-          DialogOptions & {
+          Dialog.Options & {
             /** A restriction the selectable sub-types of the Dialog. */
             types: string[];
           }

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

@@ -1,6 +1,5 @@
-import type { InexactPartial } from "../../../../types/utils.d.mts";
+import type { InexactPartial } from "fvtt-types/utils";
 import type Document from "../../../common/abstract/document.d.mts";
-import type { DocumentDatabaseOperations } from "../../../common/abstract/document.d.mts";
 import type BaseChatMessage from "../../../common/documents/chat-message.d.mts";
 
 declare global {
@@ -12,7 +11,7 @@ declare global {
 
     /* eslint-disable @typescript-eslint/no-empty-object-type */
     interface DatabaseOperations
-      extends DocumentDatabaseOperations<
+      extends Document.Database.Operations<
         ChatMessage,
         { rollMode: foundry.CONST.DICE_ROLL_MODES; chatBubble: boolean },
         {},
@@ -63,6 +62,8 @@ declare global {
   class ChatMessage extends ClientDocumentMixin(foundry.documents.BaseChatMessage) {
     static override metadata: ChatMessage.Metadata;
 
+    static get implementation(): ChatMessage.ConfiguredClass;
+
     /**
      * Is the display of dice rolls in this message collapsed (false) or expanded (true)
      * @defaultValue `false`

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

@@ -1,6 +1,5 @@
-import type { InexactPartial } from "../../../../types/utils.d.mts";
+import type { InexactPartial } from "fvtt-types/utils";
 import type Document from "../../../common/abstract/document.d.mts";
-import type { DocumentDatabaseOperations } from "../../../common/abstract/document.d.mts";
 import type BaseCombat from "../../../common/documents/combat.d.mts";
 
 declare global {
@@ -12,7 +11,7 @@ declare global {
 
     /* eslint-disable @typescript-eslint/no-empty-object-type */
     interface DatabaseOperations
-      extends DocumentDatabaseOperations<
+      extends Document.Database.Operations<
         Combat,
         {},
         { direction: -1 | 1; worldTime: { delta: number }; turnEvents: boolean },
@@ -67,6 +66,8 @@ declare global {
   class Combat extends ClientDocumentMixin(foundry.documents.BaseCombat) {
     static override metadata: Combat.Metadata;
 
+    static get implementation(): Combat.ConfiguredClass;
+
     /**
      * @param data - Initial data provided to construct the Combat document
      */
@@ -251,7 +252,7 @@ declare global {
       parent: ClientDocument,
       collection: string,
       documents: ClientDocument[],
-      ids: string,
+      ids: string[],
       options: Document.OnDeleteOptions<"Combatant"> & InexactPartial<{ combatTurn: number; turnEvents: boolean }>,
       userId: string,
     ): void;

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

@@ -1,6 +1,5 @@
-import type { ValueOf } from "../../../../types/utils.d.mts";
+import type { ValueOf } from "fvtt-types/utils";
 import type Document from "../../../common/abstract/document.d.mts";
-import type { DocumentDatabaseOperations } from "../../../common/abstract/document.d.mts";
 import type BaseCombatant from "../../../common/documents/combatant.d.mts";
 
 declare global {
@@ -11,7 +10,7 @@ declare global {
     type ConfiguredInstance = Document.ConfiguredInstanceForName<"Combatant">;
 
     interface DatabaseOperations
-      extends DocumentDatabaseOperations<
+      extends Document.Database.Operations<
         Combatant,
         { combatTurn: number },
         { combatTurn: number },
@@ -35,6 +34,8 @@ declare global {
   class Combatant extends ClientDocumentMixin(foundry.documents.BaseCombatant) {
     static override metadata: Combatant.Metadata;
 
+    static get implementation(): Combatant.ConfiguredClass;
+
     /**
      * The token video source image (if any)
      */
@@ -73,7 +74,7 @@ declare global {
     get isDefeated(): boolean;
 
     override testUserPermission(
-      user: foundry.documents.BaseUser,
+      user: User,
       permission: keyof typeof foundry.CONST.DOCUMENT_OWNERSHIP_LEVELS | foundry.CONST.DOCUMENT_OWNERSHIP_LEVELS,
       { exact }?: { exact?: boolean },
     ): boolean;

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

@@ -1,5 +1,4 @@
 import type Document from "../../../common/abstract/document.d.mts";
-import type { DocumentDatabaseOperations } from "../../../common/abstract/document.d.mts";
 import type BaseDrawing from "../../../common/documents/drawing.d.mts";
 
 declare global {
@@ -9,7 +8,7 @@ declare global {
     type ConfiguredClass = Document.ConfiguredClassForName<"Drawing">;
     type ConfiguredInstance = Document.ConfiguredInstanceForName<"Drawing">;
 
-    interface DatabaseOperations extends DocumentDatabaseOperations<DrawingDocument> {}
+    interface DatabaseOperations extends Document.Database.Operations<DrawingDocument> {}
 
     // Helpful aliases
     type ConstructorData = BaseDrawing.ConstructorData;
@@ -27,6 +26,8 @@ declare global {
   class DrawingDocument extends CanvasDocumentMixin(foundry.documents.BaseDrawing) {
     static override metadata: DrawingDocument.Metadata;
 
+    static get implementation(): DrawingDocument.ConfiguredClass;
+
     /**
      * Is the current User the author of this drawing?
      */

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

@@ -1,7 +1,6 @@
-import type { InexactPartial } from "../../../../types/utils.d.mts";
+import type { InexactPartial } from "fvtt-types/utils";
 import type { DatabaseGetOperation } from "../../../common/abstract/_types.d.mts";
 import type Document from "../../../common/abstract/document.d.mts";
-import type { DocumentDatabaseOperations } from "../../../common/abstract/document.d.mts";
 import type BaseFogExploration from "../../../common/documents/fog-exploration.d.mts";
 
 declare global {
@@ -12,7 +11,7 @@ declare global {
     type ConfiguredInstance = Document.ConfiguredInstanceForName<"FogExploration">;
 
     interface DatabaseOperations
-      extends DocumentDatabaseOperations<
+      extends Document.Database.Operations<
         FogExploration,
         { loadFog: boolean },
         { loadFog: boolean },
@@ -32,6 +31,8 @@ declare global {
   class FogExploration extends ClientDocumentMixin(foundry.documents.BaseFogExploration) {
     static override metadata: FogExploration.Metadata;
 
+    static get implementation(): FogExploration.ConfiguredClass;
+
     /**
      * Obtain the fog of war exploration progress for a specific Scene and User.
      * @param query      - Parameters for which FogExploration document is retrieved
@@ -59,4 +60,13 @@ declare global {
      * For type simplicity they are left off. These methods historically have been the source of a large amount of computation from tsc.
      */
   }
+
+  namespace FogExploration {
+    type Any = AnyFogExploration;
+    type AnyConstructor = typeof AnyFogExploration;
+  }
+}
+
+declare abstract class AnyFogExploration extends FogExploration {
+  constructor(arg0: never, ...args: never[]);
 }

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

@@ -1,6 +1,5 @@
-import type { DeepPartial, InexactPartial } from "../../../../types/utils.d.mts";
+import type { DeepPartial, InexactPartial } from "fvtt-types/utils";
 import type Document from "../../../common/abstract/document.d.mts";
-import type { DocumentDatabaseOperations } from "../../../common/abstract/document.d.mts";
 import type BaseFolder from "../../../common/documents/folder.d.mts";
 
 declare global {
@@ -11,15 +10,20 @@ declare global {
     type ConfiguredInstance = Document.ConfiguredInstanceForName<"Folder">;
     type Stored = Document.Stored<ConfiguredInstance>;
 
-    interface DatabaseOperations extends DocumentDatabaseOperations<Folder> {}
+    interface DatabaseOperations extends Document.Database.Operations<Folder> {}
 
     // Helpful aliases
-    // type TypeNames = BaseFolder.TypeNames;  // TODO: Un-comment after subtype updates are merged
+    type TypeNames = BaseFolder.TypeNames;
     type ConstructorData = BaseFolder.ConstructorData;
     type UpdateData = BaseFolder.UpdateData;
     type Schema = BaseFolder.Schema;
     type Source = BaseFolder.Source;
 
+    /**
+     * Actual document types that go in folders
+     */
+    type DocumentType = Exclude<foundry.CONST.FOLDER_DOCUMENT_TYPES, "Compendium">;
+
     interface ExportToCompendiumOptions {
       /** Update existing entries in the Compendium pack, matching by name */
       updateByName?: boolean | undefined;
@@ -32,9 +36,13 @@ declare global {
    * @see {@link Folders}            The world-level collection of Folder documents
    * @see {@link FolderConfig}       The Folder configuration application
    */
-  class Folder extends ClientDocumentMixin(foundry.documents.BaseFolder) {
+  class Folder<Type extends BaseFolder.TypeNames = BaseFolder.TypeNames> extends ClientDocumentMixin(
+    foundry.documents.BaseFolder,
+  )<Type> {
     static override metadata: Folder.Metadata;
 
+    static get implementation(): Folder.ConfiguredClass;
+
     // TODO(LukeAbby): This random override is a symptom of a greater issue.
     // Namely that `ClientDocumentMixin` incidentally erases some properties and breaks configuration.
     documentName: "Folder";
@@ -63,14 +71,16 @@ declare global {
      * unless it's a Folder inside a Compendium pack, in which case it's the array
      * of objects inside the index of the pack that are contained in this Folder.
      */
-    get contents(): this["type"] extends Document.Type ? Document.ConfiguredInstanceForName<this["type"]>[] : never;
+    // TODO: Handle compendium. This requires the index to be configured.
+    get contents(): Document.ConfiguredInstanceForName<Extract<Type, Document.Type>>[];
 
     set contents(value);
 
     /**
      * The reference to the Document type which is contained within this Folder.
      */
-    get documentClass(): this["type"] extends Document.Type ? Document.ConfiguredClassForName<this["type"]> : never;
+    // TODO: Compendium Pack index
+    get documentClass(): Document.ConfiguredClassForName<Extract<Type, Document.Type>>;
 
     /**
      * The reference to the WorldCollection instance which provides Documents to this Folder,
@@ -120,8 +130,11 @@ declare global {
      * @param options - Additional options passed to the Dialog.prompt method
      *                  (default: `{}`)
      * @returns A Promise which resolves or rejects once the dialog has been submitted or closed
+     *
+     * @remarks - Foundry documents `pack` as just being a `string` but it is unused and Foundry itself
+     * calls `exportDialog` with `null`.
      */
-    exportDialog(pack: string, options?: DialogOptions): Promise<void>;
+    exportDialog(pack: string | null, options?: Dialog.Options): Promise<void>;
 
     /**
      * Get the Folder documents which are sub-folders of the current folder, either direct children or recursively.

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

@@ -20,6 +20,8 @@ import "./measured-template.d.mts";
 import "./note.d.mts";
 import "./playlist-sound.d.mts";
 import "./playlist.d.mts";
+import "./region-behavior.d.mts";
+import "./region.d.mts";
 import "./scene.d.mts";
 import "./setting.d.mts";
 import "./table-result.d.mts";

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

@@ -1,5 +1,4 @@
 import type Document from "../../../common/abstract/document.d.mts";
-import type { DocumentDatabaseOperations } from "../../../common/abstract/document.d.mts";
 import type BaseItem from "../../../common/documents/item.d.mts";
 
 declare global {
@@ -9,7 +8,7 @@ declare global {
     type ConfiguredClass = Document.ConfiguredClassForName<"Item">;
     type ConfiguredInstance = Document.ConfiguredInstanceForName<"Item">;
 
-    interface DatabaseOperations extends DocumentDatabaseOperations<Item> {}
+    interface DatabaseOperations extends Document.Database.Operations<Item> {}
 
     // Helpful aliases
     type TypeNames = BaseItem.TypeNames;
@@ -30,8 +29,13 @@ declare global {
    * @param context - The document context, see {@link foundry.abstract.Document}
    */
   class Item extends ClientDocumentMixin(foundry.documents.BaseItem) {
+    // Note(LukeAbby): Temporary fix, look into solving this at the root of the issue.
+    documentName: "Item";
+
     static override metadata: Item.Metadata;
 
+    static get implementation(): Item.ConfiguredClass;
+
     /**
      * A convenience alias of Item#parent which is more semantically intuitive
      */

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

@@ -1,6 +1,5 @@
-import type { InexactPartial } from "../../../../types/utils.d.mts";
+import type { InexactPartial, LazyUnknown } from "fvtt-types/utils";
 import type Document from "../../../common/abstract/document.d.mts";
-import type { DocumentDatabaseOperations } from "../../../common/abstract/document.d.mts";
 import type BaseJournalEntryPage from "../../../common/documents/journal-entry-page.d.mts";
 
 declare global {
@@ -10,7 +9,7 @@ declare global {
     type ConfiguredClass = Document.ConfiguredClassForName<"JournalEntryPage">;
     type ConfiguredInstance = Document.ConfiguredInstanceForName<"JournalEntryPage">;
 
-    interface DatabaseOperations extends DocumentDatabaseOperations<JournalEntryPage> {}
+    interface DatabaseOperations extends Document.Database.Operations<JournalEntryPage> {}
 
     // Helpful aliases
     type TypeNames = BaseJournalEntryPage.TypeNames;
@@ -48,6 +47,8 @@ declare global {
   class JournalEntryPage extends ClientDocumentMixin(foundry.documents.BaseJournalEntryPage) {
     static override metadata: JournalEntryPage.Metadata;
 
+    static get implementation(): JournalEntryPage.ConfiguredClass;
+
     /**
      * The cached table of contents for this JournalEntryPage.
      */
@@ -223,7 +224,7 @@ declare global {
     protected _embedImagePage(
       config: TextEditor.DocumentHTMLEmbedConfig & {
         /** Alt text for the image, otherwise the caption will be used. **/
-        alt?: string | unknown;
+        alt?: string | LazyUnknown;
       },
       options?: InexactPartial<TextEditor.EnrichmentOptions>,
     ): Promise<HTMLElement | HTMLCollection | null>;

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

@@ -1,5 +1,4 @@
-import type { BaseJournalEntry, BaseUser } from "../../../common/documents/_module.d.mts";
-import type { DocumentDatabaseOperations } from "../../../common/abstract/document.d.mts";
+import type { BaseJournalEntry } from "../../../common/documents/_module.d.mts";
 import type Document from "../../../common/abstract/document.d.mts";
 
 declare global {
@@ -9,7 +8,7 @@ declare global {
     type ConfiguredClass = Document.ConfiguredClassForName<"JournalEntry">;
     type ConfiguredInstance = Document.ConfiguredInstanceForName<"JournalEntry">;
 
-    interface DatabaseOperations extends DocumentDatabaseOperations<JournalEntry> {}
+    interface DatabaseOperations extends Document.Database.Operations<JournalEntry> {}
 
     // Helpful aliases
     type ConstructorData = BaseJournalEntry.ConstructorData;
@@ -27,12 +26,14 @@ declare global {
   class JournalEntry extends ClientDocumentMixin(foundry.documents.BaseJournalEntry) {
     static override metadata: JournalEntry.Metadata;
 
+    static get implementation(): JournalEntry.ConfiguredClass;
+
     /**
      * A boolean indicator for whether or not the JournalEntry is visible to the current user in the directory sidebar
      */
     get visible(): boolean;
 
-    override getUserLevel(user: BaseUser): foundry.CONST.DOCUMENT_OWNERSHIP_LEVELS | null;
+    override getUserLevel(user?: User): foundry.CONST.DOCUMENT_OWNERSHIP_LEVELS | null;
 
     /**
      * Return a reference to the Note instance for this Journal Entry in the current Scene, if any.

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

@@ -1,10 +1,7 @@
-import type { InexactPartial } from "../../../../types/utils.d.mts";
+import type { InexactPartial } from "fvtt-types/utils";
 import type Document from "../../../common/abstract/document.d.mts";
-import type { DocumentDatabaseOperations } from "../../../common/abstract/document.d.mts";
 import type BaseMacro from "../../../common/documents/macro.d.mts";
 
-type RegionEvent = unknown;
-
 declare global {
   namespace Macro {
     type Metadata = Document.MetadataFor<Macro>;
@@ -12,7 +9,7 @@ declare global {
     type ConfiguredClass = Document.ConfiguredClassForName<"Macro">;
     type ConfiguredInstance = Document.ConfiguredInstanceForName<"Macro">;
 
-    interface DatabaseOperations extends DocumentDatabaseOperations<Macro> {}
+    interface DatabaseOperations extends Document.Database.Operations<Macro> {}
 
     // Helpful aliases
     type TypeNames = BaseMacro.TypeNames;
@@ -29,7 +26,7 @@ declare global {
       token: Token;
 
       /** An optional event passed to the executed macro. */
-      event: Event | RegionEvent;
+      event: Event | RegionDocument.RegionEvent;
 
       /**
        * @remarks Additional arguments passed as part of the scope
@@ -49,6 +46,8 @@ declare global {
   class Macro extends ClientDocumentMixin(foundry.documents.BaseMacro) {
     static override metadata: Macro.Metadata;
 
+    static get implementation(): Macro.ConfiguredClass;
+
     /**
      * Is the current User the author of this macro?
      */

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

@@ -1,5 +1,4 @@
 import type Document from "../../../common/abstract/document.d.mts";
-import type { DocumentDatabaseOperations } from "../../../common/abstract/document.d.mts";
 import type BaseMeasuredTemplate from "../../../common/documents/measured-template.d.mts";
 
 declare global {
@@ -9,7 +8,7 @@ declare global {
     type ConfiguredClass = Document.ConfiguredClassForName<"MeasuredTemplate">;
     type ConfiguredInstance = Document.ConfiguredInstanceForName<"MeasuredTemplate">;
 
-    interface DatabaseOperations extends DocumentDatabaseOperations<MeasuredTemplateDocument> {}
+    interface DatabaseOperations extends Document.Database.Operations<MeasuredTemplateDocument> {}
 
     // Helpful aliases
     type ConstructorData = BaseMeasuredTemplate.ConstructorData;
@@ -27,6 +26,8 @@ declare global {
   class MeasuredTemplateDocument extends CanvasDocumentMixin(foundry.documents.BaseMeasuredTemplate) {
     static override metadata: MeasuredTemplateDocument.Metadata;
 
+    static get implementation(): MeasuredTemplateDocument.ConfiguredClass;
+
     /**
      * Rotation is an alias for direction
      */