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

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

@@ -1,5 +1,5 @@
 import type { ConfiguredJournalEntryPage } from "../../../../configuration/index.d.mts";
-import type { InexactPartial, LazyUnknown, Merge } from "fvtt-types/utils";
+import type { AnyObject, Merge, NullishProps } from "#utils";
 import type Document from "../../../common/abstract/document.d.mts";
 import type { DataSchema } from "../../../common/data/fields.d.mts";
 import type { fields } from "../../../common/data/module.d.mts";
@@ -157,7 +157,7 @@ declare global {
     type Collection = never;
 
     /**
-     * An instance of `JournalEntryPage` that comes from the database but failed validation meaining that
+     * An instance of `JournalEntryPage` that comes from the database but failed validation meaning that
      * its `system` and `_source` could theoretically be anything.
      */
     interface Invalid<out SubType extends JournalEntryPage.SubType = JournalEntryPage.SubType>
@@ -230,18 +230,17 @@ declare global {
       /**
        * The text name of this page.
        */
-      name: fields.StringField<{ required: true; blank: false; label: "JOURNALENTRYPAGE.PageTitle"; textSearch: true }>;
+      // FIXME: This field is `required` with no `initial`, so actually required for construction; Currently an AssignmentType override is required to enforce this
+      name: fields.StringField<
+        { required: true; blank: false; label: "JOURNALENTRYPAGE.PageTitle"; textSearch: true },
+        string
+      >;
 
       /**
        * The type of this page, in {@link BaseJournalEntryPage.TYPES | `BaseJournalEntryPage.TYPES`}.
        * @defaultValue `"text"`
        */
-      type: fields.DocumentTypeField<
-        typeof BaseJournalEntryPage,
-        {
-          initial: "text";
-        }
-      >;
+      type: fields.DocumentTypeField<typeof BaseJournalEntryPage, { initial: "text" }>;
 
       /**
        * System-specific data.
@@ -297,17 +296,26 @@ declare global {
          * The format of the page's content, in {@link CONST.JOURNAL_ENTRY_PAGE_FORMATS | `CONST.JOURNAL_ENTRY_PAGE_FORMATS`}.
          * @defaultValue `CONST.JOURNAL_ENTRY_PAGE_FORMATS.HTML`
          */
-        format: fields.NumberField<{
-          label: "JOURNALENTRYPAGE.Format";
-          initial: typeof CONST.JOURNAL_ENTRY_PAGE_FORMATS.HTML;
-          choices: foundry.CONST.JOURNAL_ENTRY_PAGE_FORMATS[];
-        }>;
+        format: fields.NumberField<
+          {
+            label: "JOURNALENTRYPAGE.Format";
+            initial: typeof CONST.JOURNAL_ENTRY_PAGE_FORMATS.HTML;
+            choices: CONST.JOURNAL_ENTRY_PAGE_FORMATS[];
+          },
+          // FIXME: overrides required to enforce branded type
+          CONST.JOURNAL_ENTRY_PAGE_FORMATS | null | undefined,
+          CONST.JOURNAL_ENTRY_PAGE_FORMATS,
+          CONST.JOURNAL_ENTRY_PAGE_FORMATS
+        >;
       }>;
 
       /**
        * Data particular to video journal entry pages.
        */
       video: fields.SchemaField<{
+        /**
+         * @defaultValue `true`
+         */
         controls: fields.BooleanField<{ initial: true }>;
 
         /**
@@ -539,6 +547,44 @@ declare global {
       order: number;
     }
 
+    interface CreateDocumentLinkOptions extends ClientDocument.CreateDocumentLinkOptions {
+      /**
+       * @remarks If the `eventData` passed with these options has an `anchor.slug`, the default is `eventData.anchor.name`,
+       * otherwise uses `super`'s default of `this.name`
+       */
+      label?: string | null | undefined;
+    }
+
+    /**
+     * @internal
+     * Slightly editorializing the description with the addition of parentheses to make this scan
+     * for both {@linkcode JournalEntryPage.buildTOC} and {@linkcode JournalEntryPage._makeHeadingNode}
+     */
+    type _IncludeElement = NullishProps<{
+      /**
+       * Include reference(s) to the heading DOM element(s) in the returned ToC.
+       * @defaultValue `true`
+       */
+      includeElement: boolean;
+    }>;
+
+    interface BuildTOCOptions extends _IncludeElement {}
+
+    interface MakeHeadingNodeOptions extends _IncludeElement {}
+
+    interface EmbedTextPageConfig extends TextEditor.EnrichmentOptions, TextEditor.DocumentHTMLEmbedConfig {}
+
+    /** @internal */
+    type _EmbedImagePageConfig = NullishProps<{
+      /**
+       * Alt text for the image, otherwise the caption will be used.
+       * @remarks If both `alt` and `label` are omitted, the returned Element's `alt` will fall back to using `this.image.caption || this.name`
+       */
+      alt: string;
+    }>;
+
+    interface EmbedImagePageConfig extends _EmbedImagePageConfig, TextEditor.DocumentHTMLEmbedConfig {}
+
     /**
      * @deprecated {@link JournalEntryPage.Database | `JournalEntryPage.DatabaseOperation`}
      */
@@ -590,7 +636,7 @@ declare global {
      */
     get toc(): Record<string, JournalEntryPage.JournalEntryPageHeading>;
 
-    override get permission(): foundry.CONST.DOCUMENT_OWNERSHIP_LEVELS;
+    override get permission(): CONST.DOCUMENT_OWNERSHIP_LEVELS | null;
 
     /**
      * Return a reference to the Note instance for this Journal Entry Page in the current Scene, if any.
@@ -609,15 +655,10 @@ declare global {
      * @param html    - The HTML content to generate a ToC outline for.
      * @param options - Additional options to configure ToC generation.
      */
+    // options: not null (destructured)
     static buildTOC(
       html: HTMLElement[],
-      options: InexactPartial<{
-        /**
-         * Include references to the heading DOM elements in the returned ToC.
-         * @defaultValue `true`
-         */
-        includeElement: boolean;
-      }>,
+      options?: JournalEntryPage.BuildTOCOptions,
     ): Record<string, JournalEntryPage.JournalEntryPageHeading>;
 
     /**
@@ -633,36 +674,25 @@ declare global {
      * @param heading - The heading element.
      * @param options - Additional options to configure the returned node.
      */
+    // options: not null (destructured)
     protected static _makeHeadingNode(
       heading: HTMLHeadingElement,
-      options: InexactPartial<{
-        /**
-         * Whether to include the DOM element in the returned ToC node.
-         * @defaultValue `true`
-         */
-        includeElement: boolean;
-      }>,
+      options?: JournalEntryPage.MakeHeadingNodeOptions,
     ): JournalEntryPage.JournalEntryPageHeading;
 
-    protected override _createDocumentLink(
-      eventData: unknown,
-      options?: InexactPartial<{
-        /**
-         * A document to generate a link relative to.
-         */
-        relativeTo: ClientDocument;
-        /**
-         * A custom label to use instead of the document's name.
-         */
-        label: string;
-      }>,
-    ): string;
-
-    override _onClickDocumentLink(event: MouseEvent): this;
+    /** @remarks Uses `eventData`, unlike {@link ClientDocument._createDocumentLink | `ClientDocument#_createDocumentLink`} */
+    // options: not null (destructured)
+    override _createDocumentLink(eventData: AnyObject, options?: JournalEntryPage.CreateDocumentLinkOptions): string;
 
     /**
-     * @privateRemarks _onUpdate is overridden but with no signature changes from the template in BaseJournalEntryPage
+     * @remarks
+     * As `super`, but return the parent's sheet's `#render`:
+     * - AppV1: returns that sheet
+     * - AppV2: returns a Promise of that sheet
      */
+    override _onClickDocumentLink(event: MouseEvent): ClientDocument.OnClickDocumentLinkReturn;
+
+    // _onUpdate is overridden but with no signature changes from the template in BaseJournalEntryPage
 
     protected override _buildEmbedHTML(
       config: TextEditor.DocumentHTMLEmbedConfig,
@@ -717,8 +747,9 @@ declare global {
      * </section>
      * ```
      */
+    // options: not null (parameter default only)
     protected _embedTextPage(
-      config: TextEditor.DocumentHTMLEmbedConfig & TextEditor.EnrichmentOptions,
+      config: JournalEntryPage.EmbedTextPageConfig,
       options?: TextEditor.EnrichmentOptions,
     ): Promise<HTMLCollection>;
 
@@ -727,7 +758,6 @@ declare global {
      * @param config            - Configuration for embedding behavior.
      * @param options           - The original enrichment options for cases where the Document embed content
      *                            also contains text that must be enriched.
-     * @returns
      *
      * @example Create an embedded image from a sibling journal entry page.
      * ```
@@ -750,13 +780,13 @@ declare global {
      *   </figcaption>
      * </figure>
      * ```
+     *
+     * @remarks Core's implementation always returns a {@linkcode HTMLImageElement}, and does not use `options`
      */
+    // config: not null (destructured), options: not null (parameter default only)
     protected _embedImagePage(
-      config: TextEditor.DocumentHTMLEmbedConfig & {
-        /** Alt text for the image, otherwise the caption will be used. **/
-        alt?: string | LazyUnknown;
-      },
-      options?: InexactPartial<TextEditor.EnrichmentOptions>,
+      config?: JournalEntryPage.EmbedImagePageConfig,
+      options?: TextEditor.EnrichmentOptions,
     ): Promise<HTMLElement | HTMLCollection | null>;
 
     /*
@@ -773,23 +803,26 @@ declare global {
 
     // Descendant Document operations have been left out because JournalEntryPage does not have any descendant documents.
 
+    // context: not null (destructured)
     static override defaultName(
-      context: Document.DefaultNameContext<JournalEntryPage.SubType, NonNullable<JournalEntryPage.Parent>>,
+      context?: Document.DefaultNameContext<"JournalEntryPage", NonNullable<JournalEntryPage.Parent>>,
     ): string;
 
+    /** @remarks `context.parent` is required as creation requires one */
     static override createDialog(
-      data: Document.CreateDialogData<JournalEntryPage.CreateData>,
-      context: Document.CreateDialogContext<JournalEntryPage.SubType, NonNullable<JournalEntryPage.Parent>>,
+      data: Document.CreateDialogData<JournalEntryPage.CreateData> | undefined,
+      context: Document.CreateDialogContext<"JournalEntryPage", NonNullable<JournalEntryPage.Parent>>,
     ): Promise<JournalEntryPage.Stored | null | undefined>;
 
+    // options: not null (parameter default only)
     static override fromDropData(
       data: Document.DropData<JournalEntryPage.Implementation>,
-      options?: Document.FromDropDataOptions,
+      options?: AnyObject,
     ): Promise<JournalEntryPage.Implementation | undefined>;
 
     static override fromImport(
       source: JournalEntryPage.Source,
-      context?: Document.FromImportContext<JournalEntryPage.Parent>,
+      context?: Document.FromImportContext<JournalEntryPage.Parent> | null,
     ): Promise<JournalEntryPage.Implementation>;
 
     // Embedded document operations have been left out because JournalEntryPage does not have any embedded documents.

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

@@ -1,8 +1,8 @@
+import type { AnyObject, InterfaceToObject, Merge, ValueOf } from "#utils";
 import type Document from "../../../common/abstract/document.d.mts";
 import type { fields } from "../../../common/data/module.d.mts";
 import type { documents } from "../../../client-esm/client.d.mts";
 import type { DataSchema } from "../../../common/data/fields.d.mts";
-import type { InterfaceToObject, Merge, ValueOf } from "../../../../utils/index.d.mts";
 
 declare global {
   namespace JournalEntry {
@@ -175,7 +175,7 @@ declare global {
     type Collection = Journal.Configured;
 
     /**
-     * An instance of `JournalEntry` that comes from the database but failed validation meaining that
+     * An instance of `JournalEntry` that comes from the database but failed validation meaning that
      * its `system` and `_source` could theoretically be anything.
      */
     interface Invalid extends Document.Invalid<JournalEntry.Implementation> {}
@@ -246,7 +246,8 @@ declare global {
       /**
        * The name of this JournalEntry
        */
-      name: fields.StringField<{ required: true; blank: false; textSearch: true }>;
+      // FIXME: This field is `required` with no `initial`, so actually required for construction; Currently an AssignmentType override is required to enforce this
+      name: fields.StringField<{ required: true; blank: false; textSearch: true }, string>;
 
       /**
        * The pages contained within this JournalEntry document
@@ -497,6 +498,11 @@ declare global {
      */
     get visible(): boolean;
 
+    /**
+     * @remarks "Upgrade to OBSERVER ownership if the journal entry is in a LIMITED compendium,
+     * as LIMITED has no special meaning for journal entries in this context."
+     */
+    // user: not null (parameter default only where forwarded)
     override getUserLevel(user?: User.Implementation): foundry.CONST.DOCUMENT_OWNERSHIP_LEVELS | null;
 
     /**
@@ -510,11 +516,10 @@ declare global {
      * By default the entry will only be shown to players who have permission to observe it.
      * If the parameter force is passed, the entry will be shown to all players regardless of normal permission.
      *
-     * @param force - Display the entry to all players regardless of normal permissions
-     *                (default: `false`)
+     * @param force - Display the entry to all players regardless of normal permissions (default: `false`)
      * @returns A Promise that resolves back to the shown entry once the request is processed
      */
-    show(force?: boolean): Promise<this>;
+    show(force?: boolean | null): Promise<this>;
 
     /**
      * If the JournalEntry has a pinned note on the canvas, this method will animate to that note
@@ -522,11 +527,10 @@ declare global {
      * @param options - Options which modify the pan operation
      * @returns A Promise which resolves once the pan animation has concluded
      */
-    panToNote(options?: PanToNoteOptions): Promise<void>;
+    // options: not null (parameter default only, destructured where forwarded)
+    panToNote(options?: NotesLayer.PanToNoteOptions): Promise<void>;
 
-    /**
-     * @privateRemarks _onUpdate and _onDelete are all overridden but with no signature changes from their definition in BaseJournalEntry.
-     */
+    // _onUpdate and _onDelete are overridden but with no signature changes from their definition in BaseJournalEntry.
 
     /*
      * After this point these are not really overridden methods.
@@ -542,7 +546,7 @@ declare global {
 
     /**
      * @remarks To make it possible for narrowing one parameter to jointly narrow other parameters
-     * this method must be overriden like so:
+     * this method must be overridden like so:
      * ```typescript
      * class SwadeCards extends Cards {
      *   protected override _preCreateDescendantDocuments(...args: Cards.PreCreateDescendantDocumentsArgs) {
@@ -560,7 +564,7 @@ declare global {
 
     /**
      * @remarks To make it possible for narrowing one parameter to jointly narrow other parameters
-     * this method must be overriden like so:
+     * this method must be overridden like so:
      * ```typescript
      * class GurpsCards extends Cards {
      *   protected override _onCreateDescendantDocuments(...args: Cards.OnCreateDescendantDocumentsArgs) {
@@ -578,7 +582,7 @@ declare global {
 
     /**
      * @remarks To make it possible for narrowing one parameter to jointly narrow other parameters
-     * this method must be overriden like so:
+     * this method must be overridden like so:
      * ```typescript
      * class LancerCards extends Cards {
      *   protected override _preUpdateDescendantDocuments(...args: Cards.OnUpdateDescendantDocuments) {
@@ -596,7 +600,7 @@ declare global {
 
     /**
      * @remarks To make it possible for narrowing one parameter to jointly narrow other parameters
-     * this method must be overriden like so:
+     * this method must be overridden like so:
      * ```typescript
      * class Ptr2eCards extends Cards {
      *   protected override _onUpdateDescendantDocuments(...args: Cards.OnUpdateDescendantDocumentsArgs) {
@@ -614,7 +618,7 @@ declare global {
 
     /**
      * @remarks To make it possible for narrowing one parameter to jointly narrow other parameters
-     * this method must be overriden like so:
+     * this method must be overridden like so:
      * ```typescript
      * class KultCards extends Cards {
      *   protected override _preDeleteDescendantDocuments(...args: Cards.PreDeleteDescendantDocumentsArgs) {
@@ -632,7 +636,7 @@ declare global {
 
     /**
      * @remarks To make it possible for narrowing one parameter to jointly narrow other parameters
-     * this method must be overriden like so:
+     * this method must be overridden like so:
      * ```typescript
      * class BladesCards extends Cards {
      *   protected override _onDeleteDescendantDocuments(...args: Cards.OnUpdateDescendantDocuments) {
@@ -648,35 +652,26 @@ declare global {
      */
     protected override _onDeleteDescendantDocuments(...args: Cards.OnDeleteDescendantDocumentsArgs): void;
 
-    static override defaultName(context?: Document.DefaultNameContext<string, JournalEntry.Parent>): string;
+    // context: not null (destructured)
+    static override defaultName(context?: Document.DefaultNameContext<"JournalEntry", JournalEntry.Parent>): string;
 
+    // data: not null (parameter default only), context: not null (destructured)
     static override createDialog(
       data?: Document.CreateDialogData<JournalEntry.CreateData>,
-      context?: Document.CreateDialogContext<string, JournalEntry.Parent>,
+      context?: Document.CreateDialogContext<"JournalEntry", JournalEntry.Parent>,
     ): Promise<JournalEntry.Stored | null | undefined>;
 
+    // options: not null (parameter default only)
     static override fromDropData(
       data: Document.DropData<JournalEntry.Implementation>,
-      options?: Document.FromDropDataOptions,
+      options?: AnyObject,
     ): Promise<JournalEntry.Implementation | undefined>;
 
     static override fromImport(
       source: JournalEntry.Source,
-      context?: Document.FromImportContext<JournalEntry.Parent>,
+      context?: Document.FromImportContext<JournalEntry.Parent> | null,
     ): Promise<JournalEntry.Implementation>;
-  }
-}
 
-interface PanToNoteOptions {
-  /**
-   * The speed of the pan animation in milliseconds
-   * @defaultValue `250`
-   */
-  duration?: number;
-
-  /**
-   * The resulting zoom level
-   * @defaultValue `1.5`
-   */
-  scale?: number;
+    override _onClickDocumentLink(event: MouseEvent): ClientDocument.OnClickDocumentLinkReturn;
+  }
 }

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

@@ -1,5 +1,5 @@
 import type { ConfiguredMacro } from "../../../../configuration/index.d.mts";
-import type { InexactPartial, Merge } from "fvtt-types/utils";
+import type { AnyObject, Merge, NullishProps } from "#utils";
 import type { documents } from "../../../client-esm/client.d.mts";
 import type Document from "../../../common/abstract/document.d.mts";
 import type { DataSchema } from "../../../common/data/fields.d.mts";
@@ -153,7 +153,7 @@ declare global {
     type Collection = Macros.Configured;
 
     /**
-     * An instance of `Macro` that comes from the database but failed validation meaining that
+     * An instance of `Macro` that comes from the database but failed validation meaning that
      * its `system` and `_source` could theoretically be anything.
      */
     interface Invalid<out SubType extends Macro.SubType = Macro.SubType> extends Document.Invalid<OfType<SubType>> {}
@@ -225,24 +225,14 @@ declare global {
        * The name of this Macro
        * @defaultValue `""`
        */
-      name: fields.StringField<{
-        required: true;
-        blank: false;
-        label: "Name";
-        textSearch: true;
-      }>;
+      // FIXME: This field is `required` with no `initial`, so actually required for construction; Currently an AssignmentType override is required to enforce this
+      name: fields.StringField<{ required: true; blank: false; label: "Name"; textSearch: true }, string>;
 
       /**
        * A Macro subtype from CONST.MACRO_TYPES
        * @defaultValue `CONST.MACRO_TYPES.CHAT`
        */
-      type: fields.DocumentTypeField<
-        typeof BaseMacro,
-        {
-          initial: typeof CONST.MACRO_TYPES.CHAT;
-          label: "Type";
-        }
-      >;
+      type: fields.DocumentTypeField<typeof BaseMacro, { initial: typeof CONST.MACRO_TYPES.CHAT; label: "Type" }>;
 
       /**
        * The _id of a User document which created this Macro *
@@ -263,6 +253,8 @@ declare global {
       /**
        * The scope of this Macro application from CONST.MACRO_SCOPES
        * @defaultValue `"global"`
+       * @privateRemarks This field (and `CONST.MACRO_SCOPES`) is entirely vestigial, it's never checked anywhere,
+       * and its `<select>` in MacroConfig has been unconditionally disabled since at least 11.315
        */
       scope: fields.StringField<{
         required: true;
@@ -437,33 +429,61 @@ declare global {
 
     /**
      * @deprecated This type always required properties for both a `"script"` and a `"chat"` message
-     * even when necessary. It has been superceded by {@link ScriptScope | `ScriptScope`},
+     * even when necessary. It has been superseded by {@link ScriptScope | `ScriptScope`},
      * {@link ChatScope | `ChatScope`}, and {@link UnknownScope | `UnknownScope`}
      */
     type Scope = ScriptScope;
 
     /** @internal */
-    interface _ScriptScope {
+    type _ScriptScope = NullishProps<{
       /** An Actor who is the protagonist of the executed action. */
       actor: Actor.Implementation;
 
       /**  A Token which is the protagonist of the executed action. */
       token: Token.Object;
 
-      /** An optional event passed to the executed macro. */
-      event: Event | RegionDocument.RegionEvent;
+      /** The speaker data */
+      speaker: ChatMessage.SpeakerData;
 
       /**
-       * @remarks Additional arguments passed as part of the scope
+       * @remarks Sometimes provided by core:
+       * - When called in {@link foundry.data.regionBehaviors.ExecuteMacroRegionBehaviorType._handleRegionEvent | `ExecuteMacroRegionBehaviorType#_handleRegionEvent`},
+       * will be a {@linkcode Scene.Implementation} (possibly `null` if somehow called on a `RegionBehavior` whose `RegionDocument` doesn't have a parent `Scene`)
        */
-      [arg: string]: unknown;
-    }
+      scene?: unknown;
 
-    interface ScriptScope extends InexactPartial<_ScriptScope> {}
+      /**
+       * @remarks Sometimes provided by core:
+       * - When called in {@link foundry.data.regionBehaviors.ExecuteMacroRegionBehaviorType._handleRegionEvent | `ExecuteMacroRegionBehaviorType#_handleRegionEvent`},
+       * will be a {@linkcode RegionDocument.Implementation} (possibly `null` if somehow called on a `RegionBehavior` without a parent `RegionDocument`)
+       */
+      region?: unknown;
 
-    interface ChatScope {
-      speaker?: ChatMessage.SpeakerData | undefined;
-    }
+      /**
+       * @remarks Sometimes provided by core:
+       * - When called in {@link foundry.data.regionBehaviors.ExecuteMacroRegionBehaviorType._handleRegionEvent | `ExecuteMacroRegionBehaviorType#_handleRegionEvent`},
+       * will be a {@linkcode RegionBehavior.Implementation} (possibly `null` if somehow called on a `RegionBehaviorType` without a parent `RegionBehavior`)
+       */
+      behavior?: unknown;
+
+      /**
+       * @remarks Sometimes provided by core:
+       * - When called in {@link Macro._onClickDocumentLink | `Macro#_onClickDocumentLink`},
+       * will be a {@linkcode MouseEvent}
+       * - When called in {@link foundry.data.regionBehaviors.ExecuteMacroRegionBehaviorType._handleRegionEvent | `ExecuteMacroRegionBehaviorType#_handleRegionEvent`},
+       * will be a {@linkcode RegionDocument.RegionEvent}
+       */
+      event?: unknown;
+
+      /**
+       * @remarks Additional arguments passed as part of the scope. Numeric keys are disallowed (`##executeScript` throws).
+       */
+      [arg: string | symbol]: unknown;
+    }>;
+
+    interface ScriptScope extends _ScriptScope {}
+
+    interface ChatScope extends Pick<ScriptScope, "speaker"> {}
 
     interface UnknownScope extends ScriptScope, ChatScope {}
 
@@ -474,7 +494,7 @@ declare global {
     // Note: If extra types ever get added this will need to be updated to account for them, even if
     // just to return `undefined`.
     type ExecuteReturn<SubType extends Macro.SubType> =
-      | (SubType extends "chat" ? Promise<ChatMessage.Implementation | void> : never)
+      | (SubType extends "chat" ? Promise<ChatMessage.Implementation | undefined | void> : never)
       | (SubType extends "script" ? Promise<unknown> | void : never);
 
     /**
@@ -549,12 +569,13 @@ declare global {
      * @returns A promising containing a created {@link ChatMessage | `ChatMessage`} (or `undefined`) if a chat
      *          macro or the return value if a script macro. A void return is possible if the user
      *          is not permitted to execute macros or a script macro execution fails.
+     * @remarks Forwards to either `#executeChat` or `#executeScript`
      */
+    // scope: not null (parameter default only, destructured where forwarded)
     execute(scope?: Macro.ExecuteScope<SubType>): Macro.ExecuteReturn<SubType>;
 
-    #executeScript();
-
-    _onClickDocumentLink(event: MouseEvent): ReturnType<this["execute"]>;
+    /** @remarks Returns `this.execute({event})` */
+    override _onClickDocumentLink(event: MouseEvent): Macro.ExecuteReturn<SubType>;
 
     /*
      * After this point these are not really overridden methods.
@@ -570,21 +591,26 @@ declare global {
 
     // Descendant Document operations have been left out because Macro does not have any descendant documents.
 
-    static override defaultName(context?: Document.DefaultNameContext<Macro.SubType, Macro.Parent>): string;
+    // context: not null (destructured)
+    static override defaultName(context?: Document.DefaultNameContext<"Macro", Macro.Parent>): string;
 
+    // data: not null (parameter default only), context: not null (destructured)
     static override createDialog(
       data?: Macro.CreateData,
-      context?: Document.CreateDialogContext<Macro.SubType, Macro.Parent>,
+      context?: Document.CreateDialogContext<"Macro", Macro.Parent>,
     ): Promise<Macro.Stored | null | undefined>;
 
+    // options: not null (parameter default only)
     static override fromDropData(
       data: Document.DropData<Macro.Implementation>,
-      options?: Document.FromDropDataOptions,
+      options?: AnyObject,
     ): Promise<Macro.Implementation | undefined>;
 
     static override fromImport(
       source: Macro.Source,
-      context?: Document.FromImportContext<Macro.Parent>,
+      context?: Document.FromImportContext<Macro.Parent> | null,
     ): Promise<Macro.Implementation>;
+
+    #Macro: true;
   }
 }

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

@@ -1,4 +1,4 @@
-import type { Merge } from "../../../../utils/index.d.mts";
+import type { AnyObject, Merge } from "#utils";
 import type { documents } from "../../../client-esm/client.d.mts";
 import type Document from "../../../common/abstract/document.d.mts";
 import type { DataSchema } from "../../../common/data/fields.d.mts";
@@ -113,7 +113,7 @@ declare global {
     type Collection = never;
 
     /**
-     * An instance of `MeasuredTemplateDocument` that comes from the database but failed validation meaining that
+     * An instance of `MeasuredTemplateDocument` that comes from the database but failed validation meaning that
      * its `system` and `_source` could theoretically be anything.
      */
     interface Invalid extends Document.Invalid<MeasuredTemplateDocument.Implementation> {}
@@ -461,7 +461,7 @@ declare global {
     /**
      * Rotation is an alias for direction
      */
-    get rotation(): this["direction"];
+    get rotation(): number;
 
     /**
      * Is the current User the author of this template?
@@ -482,23 +482,28 @@ declare global {
 
     // Descendant Document operations have been left out because MeasuredTemplate does not have any descendant documents.
 
+    // context: not null (destructured)
     static override defaultName(
-      context: Document.DefaultNameContext<"base", NonNullable<MeasuredTemplateDocument.Parent>>,
+      context?: Document.DefaultNameContext<"MeasuredTemplate", NonNullable<MeasuredTemplateDocument.Parent>>,
     ): string;
 
+    /** @remarks `context.parent` is required as creation requires one */
     static override createDialog(
-      data: Document.CreateDialogData<MeasuredTemplateDocument.CreateData>,
-      context: Document.CreateDialogContext<string, NonNullable<MeasuredTemplateDocument.Parent>>,
+      data: Document.CreateDialogData<MeasuredTemplateDocument.CreateData> | undefined,
+      context: Document.CreateDialogContext<"MeasuredTemplate", NonNullable<MeasuredTemplateDocument.Parent>>,
     ): Promise<MeasuredTemplateDocument.Stored | null | undefined>;
 
+    // options: not null (parameter default only)
     static override fromDropData(
       data: Document.DropData<MeasuredTemplateDocument.Implementation>,
-      options?: Document.FromDropDataOptions,
+      options?: AnyObject,
     ): Promise<MeasuredTemplateDocument.Implementation | undefined>;
 
     static override fromImport(
       source: MeasuredTemplateDocument.Source,
-      context?: Document.FromImportContext<MeasuredTemplateDocument.Parent>,
+      context?: Document.FromImportContext<MeasuredTemplateDocument.Parent> | null,
     ): Promise<MeasuredTemplateDocument.Implementation>;
+
+    override _onClickDocumentLink(event: MouseEvent): ClientDocument.OnClickDocumentLinkReturn;
   }
 }