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

package/src/foundry/common/data/validation-failure.d.mts

@@ -130,13 +130,11 @@ export class DataModelValidationError extends Error {
 
 declare namespace DataModelValidationFailure {
   interface ConstructorArgs {
-    // The `| undefined` is redundant with `unknown` but it's provided anyways for easy auditing.
-
     /** The value that failed validation for this field. */
-    invalidValue?: unknown | undefined;
+    invalidValue?: unknown;
 
     /**  The value it was replaced by, if any. */
-    fallback?: unknown | undefined;
+    fallback?: unknown;
 
     /**
      * Whether the value was dropped from some parent collection.
@@ -166,8 +164,8 @@ declare namespace DataModelValidationFailure {
   }
 
   interface ToObject {
-    invalidValue?: unknown | undefined;
-    fallback?: unknown | undefined;
+    invalidValue?: unknown;
+    fallback?: unknown;
     dropped?: boolean | undefined;
     message?: string | undefined;
   }

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

@@ -1,7 +1,7 @@
 // In Foundry itself this file contains re-exports of these other modules.
 // Therefore it has a runtime effect and uses `.mjs` instead of `.d.mts`.
-// While `.mts` could work, to avoid `import/no-unresolved` from erroring `.mjs` is used.
-/* eslint-disable import/extensions */
+// While `.mts` could work, to avoid `import-x/no-unresolved` from erroring `.mjs` is used.
+/* eslint-disable import-x/extensions */
 
 export { default as BaseActiveEffect } from "./active-effect.mjs";
 export { default as BaseActorDelta } from "./actor-delta.mjs";
@@ -25,6 +25,8 @@ export { default as BaseMeasuredTemplate } from "./measured-template.mjs";
 export { default as BaseNote } from "./note.mjs";
 export { default as BasePlaylist } from "./playlist.mjs";
 export { default as BasePlaylistSound } from "./playlist-sound.mjs";
+export { default as BaseRegionBehavior } from "./region-behavior.mjs";
+export { default as BaseRegion } from "./region.mjs";
 export { default as BaseRollTable } from "./roll-table.mjs";
 export { default as BaseScene } from "./scene.mjs";
 export { default as BaseSetting } from "./setting.mjs";

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

@@ -1,9 +1,4 @@
 import type BaseActiveEffect from "./active-effect.d.mts";
-import type BaseActorDelta from "./actor-delta.d.mts";
-import type BaseActor from "./actor.d.mts";
-import type BaseAdventure from "./adventure.d.mts";
-import type BaseAmbientLight from "./ambient-light.d.mts";
-import type BaseAmbientSound from "./ambient-sound.d.mts";
 import type BaseCard from "./card.d.mts";
 import type BaseCards from "./cards.d.mts";
 import type BaseChatMessage from "./chat-message.d.mts";
@@ -20,6 +15,8 @@ import type BaseMeasuredTemplate from "./measured-template.d.mts";
 import type BaseNote from "./note.d.mts";
 import type BasePlaylistSound from "./playlist-sound.d.mts";
 import type BasePlaylist from "./playlist.d.mts";
+import type BaseRegionBehavior from "./region-behavior.d.mts";
+import type BaseRegion from "./region.d.mts";
 import type BaseRollTable from "./roll-table.d.mts";
 import type BaseScene from "./scene.d.mts";
 import type BaseSetting from "./setting.d.mts";
@@ -36,44 +33,12 @@ export type EffectDurationData = BaseActiveEffect.Properties["duration"];
 // TODO(LukeAbby): This understandably adds a circular loop because `DataField` depends on `EffectChangeData`.
 // export type EffectChangeData = BaseActiveEffect.Properties["changes"][number];
 
-// TODO(LukeAbby): Audit. This is used both as an assignment, constructor, and initialized type. It's likely this isn't
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-export type EffectChangeData = {
-  /**
-   * The attribute path in the Actor or Item data which the change modifies
-   * @defaultValue `""`
-   */
-  key: string;
-
-  /**
-   * The value of the change effect
-   * @defaultValue `""`
-   */
-  value: string;
-
-  /**
-   * The modification mode with which the change is applied
-   * @defaultValue `CONST.ACTIVE_EFFECT_MODES.ADD`
-   */
-  mode: number | null;
-
-  /**
-   * The priority level with which this change is applied
-   * @defaultValue `null`
-   */
-  priority: number | null;
-};
-
-export type ActorData = BaseActor.Properties;
-
-export type ActorDeltaData = BaseActorDelta.Properties;
-
-export type AdventureData = BaseAdventure.Properties;
-
-export type AmbientLightData = BaseAmbientLight.Properties;
-
-export type AmbientSoundData = BaseAmbientSound.Properties;
-
+// TODO(LukeAbby): Audit. This is used both as an assignment, constructor, and initialized type.
+// It's likely this isn't really supposed to be used in fvtt-types.
+/**
+ * @deprecated {@link ActiveEffect.EffectChangeData | `ActiveEffect.EffectChangeData`}
+ */
+export type EffectChangeData = ActiveEffect.EffectChangeData;
 export interface AmbientSoundEffect {
   type: string;
   intensity: number;
@@ -146,9 +111,9 @@ export type GlobalLightData = BaseScene.Properties["environment"]["globalLight"]
 // @ts-expect-error This still has to be typed
 export type SceneEnvironmentData = BaseScene.Properties["environment"];
 
-export type RegionData = unknown; // TODO: Add when BaseRegion's schema is added.
+export type RegionData = BaseRegion.Properties;
 
-export type RegionBehaviorData = unknown; // TODO: Add when BaseRegionBehavior's schema is added.
+export type RegionBehaviorData = BaseRegionBehavior.Properties;
 
 export type SettingData = BaseSetting.Properties;
 

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

@@ -1,10 +1,11 @@
-import type { InterfaceToObject } from "../../../types/helperTypes.d.mts";
-import type { AnyObject, InexactPartial } from "../../../types/utils.mts";
+import type { InterfaceToObject, AnyObject, InexactPartial } from "fvtt-types/utils";
 import type Document from "../abstract/document.mts";
 import type * as CONST from "../constants.mts";
 import type * as fields from "../data/fields.d.mts";
 import type * as documents from "./_module.mts";
 
+type DataSchema = foundry.data.fields.DataSchema;
+
 /**
  * The ActiveEffect Document.
  */
@@ -21,14 +22,14 @@ declare class BaseActiveEffect extends Document<"ActiveEffect", BaseActiveEffect
 
   override parent: BaseActiveEffect.Parent;
 
-  override canUserModify(user: documents.BaseUser, action: "create" | "update" | "delete", data?: AnyObject): boolean;
+  override canUserModify(user: User, action: "create" | "update" | "delete", data?: AnyObject): boolean;
 
   static override metadata: BaseActiveEffect.Metadata;
 
   static override defineSchema(): BaseActiveEffect.Schema;
 
   override testUserPermission(
-    user: documents.BaseUser,
+    user: User,
     permission: keyof typeof CONST.DOCUMENT_OWNERSHIP_LEVELS | CONST.DOCUMENT_OWNERSHIP_LEVELS,
     options?: InexactPartial<{
       /**

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

@@ -1,8 +1,10 @@
-import type { AnyObject, InexactPartial } from "../../../types/utils.d.mts";
+import type { AnyMutableObject, AnyObject, InexactPartial } from "fvtt-types/utils";
 import type Document from "../abstract/document.mts";
-import type { fields } from "../data/module.d.mts";
+import type { fields } from "../data/_module.d.mts";
 import type { CONST, documents } from "../../client-esm/client.d.mts";
 
+type DataSchema = foundry.data.fields.DataSchema;
+
 /**
  * The ActorDelta Document.
  * Defines the DataSchema and common behaviors for an ActorDelta which are shared between both client and server.
@@ -23,10 +25,10 @@ declare class BaseActorDelta extends Document<"ActorDelta", BaseActorDelta.Schem
 
   static override defineSchema(): BaseActorDelta.Schema;
 
-  override canUserModify(user: documents.BaseUser, action: "create" | "update" | "delete", data?: AnyObject): boolean;
+  override canUserModify(user: User, action: "create" | "update" | "delete", data?: AnyObject): boolean;
 
   override testUserPermission(
-    user: documents.BaseUser,
+    user: User,
     permission: keyof typeof CONST.DOCUMENT_OWNERSHIP_LEVELS | CONST.DOCUMENT_OWNERSHIP_LEVELS,
     options?: InexactPartial<{
       /**
@@ -49,7 +51,7 @@ declare class BaseActorDelta extends Document<"ActorDelta", BaseActorDelta.Schem
     context: unknown,
   ): Document.ConfiguredClassForName<"Actor"> | null;
 
-  static migrateData(source: AnyObject): AnyObject;
+  static migrateData(source: AnyMutableObject): AnyMutableObject;
 
   //TODO: Figure out if this override still applies
   toObject(source: true): this["_source"];

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

@@ -1,9 +1,11 @@
-import type { AnyObject } from "../../../types/utils.mts";
+import type { AnyObject } from "fvtt-types/utils";
 import type Document from "../abstract/document.mts";
 import type { PrototypeToken } from "../data/data.mts";
 import type * as fields from "../data/fields.d.mts";
 import type * as documents from "./_module.d.mts";
 
+type DataSchema = foundry.data.fields.DataSchema;
+
 /**
  * The Actor Document.
  * Defines the DataSchema and common behaviors for an Actor which are shared between both client and server.
@@ -50,24 +52,7 @@ declare class BaseActor extends Document<"Actor", BaseActor.Schema, any> {
     options?: Omit<foundry.abstract.DataModel.DataValidationOptions, "parent">,
   ): BaseActor.Source;
 
-  static override canUserCreate(user: documents.BaseUser): boolean;
-
-  /**
-   * Is a user able to create this actor?
-   * @param user - The user attempting the creation operation.
-   * @param doc  - The Actor being created.
-   * @internal
-   */
-  static #canCreate(user: documents.BaseUser, doc: BaseActor): boolean;
-
-  /**
-   * Is a user able to update an existing actor?
-   * @param user - The user attempting the update operation.
-   * @param doc  - The Actor being updated.
-   * @param data - The update delta being applied.
-   * @internal
-   */
-  static #canUpdate(user: documents.BaseUser, doc: BaseActor, data: BaseActor.UpdateData): boolean;
+  static override canUserCreate(user: User): boolean;
 
   /**
    * @privateRemarks _preCreate and _preUpdate are overridden but with no signature changes.
@@ -75,6 +60,8 @@ declare class BaseActor extends Document<"Actor", BaseActor.Schema, any> {
    */
 
   static override migrateData(source: AnyObject): AnyObject;
+
+  #baseActor: true;
 }
 
 declare namespace BaseActor {

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

@@ -1,6 +1,8 @@
 import type Document from "../abstract/document.mts";
 import type * as fields from "../data/fields.d.mts";
 
+type DataSchema = foundry.data.fields.DataSchema;
+
 /**
  * The Adventure Document.
  * Defines the DataSchema and common behaviors for an Adventure which are shared between both client and server.
@@ -173,8 +175,17 @@ declare namespace BaseAdventure {
   type ContentFields = {
     [Key in keyof BaseAdventure.Schema as BaseAdventure.Schema[Key] extends fields.SetField.Any
       ? Key
-      : never]: BaseAdventure.Schema[Key] extends fields.SetField<infer ElementType, any, any, any, any, any, any, any>
-      ? ElementType extends fields.EmbeddedDataField<infer ModelType, any, any, any, any>
+      : never]: BaseAdventure.Schema[Key] extends fields.SetField<
+      infer ElementType,
+      infer _1,
+      infer _2,
+      infer _3,
+      infer _4,
+      infer _5,
+      infer _6,
+      infer _7
+    >
+      ? ElementType extends fields.EmbeddedDataField<infer ModelType, infer _8, infer _9, infer _10, infer _11>
         ? ModelType extends Document.AnyConstructor // TODO: This doesn't seem to quite work to ensure it's the configured class
           ? ModelType["implementation"]
           : ModelType

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

@@ -1,8 +1,10 @@
-import type { AnyObject } from "../../../types/utils.mts";
+import type { AnyObject } from "fvtt-types/utils";
 import type Document from "../abstract/document.mts";
 import type { LightData } from "../data/data.mts";
 import type * as fields from "../data/fields.d.mts";
 
+type DataSchema = foundry.data.fields.DataSchema;
+
 /**
  * The Document definition for an AmbientLight.
  * Defines the DataSchema and common behaviors for an AmbientLight which are shared between both client and server.

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

@@ -1,7 +1,9 @@
-import type { AnyObject } from "../../../types/utils.mts";
+import type { AnyObject } from "fvtt-types/utils";
 import type Document from "../abstract/document.mts";
 import type * as fields from "../data/fields.d.mts";
 
+type DataSchema = foundry.data.fields.DataSchema;
+
 /**
  * The Document definition for an AmbientSound.
  * Defines the DataSchema and common behaviors for an AmbientSound which are shared between both client and server.

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

@@ -1,9 +1,11 @@
-import type { InexactPartial } from "../../../types/utils.mts";
+import type { InexactPartial } from "fvtt-types/utils";
 import type Document from "../abstract/document.mts";
 import type * as CONST from "../constants.mts";
 import type * as fields from "../data/fields.d.mts";
 import type * as documents from "./_module.mts";
 
+type DataSchema = foundry.data.fields.DataSchema;
+
 /**
  * The Card Document.
  * Defines the DataSchema and common behaviors for a Card which are shared between both client and server.
@@ -41,15 +43,15 @@ declare class BaseCard extends Document<"Card", BaseCard.Schema, any> {
   /**
    * Is a User able to create a new Card within this parent?
    */
-  static #canCreate(user: documents.BaseUser, doc: BaseCard, data: BaseCard.ConstructorData): boolean;
+  static #canCreate(user: User, doc: BaseCard, data: BaseCard.ConstructorData): boolean;
 
   /**
    * Is a user able to update an existing Card?
    */
-  static #canUpdate(user: documents.BaseUser, doc: BaseCard, data: BaseCard.UpdateData): boolean;
+  static #canUpdate(user: User, doc: BaseCard, data: BaseCard.UpdateData): boolean;
 
   override testUserPermission(
-    user: documents.BaseUser,
+    user: User,
     permission: keyof typeof CONST.DOCUMENT_OWNERSHIP_LEVELS | CONST.DOCUMENT_OWNERSHIP_LEVELS,
     options?: InexactPartial<{
       /**

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

@@ -1,8 +1,10 @@
-import type { AnyObject } from "../../../types/utils.mts";
+import type { AnyObject } from "fvtt-types/utils";
 import type Document from "../abstract/document.mts";
 import type * as fields from "../data/fields.d.mts";
 import type * as documents from "./_module.mts";
 
+type DataSchema = foundry.data.fields.DataSchema;
+
 /**
  * The Cards Document.
  * Defines the DataSchema and common behaviors for a Cards Document which are shared between both client and server.

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

@@ -1,9 +1,11 @@
-import type { AnyObject, InexactPartial } from "../../../types/utils.mts";
+import type { AnyObject, InexactPartial } from "fvtt-types/utils";
 import type Document from "../abstract/document.mts";
 import type * as CONST from "../constants.mts";
 import type * as fields from "../data/fields.d.mts";
 import type * as documents from "./_module.mts";
 
+type DataSchema = foundry.data.fields.DataSchema;
+
 /**
  * The ChatMessage Document.
  * Defines the DataSchema and common behaviors for a ChatMessage which are shared between both client and server.
@@ -29,13 +31,13 @@ declare class BaseChatMessage extends Document<"ChatMessage", BaseChatMessage.Sc
    * Is a user able to create a new chat message?
    * @internal
    */
-  static #canCreate(user: documents.BaseUser, doc: BaseChatMessage): boolean;
+  // static #canCreate(user: User, doc: BaseChatMessage): boolean;
 
-  /**
-   * Is a user able to update an existing chat message?
-   * @internal
-   */
-  static #canUpdate(user: documents.BaseUser, doc: BaseChatMessage, data: BaseChatMessage.UpdateData): boolean;
+  // /**
+  //  * Is a user able to update an existing chat message?
+  //  * @internal
+  //  */
+  // static #canUpdate(user: User, doc: BaseChatMessage, data: BaseChatMessage.UpdateData): boolean;
 
   /**
    * Validate that Rolls belonging to the ChatMessage document are valid
@@ -44,7 +46,7 @@ declare class BaseChatMessage extends Document<"ChatMessage", BaseChatMessage.Sc
   static #validateRoll(rollJSON: string): void;
 
   override testUserPermission(
-    user: foundry.documents.BaseUser,
+    user: User,
     permission: keyof typeof CONST.DOCUMENT_OWNERSHIP_LEVELS | CONST.DOCUMENT_OWNERSHIP_LEVELS,
     options?: InexactPartial<{ exact: boolean }>,
   ): boolean;

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

@@ -2,6 +2,8 @@ import type Document from "../abstract/document.mts";
 import type * as fields from "../data/fields.d.mts";
 import type * as documents from "./_module.mts";
 
+type DataSchema = foundry.data.fields.DataSchema;
+
 /**
  * The Combat Document.
  * Defines the DataSchema and common behaviors for a Combat which are shared between both client and server.
@@ -27,7 +29,7 @@ declare class BaseCombat extends Document<"Combat", BaseCombat.Schema, any> {
    * Is a user able to update an existing Combat?
    * @internal
    */
-  static #canUpdate(user: documents.BaseUser, doc: BaseCombat, data: BaseCombat.UpdateData): boolean;
+  static #canUpdate(user: User, doc: BaseCombat, data: BaseCombat.UpdateData): boolean;
 
   /**
    * Can a certain User change the Combat round?

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

@@ -3,6 +3,8 @@ import type { DOCUMENT_OWNERSHIP_LEVELS } from "../constants.d.mts";
 import type * as fields from "../data/fields.d.mts";
 import type * as documents from "./_module.mts";
 
+type DataSchema = foundry.data.fields.DataSchema;
+
 /**
  * The Combatant Document.
  * Defines the DataSchema and common behaviors for a Combatant which are shared between both client and server.
@@ -24,19 +26,9 @@ declare class BaseCombatant extends Document<"Combatant", BaseCombatant.Schema,
 
   static override defineSchema(): BaseCombatant.Schema;
 
-  /**
-   * Is a user able to update an existing Combatant?
-   * @internal
-   */
-  static #canUpdate(user: documents.BaseUser, doc: BaseCombatant, data: BaseCombatant.UpdateData): boolean;
-
-  /**
-   * Is a user able to create this Combatant?
-   * @internal
-   */
-  static #canCreate(user: documents.BaseUser, doc: BaseCombatant, data: BaseCombatant.ConstructorData): boolean;
+  override getUserLevel(user?: User): DOCUMENT_OWNERSHIP_LEVELS | null;
 
-  override getUserLevel(user?: documents.BaseUser): DOCUMENT_OWNERSHIP_LEVELS | null;
+  #baseCombatant: true;
 }
 
 export default BaseCombatant;

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

@@ -1,10 +1,12 @@
-import type { AnyObject, InexactPartial } from "../../../types/utils.mts";
+import type { AnyObject, InexactPartial } from "fvtt-types/utils";
 import type Document from "../abstract/document.mts";
 import type * as CONST from "../constants.mts";
 import type * as fields from "../data/fields.d.mts";
-import type { ShapeData } from "../data/module.mts";
+import type { ShapeData } from "../data/_module.d.mts";
 import type * as documents from "./_module.mts";
 
+type DataSchema = foundry.data.fields.DataSchema;
+
 /**
  * The Document definition for a Drawing.
  * Defines the DataSchema and common behaviors for a Drawing which are shared between both client and server.
@@ -37,10 +39,10 @@ declare class BaseDrawing extends Document<"Drawing", BaseDrawing.Schema, any> {
    * Is a user able to update or delete an existing Drawing document??
    * @internal
    */
-  static #canModify(user: documents.BaseUser, doc: BaseDrawing, data: BaseDrawing.UpdateData): boolean;
+  static #canModify(user: User, doc: BaseDrawing, data: BaseDrawing.UpdateData): boolean;
 
   override testUserPermission(
-    user: documents.BaseUser,
+    user: User,
     permission: keyof typeof CONST.DOCUMENT_OWNERSHIP_LEVELS | CONST.DOCUMENT_OWNERSHIP_LEVELS,
     options?: InexactPartial<{
       /**

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

@@ -2,6 +2,8 @@ import type Document from "../abstract/document.mts";
 import type * as fields from "../data/fields.d.mts";
 import type * as documents from "./_module.mts";
 
+type DataSchema = foundry.data.fields.DataSchema;
+
 /**
  * The FogExploration Document.
  * Defines the DataSchema and common behaviors for FogExploration which are shared between both client and server.
@@ -26,7 +28,7 @@ declare class BaseFogExploration extends Document<"FogExploration", BaseFogExplo
 
   static override defineSchema(): BaseFogExploration.Schema;
 
-  static #canModify(user: documents.BaseUser, doc: BaseFogExploration);
+  static #canModify(user: User, doc: BaseFogExploration);
 
   /**
    * @privateRemarks _preUpdate is overridden but with no signature changes.

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

@@ -1,6 +1,8 @@
 import type Document from "../abstract/document.mts";
 import type * as fields from "../data/fields.d.mts";
 
+type DataSchema = foundry.data.fields.DataSchema;
+
 /**
  * The Folder Document.
  * Defines the DataSchema and common behaviors for a Folder which are shared between both client and server.
@@ -8,12 +10,18 @@ import type * as fields from "../data/fields.d.mts";
 // Note(LukeAbby): You may wonder why documents don't simply pass the `Parent` generic parameter.
 // This pattern evolved from trying to avoid circular loops and even internal tsc errors.
 // See: https://gist.github.com/LukeAbby/0d01b6e20ef19ebc304d7d18cef9cc21
-declare class BaseFolder extends Document<"Folder", BaseFolder.Schema, any> {
+declare class BaseFolder<Type extends BaseFolder.TypeNames = BaseFolder.TypeNames> extends Document<
+  "Folder",
+  BaseFolder.Schema,
+  any
+> {
   /**
    * @privateRemarks Manual override of the return due to TS limitations with static `this`
    */
   static get TYPES(): BaseFolder.TypeNames[];
 
+  type: Type;
+
   /**
    * @param data    - Initial data from which to construct the Folder
    * @param context - Construction context options

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

@@ -1,8 +1,10 @@
-import type { AnyObject, InexactPartial } from "../../../types/utils.mts";
+import type { AnyObject, InexactPartial } from "fvtt-types/utils";
 import type Document from "../abstract/document.mts";
 import type * as fields from "../data/fields.d.mts";
 import type * as documents from "./_module.mts";
 
+type DataSchema = foundry.data.fields.DataSchema;
+
 /**
  * The Document definition for an Item.
  * Defines the DataSchema and common behaviors for an Item which are shared between both client and server.
@@ -43,10 +45,10 @@ declare class BaseItem extends Document<"Item", BaseItem.Schema, any> {
    */
   static getDefaultArtwork(itemData: BaseItem.ConstructorData): { img: string };
 
-  override canUserModify(user: documents.BaseUser, action: "create" | "delete" | "update", data?: AnyObject): boolean;
+  override canUserModify(user: User, action: "create" | "delete" | "update", data?: AnyObject): boolean;
 
   override testUserPermission(
-    user: documents.BaseUser,
+    user: User,
     permission: keyof typeof CONST.DOCUMENT_OWNERSHIP_LEVELS | foundry.CONST.DOCUMENT_OWNERSHIP_LEVELS,
     options?: InexactPartial<{
       /**

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

@@ -1,6 +1,7 @@
 import type Document from "../abstract/document.mts";
 import type * as fields from "../data/fields.d.mts";
-import type * as documents from "./_module.mts";
+
+type DataSchema = foundry.data.fields.DataSchema;
 
 /**
  * The JournalEntryPage Document.
@@ -30,7 +31,7 @@ declare class BaseJournalEntryPage extends Document<"JournalEntryPage", BaseJour
 
   static override defineSchema(): BaseJournalEntryPage.Schema;
 
-  override getUserLevel(user: documents.BaseUser): foundry.CONST.DOCUMENT_OWNERSHIP_LEVELS | null;
+  override getUserLevel(user?: User): foundry.CONST.DOCUMENT_OWNERSHIP_LEVELS | null;
 }
 
 export default BaseJournalEntryPage;

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

@@ -1,8 +1,10 @@
-import type { AnyObject } from "../../../types/utils.mts";
+import type { AnyObject } from "fvtt-types/utils";
 import type Document from "../abstract/document.mts";
 import type * as fields from "../data/fields.d.mts";
 import type * as documents from "./_module.mts";
 
+type DataSchema = foundry.data.fields.DataSchema;
+
 /**
  * The JournalEntry Document.
  * Defines the DataSchema and common behaviors for a JournalEntry which are shared between both client and server.

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

@@ -1,9 +1,11 @@
-import type { AnyObject, InexactPartial } from "../../../types/utils.d.mts";
+import type { AnyObject, InexactPartial } from "fvtt-types/utils";
 import type Document from "../abstract/document.d.mts";
 import type * as CONST from "../constants.mts";
 import type * as fields from "../data/fields.d.mts";
 import type * as documents from "./_module.mts";
 
+type DataSchema = foundry.data.fields.DataSchema;
+
 /**
  * The Macro Document.
  * Defines the DataSchema and common behaviors for a Macro which are shared between both client and server.
@@ -39,10 +41,10 @@ declare class BaseMacro extends Document<"Macro", BaseMacro.Schema, any> {
 
   static override validateJoint(data: Record<string, unknown>): void;
 
-  static override canUserCreate(user: foundry.documents.BaseUser): boolean;
+  static override canUserCreate(user: User): boolean;
 
   override testUserPermission(
-    user: documents.BaseUser,
+    user: User,
     permission: keyof typeof CONST.DOCUMENT_OWNERSHIP_LEVELS | CONST.DOCUMENT_OWNERSHIP_LEVELS,
     options?: InexactPartial<{
       /**

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

@@ -1,8 +1,10 @@
-import type { InexactPartial } from "../../../types/utils.mts";
+import type { InexactPartial } from "fvtt-types/utils";
 import type Document from "../abstract/document.mts";
 import type * as fields from "../data/fields.d.mts";
 import type * as documents from "./_module.mts";
 
+type DataSchema = foundry.data.fields.DataSchema;
+
 /**
  * The Document definition for a MeasuredTemplate.
  * Defines the DataSchema and common behaviors for a MeasuredTemplate which are shared between both client and server.
@@ -33,7 +35,7 @@ declare class BaseMeasuredTemplate extends Document<"MeasuredTemplate", BaseMeas
    * @param doc  - The MeasuredTemplate being created.
    * @internal
    */
-  static #canCreate(user: documents.BaseUser, doc: BaseMeasuredTemplate): boolean;
+  static #canCreate(user: User, doc: BaseMeasuredTemplate): boolean;
 
   /**
    * Is a user able to modify an existing MeasuredTemplate?
@@ -42,14 +44,10 @@ declare class BaseMeasuredTemplate extends Document<"MeasuredTemplate", BaseMeas
    * @param data - Data being changed.
    * @internal
    */
-  static #canModify(
-    user: documents.BaseUser,
-    doc: BaseMeasuredTemplate,
-    data?: BaseMeasuredTemplate.UpdateData,
-  ): boolean;
+  static #canModify(user: User, doc: BaseMeasuredTemplate, data?: BaseMeasuredTemplate.UpdateData): boolean;
 
   override testUserPermission(
-    user: foundry.documents.BaseUser,
+    user: User,
     permission: keyof typeof CONST.DOCUMENT_OWNERSHIP_LEVELS | foundry.CONST.DOCUMENT_OWNERSHIP_LEVELS,
     options?: InexactPartial<{
       /**

package/src/foundry/common/documents/module.d.mts

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