@league-of-foundry-developers/foundry-vtt-types 13.340.1 → 13.345.1

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

@@ -1,9 +1,7 @@
 import type {
-  ConfigurationFailure,
   ConfiguredDocumentClass,
   ConfiguredDocumentInstance,
   ConfiguredMetadata,
-  CreateData,
 } from "../../../types/documentConfiguration.d.mts";
 import type {
   GetKey,
@@ -17,15 +15,17 @@ import type {
   RemoveIndexSignatures,
   FixedInstanceType,
   NullishProps,
-  AllKeysOf,
   DiscriminatedUnion,
-  SimpleMerge,
   PickValue,
   Identity,
   Brand,
-} from "fvtt-types/utils";
+  AnyMutableObject,
+  MaybePromise,
+  Override,
+} from "#utils";
 import type * as CONST from "../constants.mts";
 import type {
+  DataSchema,
   DataField,
   DocumentStatsField,
   EmbeddedCollectionField,
@@ -33,12 +33,12 @@ import type {
   SchemaField,
   TypeDataField,
 } from "../data/fields.d.mts";
-import type { fields } from "../data/_module.d.mts";
 import type { LogCompatibilityWarningOptions } from "../utils/logging.mts";
 import type {
   DatabaseAction,
   DatabaseCreateOperation,
   DatabaseDeleteOperation,
+  DatabaseGetOperation,
   DatabaseUpdateOperation,
   DocumentSocketRequest,
 } from "./_types.d.mts";
@@ -46,10 +46,14 @@ import type DataModel from "./data.mts";
 import type DocumentSocketResponse from "./socket.d.mts";
 import type EmbeddedCollection from "./embedded-collection.d.mts";
 
-type DataSchema = foundry.data.fields.DataSchema;
-
 export default Document;
 
+type InexactPartialExcept<T extends object, RequiredKey> = {
+  [K in keyof T as Extract<K, RequiredKey>]: T[K];
+} & {
+  [K in keyof T as Exclude<K, RequiredKey>]?: T[K] | undefined;
+};
+
 type _ClassMustBeAssignableToInternal = MustConform<typeof Document, Document.Internal.Constructor>;
 type _InstanceMustBeAssignableToInternal = MustConform<Document.Any, Document.Internal.Instance.Any>;
 
@@ -57,7 +61,8 @@ type _InstanceMustBeAssignableToInternal = MustConform<Document.Any, Document.In
 // `name?: string` etc. were to be put in `Document` directly they'd actually override the schema.
 // Therefore this workaround is used to force `DataModel` to override the properties.
 declare const _InternalDocument: (new (...args: any[]) => {
-  name?: string | undefined;
+  // TODO: removing undefined breaks everything, but should be valid to do, investigate
+  name?: string | null | undefined;
 
   // `{}` is used so that `{}` and the actual shape of `system` are merged.
   // eslint-disable-next-line @typescript-eslint/no-empty-object-type
@@ -90,10 +95,8 @@ declare abstract class Document<
 
   override parent: Parent;
 
-  protected override _configure(options?: {
-    pack?: string | null | undefined;
-    parentCollection?: string | null | undefined;
-  }): void;
+  // options: not null (destructured)
+  protected override _configure(options?: Document.ConfigureOptions): void;
 
   /**
    * An immutable reverse-reference to the name of the collection that this Document exists in on its parent, if any.
@@ -113,16 +116,9 @@ declare abstract class Document<
   /**
    * Ensure that all Document classes share the same schema of their base declaration.
    */
-  static get schema(): foundry.data.fields.SchemaField.Any;
+  static get schema(): SchemaField.Any;
 
-  protected _initialize(options?: any): void;
-
-  /**
-   * A mapping of singleton embedded Documents which exist in this model.
-   */
-  readonly singletons: Record<string, Document.AnyChild<this>>;
-
-  protected static override _initializationOrder(): Generator<[string, DataField.Any]>;
+  protected static override _initializationOrder(): Generator<[string, DataField.Any], void, undefined>;
 
   /**
    * Default metadata which applies to each instance of this Document type.
@@ -130,24 +126,31 @@ declare abstract class Document<
    * ```typescript
    * {
    *   name: "Document",
+   *   label: "DOCUMENT.Document"
+   *   coreTypes: [BASE_DOCUMENT_TYPE],
    *   collection: "documents",
+   *   embedded: {},
+   *   hasTypeData: false,
    *   indexed: false,
    *   compendiumIndexFields: [],
-   *   label: "DOCUMENT.Document",
-   *   coreTypes: [],
-   *   embedded: {},
    *   permissions: {
-   *     create: "ASSISTANT",
-   *     update: "ASSISTANT",
-   *     delete: "ASSISTANT"
+   *     view: "LIMITED"       // At least limited permission is required to view the Document
+   *     create: "ASSISTANT",  // Assistants or Gamemasters can create Documents
+   *     update: "ASSISTANT",  // Document owners can update Documents (this includes GM users)
+   *     delete: "ASSISTANT"   // Assistants or Gamemasters can create Documents
    *   },
-   *   preserveOnImport: ["_id", "sort", "ownership"],
+   *   preserveOnImport: ["_id", "sort", "ownership", folder],
    *   schemaVersion: undefined
    * }
    * ```
    */
   static metadata: Document.Metadata.Any;
 
+  /**
+   * @defaultValue `["DOCUMENT"]`
+   */
+  static override LOCALIZATION_PREFIXES: string[];
+
   /**
    * The database backend used to execute operations and handle results
    */
@@ -156,7 +159,7 @@ declare abstract class Document<
   /**
    * Return a reference to the implemented subclass of this base document type.
    */
-  static get implementation(): Document.AnyConstructor;
+  static get implementation(): Document.Internal.Constructor;
 
   /**
    * The base document definition that this document class extends from.
@@ -176,7 +179,7 @@ declare abstract class Document<
   /**
    * The canonical name of this Document type, for example "Actor".
    */
-  static get documentName(): string;
+  static get documentName(): Document.Type;
 
   /**
    * The canonical name of this Document type, for example "Actor".
@@ -201,9 +204,14 @@ declare abstract class Document<
   /**
    * Identify the collection in a parent Document that this Document exists belongs to, if any.
    * @param parentCollection - An explicitly provided parent collection name.
+   * @remarks If passed a value for `parentCollection`, simply returns that value
+   *
+   * Foundry marked `@internal`
    */
   _getParentCollection(parentCollection?: string): string | null;
 
+  _id: string | null;
+
   /**
    * The canonical identifier for this Document
    */
@@ -214,27 +222,43 @@ declare abstract class Document<
    */
   get isEmbedded(): boolean;
 
+  /**
+   * Is this document in a compendium?
+   */
+  get inCompendium(): boolean;
+
   /**
    * A Universally Unique Identifier (uuid) for this Document instance.
    */
   get uuid(): string;
 
   /**
-   * Test whether a given User has a sufficient role in order to create Documents of this type in general.
+   * Test whether a given User has sufficient permissions to create Documents of this type in general. This does not
+   * guarantee that the User is able to create all Documents of this type, as certain document-specific requirements
+   * may also be present.
+   *
+   * Generally speaking, this method is used to verify whether a User should be presented with the option to create
+   * Documents of this type in the UI.
    * @param user - The User being tested
    * @returns Does the User have a sufficient role to create?
    */
-  static canUserCreate(user: User.Internal.Implementation): boolean;
+  static canUserCreate(user: User.Implementation): boolean;
 
   /**
-   * Get the explicit permission level that a specific User has over this Document, a value in CONST.DOCUMENT_OWNERSHIP_LEVELS.
-   * This method returns the value recorded in Document ownership, regardless of the User's role.
+   * Get the explicit permission level that a User has over this Document, a value in {@link CONST.DOCUMENT_OWNERSHIP_LEVELS | `CONST.DOCUMENT_OWNERSHIP_LEVELS`}.
+   * Compendium content ignores the ownership field in favor of User role-based ownership. Otherwise, Documents use
+   * granular per-User ownership definitions and Embedded Documents defer to their parent ownership.
+   *
+   * This method returns the value recorded in Document ownership, regardless of the User's role, for example a
+   * GAMEMASTER user might still return a result of NONE if they are not explicitly denoted as having a level.
+   *
    * To test whether a user has a certain capability over the document, testUserPermission should be used.
-   * @param user - The User being tested
-   *               (default: `game.user`)
+   * @param user - The User being tested (default: `game.user`)
    * @returns A numeric permission level from CONST.DOCUMENT_OWNERSHIP_LEVELS or null
+   *
+   * @privateRemarks Making this just `User.Implementation` causes circularities
    */
-  getUserLevel(user?: User.Internal.Implementation): CONST.DOCUMENT_OWNERSHIP_LEVELS | null;
+  getUserLevel(user?: User.Internal.Implementation | null): CONST.DOCUMENT_OWNERSHIP_LEVELS | null;
 
   /**
    * Test whether a certain User has a requested permission level (or greater) over the Document
@@ -242,11 +266,13 @@ declare abstract class Document<
    * @param permission - The permission level from DOCUMENT_PERMISSION_LEVELS to test
    * @param options    - Additional options involved in the permission test
    * @returns Does the user have this permission level over the Document?
+   *
+   * @privateRemarks Making this just `User.Implementation` causes circularities
    */
   // options: not null (destructured)
   testUserPermission(
     user: User.Internal.Implementation,
-    permission: Document.TestableOwnershipLevel,
+    permission: Document.ActionPermission,
     options?: Document.TestUserPermissionOptions,
   ): boolean;
 
@@ -254,10 +280,12 @@ declare abstract class Document<
    * Test whether a given User has permission to perform some action on this Document
    * @param user   - The User attempting modification
    * @param action - The attempted action
-   * @param data   - Data involved in the attempted action
-   *                 (default: `{}`)
+   * @param data   - Data involved in the attempted action (default: `{}`)
    * @returns Does the User have permission?
+   *
+   * @privateRemarks Making this just `User.Implementation` causes circularities
    */
+  // data: not null (parameter default only)
   canUserModify<Action extends "create" | "update" | "delete">(
     user: User.Internal.Implementation,
     action: Action,
@@ -271,21 +299,22 @@ declare abstract class Document<
    * @param context - Additional context options passed to the create method
    * @returns The cloned Document instance
    */
-  override clone<Save extends boolean = false>(
-    data?: fields.SchemaField.UpdateData<Schema>,
-    context?: Document.CloneContext<Save> & InexactPartial<Document.ConstructionContext<Parent>>,
-  ): Save extends true ? Promise<this> : this;
+  // data: not null (property access), context: not null (destructured)
+  override clone<Save extends boolean | null | undefined = undefined>(
+    data?: SchemaField.UpdateData<Schema>,
+    context?: Document.CloneContext<Save>,
+  ): Document.Clone<this, Save>;
 
   /**
    * For Documents which include game system data, migrate the system data object to conform to its latest data model.
    * The data model is defined by the template.json specification included by the game system.
    * @returns The migrated system data object
+   * @throws If this document type either doesn't have subtypes or it does but the one on this document is a DataModel
    */
   migrateSystemData(): object;
 
-  override toObject<Source extends boolean | undefined>(
-    source?: Source,
-  ): Source extends false ? SchemaField.SourceData<Schema> : Readonly<SchemaField.SourceData<Schema>>;
+  /** @remarks `Document#toObject` calls `this.constructor.shimData()` on the data before returning */
+  override toObject(source?: boolean | null): SchemaField.SourceData<Schema>;
 
   /**
    * Create multiple Documents using provided input data.
@@ -414,7 +443,7 @@ declare abstract class Document<
 
   /**
    * Create a new Document using provided input data, saving it to the database.
-   * @see {@link Document.createDocuments | `Document.createDocuments`}
+   * @see {@linkcode Document.createDocuments}
    * @param data      - Initial data used to create this Document, or a Document instance to persist.
    * @param operation - Parameters of the creation operation
    *                    (default: `{}`)
@@ -443,11 +472,12 @@ declare abstract class Document<
    * returned.
    */
   // Note: This uses `never` because it's unsound to try to call `Document.create` directly.
+  // TODO: This can take an array of data and return an array of documents, in addition to its current typing
   static create(data: never, operation?: never): Promise<Document.Any | undefined>;
 
   /**
    * Update this Document using incremental data, saving it to the database.
-   * @see {@link Document.updateDocuments | `Document.updateDocuments`}
+   * @see {@linkcode Document.updateDocuments}
    * @param data      - Differential update data which modifies the existing values of this document data
    *                    (default: `{}`)
    * @param operation - Parameters of the update operation
@@ -462,7 +492,7 @@ declare abstract class Document<
 
   /**
    * Delete this Document, removing it from the database.
-   * @see {@link Document.deleteDocuments | `Document.deleteDocuments`}
+   * @see {@linkcode Document.deleteDocuments}
    * @param operation - Parameters of the deletion operation
    *                    (default: `{}`)
    * @returns The deleted Document instance
@@ -478,8 +508,16 @@ declare abstract class Document<
    * @param documentId - The Document ID
    * @param operation  - Additional options which customize the request
    * @returns The retrieved Document, or null
+   *
+   * @remarks If the Document is in a compendium (i.e `operation.pack` is provided), returns the index
+   * entry (or `null`), instead of the Document.
+   *
+   * {@link FogExploration.get | `FogExploration.get`} can possibly forward args and return to/from
+   * {@link FogExploration.load | `FogExploration.load`}, which accounts for the `Promise<>` part
+   * of the return; All other documents return `SomeDoc.Implementation | null`
    */
-  static get(documentId: string, operation?: Document.Database.GetOptions): Document.Any | null;
+  // TODO: Type for possible index entry return
+  static get(documentId: string, operation?: Document.Database.GetOptions): MaybePromise<Document.Any | null>;
 
   /**
    * A compatibility method that returns the appropriate name of an embedded collection within this Document.
@@ -526,7 +564,7 @@ declare abstract class Document<
 
   /**
    * Create multiple embedded Document instances within this parent Document using provided input data.
-   * @see {@link Document.createDocuments | `Document.createDocuments`}
+   * @see {@linkcode Document.createDocuments}
    * @param embeddedName - The name of the embedded Document type
    * @param data         - An array of data objects used to create multiple documents
    *                       (default: `[]`)
@@ -545,7 +583,7 @@ declare abstract class Document<
 
   /**
    * Update multiple embedded Document instances within a parent Document using provided differential data.
-   * @see {@link Document.updateDocuments | `Document.updateDocuments`}
+   * @see {@linkcode Document.updateDocuments}
    * @param embeddedName - The name of the embedded Document type
    * @param updates      - An array of differential data objects, each used to update a single Document
    *                       (default: `[]`)
@@ -564,7 +602,7 @@ declare abstract class Document<
 
   /**
    * Delete multiple embedded Document instances within a parent Document using provided string ids.
-   * @see {@link Document.deleteDocuments | `Document.deleteDocuments`}
+   * @see {@linkcode Document.deleteDocuments}
    * @param embeddedName - The name of the embedded Document type
    * @param ids          - An array of string ids for each Document to be deleted
    * @param operation    - Parameters of the database deletion workflow
@@ -580,7 +618,7 @@ declare abstract class Document<
    * @param _parentPath - A parent field path already traversed
    * @remarks Not called within Foundry's client-side code, likely exists for server documents
    */
-  traverseEmbeddedDocuments(_parentPath?: string): Generator<[string, Document.AnyChild<this>]>;
+  traverseEmbeddedDocuments(_parentPath?: string): Generator<[string, Document.AnyChild<this>], void, undefined>;
 
   /**
    * Get the value of a "flag" for this document
@@ -638,7 +676,7 @@ declare abstract class Document<
    * @param options - Additional options which modify the creation request
    * @param userId  - The id of the User requesting the document update
    */
-  protected _onCreate(data: never, options: never, userId: string): void;
+  protected _onCreate(data: never, options: never, userId: string): MaybePromise<void>;
 
   /**
    * Pre-process a creation operation, potentially altering its instructions or input data. Pre-operation events only
@@ -695,7 +733,7 @@ declare abstract class Document<
    * @param options - Additional options which modify the update request
    * @param userId  - The id of the User requesting the document update
    */
-  protected _onUpdate(changed: never, options: never, userId: string): void;
+  protected _onUpdate(changed: never, options: never, userId: string): MaybePromise<void>;
 
   /**
    * Pre-process an update operation, potentially altering its instructions or input data. Pre-operation events only
@@ -751,7 +789,7 @@ declare abstract class Document<
    * @param options - Additional options which modify the deletion request
    * @param userId  - The id of the User requesting the document update
    */
-  protected _onDelete(options: never, userId: string): void;
+  protected _onDelete(options: never, userId: string): MaybePromise<void>;
 
   /**
    * Pre-process a deletion operation, potentially altering its instructions or input data. Pre-operation events only
@@ -793,27 +831,22 @@ declare abstract class Document<
     user: User.Internal.Implementation,
   ): Promise<unknown>;
 
-  /**
-   * Configure whether V10 Document Model migration warnings should be logged for this class.
-   */
-  static LOG_V10_COMPATIBILITY_WARNINGS: boolean;
-
-  /**
-   * @deprecated since v11, will be removed in v13
-   * @remarks "You are accessing `Document.hasSystemData` which is deprecated. Please use `Document.hasTypeData` instead."
-   */
-  static get hasSystemData(): undefined | true;
-
   /**
    * A reusable helper for adding migration shims.
    */
-  protected static _addDataFieldShims(data: AnyObject, shims: AnyObject, options?: Document.DataFieldShimOptions): void;
+  // options: not null (parameter default only in _addDataFieldShim)
+  protected static _addDataFieldShims(
+    data: AnyMutableObject,
+    shims: Record<string, string>,
+    options?: Document.DataFieldShimOptions,
+  ): void;
 
   /**
    * A reusable helper for adding a migration shim
    */
+  // options: not null (parameter default only)
   protected static _addDataFieldShim(
-    data: AnyObject,
+    data: AnyMutableObject,
     oldKey: string,
     newKey: string,
     options?: Document.DataFieldShimOptions,
@@ -826,15 +859,16 @@ declare abstract class Document<
    * @param oldKey - The old field name
    * @param newKey - The new field name
    * @param apply  - An application function, otherwise the old value is applied
-   * @internal
+   * @remarks Foundry marked `@internal`
    */
   protected static _addDataFieldMigration(
-    data: AnyObject,
+    data: AnyMutableObject,
     oldKey: string,
     newKey: string,
-    apply?: (data: AnyObject) => unknown,
+    apply?: (data: AnyMutableObject) => unknown,
   ): unknown;
 
+  // options: not null (destructured where forwarded)
   protected static _logDataFieldMigration(
     oldKey: string,
     newKey: string,
@@ -843,7 +877,7 @@ declare abstract class Document<
 
   /**
    * @deprecated since v12, will be removed in v14
-   * @remarks `"The Document._onCreateDocuments static method is deprecated in favor of Document._onCreateOperation"`
+   * @remarks "The `Document._onCreateDocuments` static method is deprecated in favor of {@link Document._onCreateOperation | `Document._onCreateOperation`}"
    */
   // Note: This uses `never` because it's unsound to try to do `Document._onCreateDocuments` directly.
   protected static _onCreateDocuments(
@@ -853,7 +887,7 @@ declare abstract class Document<
 
   /**
    * @deprecated since v12, will be removed in v14
-   * @remarks `"The Document._onUpdateDocuments static method is deprecated in favor of Document._onUpdateOperation"`
+   * @remarks "The `Document._onUpdateDocuments` static method is deprecated in favor of {@link Document._onUpdateOperation | `Document._onUpdateOperation`}"
    */
   // Note: This uses `never` because it's unsound to try to do `Document._onUpdateDocuments` directly.
   protected static _onUpdateDocuments(
@@ -863,7 +897,7 @@ declare abstract class Document<
 
   /**
    * @deprecated since v12, will be removed in v14
-   * @remarks `"The Document._onDeleteDocuments static method is deprecated in favor of Document._onDeleteOperation"`
+   * @remarks "The `Document._onDeleteDocuments` static method is deprecated in favor of {@link Document._onDeleteOperation | `Document._onDeleteOperation`}"
    */
   // Note: This uses `never` because it's unsound to try to do `Document._onDeleteDocuments` directly.
   protected static _onDeleteDocuments(
@@ -871,8 +905,6 @@ declare abstract class Document<
     context: Document.ModificationContext<Document.Any | null>,
   ): Promise<unknown>;
 
-  static " fvtt_types_internal_document_name_static": Document.Type;
-
   " fvtt_types_internal_document_name": DocumentName;
   " fvtt_types_internal_document_schema": Schema;
   " fvtt_types_internal_document_parent": Parent;
@@ -890,8 +922,12 @@ declare abstract class AnyDocument extends Document<Document.Type, {}, Document.
 
 declare namespace Document {
   interface Any extends AnyDocument {}
-  interface AnyStored extends Stored<Any> {}
-  interface AnyValid extends AnyDocument {}
+  interface AnyStored extends Document.Internal.Stored<Any> {}
+  interface AnyValid extends AnyDocument {
+    get invalid(): false;
+  }
+  interface AnyInvalid extends Document.Internal.Invalid<AnyValid> {}
+
   interface AnyConstructor extends Identity<typeof AnyDocument> {}
 
   type Type = CONST.ALL_DOCUMENT_TYPES;
@@ -923,35 +959,29 @@ declare namespace Document {
     | "ChatMessage"
     | "Combat"
     | "Combatant"
+    | "CombatantGroup"
     | "Item"
     | "JournalEntryPage"
     | "RegionBehavior";
 
-  // The `data` parameter has a default of `{}`. This means it's optional in that scenario.
-  // Note(LukeAbby): Update when `ParameterWithDefaults` is added.
-  // `CreateData` also should be updated to allow `undefined` directly.
-  type ConstructorParameters<CreateData extends object | undefined, Parent extends Document.Any | null> = [
-    // eslint-disable-next-line @typescript-eslint/no-empty-object-type
-    {},
-  ] extends [CreateData]
-    ? [data?: CreateData, context?: Document.ConstructionContext<Parent>]
-    : [data: CreateData, context?: Document.ConstructionContext<Parent>];
-
   type CoreTypesForName<Name extends Type> = string &
     GetKey<Document.MetadataFor<Name>, "coreTypes", [CONST.BASE_DOCUMENT_TYPE]>[number];
 
   type ConfiguredSubTypesOf<Name extends Type> = Name extends "ActorDelta"
     ? ConfiguredSubTypesOf<"Actor">
-    : string & (keyof GetKey<DataModelConfig, Name, unknown> | keyof GetKey<SourceConfig, Name, unknown>);
+    : // ESLint doesn't know that `DataModelConfig` and `SourceConfig` are meant to be declaration merged into.
+      // Therefore it hastily thinks the results are always `never`.
+      // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents, @typescript-eslint/no-duplicate-type-constituents
+      string & (keyof GetKey<DataModelConfig, Name, unknown> | keyof GetKey<SourceConfig, Name, unknown>);
 
   type SubTypesOf<Name extends Type> = Name extends "ActorDelta"
     ? SubTypesOf<"Actor">
     :
         | Document.CoreTypesForName<Name>
         | ConfiguredSubTypesOf<Name>
-        | (Document.MetadataFor<Name> extends { readonly hasTypeData: true } ? Document.ModuleSubtype : never);
+        | (Document.MetadataFor<Name> extends { readonly hasTypeData: true } ? Document.ModuleSubType : never);
 
-  type ModuleSubtype = Brand<`${string}.${string}`, "Document.ModuleSubtype">;
+  type ModuleSubType = Brand<`${string}.${string}`, "Document.ModuleSubtype">;
 
   type OfType<Name extends WithSubTypes, SubType extends SubTypesOf<Name>> =
     | (Name extends "ActiveEffect" ? ActiveEffect.OfType<SubType & ActiveEffect.SubType> : never)
@@ -962,6 +992,7 @@ declare namespace Document {
     | (Name extends "ChatMessage" ? ChatMessage.OfType<SubType & ChatMessage.SubType> : never)
     | (Name extends "Combat" ? Combat.OfType<SubType & Combat.SubType> : never)
     | (Name extends "Combatant" ? Combatant.OfType<SubType & Combatant.SubType> : never)
+    | (Name extends "CombatantGroup" ? CombatantGroup.OfType<SubType & CombatantGroup.SubType> : never)
     | (Name extends "Folder" ? Folder.OfType<SubType & Folder.SubType> : never)
     | (Name extends "Item" ? Item.OfType<SubType & Item.SubType> : never)
     | (Name extends "JournalEntryPage" ? JournalEntryPage.OfType<SubType & JournalEntryPage.SubType> : never)
@@ -975,10 +1006,10 @@ declare namespace Document {
    * strong indicator.
    *
    * `UnknownSourceData` covers the case where it's configured without a data model.
-   * See {@link UnknownSystem | `UnknownSystem`} for other possibilities.
+   * See {@linkcode UnknownSystem} for other possibilities.
    */
   interface UnknownSourceData extends AnyObject {
-    type: ModuleSubtype;
+    type: ModuleSubType;
   }
 
   /**
@@ -995,6 +1026,7 @@ declare namespace Document {
     | "ChatMessage"
     | "Combat"
     | "Combatant"
+    | "CombatantGroup"
     | "Item"
     | "JournalEntryPage"
     | "RegionBehavior";
@@ -1025,20 +1057,20 @@ declare namespace Document {
    * @internal
    */
   interface _WorldCollectionMap {
-    Actor: Actors.Configured;
-    Cards: CardStacks;
-    Combat: CombatEncounters;
-    FogExploration: FogExplorations;
-    Folder: Folders;
-    Item: Items;
-    JournalEntry: Journal;
-    Macro: Macros;
-    ChatMessage: Messages;
-    Playlist: Playlists;
-    Scene: Scenes;
-    Setting: WorldSettings;
-    RollTable: RollTables;
-    User: Users;
+    Actor: foundry.documents.collections.Actors.Configured;
+    Cards: foundry.documents.collections.CardStacks;
+    Combat: foundry.documents.collections.CombatEncounters;
+    FogExploration: foundry.documents.collections.FogExplorations;
+    Folder: foundry.documents.collections.Folders;
+    Item: foundry.documents.collections.Items;
+    JournalEntry: foundry.documents.collections.Journal;
+    Macro: foundry.documents.collections.Macros;
+    ChatMessage: foundry.documents.collections.ChatMessages;
+    Playlist: foundry.documents.collections.Playlists;
+    Scene: foundry.documents.collections.Scenes;
+    Setting: foundry.documents.collections.WorldSettings;
+    RollTable: foundry.documents.collections.RollTables;
+    User: foundry.documents.collections.Users;
   }
 
   type WorldCollectionFor<Name extends Document.WorldType> = _WorldCollectionMap[Name];
@@ -1066,7 +1098,7 @@ declare namespace Document {
   // Documented at https://gist.github.com/LukeAbby/c7420b053d881db4a4d4496b95995c98
   namespace Internal {
     type Constructor = (abstract new (...args: never) => Instance.Any) & {
-      " fvtt_types_internal_document_name_static": Document.Type;
+      documentName: Document.Type;
     };
 
     interface Instance<
@@ -1092,11 +1124,13 @@ declare namespace Document {
       type Complete<T extends Any> = T extends Document.Any ? T : never;
     }
 
-    type OfType<Configured, Document extends Document.Any> = Configured extends { document: infer D }
-      ? D extends Document
-        ? D
-        : FixedInstanceType<ConfigurationFailure[Document["documentName"]]>
-      : Document;
+    // 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 SystemMap<Name extends Document.WithSystem> = _SystemMap<
       Name,
@@ -1113,7 +1147,7 @@ declare namespace Document {
               [K in SubType]: infer Source;
             }
           ? Source
-          : SubType extends Document.ModuleSubtype
+          : SubType extends Document.ModuleSubType
             ? // eslint-disable-next-line @typescript-eslint/no-empty-object-type
               {}
             : UnknownSystem;
@@ -1121,7 +1155,42 @@ declare namespace Document {
 
     type SystemOfType<SystemMap extends Record<SubType, object>, SubType extends string> =
       | DiscriminatedUnion<SystemMap[SubType]>
-      | (SubType extends ModuleSubtype ? UnknownSystem : never);
+      | (SubType extends ModuleSubType | "base" ? UnknownSystem : never);
+
+    // TODO(LukeAbby): Improve the type display with a helper here.
+    type Stored<D extends Document.Any> = Override<
+      D,
+      {
+        id: string;
+        _id: string;
+        _source: Override<D["_source"], { _id: string }>;
+      }
+    >;
+
+    // @ts-expect-error - This pattern is inherently an error.
+    interface Invalid<D extends Document.Any> extends _Invalid, D {}
+
+    /** @internal */
+    interface _Invalid {
+      _source: object;
+      system?: object | undefined;
+      get invalid(): true;
+    }
+
+    interface DropData<DocumentType extends Document.Type> {
+      /**
+       * The data used to create a new document.
+       * At least one of `data` and `uuid` must be set.
+       */
+      data?: Document.CreateDataForName<DocumentType>;
+
+      /**
+       * The uuid of an existing document.
+       * At least one of `data` and `uuid` must be set.
+       */
+      // TODO: Handle as part of the UUID update.
+      uuid?: string;
+    }
   }
 
   /** Any Document, that is a child of the given parent Document. */
@@ -1129,24 +1198,6 @@ declare namespace Document {
   // eslint-disable-next-line @typescript-eslint/no-empty-object-type
   type AnyChild<Parent extends Any | null> = Document<Document.Type, {}, Parent>;
 
-  /**
-   * @deprecated {@link Document.CreateDataFor | `Document.CreateDataFor`}
-   */
-  type ConstructorDataFor<T extends Document.Internal.Constructor> = SchemaField.CreateData<
-    T extends { defineSchema: () => infer R extends DataSchema } ? R : never
-  >;
-
-  /**
-   * Returns the type of the constructor data for the given {@link foundry.abstract.Document | `foundry.abstract.Document`}.
-   */
-  type CreateDataFor<T extends Document.Internal.Constructor> = SchemaField.CreateData<
-    T extends { defineSchema: () => infer R extends DataSchema } ? R : never
-  >;
-
-  type UpdateDataFor<T extends Document.Internal.Constructor> = SchemaField.UpdateData<
-    T extends { defineSchema: () => infer R extends DataSchema } ? R : never
-  >;
-
   // These helper types exist to help break a loop
 
   type CreateDataForName<DocumentType extends Document.Type> =
@@ -1159,9 +1210,11 @@ declare namespace Document {
     | (DocumentType extends "ChatMessage" ? ChatMessage.CreateData : never)
     | (DocumentType extends "Combat" ? Combat.CreateData : never)
     | (DocumentType extends "Combatant" ? Combatant.CreateData : never)
+    | (DocumentType extends "CombatantGroup" ? CombatantGroup.CreateData : never)
     | (DocumentType extends "FogExploration" ? FogExploration.CreateData : never)
     | (DocumentType extends "Folder" ? Folder.CreateData : never)
     | (DocumentType extends "Item" ? Item.CreateData : never)
+    | (DocumentType extends "JournalEntryCategory" ? JournalEntryCategory.CreateData : never)
     | (DocumentType extends "JournalEntryPage" ? JournalEntryPage.CreateData : never)
     | (DocumentType extends "JournalEntry" ? JournalEntry.CreateData : never)
     | (DocumentType extends "Macro" ? Macro.CreateData : never)
@@ -1193,9 +1246,11 @@ declare namespace Document {
     | (DocumentType extends "ChatMessage" ? ChatMessage.UpdateData : never)
     | (DocumentType extends "Combat" ? Combat.UpdateData : never)
     | (DocumentType extends "Combatant" ? Combatant.UpdateData : never)
+    | (DocumentType extends "CombatantGroup" ? CombatantGroup.UpdateData : never)
     | (DocumentType extends "FogExploration" ? FogExploration.UpdateData : never)
     | (DocumentType extends "Folder" ? Folder.UpdateData : never)
     | (DocumentType extends "Item" ? Item.UpdateData : never)
+    | (DocumentType extends "JournalEntryCategory" ? JournalEntryCategory.UpdateData : never)
     | (DocumentType extends "JournalEntryPage" ? JournalEntryPage.UpdateData : never)
     | (DocumentType extends "JournalEntry" ? JournalEntry.UpdateData : never)
     | (DocumentType extends "Macro" ? Macro.UpdateData : never)
@@ -1217,10 +1272,41 @@ declare namespace Document {
     | (DocumentType extends "Token" ? TokenDocument.UpdateData : never)
     | (DocumentType extends "Wall" ? WallDocument.UpdateData : never);
 
-  /**
-   * @deprecated {@link SchemaField.CreateData | `SchemaField.CreateData`}
-   */
-  type ConstructorDataForSchema<Schema extends DataSchema> = SchemaField.CreateData<Schema>;
+  type SourceForName<DocumentType extends Document.Type> =
+    | (DocumentType extends "ActiveEffect" ? ActiveEffect.Source : never)
+    | (DocumentType extends "ActorDelta" ? ActorDelta.Source : never)
+    | (DocumentType extends "Actor" ? Actor.Source : never)
+    | (DocumentType extends "Adventure" ? Adventure.Source : never)
+    | (DocumentType extends "Card" ? Card.Source : never)
+    | (DocumentType extends "Cards" ? Cards.Source : never)
+    | (DocumentType extends "ChatMessage" ? ChatMessage.Source : never)
+    | (DocumentType extends "Combat" ? Combat.Source : never)
+    | (DocumentType extends "Combatant" ? Combatant.Source : never)
+    | (DocumentType extends "CombatantGroup" ? CombatantGroup.Source : never)
+    | (DocumentType extends "FogExploration" ? FogExploration.Source : never)
+    | (DocumentType extends "Folder" ? Folder.Source : never)
+    | (DocumentType extends "Item" ? Item.Source : never)
+    | (DocumentType extends "JournalEntryCategory" ? JournalEntryCategory.Source : never)
+    | (DocumentType extends "JournalEntryPage" ? JournalEntryPage.Source : never)
+    | (DocumentType extends "JournalEntry" ? JournalEntry.Source : never)
+    | (DocumentType extends "Macro" ? Macro.Source : never)
+    | (DocumentType extends "PlaylistSound" ? PlaylistSound.Source : never)
+    | (DocumentType extends "Playlist" ? Playlist.Source : never)
+    | (DocumentType extends "RegionBehavior" ? RegionBehavior.Source : never)
+    | (DocumentType extends "RollTable" ? RollTable.Source : never)
+    | (DocumentType extends "Scene" ? Scene.Source : never)
+    | (DocumentType extends "Setting" ? Setting.Source : never)
+    | (DocumentType extends "TableResult" ? TableResult.Source : never)
+    | (DocumentType extends "User" ? User.Source : never)
+    | (DocumentType extends "AmbientLight" ? AmbientLightDocument.Source : never)
+    | (DocumentType extends "AmbientSound" ? AmbientSoundDocument.Source : never)
+    | (DocumentType extends "Drawing" ? DrawingDocument.Source : never)
+    | (DocumentType extends "MeasuredTemplate" ? MeasuredTemplateDocument.Source : never)
+    | (DocumentType extends "Note" ? NoteDocument.Source : never)
+    | (DocumentType extends "Region" ? NoteDocument.Source : never)
+    | (DocumentType extends "Tile" ? TileDocument.Source : never)
+    | (DocumentType extends "Token" ? TokenDocument.Source : never)
+    | (DocumentType extends "Wall" ? WallDocument.Source : never);
 
   type SystemConstructor = AnyConstructor & {
     metadata: { name: SystemType };
@@ -1230,48 +1316,88 @@ declare namespace Document {
     NameFor<ConcreteDocument>
   >;
 
-  type ToConfiguredInstance<ConcreteDocument extends Document.Internal.Constructor> = MakeConform<
-    FixedInstanceType<ConfiguredDocumentClass[NameFor<ConcreteDocument>]>,
-    Document.Any
-    // TODO(LukeAbby): Look into if there's a way to do this without causing circular loops.
-    // FixedInstanceType<ConfigurationFailure[Name]>
-  >;
-
-  type ToConfiguredStored<D extends Document.AnyConstructor> = Stored<ToConfiguredInstance<D>>;
-
-  type Stored<D extends Document.Any> = D & {
-    id: string;
-    _id: string;
-    _source: GetKey<D, "_source"> & { _id: string };
-  };
-
-  type Invalid<D extends Document.Any> = SimpleMerge<
-    D,
-    {
-      id: string;
-      _id: string;
-      _source: object;
-      system: object;
-    }
+  type ToConfiguredInstance<ConcreteDocument extends Document.Internal.Constructor> = ImplementationFor<
+    NameFor<ConcreteDocument>
   >;
 
-  type ToStored<D extends Document.AnyConstructor> = Stored<FixedInstanceType<D>>;
-
-  type ToStoredIf<D extends Document.AnyConstructor, Temporary extends boolean | undefined> = Temporary extends true
-    ? FixedInstanceType<D>
-    : ToConfiguredStored<D>;
-
-  /** @deprecated {@link Document.TemporaryIf | `Document.TemporaryIf`} */
-  type StoredIf<D extends Document.Any, Temporary extends boolean | undefined> = TemporaryIf<D, Temporary>;
-
   type TemporaryIf<D extends Document.Any, Temporary extends boolean | undefined> = Temporary extends true
     ? D
-    : Stored<D>;
-
-  type Temporary<D extends Document.Any> = D extends Stored<infer U> ? U : D;
-
-  type NameFor<ConcreteDocument extends Document.Internal.Constructor> =
-    ConcreteDocument[" fvtt_types_internal_document_name_static"];
+    : // eslint-disable-next-line @typescript-eslint/no-deprecated
+      Stored<D>;
+
+  type StoredForName<DocumentType extends Document.Type> =
+    | (DocumentType extends "ActiveEffect" ? ActiveEffect.Stored : never)
+    | (DocumentType extends "ActorDelta" ? ActorDelta.Stored : never)
+    | (DocumentType extends "Actor" ? Actor.Stored : never)
+    | (DocumentType extends "Adventure" ? Adventure.Stored : never)
+    | (DocumentType extends "Card" ? Card.Stored : never)
+    | (DocumentType extends "Cards" ? Cards.Stored : never)
+    | (DocumentType extends "ChatMessage" ? ChatMessage.Stored : never)
+    | (DocumentType extends "Combat" ? Combat.Stored : never)
+    | (DocumentType extends "Combatant" ? Combatant.Stored : never)
+    | (DocumentType extends "CombatantGroup" ? CombatantGroup.Stored : never)
+    | (DocumentType extends "FogExploration" ? FogExploration.Stored : never)
+    | (DocumentType extends "Folder" ? Folder.Stored : never)
+    | (DocumentType extends "Item" ? Item.Stored : never)
+    | (DocumentType extends "JournalEntryCategory" ? JournalEntryCategory.Stored : never)
+    | (DocumentType extends "JournalEntryPage" ? JournalEntryPage.Stored : never)
+    | (DocumentType extends "JournalEntry" ? JournalEntry.Stored : never)
+    | (DocumentType extends "Macro" ? Macro.Stored : never)
+    | (DocumentType extends "PlaylistSound" ? PlaylistSound.Stored : never)
+    | (DocumentType extends "Playlist" ? Playlist.Stored : never)
+    | (DocumentType extends "RegionBehavior" ? RegionBehavior.Stored : never)
+    | (DocumentType extends "RollTable" ? RollTable.Stored : never)
+    | (DocumentType extends "Scene" ? Scene.Stored : never)
+    | (DocumentType extends "Setting" ? Setting.Stored : never)
+    | (DocumentType extends "TableResult" ? TableResult.Stored : never)
+    | (DocumentType extends "User" ? User.Stored : never)
+    | (DocumentType extends "AmbientLight" ? AmbientLightDocument.Stored : never)
+    | (DocumentType extends "AmbientSound" ? AmbientSoundDocument.Stored : never)
+    | (DocumentType extends "Drawing" ? DrawingDocument.Stored : never)
+    | (DocumentType extends "MeasuredTemplate" ? MeasuredTemplateDocument.Stored : never)
+    | (DocumentType extends "Note" ? NoteDocument.Stored : never)
+    | (DocumentType extends "Region" ? NoteDocument.Stored : never)
+    | (DocumentType extends "Tile" ? TileDocument.Stored : never)
+    | (DocumentType extends "Token" ? TokenDocument.Stored : never)
+    | (DocumentType extends "Wall" ? WallDocument.Stored : never);
+
+  type InvalidForName<DocumentType extends Document.Type> =
+    | (DocumentType extends "ActiveEffect" ? ActiveEffect.Invalid : never)
+    | (DocumentType extends "ActorDelta" ? ActorDelta.Invalid : never)
+    | (DocumentType extends "Actor" ? Actor.Invalid : never)
+    | (DocumentType extends "Adventure" ? Adventure.Invalid : never)
+    | (DocumentType extends "Card" ? Card.Invalid : never)
+    | (DocumentType extends "Cards" ? Cards.Invalid : never)
+    | (DocumentType extends "ChatMessage" ? ChatMessage.Invalid : never)
+    | (DocumentType extends "Combat" ? Combat.Invalid : never)
+    | (DocumentType extends "Combatant" ? Combatant.Invalid : never)
+    | (DocumentType extends "CombatantGroup" ? CombatantGroup.Invalid : never)
+    | (DocumentType extends "FogExploration" ? FogExploration.Invalid : never)
+    | (DocumentType extends "Folder" ? Folder.Invalid : never)
+    | (DocumentType extends "Item" ? Item.Invalid : never)
+    | (DocumentType extends "JournalEntryCategory" ? JournalEntryCategory.Invalid : never)
+    | (DocumentType extends "JournalEntryPage" ? JournalEntryPage.Invalid : never)
+    | (DocumentType extends "JournalEntry" ? JournalEntry.Invalid : never)
+    | (DocumentType extends "Macro" ? Macro.Invalid : never)
+    | (DocumentType extends "PlaylistSound" ? PlaylistSound.Invalid : never)
+    | (DocumentType extends "Playlist" ? Playlist.Invalid : never)
+    | (DocumentType extends "RegionBehavior" ? RegionBehavior.Invalid : never)
+    | (DocumentType extends "RollTable" ? RollTable.Invalid : never)
+    | (DocumentType extends "Scene" ? Scene.Invalid : never)
+    | (DocumentType extends "Setting" ? Setting.Invalid : never)
+    | (DocumentType extends "TableResult" ? TableResult.Invalid : never)
+    | (DocumentType extends "User" ? User.Invalid : never)
+    | (DocumentType extends "AmbientLight" ? AmbientLightDocument.Invalid : never)
+    | (DocumentType extends "AmbientSound" ? AmbientSoundDocument.Invalid : never)
+    | (DocumentType extends "Drawing" ? DrawingDocument.Invalid : never)
+    | (DocumentType extends "MeasuredTemplate" ? MeasuredTemplateDocument.Invalid : never)
+    | (DocumentType extends "Note" ? NoteDocument.Invalid : never)
+    | (DocumentType extends "Region" ? NoteDocument.Invalid : never)
+    | (DocumentType extends "Tile" ? TileDocument.Invalid : never)
+    | (DocumentType extends "Token" ? TokenDocument.Invalid : never)
+    | (DocumentType extends "Wall" ? WallDocument.Invalid : never);
+
+  type NameFor<ConcreteDocument extends Document.Internal.Constructor> = ConcreteDocument["documentName"];
 
   type ImplementationFor<Name extends Type> = ConfiguredDocumentInstance[Name];
   type ImplementationClassFor<Name extends Type> = ConfiguredDocumentClass[Name];
@@ -1279,16 +1405,6 @@ declare namespace Document {
   type ObjectClassFor<Name extends PlaceableType> = CONFIG[Name]["objectClass"];
   type ObjectFor<Name extends PlaceableType> = FixedInstanceType<CONFIG[Name]["objectClass"]>;
 
-  /**
-   * @deprecated {@link ObjectClassFor | `ObjectClassFor`}
-   */
-  type ConfiguredObjectClassForName<Name extends PlaceableType> = ObjectClassFor<Name>;
-
-  /**
-   * @deprecated {@link ObjectFor | `ObjectFor`}
-   */
-  type ConfiguredObjectInstanceForName<Name extends PlaceableType> = ObjectFor<Name>;
-
   type ConfiguredDataForName<Name extends Type> = GetKey<DataConfig, Name, EmptyObject>;
 
   type ConfiguredSourceForName<Name extends Type> = GetKey<SourceConfig, Name, EmptyObject>;
@@ -1303,7 +1419,7 @@ declare namespace Document {
   type MetadataFor<Name extends Document.Type> = ConfiguredMetadata[Name];
 
   type CollectionRecord<Schema extends DataSchema> = {
-    [Key in keyof Schema]: Schema[Key] extends fields.EmbeddedCollectionField.Any ? Schema[Key] : never;
+    [Key in keyof Schema]: Schema[Key] extends EmbeddedCollectionField.Any ? Schema[Key] : never;
   };
 
   type Flags<ConcreteDocument extends Internal.Instance.Any> = OptionsForSchema<SchemaFor<ConcreteDocument>>;
@@ -1351,30 +1467,59 @@ declare namespace Document {
     };
   }
 
-  interface ConstructionContext<Parent extends Document.Any | null> {
+  /** @internal */
+  type _ConstructionContext<Parent extends Document.Any | null> = NullishProps<{
     /**
      * The parent Document of this one, if this one is embedded
      * @defaultValue `null`
      */
-    parent?: Parent | null | undefined;
+    parent: Parent;
 
     /**
      * The compendium collection ID which contains this Document, if any
      * @defaultValue `null`
      */
-    pack?: string | null | undefined;
+    pack: string;
 
     /**
      * Whether to validate initial data strictly?
      * @defaultValue `true`
      */
-    strict?: boolean | null | undefined;
+    strict: boolean;
 
     /**
-     * An immutable reverse-reference to the name of the collection that thi8s Document exists in on its parent, if any.
+     * An immutable reverse-reference to the name of the collection that this Document exists in on its parent, if any.
+     * @privateRemarks Omitted from the typedef, inferred from usage in {@link Document._configure | `Document#_configure`}
+     * (and included in the construction context rather than `ConfigureOptions` due to being passed to construction in
+     * {@link foundry.abstract.EmbeddedCollection.createDocument | `EmbeddedCollection#createDocument`})
      */
-    parentCollection?: string | null | undefined;
-  }
+    parentCollection: string;
+  }>;
+
+  /**
+   * Foundry does not include the properties from the DataModel construction context in `DocumentConstructionContext`,
+   * but they're all still valid.
+   *
+   * `strict` is omitted from the DataModel interface so the Document interface's property
+   * description takes precedence.
+   */
+  interface ConstructionContext<Parent extends Document.Any | null = Document.Any | null>
+    extends Omit<DataModel._ConstructionContext, "strict">,
+      _ConstructionContext<Parent> {}
+
+  /** `DataModel#constructor` pulls `parent` and `strict` out of the passed context before forwarding to `#_configure` */
+  interface ConfigureOptions extends Omit<ConstructionContext, "parent" | "strict"> {}
+
+  /** `DataModel#constructor` pulls `parent` out of the passed context before forwarding to `#_initializeSource` */
+  interface InitializeOptions extends Omit<ConstructionContext, "parent"> {}
+
+  /**
+   * `DataModel#constructor` pulls `parent` out of the passed context before forwarding to `#_initializeSource`
+   * @privateRemarks `Document` doesn't override `_initializeSource`, but at least one specific document does (Actor only, as of v12);
+   * Without an override, this is handled by the `& ExtraConstructorOptions` in the `DataModel` signature, but with one,
+   * a manually combined interface is needed.
+   */
+  interface InitializeSourceOptions extends DataModel.InitializeSourceOptions, Omit<ConstructionContext, "parent"> {}
 
   interface ModificationContext<Parent extends Document.Any | null> {
     /**
@@ -1460,92 +1605,57 @@ declare namespace Document {
     deleteAll?: boolean | undefined;
   }
 
-  interface CloneContext<Save extends boolean | undefined = boolean | undefined> {
+  /** @internal */
+  type _CloneContext<Save extends boolean | null | undefined = boolean | null | undefined> = NullishProps<{
     /**
      * Save the clone to the World database?
      * @defaultValue `false`
      */
-    save?: Save;
+    save: Save;
 
     /**
      * Keep the same ID of the original document
      * @defaultValue `false`
      */
-    keepId?: boolean | undefined;
+    keepId: boolean;
 
     /**
      * Track the clone source
      * @defaultValue `false`
      */
-    addSource?: boolean | undefined;
-  }
-
-  type ModificationOptions = Omit<Document.ModificationContext<Document.Any | null>, "parent" | "pack">;
-
-  /* eslint-disable @typescript-eslint/no-deprecated */
-  /** @deprecated Use {@link Database.PreCreateOptions | `Database.PreCreateOptions`} */
-  type PreCreateOptions<Name extends Type> = Omit<
-    Document.Database.OperationOf<Name, "create">,
-    "data" | "noHook" | "pack" | "parent"
-  >;
-
-  /** @deprecated Use {@link Database.CreateOptions | `Database.CreateOptions`}  */
-  type OnCreateOptions<Name extends Type> = Omit<
-    Document.Database.OperationOf<Name, "create">,
-    "pack" | "parentUuid" | "syntheticActorUpdate"
-  >;
-
-  /** @deprecated Use {@link Database.PreUpdateOptions | `Database.PreUpdateOperation`}  */
-  type PreUpdateOptions<Name extends Type> = Omit<
-    Document.Database.OperationOf<Name, "update">,
-    "updates" | "restoreDelta" | "noHook" | "parent" | "pack"
-  >;
-
-  /** @deprecated Use {@link Database.UpdateOptions | `Database.OnUpdateOperation`} */
-  type OnUpdateOptions<Name extends Type> = Omit<
-    Document.Database.OperationOf<Name, "update">,
-    "pack" | "parentUuid" | "syntheticActorUpdate"
-  >;
-
-  /** @deprecated Use {@link Database.PreDeleteOperationInstance | `Database.PreDeleteOperationInstance`} */
-  type PreDeleteOptions<Name extends Type> = Omit<
-    Document.Database.OperationOf<Name, "delete">,
-    "ids" | "deleteAll" | "noHook" | "pack" | "parent"
-  >;
-
-  /** @deprecated Use {@link Database.DeleteOptions | `Database.OnDeleteOptions`} */
-  type OnDeleteOptions<Name extends Type> = Omit<
-    Document.Database.OperationOf<Name, "delete">,
-    "deleteAll" | "pack" | "parentUuid" | "syntheticActorUpdate"
-  >;
+    addSource: boolean;
+  }>;
 
-  /** @deprecated Use {@link Database.PreCreateOptions | `Database.PreCreateOptions`} or {@link Database.PreUpdateOptions | `Database.PreUpdateOperation`}*/
-  type PreUpsertOptions<Name extends Type> = PreCreateOptions<Name> | PreUpdateOptions<Name>;
+  /**
+   * @privateRemarks Since we've lost the ExtraConstructorOptions type param, we have to extend
+   * the (parentless) construction context
+   */
+  interface CloneContext<Save extends boolean | null | undefined = boolean | null | undefined>
+    extends _CloneContext<Save>,
+      Omit<Document.ConstructionContext, "parent"> {}
 
-  /** @deprecated Use {@link Database.CreateOptions | `Database.CreateOptions`} or {@link Database.UpdateOptions | `Database.OnUpdateOperation`} */
-  type OnUpsertOptions<Name extends Type> = OnCreateOptions<Name> | OnUpdateOptions<Name>;
-  /* eslint-enable @typescript-eslint/no-deprecated */
+  type ModificationOptions = Omit<Document.ModificationContext<Document.Any | null>, "parent" | "pack">;
 
   interface Metadata<out ThisType extends Document.Any> {
     readonly name: ThisType["documentName"];
-    readonly collection: string;
-    readonly indexed: boolean;
-    readonly compendiumIndexFields: readonly string[];
     readonly label: string;
     readonly coreTypes: readonly string[];
+    readonly collection: string;
     readonly embedded: {
       [DocumentType in Document.Type]?: string;
     };
     readonly permissions: {
+      view: string | ToMethod<(user: User.Internal.Implementation, doc: ThisType, data: AnyObject) => boolean>;
       create: string | ToMethod<(user: User.Internal.Implementation, doc: ThisType, data: AnyObject) => boolean>;
       update: string | ToMethod<(user: User.Internal.Implementation, doc: ThisType, data: AnyObject) => boolean>;
       delete: string | ToMethod<(user: User.Internal.Implementation, doc: ThisType, data: EmptyObject) => boolean>;
     };
+    readonly hasTypeData?: boolean;
+    readonly indexed: boolean;
+    readonly compendiumIndexFields: readonly string[];
     readonly preserveOnImport: readonly string[];
     readonly schemaVersion?: string | undefined;
     readonly labelPlural?: string; // This is not set for the Document class but every class that implements Document actually provides it.
-    readonly types?: readonly string[];
-    readonly hasSystemData?: boolean;
   }
 
   namespace Metadata {
@@ -1553,69 +1663,54 @@ declare namespace Document {
 
     interface Default {
       readonly name: "Document";
-      readonly collection: "documents";
-      readonly indexed: false;
-      readonly compendiumIndexFields: [];
       readonly label: "DOCUMENT.Document";
       readonly coreTypes: [CONST.BASE_DOCUMENT_TYPE];
+      readonly collection: "documents";
       readonly embedded: EmptyObject;
+      readonly hasTypeData: false;
+      readonly indexed: false;
+      readonly compendiumIndexFields: [];
       readonly permissions: {
+        view: "LIMITED";
         create: "ASSISTANT";
-        update: "ASSISTANT";
+        update: "OWNER";
         delete: "ASSISTANT";
       };
-      readonly preserveOnImport: ["_id", "sort", "ownership"];
+      readonly preserveOnImport: ["_id", "sort", "ownership", "folder"];
     }
 
     interface Embedded extends Identity<{ [K in Document.Type]?: string }> {}
   }
 
-  type ConfiguredSheetClassFor<Name extends Document.Type> = MakeConform<
+  type SheetClassFor<Name extends Document.Type> = MakeConform<
     GetKey<GetKey<CONFIG, Name>, "sheetClass">,
     AnyConstructor
   >;
 
-  type ConfiguredObjectClassFor<Name extends Document.Type> = GetKey<GetKey<CONFIG, Name>, "objectClass">;
-
-  type ConfiguredLayerClassFor<Name extends Document.Type> = GetKey<GetKey<CONFIG, Name>, "layerClass">;
-
-  type DropData<T extends Document.Any> = T extends { id: string | undefined }
-    ? DropData.Data<T> & DropData.UUID
-    : DropData.Data<T>;
-
-  namespace DropData {
-    type Any = DropData<any>;
-
-    interface Data<T extends Document.Any> {
-      type: T["documentName"];
-      data: T["_source"];
-    }
-
-    interface UUID {
-      uuid: string;
-    }
-  }
+  type LayerClassFor<Name extends Document.Type> = GetKey<GetKey<CONFIG, Name>, "layerClass">;
 
   namespace Database {
     type Operation = "create" | "update" | "delete";
 
-    interface GetOptions {
-      pack?: string | null;
-    }
+    /**
+     * @privateRemarks Foundry types {@link Document.get | `Document.get`} as taking a {@link DatabaseGetOperation | `DatabaseGetOperation`}
+     * but it only ever looks for `pack`
+     */
+    interface GetOptions extends Pick<DatabaseGetOperation, "pack"> {}
 
-    /** Used for {@link Document.createDocuments | `Document.createDocuments`} */
+    /** Used for {@linkcode Document.createDocuments} */
     type CreateOperation<Op extends DatabaseCreateOperation> = NullishProps<Omit<Op, "data" | "modifiedTime">>;
 
-    /** Used for {@link Document.update | `Document.update`} */
+    /** Used for {@linkcode Document.update} */
     type UpdateOperation<Op extends DatabaseUpdateOperation> = InexactPartial<Omit<Op, "updates">>;
 
-    /** Used for {@link Document.delete | `Document.delete`} */
+    /** Used for {@linkcode Document.delete} */
     type DeleteOperation<Op extends DatabaseDeleteOperation> = InexactPartial<Omit<Op, "ids">>;
 
-    /** Used for {@link Document._preCreateOperation | `Document._preCreateOperation`} */
-    type PreCreateOperationStatic<Op extends DatabaseCreateOperation> = InexactPartial<
+    /** Used for {@linkcode Document._preCreateOperation} */
+    type PreCreateOperationStatic<Op extends DatabaseCreateOperation> = InexactPartialExcept<
       Op,
-      Exclude<AllKeysOf<Op>, "modifiedTime" | "render" | "renderSheet" | "data" | "noHook" | "pack" | "parent">
+      "modifiedTime" | "render" | "renderSheet" | "data" | "noHook" | "pack" | "parent"
     >;
 
     /** Used for {@link Document._preCreate | `Document#_preCreate`} */
@@ -1630,7 +1725,7 @@ declare namespace Document {
       "data" | "pack" | "parentUuid" | "syntheticActorUpdate"
     >;
 
-    /** Used for {@link Document.updateDocuments | `Document.updateDocuments`} */
+    /** Used for {@linkcode Document.updateDocuments} */
     type UpdateDocumentsOperation<Op extends DatabaseUpdateOperation> = NullishProps<
       Omit<Op, "updates" | "modifiedTime">
     >;
@@ -1640,13 +1735,10 @@ declare namespace Document {
       Omit<Op, "updates" | "parent" | "pack">
     >;
 
-    /** Used for {@link Document._preUpdateOperation | `Document._preUpdateOperation`} */
-    type PreUpdateOperationStatic<Op extends DatabaseUpdateOperation> = InexactPartial<
+    /** Used for {@linkcode Document._preUpdateOperation} */
+    type PreUpdateOperationStatic<Op extends DatabaseUpdateOperation> = InexactPartialExcept<
       Op,
-      Exclude<
-        AllKeysOf<Op>,
-        "modifiedTime" | "diff" | "recursive" | "render" | "updates" | "restoreDelta" | "noHook" | "pack" | "parent"
-      >
+      "modifiedTime" | "diff" | "recursive" | "render" | "updates" | "restoreDelta" | "noHook" | "pack" | "parent"
     >;
 
     /** Used for {@link Document._preUpdate | `Document#_preUpdate`} */
@@ -1661,23 +1753,23 @@ declare namespace Document {
       "updates" | "pack" | "parentUuid" | "syntheticActorUpdate"
     >;
 
-    /** Used for {@link Document.deleteDocuments | `Document.deleteDocuments`} */
+    /** Used for {@linkcode Document.deleteDocuments} */
     type DeleteDocumentsOperation<Op extends DatabaseDeleteOperation> = NullishProps<Omit<Op, "ids" | "modifiedTime">>;
 
-    /** Used for {@link Document.delete | `Document.delete`} */
+    /** Used for {@linkcode Document.delete} */
     type DeleteOperationInstance<Op extends DatabaseDeleteOperation> = InexactPartial<
       Omit<Op, "ids" | "parent" | "pack">
     >;
 
-    /** Used for {@link Document._preDeleteOperation | `Document._preDeleteOperation`} */
-    type PreDeleteOperationStatic<Op extends DatabaseDeleteOperation> = InexactPartial<
+    /** Used for {@linkcode Document._preDeleteOperation} */
+    type PreDeleteOperationStatic<Op extends DatabaseDeleteOperation> = InexactPartialExcept<
       Op,
-      Exclude<AllKeysOf<Op>, "modifiedTime" | "render" | "ids" | "deleteAll" | "noHook" | "pack" | "parent">
+      "modifiedTime" | "render" | "ids" | "deleteAll" | "noHook" | "pack" | "parent"
     >;
 
     /** Used for {@link Document._preDelete | `Document#_preDelete`} */
     type PreDeleteOperationInstance<Op extends DatabaseDeleteOperation> = Omit<
-      InexactPartial<Op, Exclude<AllKeysOf<Op>, "modifiedTime" | "render">>,
+      InexactPartialExcept<Op, "modifiedTime" | "render">,
       "ids" | "deleteAll" | "noHook" | "pack" | "parent"
     >;
 
@@ -1687,31 +1779,6 @@ declare namespace Document {
       "ids" | "deleteAll" | "pack" | "parentUuid" | "syntheticActorUpdate"
     >;
 
-    /**
-     * This is a helper type that gets the right DatabaseOperation (including the
-     * proper options) for a particular Document type.
-     *
-     * @deprecated This is no longer used internally inside fvtt-types. If you have use for it please file an issue.
-     */
-    type OperationOf<T extends Document.Type, Operation extends Database.Operation> =
-      | (Operation extends "create" ? DatabaseOperationCreateMap[T] : never)
-      | (Operation extends "update" ? DatabaseOperationUpdateMap[T] : never)
-      | (Operation extends "delete" ? DatabaseOperationDeleteMap[T] : never);
-
-    /**
-     * @deprecated See individual document's namespaces.
-     */
-    interface Operations<
-      _T extends Document.Internal.Instance.Any = Document.Internal.Instance.Any,
-      _ExtraCreateOptions extends AnyObject = any,
-      _ExtraUpdateOptions extends AnyObject = any,
-      _ExtraDeleteOptions extends AnyObject = any,
-    > {
-      create: AnyObject;
-      update: AnyObject;
-      delete: AnyObject;
-    }
-
     type CreateForName<DocumentType extends Document.Type> =
       | (DocumentType extends "ActiveEffect" ? ActiveEffect.Database.Create : never)
       | (DocumentType extends "ActorDelta" ? ActorDelta.Database.Create : never)
@@ -1722,9 +1789,11 @@ declare namespace Document {
       | (DocumentType extends "ChatMessage" ? ChatMessage.Database.Create : never)
       | (DocumentType extends "Combat" ? Combat.Database.Create : never)
       | (DocumentType extends "Combatant" ? Combatant.Database.Create : never)
+      | (DocumentType extends "CombatantGroup" ? CombatantGroup.Database.Create : never)
       | (DocumentType extends "FogExploration" ? FogExploration.Database.Create : never)
       | (DocumentType extends "Folder" ? Folder.Database.Create : never)
       | (DocumentType extends "Item" ? Item.Database.Create : never)
+      | (DocumentType extends "JournalEntryCategory" ? JournalEntryCategory.Database.Create : never)
       | (DocumentType extends "JournalEntryPage" ? JournalEntryPage.Database.Create : never)
       | (DocumentType extends "JournalEntry" ? JournalEntry.Database.Create : never)
       | (DocumentType extends "Macro" ? Macro.Database.Create : never)
@@ -1746,6 +1815,45 @@ declare namespace Document {
       | (DocumentType extends "Token" ? TokenDocument.Database.Create : never)
       | (DocumentType extends "Wall" ? WallDocument.Database.Create : never);
 
+    type CreateOperationForName<
+      DocumentType extends Document.Type,
+      Temporary extends boolean | undefined = undefined,
+    > =
+      | (DocumentType extends "ActiveEffect" ? ActiveEffect.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "ActorDelta" ? ActorDelta.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "Actor" ? Actor.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "Adventure" ? Adventure.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "Card" ? Card.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "Cards" ? Cards.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "ChatMessage" ? ChatMessage.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "Combat" ? Combat.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "Combatant" ? Combatant.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "CombatantGroup" ? CombatantGroup.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "FogExploration" ? FogExploration.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "Folder" ? Folder.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "Item" ? Item.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "JournalEntryCategory" ? JournalEntryCategory.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "JournalEntryPage" ? JournalEntryPage.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "JournalEntry" ? JournalEntry.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "Macro" ? Macro.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "PlaylistSound" ? PlaylistSound.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "Playlist" ? Playlist.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "RegionBehavior" ? RegionBehavior.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "RollTable" ? RollTable.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "Scene" ? Scene.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "Setting" ? Setting.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "TableResult" ? TableResult.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "User" ? User.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "AmbientLight" ? AmbientLightDocument.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "AmbientSound" ? AmbientSoundDocument.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "Drawing" ? DrawingDocument.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "MeasuredTemplate" ? MeasuredTemplateDocument.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "Note" ? NoteDocument.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "Region" ? RegionDocument.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "Tile" ? TileDocument.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "Token" ? TokenDocument.Database.CreateOperation<Temporary> : never)
+      | (DocumentType extends "Wall" ? WallDocument.Database.CreateOperation<Temporary> : never);
+
     type UpdateOperationForName<DocumentType extends Document.Type> =
       | (DocumentType extends "ActiveEffect" ? ActiveEffect.Database.UpdateOperation : never)
       | (DocumentType extends "ActorDelta" ? ActorDelta.Database.UpdateOperation : never)
@@ -1756,9 +1864,11 @@ declare namespace Document {
       | (DocumentType extends "ChatMessage" ? ChatMessage.Database.UpdateOperation : never)
       | (DocumentType extends "Combat" ? Combat.Database.UpdateOperation : never)
       | (DocumentType extends "Combatant" ? Combatant.Database.UpdateOperation : never)
+      | (DocumentType extends "CombatantGroup" ? CombatantGroup.Database.UpdateOperation : never)
       | (DocumentType extends "FogExploration" ? FogExploration.Database.UpdateOperation : never)
       | (DocumentType extends "Folder" ? Folder.Database.UpdateOperation : never)
       | (DocumentType extends "Item" ? Item.Database.UpdateOperation : never)
+      | (DocumentType extends "JournalEntryCategory" ? JournalEntryCategory.Database.UpdateOperation : never)
       | (DocumentType extends "JournalEntryPage" ? JournalEntryPage.Database.UpdateOperation : never)
       | (DocumentType extends "JournalEntry" ? JournalEntry.Database.UpdateOperation : never)
       | (DocumentType extends "Macro" ? Macro.Database.UpdateOperation : never)
@@ -1790,9 +1900,11 @@ declare namespace Document {
       | (DocumentType extends "ChatMessage" ? ChatMessage.Database.DeleteOperation : never)
       | (DocumentType extends "Combat" ? Combat.Database.DeleteOperation : never)
       | (DocumentType extends "Combatant" ? Combatant.Database.DeleteOperation : never)
+      | (DocumentType extends "CombatantGround" ? CombatantGroup.Database.DeleteOperation : never)
       | (DocumentType extends "FogExploration" ? FogExploration.Database.DeleteOperation : never)
       | (DocumentType extends "Folder" ? Folder.Database.DeleteOperation : never)
       | (DocumentType extends "Item" ? Item.Database.DeleteOperation : never)
+      | (DocumentType extends "JournalEntryCategory" ? JournalEntryCategory.Database.DeleteOperation : never)
       | (DocumentType extends "JournalEntryPage" ? JournalEntryPage.Database.DeleteOperation : never)
       | (DocumentType extends "JournalEntry" ? JournalEntry.Database.DeleteOperation : never)
       | (DocumentType extends "Macro" ? Macro.Database.DeleteOperation : never)
@@ -1824,9 +1936,11 @@ declare namespace Document {
       | (DocumentType extends "ChatMessage" ? ChatMessage.Database.CreateOptions : never)
       | (DocumentType extends "Combat" ? Combat.Database.CreateOptions : never)
       | (DocumentType extends "Combatant" ? Combatant.Database.CreateOptions : never)
+      | (DocumentType extends "CombatantGroup" ? CombatantGroup.Database.CreateOptions : never)
       | (DocumentType extends "FogExploration" ? FogExploration.Database.CreateOptions : never)
       | (DocumentType extends "Folder" ? Folder.Database.CreateOptions : never)
       | (DocumentType extends "Item" ? Item.Database.CreateOptions : never)
+      | (DocumentType extends "JournalEntryCategory" ? JournalEntryCategory.Database.CreateOptions : never)
       | (DocumentType extends "JournalEntryPage" ? JournalEntryPage.Database.CreateOptions : never)
       | (DocumentType extends "JournalEntry" ? JournalEntry.Database.CreateOptions : never)
       | (DocumentType extends "Macro" ? Macro.Database.CreateOptions : never)
@@ -1858,9 +1972,11 @@ declare namespace Document {
       | (DocumentType extends "ChatMessage" ? ChatMessage.Database.UpdateOptions : never)
       | (DocumentType extends "Combat" ? Combat.Database.UpdateOptions : never)
       | (DocumentType extends "Combatant" ? Combatant.Database.UpdateOptions : never)
+      | (DocumentType extends "CombatantGroup" ? CombatantGroup.Database.UpdateOptions : never)
       | (DocumentType extends "FogExploration" ? FogExploration.Database.UpdateOptions : never)
       | (DocumentType extends "Folder" ? Folder.Database.UpdateOptions : never)
       | (DocumentType extends "Item" ? Item.Database.UpdateOptions : never)
+      | (DocumentType extends "JournalEntryCategory" ? JournalEntryCategory.Database.UpdateOptions : never)
       | (DocumentType extends "JournalEntryPage" ? JournalEntryPage.Database.UpdateOptions : never)
       | (DocumentType extends "JournalEntry" ? JournalEntry.Database.UpdateOptions : never)
       | (DocumentType extends "Macro" ? Macro.Database.UpdateOptions : never)
@@ -1892,9 +2008,11 @@ declare namespace Document {
       | (DocumentType extends "ChatMessage" ? ChatMessage.Database.DeleteOptions : never)
       | (DocumentType extends "Combat" ? Combat.Database.DeleteOptions : never)
       | (DocumentType extends "Combatant" ? Combatant.Database.DeleteOptions : never)
+      | (DocumentType extends "CombatantGroup" ? CombatantGroup.Database.DeleteOptions : never)
       | (DocumentType extends "FogExploration" ? FogExploration.Database.DeleteOptions : never)
       | (DocumentType extends "Folder" ? Folder.Database.DeleteOptions : never)
       | (DocumentType extends "Item" ? Item.Database.DeleteOptions : never)
+      | (DocumentType extends "JournalEntryCategory" ? JournalEntryCategory.Database.DeleteOptions : never)
       | (DocumentType extends "JournalEntryPage" ? JournalEntryPage.Database.DeleteOptions : never)
       | (DocumentType extends "JournalEntry" ? JournalEntry.Database.DeleteOptions : never)
       | (DocumentType extends "Macro" ? Macro.Database.DeleteOptions : never)
@@ -1919,7 +2037,7 @@ declare namespace Document {
 
   interface DataFieldShimOptions {
     /**
-     * Apply shims to embedded models?
+     * A string to log as a compatibility warning on accessing the `oldKey`
      */
     warning?: string | null | undefined;
 
@@ -1929,6 +2047,11 @@ declare namespace Document {
     value?: unknown;
   }
 
+  /**
+   * If a `parent` is required for a given Document's creation, its template must pass `NonNullable<X.Parent>` to `CreateDialogContext`
+   *
+   * @internal
+   */
   type ParentContext<Parent extends Document.Any | null> = Parent extends null
     ? {
         /** A parent document within which the created Document should belong */
@@ -1939,45 +2062,103 @@ declare namespace Document {
         parent: Parent;
       };
 
-  type DefaultNameContext<SubType extends string, Parent extends Document.Any | null> = {
-    /** The sub-type of the document */
-    type?: SubType | undefined;
-
-    /** A compendium pack within which the Document should be created */
-    pack?: string | undefined;
-  } & ParentContext<Parent>;
+  /** @internal */
+  type _PossibleSubtypeContext<DocumentName extends Document.Type> =
+    GetKey<Document.MetadataFor<DocumentName>, "hasTypeData"> extends true
+      ? NullishProps<{
+          /**
+           * The sub-type of the document
+           * @remarks Pulls from `CONFIG[documentName].typeLabels?.[type]` if provided. Ignored if falsey.
+           */
+          type: Document.SubTypesOf<DocumentName>;
+        }>
+      : {
+          /** @deprecated This Document type does not support subtypes */
+          type?: never;
+        };
+
+  type DefaultNameContext<DocumentName extends Document.Type, Parent extends Document.Any | null> = InexactPartial<{
+    /**
+     * A compendium pack within which the Document should be created
+     * @remarks Only used to generate the list of existing names to check against when incrementing the index for the `(number)` suffix.
+     * Ignored if falsey, or if `parent` is provided and truthy.
+     */
+    pack: string | null;
 
-  interface FromDropDataOptions {
     /**
-     * Import the provided document data into the World, if it is not already a World-level Document reference
-     * @defaultValue `false`
+     * A parent document within which the created Document should belong
+     * @remarks Only used to generate the list of existing names to check against when incrementing the index for the `(number)` suffix.
+     * Ignored if falsey.
      */
-    importWorld?: boolean;
-  }
+    parent: Parent | null;
+  }> &
+    _PossibleSubtypeContext<DocumentName>;
 
-  type CreateDialogData<CreateData extends object> = InexactPartial<
-    CreateData,
-    Extract<AllKeysOf<CreateData>, "name" | "type" | "folder">
-  >;
+  // TODO(LukeAbby): Inline into each document.
+  type CreateDialogData<CreateData extends object> = InexactPartial<{
+    [K in keyof CreateData as Extract<K, "name" | "type" | "folder">]: CreateData[K];
+  }> &
+    Omit<CreateData, "name" | "type" | "folder">;
 
+  /** @internal */
+  type _PossibleSubtypesContext<DocumentName extends Document.Type> =
+    GetKey<Document.MetadataFor<DocumentName>, "hasTypeData"> extends true
+      ? {
+          /** @deprecated This Document type does not support subtypes */
+          types?: never;
+        }
+      : NullishProps<{
+          /**
+           * A restriction the selectable sub-types of the Dialog.
+           * @remarks Only checked if the document has `static TYPES` of length \> 1 (i.e it both `hasTypeData` and has
+           * at least one non-`"base"` type registered). The computed list will always exclude {@link CONST.BASE_DOCUMENT_TYPE | `CONST.BASE_DOCUMENT_TYPE`},
+           * so it is disallowed in this whitelist.
+           */
+          types: Exclude<Document.SubTypesOf<DocumentName>, "base">[];
+        }>;
+
+  /** @deprecated in favor of {@linkcode CreateDialogOptions} */
   type CreateDialogContext<
-    SubType extends string,
+    DocumentName extends Document.Type,
     Parent extends Document.Any | null,
-  > = InexactPartial<Dialog.Options> & {
+  > = InexactPartial<foundry.appv1.api.Dialog.Options> &
+    NullishProps<{
+      /**
+       * A compendium pack within which the Document should be created
+       * @remarks Only checked if `parent` is falsey, and only used to generate the list of folders for the dialog
+       */
+      pack: string;
+    }> &
+    _PossibleSubtypesContext<DocumentName> &
+    ParentContext<Parent>;
+
+  type CreateDialogOptions<DocumentName extends Document.Type> =
+    InexactPartial<foundry.applications.api.DialogV2.PromptConfig> &
+      NullishProps<{
+        /**
+         * A template to use for the dialog contents instead of the default.
+         */
+        template: string;
+
+        /**
+         * Additional render context to provide to the template.
+         */
+        context: AnyObject;
+      }> &
+      _PossibleSubtypesContext<DocumentName>;
+
+  interface FromImportContext<Parent extends Document.Any | null> extends Omit<ConstructionContext<Parent>, "strict"> {
     /**
-     * A compendium pack within which the Document should be created
+     * Strict validation is enabled by default.
+     * @defaultValue `true`
+     * @remarks Not allowed to be `undefined` as that would produce `false`, not the expected default of `true`, due to being spread
+     * into an object with `strict: true`, then passed to {@link Document.fromSource | `Document.fromSource`}, where the parameter
+     * default is `false`
      */
-    pack?: string | null | undefined;
-
-    /** A restriction the selectable sub-types of the Dialog. */
-    types?: SubType[] | null | undefined;
-  } & ParentContext<Parent>;
-
-  interface FromImportContext<Parent extends Document.Any | null>
-    extends ConstructionContext<Parent>,
-      DataModel.DataValidationOptions<Parent> {}
+    strict?: boolean | null;
+  }
 
-  type TestableOwnershipLevel = keyof typeof CONST.DOCUMENT_OWNERSHIP_LEVELS | CONST.DOCUMENT_OWNERSHIP_LEVELS;
+  type ActionPermission = keyof typeof CONST.DOCUMENT_OWNERSHIP_LEVELS | CONST.DOCUMENT_OWNERSHIP_LEVELS;
 
   /** @internal */
   type _TestUserPermissionsOptions = NullishProps<{
@@ -1990,39 +2171,6 @@ declare namespace Document {
 
   interface TestUserPermissionOptions extends _TestUserPermissionsOptions {}
 
-  /**
-   * @deprecated {@link ImplementationFor | `ImplementationFor`}
-   */
-  type ConfiguredInstanceForName<Name extends Type> = ImplementationFor<Name>;
-
-  /**
-   * @deprecated {@link ImplementationClassFor | `ImplementationClassFor`}
-   */
-  type ConfiguredClassForName<Name extends Type> = ImplementationClassFor<Name>;
-
-  /**
-   * @deprecated {@link SchemaField.SourceData | `SchemaField.SourceData<Schema>`}
-   */
-  type ToObjectFalseType<T extends Document.Internal.Instance.Any> = T extends {
-    toObject: (source: false) => infer U;
-  }
-    ? U
-    : T;
-
-  /**
-   * @deprecated {@link Document.Database.OperationOf | `Document.Database.OperationOf`}
-   */
-  type DatabaseOperationsFor<
-    Name extends Document.Type,
-    ConcreteOperation extends Document.Database.Operation,
-    // eslint-disable-next-line @typescript-eslint/no-deprecated
-  > = Document.Database.OperationOf<Name, ConcreteOperation>;
-
-  /**
-   * @deprecated {@link CreateDataForName | `CreateDataForName`}
-   */
-  type ConstructorDataForName<T extends Document.Type> = CreateData[T];
-
   type CanUserModifyData<Schema extends DataSchema, Action extends "create" | "update" | "delete"> =
     | (Action extends "create" ? SchemaField.CreateData<Schema> : never)
     | (Action extends "update" ? SchemaField.UpdateData<Schema> : never)
@@ -2142,152 +2290,161 @@ declare namespace Document {
         userId: string,
       ]
     : never;
-}
 
-/** @deprecated {@link Document.Database.Operation | `Document.Database.Operation`} */
-export type Operation = Document.Database.Operation;
+  type Clone<This extends Document.Any, Save extends boolean | null | undefined> = Save extends true
+    ? Promise<This>
+    : This;
 
-/* eslint-disable @typescript-eslint/no-deprecated */
-/**
- * @deprecated if you want to get individual operations see {@link Document.Database.OperationOf | `Document.Database.OperationOf`}
- */
-export interface DatabaseOperationMap {
-  ActiveEffect: ActiveEffect.DatabaseOperations;
-  Actor: Actor.DatabaseOperations;
-  ActorDelta: ActorDelta.DatabaseOperations;
-  Adventure: Adventure.DatabaseOperations;
-  AmbientLight: AmbientLightDocument.DatabaseOperations;
-  AmbientSound: AmbientSoundDocument.DatabaseOperations;
-  Card: Card.DatabaseOperations;
-  Cards: Cards.DatabaseOperations;
-  ChatMessage: ChatMessage.DatabaseOperations;
-  Combat: Combat.DatabaseOperations;
-  Combatant: Combatant.DatabaseOperations;
-  Drawing: DrawingDocument.DatabaseOperations;
-  FogExploration: FogExploration.DatabaseOperations;
-  Folder: Folder.DatabaseOperations;
-  Item: Item.DatabaseOperations;
-  JournalEntry: JournalEntry.DatabaseOperations;
-  JournalEntryPage: JournalEntryPage.DatabaseOperations;
-  Macro: Macro.DatabaseOperations;
-  MeasuredTemplate: MeasuredTemplateDocument.DatabaseOperations;
-  Note: NoteDocument.DatabaseOperations;
-  Playlist: Playlist.DatabaseOperations;
-  PlaylistSound: PlaylistSound.DatabaseOperations;
-  Region: RegionDocument.DatabaseOperations;
-  RegionBehavior: RegionBehavior.DatabaseOperations;
-  RollTable: RollTable.DatabaseOperations;
-  Scene: Scene.DatabaseOperations;
-  Setting: Setting.DatabaseOperations;
-  TableResult: TableResult.DatabaseOperations;
-  Tile: TileDocument.DatabaseOperations;
-  Token: TokenDocument.DatabaseOperations;
-  User: User.DatabaseOperations;
-  Wall: WallDocument.DatabaseOperations;
-}
-/* eslint-enable @typescript-eslint/no-deprecated */
-
-interface DatabaseOperationCreateMap {
-  ActiveEffect: ActiveEffect.Database.Create;
-  Actor: Actor.Database.Create;
-  ActorDelta: ActorDelta.Database.Create;
-  Adventure: Adventure.Database.Create;
-  AmbientLight: AmbientLightDocument.Database.Create;
-  AmbientSound: AmbientSoundDocument.Database.Create;
-  Card: Card.Database.Create;
-  Cards: Cards.Database.Create;
-  ChatMessage: ChatMessage.Database.Create;
-  Combat: Combat.Database.Create;
-  Combatant: Combatant.Database.Create;
-  Drawing: DrawingDocument.Database.Create;
-  FogExploration: FogExploration.Database.Create;
-  Folder: Folder.Database.Create;
-  Item: Item.Database.Create;
-  JournalEntry: JournalEntry.Database.Create;
-  JournalEntryPage: JournalEntryPage.Database.Create;
-  Macro: Macro.Database.Create;
-  MeasuredTemplate: MeasuredTemplateDocument.Database.Create;
-  Note: NoteDocument.Database.Create;
-  Playlist: Playlist.Database.Create;
-  PlaylistSound: PlaylistSound.Database.Create;
-  Region: RegionDocument.Database.Create;
-  RegionBehavior: RegionBehavior.Database.Create;
-  RollTable: RollTable.Database.Create;
-  Scene: Scene.Database.Create;
-  Setting: Setting.Database.Create;
-  TableResult: TableResult.Database.Create;
-  Tile: TileDocument.Database.Create;
-  Token: TokenDocument.Database.Create;
-  User: User.Database.Create;
-  Wall: WallDocument.Database.Create;
-}
+  /**
+   * The options for `fromDropData`. Foundry never uses these so the interface is currently empty.
+   */
+  // eslint-disable-next-line @typescript-eslint/no-empty-object-type
+  interface DropDataOptions {}
+
+  type DropDataFor<Name extends Document.Type> = {
+    ActiveEffect: ActiveEffect.DropData;
+    ActorDelta: ActorDelta.DropData;
+    Actor: Actor.DropData;
+    Adventure: Adventure.DropData;
+    Card: Card.DropData;
+    Cards: Cards.DropData;
+    ChatMessage: ChatMessage.DropData;
+    Combat: Combat.DropData;
+    Combatant: Combatant.DropData;
+    CombatantGroup: CombatantGroup.DropData;
+    FogExploration: FogExploration.DropData;
+    Folder: Folder.DropData;
+    Item: Item.DropData;
+    JournalEntryCategory: JournalEntryCategory.DropData;
+    JournalEntryPage: JournalEntryPage.DropData;
+    JournalEntry: JournalEntry.DropData;
+    Macro: Macro.DropData;
+    PlaylistSound: PlaylistSound.DropData;
+    Playlist: Playlist.DropData;
+    RegionBehavior: RegionBehavior.DropData;
+    RollTable: RollTable.DropData;
+    Scene: Scene.DropData;
+    Setting: Setting.DropData;
+    TableResult: TableResult.DropData;
+    User: User.DropData;
+    AmbientLight: AmbientLightDocument.DropData;
+    AmbientSound: AmbientSoundDocument.DropData;
+    Drawing: DrawingDocument.DropData;
+    MeasuredTemplate: MeasuredTemplateDocument.DropData;
+    Note: NoteDocument.DropData;
+    Region: RegionDocument.DropData;
+    Tile: TileDocument.DropData;
+    Token: TokenDocument.DropData;
+    Wall: WallDocument.DropData;
+  }[Name];
+
+  /**
+   * @deprecated This type should not be used directly. Use `StoredForName` as this type does not account for anything declaration merged into `Stored`.
+   */
+  // eslint-disable-next-line @typescript-eslint/no-deprecated
+  type ToConfiguredStored<D extends Document.AnyConstructor> = Stored<ToConfiguredInstance<D>>;
 
-interface DatabaseOperationUpdateMap {
-  ActiveEffect: ActiveEffect.Database.Update;
-  Actor: Actor.Database.Update;
-  ActorDelta: ActorDelta.Database.Update;
-  Adventure: Adventure.Database.Update;
-  AmbientLight: AmbientLightDocument.Database.Update;
-  AmbientSound: AmbientSoundDocument.Database.Update;
-  Card: Card.Database.Update;
-  Cards: Cards.Database.Update;
-  ChatMessage: ChatMessage.Database.Update;
-  Combat: Combat.Database.Update;
-  Combatant: Combatant.Database.Update;
-  Drawing: DrawingDocument.Database.Update;
-  FogExploration: FogExploration.Database.Update;
-  Folder: Folder.Database.Update;
-  Item: Item.Database.Update;
-  JournalEntry: JournalEntry.Database.Update;
-  JournalEntryPage: JournalEntryPage.Database.Update;
-  Macro: Macro.Database.Update;
-  MeasuredTemplate: MeasuredTemplateDocument.Database.Update;
-  Note: NoteDocument.Database.Update;
-  Playlist: Playlist.Database.Update;
-  PlaylistSound: PlaylistSound.Database.Update;
-  Region: RegionDocument.Database.Update;
-  RegionBehavior: RegionBehavior.Database.Update;
-  RollTable: RollTable.Database.Update;
-  Scene: Scene.Database.Update;
-  Setting: Setting.Database.Update;
-  TableResult: TableResult.Database.Update;
-  Tile: TileDocument.Database.Update;
-  Token: TokenDocument.Database.Update;
-  User: User.Database.Update;
-  Wall: WallDocument.Database.Update;
-}
+  /**
+   * @deprecated This type should not be used directly. Use `StoredForName` as this type does not account for anything declaration merged into `Stored`.
+   */
+  type Stored<D extends Document.Any> = Document.Internal.Stored<D>;
+
+  /**
+   * @deprecated This type should not be used directly. Use `InvalidForName` as this type does not account for anything declaration merged into `Invalid`.
+   */
+  type Invalid<D extends Document.Any> = Document.Internal.Invalid<D>;
+
+  /**
+   * @deprecated This type should not be used directly. Use `StoredForName` as this type does not account for anything declaration merged into `Stored`.
+   */
+  // eslint-disable-next-line @typescript-eslint/no-deprecated
+  type ToStored<D extends Document.AnyConstructor> = Stored<FixedInstanceType<D>>;
+
+  /**
+   * @deprecated This type should not be used directly. Use `StoredForName` as this type does not account for anything declaration merged into `Stored`.
+   */
+  type ToStoredIf<D extends Document.AnyConstructor, Temporary extends boolean | undefined> = Temporary extends true
+    ? FixedInstanceType<D>
+    : // eslint-disable-next-line @typescript-eslint/no-deprecated
+      ToConfiguredStored<D>;
+
+  /** @deprecated This type currently does not have a replacement as it was deemed too niche. If you have a use case for it let us know. */
+  type Temporary<D extends Document.Any> = D extends Internal.Stored<infer U> ? U : D;
+
+  /**
+   * @deprecated Replaced with {@linkcode Document.SheetClassFor}
+   */
+  export import ConfiguredSheetClassFor = Document.SheetClassFor;
+
+  /**
+   * @deprecated Replaced with {@linkcode Document.ObjectClassFor}
+   */
+  export import ConfiguredObjectClassFor = Document.ObjectClassFor;
+
+  /**
+   * @deprecated Replaced with {@linkcode Document.LayerClassFor}
+   */
+  export import ConfiguredLayerClassFor = Document.LayerClassFor;
+
+  /**
+   * Returns the type of the constructor data for the given {@linkcode foundry.abstract.Document}.
+   * @deprecated Replaced with {@linkcode CreateDataForName}
+   */
+  type CreateDataFor<T extends Document.Internal.Constructor> = SchemaField.CreateData<
+    T extends { defineSchema: () => infer R extends DataSchema } ? R : never
+  >;
+
+  /**
+   * @deprecated Replaced with {@linkcode UpdateDataForName}
+   */
+  type UpdateDataFor<T extends Document.Internal.Constructor> = SchemaField.UpdateData<
+    T extends { defineSchema: () => infer R extends DataSchema } ? R : never
+  >;
+
+  /**
+   * @deprecated Use `[Document].DropData` instead.
+   */
+  type DropData<T extends Document.Any> = T extends { id: string | undefined }
+    ? // eslint-disable-next-line @typescript-eslint/no-deprecated
+      DropData.Data<T> & DropData.UUID
+    : // eslint-disable-next-line @typescript-eslint/no-deprecated
+      DropData.Data<T>;
+
+  namespace DropData {
+    /**
+     * @deprecated - This type is likely too broad to be useful. Deprecated without replacement.
+     */
+    // eslint-disable-next-line @typescript-eslint/no-deprecated
+    type Any = DropData<any>;
+
+    /**
+     * @deprecated - This type is a part of the drop data which is now gotten through
+     * `[Document].DropData`. Use that instead.
+     */
+    interface Data<T extends Document.Any> {
+      type: T["documentName"];
+      data: T["_source"];
+    }
 
-interface DatabaseOperationDeleteMap {
-  ActiveEffect: ActiveEffect.Database.Delete;
-  Actor: Actor.Database.Delete;
-  ActorDelta: ActorDelta.Database.Delete;
-  Adventure: Adventure.Database.Delete;
-  AmbientLight: AmbientLightDocument.Database.Delete;
-  AmbientSound: AmbientSoundDocument.Database.Delete;
-  Card: Card.Database.Delete;
-  Cards: Cards.Database.Delete;
-  ChatMessage: ChatMessage.Database.Delete;
-  Combat: Combat.Database.Delete;
-  Combatant: Combatant.Database.Delete;
-  Drawing: DrawingDocument.Database.Delete;
-  FogExploration: FogExploration.Database.Delete;
-  Folder: Folder.Database.Delete;
-  Item: Item.Database.Delete;
-  JournalEntry: JournalEntry.Database.Delete;
-  JournalEntryPage: JournalEntryPage.Database.Delete;
-  Macro: Macro.Database.Delete;
-  MeasuredTemplate: MeasuredTemplateDocument.Database.Delete;
-  Note: NoteDocument.Database.Delete;
-  Playlist: Playlist.Database.Delete;
-  PlaylistSound: PlaylistSound.Database.Delete;
-  Region: RegionDocument.Database.Delete;
-  RegionBehavior: RegionBehavior.Database.Delete;
-  RollTable: RollTable.Database.Delete;
-  Scene: Scene.Database.Delete;
-  Setting: Setting.Database.Delete;
-  TableResult: TableResult.Database.Delete;
-  Tile: TileDocument.Database.Delete;
-  Token: TokenDocument.Database.Delete;
-  User: User.Database.Delete;
-  Wall: WallDocument.Database.Delete;
+    /**
+     * @deprecated - This type is a part of the drop data which is now gotten through
+     * `[Document].DropData`. Use that instead.
+     */
+    interface UUID {
+      uuid: string;
+    }
+  }
+
+  /**
+   * @deprecated This type has been deprecated because of the inconsistent casing of "Subtype" instead of "SubType". Use {@linkcode Document.ModuleSubType} instead.
+   */
+  type ModuleSubtype = ModuleSubType;
+
+  /**
+   * @deprecated This type was used to simplify the logic behind `ConstructorArgs` but that's now being deprecated.
+   */
+  type ConstructorParameters<CreateData extends object | undefined, Parent extends Document.Any | null> = [
+    data?: CreateData,
+    context?: Document.ConstructionContext<Parent>,
+  ];
 }