@league-of-foundry-developers/foundry-vtt-types 12.331.4-beta → 12.331.5

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

@@ -1,10 +1,11 @@
-import type { AnyMutableObject, AnyObject, InexactPartial } from "fvtt-types/utils";
+import type { AnyMutableObject } from "#utils";
 import type Document from "../abstract/document.mts";
 import type { fields } from "../data/module.d.mts";
-import type { CONST, documents } from "../../client-esm/client.d.mts";
+import type { documents } from "../../client-esm/client.d.mts";
 import type { DataField, SchemaField } from "../data/fields.d.mts";
 import type DataModel from "../abstract/data.d.mts";
 import type { LogCompatibilityWarningOptions } from "../utils/logging.d.mts";
+import type EmbeddedCollection from "../abstract/embedded-collection.d.mts";
 
 /**
  * The ActorDelta Document.
@@ -30,45 +31,80 @@ declare abstract class BaseActorDelta<
    */
   constructor(...args: ActorDelta.ConstructorArgs);
 
+  /**
+   * @defaultValue
+   * ```js
+   * mergeObject(super.metadata, {
+   *   name: "ActorDelta",
+   *   collection: "delta",
+   *   label: "DOCUMENT.ActorDelta",
+   *   labelPlural: "DOCUMENT.ActorDeltas",
+   *   isEmbedded: true,
+   *   embedded: {
+   *     Item: "items",
+   *     ActiveEffect: "effects"
+   *   },
+   *   schemaVersion: "12.324"
+   * });
+   * ```
+   */
   static override metadata: BaseActorDelta.Metadata;
 
   static override defineSchema(): BaseActorDelta.Schema;
 
-  override canUserModify(
-    user: User.Internal.Implementation,
-    action: "create" | "update" | "delete",
-    data?: AnyObject,
+  /**
+   * @remarks Forwards to `this.parent.canUserModify`. Core's `TokenDocument` implementation doesn't override this method,
+   * so without further extension that's equivalent to {@link Document.canUserModify | `Document#canUserModify`}
+   */
+  // data: not null (parameter default only)
+  override canUserModify<Action extends "create" | "update" | "delete">(
+    user: User.Implementation,
+    action: Action,
+    data?: Document.CanUserModifyData<TokenDocument.Schema, Action>,
   ): boolean;
 
+  /** @remarks Forwards to {@link TokenDocument.testUserPermission | `this.parent.testUserPermission`} */
+  // options: not null (destructured)
   override testUserPermission(
-    user: User.Internal.Implementation,
-    permission: keyof typeof CONST.DOCUMENT_OWNERSHIP_LEVELS | CONST.DOCUMENT_OWNERSHIP_LEVELS,
-    options?: InexactPartial<{
-      /**
-       * Require the exact permission level requested?
-       * @defaultValue `false`
-       */
-      exact: boolean;
-    }>,
+    user: User.Implementation,
+    permission: Document.ActionPermission,
+    options?: Document.TestUserPermissionOptions,
   ): boolean;
 
   /**
    * Retrieve the base actor's collection, if it exists.
    * @param collectionName - The collection name.
+   * @remarks Passes `collectionName` to the token's `baseActor`'s {@link Actor.getEmbeddedCollection | `#getEmbeddedCollection`}
    */
-  getBaseCollection(collectionName: string): Collection<Actor.Implementation> | undefined;
+  getBaseCollection<DocType extends Actor.Embedded.Name>(
+    collectionName: DocType,
+  ): EmbeddedCollection<Document.ImplementationFor<DocType>, Actor.Implementation> | undefined;
 
+  /**
+   * Apply an ActorDelta to an Actor and return the resultant synthetic Actor.
+   * @param delta     - The ActorDelta.
+   * @param baseActor - The base Actor.
+   * @param context   - Context to supply to synthetic Actor instantiation.
+   * @remarks `context` is spread into an object, so it being `null` is effectively the same as omitted
+   */
   static applyDelta(
     delta: BaseActorDelta,
     baseActor: documents.BaseActor,
-    context: unknown,
-  ): Document.ImplementationClassFor<"Actor"> | null;
+    context?: BaseActorDelta.ApplyDeltaContext | null,
+  ): Actor.Implementation | null;
 
+  /**
+   * @remarks
+   * Migrations:
+   * - {@link documents.BaseActor.migrateData | `BaseActor`}'s
+   *
+   * Simply forwards to `BaseActor`
+   */
   static migrateData(source: AnyMutableObject): AnyMutableObject;
 
-  // TODO: Figure out if this override still applies
-  toObject(source: true): this["_source"];
-  toObject(source?: boolean): ReturnType<this["schema"]["toObject"]>;
+  /** @remarks Strips optional (`required: false`) fields from the object before returning */
+  // TODO: Properly type this override
+  override toObject(source?: boolean | null): SchemaField.SourceData<ActorDelta.Schema>;
 
   /*
    * After this point these are not really overridden methods.
@@ -87,39 +123,39 @@ declare abstract class BaseActorDelta<
   // Same as Document for now
   protected static override _initializationOrder(): Generator<[string, DataField.Any]>;
 
-  readonly parentCollection: ActorDelta.ParentCollectionName | null;
+  override readonly parentCollection: ActorDelta.ParentCollectionName | null;
 
-  readonly pack: string | null;
+  override readonly pack: string | null;
 
   static override get implementation(): ActorDelta.ImplementationClass;
 
-  static get baseDocument(): typeof BaseActorDelta;
+  static override get baseDocument(): typeof BaseActorDelta;
 
-  static get collectionName(): ActorDelta.ParentCollectionName;
+  static override get collectionName(): ActorDelta.ParentCollectionName;
 
-  static get documentName(): ActorDelta.Name;
+  static override get documentName(): ActorDelta.Name;
 
-  static get TYPES(): BaseActorDelta.SubType[];
+  static override get TYPES(): BaseActorDelta.SubType[];
 
-  static get hasTypeData(): true;
+  static override get hasTypeData(): true;
 
-  static get hierarchy(): ActorDelta.Hierarchy;
+  static override get hierarchy(): ActorDelta.Hierarchy;
 
   override system: ActorDelta.SystemOfType<SubType>;
 
   override parent: BaseActorDelta.Parent;
 
-  static createDocuments<Temporary extends boolean | undefined = false>(
+  static override createDocuments<Temporary extends boolean | undefined = false>(
     data: Array<ActorDelta.Implementation | ActorDelta.CreateData> | undefined,
     operation?: Document.Database.CreateOperation<ActorDelta.Database.Create<Temporary>>,
   ): Promise<Array<Document.TemporaryIf<ActorDelta.Implementation, Temporary>>>;
 
-  static updateDocuments(
+  static override updateDocuments(
     updates: ActorDelta.UpdateData[] | undefined,
     operation?: Document.Database.UpdateDocumentsOperation<ActorDelta.Database.Update>,
   ): Promise<ActorDelta.Implementation[]>;
 
-  static deleteDocuments(
+  static override deleteDocuments(
     ids: readonly string[] | undefined,
     operation?: Document.Database.DeleteDocumentsOperation<ActorDelta.Database.Delete>,
   ): Promise<ActorDelta.Implementation[]>;
@@ -192,121 +228,151 @@ declare abstract class BaseActorDelta<
     key: Key,
   ): Promise<this>;
 
-  protected _preCreate(
+  protected override _preCreate(
     data: ActorDelta.CreateData,
     options: ActorDelta.Database.PreCreateOptions,
     user: User.Implementation,
   ): Promise<boolean | void>;
 
-  protected _onCreate(
+  protected override _onCreate(
     data: ActorDelta.CreateData,
     options: ActorDelta.Database.OnCreateOperation,
     userId: string,
   ): void;
 
-  protected static _preCreateOperation(
+  protected static override _preCreateOperation(
     documents: ActorDelta.Implementation[],
     operation: Document.Database.PreCreateOperationStatic<ActorDelta.Database.Create>,
     user: User.Implementation,
   ): Promise<boolean | void>;
 
-  protected static _onCreateOperation(
+  protected static override _onCreateOperation(
     documents: ActorDelta.Implementation[],
     operation: ActorDelta.Database.Create,
     user: User.Implementation,
   ): Promise<void>;
 
-  protected _preUpdate(
+  protected override _preUpdate(
     changed: ActorDelta.UpdateData,
     options: ActorDelta.Database.PreUpdateOptions,
     user: User.Implementation,
   ): Promise<boolean | void>;
 
-  protected _onUpdate(
+  protected override _onUpdate(
     changed: ActorDelta.UpdateData,
     options: ActorDelta.Database.OnUpdateOperation,
     userId: string,
   ): void;
 
-  protected static _preUpdateOperation(
+  protected static override _preUpdateOperation(
     documents: ActorDelta.Implementation[],
     operation: ActorDelta.Database.Update,
     user: User.Implementation,
   ): Promise<boolean | void>;
 
-  protected static _onUpdateOperation(
+  protected static override _onUpdateOperation(
     documents: ActorDelta.Implementation[],
     operation: ActorDelta.Database.Update,
     user: User.Implementation,
   ): Promise<void>;
 
-  protected _preDelete(
+  protected override _preDelete(
     options: ActorDelta.Database.PreDeleteOptions,
     user: User.Implementation,
   ): Promise<boolean | void>;
 
-  protected _onDelete(options: ActorDelta.Database.OnDeleteOperation, userId: string): void;
+  protected override _onDelete(options: ActorDelta.Database.OnDeleteOperation, userId: string): void;
 
-  protected static _preDeleteOperation(
+  protected static override _preDeleteOperation(
     documents: ActorDelta.Implementation[],
     operation: ActorDelta.Database.Delete,
     user: User.Implementation,
   ): Promise<boolean | void>;
 
-  protected static _onDeleteOperation(
+  protected static override _onDeleteOperation(
     documents: ActorDelta.Implementation[],
     operation: ActorDelta.Database.Delete,
     user: User.Implementation,
   ): Promise<void>;
 
-  static get hasSystemData(): true;
+  static override get hasSystemData(): true;
 
   // These data field things have been ticketed but will probably go into backlog hell for a while.
   // We'll end up copy and pasting without modification for now I think. It makes it a tiny bit easier to update though.
-  protected static _addDataFieldShims(data: AnyObject, shims: AnyObject, options?: Document.DataFieldShimOptions): void;
 
-  protected static _addDataFieldMigration(
-    data: AnyObject,
+  // options: not null (parameter default only in _addDataFieldShim)
+  protected static override _addDataFieldShims(
+    data: AnyMutableObject,
+    shims: Record<string, string>,
+    options?: Document.DataFieldShimOptions,
+  ): void;
+
+  // options: not null (parameter default only)
+  protected static override _addDataFieldShim(
+    data: AnyMutableObject,
     oldKey: string,
     newKey: string,
-    apply?: (data: AnyObject) => unknown,
-  ): unknown;
+    options?: Document.DataFieldShimOptions,
+  ): void;
 
-  protected static _logDataFieldMigration(
+  protected static override _addDataFieldMigration(
+    data: AnyMutableObject,
+    oldKey: string,
+    newKey: string,
+    apply?: ((data: AnyMutableObject) => unknown) | null,
+  ): boolean;
+
+  // options: not null (destructured where forwarded)
+  protected static override _logDataFieldMigration(
     oldKey: string,
     newKey: string,
     options?: LogCompatibilityWarningOptions,
   ): void;
 
-  protected static _onCreateDocuments(
+  /**
+   * @deprecated since v12, will be removed in v14
+   * @remarks "The `Document._onCreateDocuments` static method is deprecated in favor of {@link Document._onCreateOperation | `Document._onCreateOperation`}"
+   */
+  protected static override _onCreateDocuments(
     documents: ActorDelta.Implementation[],
     context: Document.ModificationContext<ActorDelta.Parent>,
   ): Promise<void>;
 
-  protected static _onUpdateDocuments(
+  /**
+   * @deprecated since v12, will be removed in v14
+   * @remarks "The `Document._onUpdateDocuments` static method is deprecated in favor of {@link Document._onUpdateOperation | `Document._onUpdateOperation`}"
+   */
+  protected static override _onUpdateDocuments(
     documents: ActorDelta.Implementation[],
     context: Document.ModificationContext<ActorDelta.Parent>,
   ): Promise<void>;
 
-  protected static _onDeleteDocuments(
+  /**
+   * @deprecated since v12, will be removed in v14
+   * @remarks "The `Document._onDeleteDocuments` static method is deprecated in favor of {@link Document._onDeleteOperation | `Document._onDeleteOperation`}"
+   */
+  protected static override _onDeleteDocuments(
     documents: ActorDelta.Implementation[],
     context: Document.ModificationContext<ActorDelta.Parent>,
   ): Promise<void>;
 
   /* DataModel overrides */
 
-  protected static _schema: SchemaField<ActorDelta.Schema>;
+  protected static override _schema: SchemaField<ActorDelta.Schema>;
 
-  static get schema(): SchemaField<ActorDelta.Schema>;
+  static override get schema(): SchemaField<ActorDelta.Schema>;
 
-  static validateJoint(data: ActorDelta.Source): void;
+  static override validateJoint(data: ActorDelta.Source): void;
 
+  // options: not null (parameter default only, destructured in super)
   static override fromSource(
     source: ActorDelta.CreateData,
-    { strict, ...context }?: DataModel.FromSourceOptions,
+    context?: DataModel.FromSourceOptions,
   ): ActorDelta.Implementation;
 
   static override fromJSON(json: string): ActorDelta.Implementation;
+
+  static #BaseActorDelta: true;
 }
 
 export default BaseActorDelta;
@@ -340,6 +406,21 @@ declare namespace BaseActorDelta {
   export import DatabaseOperation = ActorDelta.Database;
   export import Flags = ActorDelta.Flags;
 
+  /**
+   * @internal
+   * This interface is spread into an object that already has `parent` defined, and as this is ActorDelta logic,
+   * let's assume that overwriting the parent is contraindicated.
+   */
+  type _ApplyDeltaContext = Omit<Document.ConstructionContext<TokenDocument.Implementation>, "parent">;
+
+  interface ApplyDeltaContext extends _ApplyDeltaContext {
+    /**
+     * @deprecated This context is spread into an `Actor` creation context for the synthetic actor,
+     * overriding the provided default of `parent: delta.parent` is nonsensical
+     */
+    parent?: never;
+  }
+
   // The document subclasses override `system` anyways.
   // There's no point in doing expensive computation work comparing the base class system.
   /** @internal */

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

@@ -1,4 +1,4 @@
-import type { AnyMutableObject, AnyObject } from "fvtt-types/utils";
+import type { AnyMutableObject } from "#utils";
 import type DataModel from "../abstract/data.d.mts";
 import type Document from "../abstract/document.mts";
 import type { DataField, SchemaField } from "../data/fields.d.mts";
@@ -29,6 +29,26 @@ declare abstract class BaseActor<out SubType extends Actor.SubType = Actor.SubTy
    */
   constructor(...args: Actor.ConstructorArgs);
 
+  /**
+   * @defaultValue
+   * ```js
+   * mergeObject(super.metadata, {
+   *   name: "Actor",
+   *   collection: "actors",
+   *   indexed: true,
+   *   compendiumIndexFields: ["_id", "name", "img", "type", "sort", "folder"],
+   *   embedded: {ActiveEffect: "effects", Item: "items"},
+   *   hasTypeData: true,
+   *   label: "DOCUMENT.Actor",
+   *   labelPlural: "DOCUMENT.Actors",
+   *   permissions: {
+   *     create: this.#canCreate,
+   *     update: this.#canUpdate
+   *   },
+   *   schemaVersion: "12.324"
+   * })
+   * ```
+   */
   static override metadata: BaseActor.Metadata;
 
   static override defineSchema(): BaseActor.Schema;
@@ -42,24 +62,24 @@ declare abstract class BaseActor<out SubType extends Actor.SubType = Actor.SubTy
   /**
    * Determine default artwork based on the provided actor data
    * @param actorData - The source actor data
+   * @remarks Core's implementation does not use `actorData`
    */
-  static getDefaultArtwork(actorData: BaseActor.CreateData): {
-    img: string;
-    texture: { src: string };
-  };
+  static getDefaultArtwork(actorData?: BaseActor.CreateData): BaseActor.GetDefaultArtworkReturn;
 
+  // options: not null (parameter default only)
   protected override _initializeSource(
     data: BaseActor.CreateData | this,
-    options?: Omit<foundry.abstract.DataModel.DataValidationOptions, "parent">,
+    options?: Document.InitializeSourceOptions,
   ): BaseActor.Source;
 
+  /** @remarks Returns `user.hasPermission("ACTOR_CREATE")` */
   static override canUserCreate(user: User.Implementation): boolean;
 
   /**
-   * @privateRemarks _preCreate and _preUpdate are overridden but with no signature changes.
-   * For type simplicity they are left off. These methods historically have been the source of a large amount of computation from tsc.
+   * @remarks
+   * Migrations:
+   * - `flags.core.sourceId` to `_stats.compendiumSource` (since v12, no specified end)
    */
-
   static override migrateData(source: AnyMutableObject): AnyMutableObject;
 
   /*
@@ -79,39 +99,39 @@ declare abstract class BaseActor<out SubType extends Actor.SubType = Actor.SubTy
   // Same as Document for now
   protected static override _initializationOrder(): Generator<[string, DataField.Any]>;
 
-  readonly parentCollection: Actor.ParentCollectionName | null;
+  override readonly parentCollection: Actor.ParentCollectionName | null;
 
-  readonly pack: string | null;
+  override readonly pack: string | null;
 
-  static get implementation(): Actor.ImplementationClass;
+  static override get implementation(): Actor.ImplementationClass;
 
-  static get baseDocument(): typeof BaseActor;
+  static override get baseDocument(): typeof BaseActor;
 
-  static get collectionName(): Actor.ParentCollectionName;
+  static override get collectionName(): Actor.ParentCollectionName;
 
-  static get documentName(): Actor.Name;
+  static override get documentName(): Actor.Name;
 
-  static get TYPES(): BaseActor.SubType[];
+  static override get TYPES(): BaseActor.SubType[];
 
-  static get hasTypeData(): true;
+  static override get hasTypeData(): true;
 
-  static get hierarchy(): Actor.Hierarchy;
+  static override get hierarchy(): Actor.Hierarchy;
 
   override system: Actor.SystemOfType<SubType>;
 
   override parent: BaseActor.Parent;
 
-  static createDocuments<Temporary extends boolean | undefined = false>(
+  static override createDocuments<Temporary extends boolean | undefined = false>(
     data: Array<Actor.Implementation | Actor.CreateData> | undefined,
     operation?: Document.Database.CreateOperation<Actor.Database.Create<Temporary>>,
   ): Promise<Array<Document.TemporaryIf<Actor.Implementation, Temporary>>>;
 
-  static updateDocuments(
+  static override updateDocuments(
     updates: Actor.UpdateData[] | undefined,
     operation?: Document.Database.UpdateDocumentsOperation<Actor.Database.Update>,
   ): Promise<Actor.Implementation[]>;
 
-  static deleteDocuments(
+  static override deleteDocuments(
     ids: readonly string[] | undefined,
     operation?: Document.Database.DeleteDocumentsOperation<Actor.Database.Delete>,
   ): Promise<Actor.Implementation[]>;
@@ -184,112 +204,144 @@ declare abstract class BaseActor<out SubType extends Actor.SubType = Actor.SubTy
     key: Key,
   ): Promise<this>;
 
-  protected _preCreate(
+  protected override _preCreate(
     data: Actor.CreateData,
     options: Actor.Database.PreCreateOptions,
     user: User.Implementation,
   ): Promise<boolean | void>;
 
-  protected _onCreate(data: Actor.CreateData, options: Actor.Database.OnCreateOperation, userId: string): void;
+  protected override _onCreate(data: Actor.CreateData, options: Actor.Database.OnCreateOperation, userId: string): void;
 
-  protected static _preCreateOperation(
+  protected static override _preCreateOperation(
     documents: Actor.Implementation[],
     operation: Document.Database.PreCreateOperationStatic<Actor.Database.Create>,
     user: User.Implementation,
   ): Promise<boolean | void>;
 
-  protected static _onCreateOperation(
+  protected static override _onCreateOperation(
     documents: Actor.Implementation[],
     operation: Actor.Database.Create,
     user: User.Implementation,
   ): Promise<void>;
 
-  protected _preUpdate(
+  protected override _preUpdate(
     changed: Actor.UpdateData,
     options: Actor.Database.PreUpdateOptions,
     user: User.Implementation,
   ): Promise<boolean | void>;
 
-  protected _onUpdate(changed: Actor.UpdateData, options: Actor.Database.OnUpdateOperation, userId: string): void;
+  protected override _onUpdate(
+    changed: Actor.UpdateData,
+    options: Actor.Database.OnUpdateOperation,
+    userId: string,
+  ): void;
 
-  protected static _preUpdateOperation(
+  protected static override _preUpdateOperation(
     documents: Actor.Implementation[],
     operation: Actor.Database.Update,
     user: User.Implementation,
   ): Promise<boolean | void>;
 
-  protected static _onUpdateOperation(
+  protected static override _onUpdateOperation(
     documents: Actor.Implementation[],
     operation: Actor.Database.Update,
     user: User.Implementation,
   ): Promise<void>;
 
-  protected _preDelete(options: Actor.Database.PreDeleteOptions, user: User.Implementation): Promise<boolean | void>;
+  protected override _preDelete(
+    options: Actor.Database.PreDeleteOptions,
+    user: User.Implementation,
+  ): Promise<boolean | void>;
 
-  protected _onDelete(options: Actor.Database.OnDeleteOperation, userId: string): void;
+  protected override _onDelete(options: Actor.Database.OnDeleteOperation, userId: string): void;
 
-  protected static _preDeleteOperation(
+  protected static override _preDeleteOperation(
     documents: Actor.Implementation[],
     operation: Actor.Database.Delete,
     user: User.Implementation,
   ): Promise<boolean | void>;
 
-  protected static _onDeleteOperation(
+  protected static override _onDeleteOperation(
     documents: Actor.Implementation[],
     operation: Actor.Database.Delete,
     user: User.Implementation,
   ): Promise<void>;
 
-  static get hasSystemData(): true;
+  static override get hasSystemData(): true;
 
   // These data field things have been ticketed but will probably go into backlog hell for a while.
   // We'll end up copy and pasting without modification for now I think. It makes it a tiny bit easier to update though.
-  protected static _addDataFieldShims(data: AnyObject, shims: AnyObject, options?: Document.DataFieldShimOptions): void;
 
-  protected static _addDataFieldMigration(
-    data: AnyObject,
+  // options: not null (parameter default only in _addDataFieldShim)
+  protected static override _addDataFieldShims(
+    data: AnyMutableObject,
+    shims: Record<string, string>,
+    options?: Document.DataFieldShimOptions,
+  ): void;
+
+  // options: not null (parameter default only)
+  protected static override _addDataFieldShim(
+    data: AnyMutableObject,
     oldKey: string,
     newKey: string,
-    apply?: (data: AnyObject) => unknown,
-  ): unknown;
+    options?: Document.DataFieldShimOptions,
+  ): void;
 
-  protected static _logDataFieldMigration(
+  protected static override _addDataFieldMigration(
+    data: AnyMutableObject,
+    oldKey: string,
+    newKey: string,
+    apply?: ((data: AnyMutableObject) => unknown) | null,
+  ): boolean;
+
+  // options: not null (destructured where forwarded)
+  protected static override _logDataFieldMigration(
     oldKey: string,
     newKey: string,
     options?: LogCompatibilityWarningOptions,
   ): void;
 
-  protected static _onCreateDocuments(
+  /**
+   * @deprecated since v12, will be removed in v14
+   * @remarks "The `Document._onCreateDocuments` static method is deprecated in favor of {@link Document._onCreateOperation | `Document._onCreateOperation`}"
+   */
+  protected static override _onCreateDocuments(
     documents: Actor.Implementation[],
     context: Document.ModificationContext<Actor.Parent>,
   ): Promise<void>;
 
-  protected static _onUpdateDocuments(
+  /**
+   * @deprecated since v12, will be removed in v14
+   * @remarks "The `Document._onUpdateDocuments` static method is deprecated in favor of {@link Document._onUpdateOperation | `Document._onUpdateOperation`}"
+   */
+  protected static override _onUpdateDocuments(
     documents: Actor.Implementation[],
     context: Document.ModificationContext<Actor.Parent>,
   ): Promise<void>;
 
-  protected static _onDeleteDocuments(
+  /**
+   * @deprecated since v12, will be removed in v14
+   * @remarks "The `Document._onDeleteDocuments` static method is deprecated in favor of {@link Document._onDeleteOperation | `Document._onDeleteOperation`}"
+   */
+  protected static override _onDeleteDocuments(
     documents: Actor.Implementation[],
     context: Document.ModificationContext<Actor.Parent>,
   ): Promise<void>;
 
   /* DataModel overrides */
 
-  protected static _schema: SchemaField<Actor.Schema>;
+  protected static override _schema: SchemaField<Actor.Schema>;
 
-  static get schema(): SchemaField<Actor.Schema>;
+  static override get schema(): SchemaField<Actor.Schema>;
 
-  static validateJoint(data: Actor.Source): void;
+  static override validateJoint(data: Actor.Source): void;
 
-  static override fromSource(
-    source: Actor.CreateData,
-    { strict, ...context }?: DataModel.FromSourceOptions,
-  ): Actor.Implementation;
+  // options: not null (parameter default only, destructured in super)
+  static override fromSource(source: Actor.CreateData, context?: DataModel.FromSourceOptions): Actor.Implementation;
 
   static override fromJSON(json: string): Actor.Implementation;
 
-  #baseActor: true;
+  static #BaseActor: true;
 }
 
 declare namespace BaseActor {
@@ -320,6 +372,8 @@ declare namespace BaseActor {
   export import Schema = Actor.Schema;
   export import DatabaseOperation = Actor.Database;
   export import Flags = Actor.Flags;
+  export import GetDefaultArtworkReturn = Actor.GetDefaultArtworkReturn;
+  export import GetDefaultArtworkTextureReturn = Actor.GetDefaultArtworkTextureReturn;
 
   // The document subclasses override `system` anyways.
   // There's no point in doing expensive computation work comparing the base class system.