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

package/src/foundry/common/grid/base.d.mts

@@ -1,4 +1,4 @@
-import type { AnyObject, InexactPartial } from "../../../types/utils.d.mts";
+import type { AnyObject, EmptyObject, InexactPartial, Identity } from "#utils";
 
 /**
  * The base grid class.
@@ -26,9 +26,9 @@ declare abstract class BaseGrid {
   alpha: number;
 
   /**
-   * The grid type (see {@link CONST.GRID_TYPES}).
+   * The grid type (see {@link CONST.GRID_TYPES | `CONST.GRID_TYPES`}).
    */
-  type: number;
+  type: CONST.GRID_TYPES;
 
   get isGridless(): boolean;
 
@@ -93,7 +93,7 @@ declare abstract class BaseGrid {
    * In square grids with illegal diagonals the offset of the given coordinates is returned
    * if the direction is diagonal.
    * @param coords    - The coordinates
-   * @param direction - The direction (see {@link CONST.MOVEMENT_DIRECTIONS})
+   * @param direction - The direction (see {@link CONST.MOVEMENT_DIRECTIONS | `CONST.MOVEMENT_DIRECTIONS`})
    * @returns The offset
    */
   abstract getShiftedOffset(coords: BaseGrid.Coordinates, direction: number): BaseGrid.Offset;
@@ -104,7 +104,7 @@ declare abstract class BaseGrid {
    * In square grids with illegal diagonals the point is not shifted if the direction is diagonal.
    * In gridless grids the point coordinates are shifted by the grid size.
    * @param point     - The point that is to be shifted
-   * @param direction - The direction (see {@link CONST.MOVEMENT_DIRECTIONS})
+   * @param direction - The direction (see {@link CONST.MOVEMENT_DIRECTIONS | `CONST.MOVEMENT_DIRECTIONS`})
    * @returns The shifted point
    */
   abstract getShiftedPoint(point: Canvas.Point, direction: number): Canvas.Point;
@@ -129,7 +129,7 @@ declare abstract class BaseGrid {
 
   /**
    * Returns the points of the grid space shape relative to the center point.
-   * The points are returned in the same order as in {@link BaseGrid#getVertices}.
+   * The points are returned in the same order as in {@link BaseGrid.getVertices | `BaseGrid#getVertices`}.
    * In gridless grids an empty array is returned.
    * @returns The points of the polygon
    */
@@ -173,7 +173,7 @@ declare abstract class BaseGrid {
 
   /**
    * Measures the path and writes the measurements into `result`.
-   * Called by {@link BaseGrid#measurePath}.
+   * Called by {@link BaseGrid.measurePath | `BaseGrid#getDirectPath`}.
    * @param waypoints - The waypoints the path must pass through
    * @param options   - Additional measurement options
    * @param result    - The measurement result that the measurements need to be written to
@@ -249,7 +249,7 @@ declare abstract class BaseGrid {
    * @param size     - The grid size.
    * @param padding  - The percentage of padding.
    * @param options  - Options to configure the padding calculation.
-   * @deprecated Since v12 until v14. Use {@link BaseGrid#calculateDimensions} instead.
+   * @deprecated Since v12 until v14. Use {@link BaseGrid.calculateDimensions | `BaseGrid#calculateDimensions`} instead.
    */
   static calculatePadding(
     gridType: foundry.CONST.GRID_TYPES,
@@ -266,49 +266,49 @@ declare abstract class BaseGrid {
   ): { width: number; height: number; x: number; y: number };
 
   /**
-   * @deprecated Since v12 until v14. Use {@link BaseGrid#sizeX} instead.
+   * @deprecated Since v12 until v14. Use {@link BaseGrid.sizeX | `BaseGrid#sizeX`} instead.
    */
   get w(): number;
 
   /**
-   * @deprecated Since v12 until v14. Use {@link BaseGrid#sizeX} instead.
+   * @deprecated Since v12 until v14. Use {@link BaseGrid.sizeX | `BaseGrid#sizeX`} instead.
    */
   set w(value: number);
 
   /**
-   * @deprecated Since v12 until v14. Use {@link BaseGrid#sizeY} instead.
+   * @deprecated Since v12 until v14. Use {@link BaseGrid.sizeY | `BaseGrid#sizeY`} instead.
    */
   get h(): number;
 
   /**
-   * @deprecated Since v12 until v14. Use {@link BaseGrid#sizeY} instead.
+   * @deprecated Since v12 until v14. Use {@link BaseGrid.sizeY | `BaseGrid#sizeY`} instead.
    */
   set h(value: number);
 
   /**
    * Given a pair of coordinates (x, y) - return the top-left of the grid square which contains that point
    * @returns An Array [x, y] of the top-left coordinate of the square which contains (x, y)
-   * @deprecated Since v12 until v14. Use {@link BaseGrid#getTopLeftPoint} instead.
+   * @deprecated Since v12 until v14. Use {@link BaseGrid.getTopLeftPoint | `BaseGrid#getTopLeftPoint`} instead.
    */
-  getTopLeft(x: number, y: number): Canvas.PointArray;
+  getTopLeft(x: number, y: number): Canvas.PointTuple;
 
   /**
    * Given a pair of coordinates (x, y), return the center of the grid square which contains that point
    * @param x - The x-coordinate
    * @param y - The y-coordinate
    * @returns An array [cx, cy] of the central point of the grid space which contains (x, y)
-   * @deprecated Since v12 until v14. Use {@link BaseGrid#getCenterPoint} instead.
+   * @deprecated Since v12 until v14. Use {@link BaseGrid.getCenterPoint | `BaseGrid#getCenterPoint`} instead.
    */
-  getCenter(x: number, y: number): Canvas.PointArray;
+  getCenter(x: number, y: number): Canvas.PointTuple;
 
   /**
    * Get the grid row and column positions which are neighbors of a certain position
    * @param row - The grid row coordinate against which to test for neighbors
    * @param col - The grid column coordinate against which to test for neighbors
    * @returns An array of grid positions which are neighbors of the row and column
-   * @deprecated Since v12 until v14. Use {@link BaseGrid#getAdjacentOffsets} instead.
+   * @deprecated Since v12 until v14. Use {@link BaseGrid.getAdjacentOffsets | `BaseGrid#getAdjacentOffsets`} instead.
    */
-  getNeighbors(row: number, col: number): Canvas.PointArray[];
+  getNeighbors(row: number, col: number): Canvas.PointTuple[];
 
   /**
    * Given a pair of pixel coordinates, return the grid position as an Array.
@@ -316,9 +316,9 @@ declare abstract class BaseGrid {
    * @param x - The x-coordinate pixel position
    * @param y - The y-coordinate pixel position
    * @returns An array representing the position in grid units
-   * @deprecated Since v12 until v14. Use {@link BaseGrid#getOffset} instead.
+   * @deprecated Since v12 until v14. Use {@link BaseGrid.getOffset | `BaseGrid#getOffset`} instead.
    */
-  getGridPositionFromPixels(x: number, y: number): Canvas.PointArray;
+  getGridPositionFromPixels(x: number, y: number): Canvas.PointTuple;
 
   /* -------------------------------------------- */
 
@@ -328,9 +328,9 @@ declare abstract class BaseGrid {
    * @param x - The x-coordinate grid position
    * @param y - The y-coordinate grid position
    * @returns An array representing the position in pixels
-   * @deprecated Since v12 until v14. Use {@link BaseGrid#getTopLeftPoint} instead.
+   * @deprecated Since v12 until v14. Use {@link BaseGrid.getTopLeftPoint | `BaseGrid#getTopLeftPoint`} instead.
    */
-  getPixelsFromGridPosition(x: number, y: number): Canvas.PointArray;
+  getPixelsFromGridPosition(x: number, y: number): Canvas.PointTuple;
 
   /* -------------------------------------------- */
 
@@ -341,7 +341,7 @@ declare abstract class BaseGrid {
    * @param dx - The number of grid positions to shift horizontally
    * @param dy - The number of grid positions to shift vertically
    * @param options - Additional options to configure shift behavior.
-   * @deprecated Since v12 until v14. Use {@link BaseGrid#getShiftedPoint} instead.
+   * @deprecated Since v12 until v14. Use {@link BaseGrid.getShiftedPoint | `BaseGrid#getShiftedPoint`} instead.
    */
   shiftPosition(
     x: number,
@@ -352,9 +352,9 @@ declare abstract class BaseGrid {
       /**
        * The token that is being shifted.
        */
-      token: Token;
+      token: Token.Object;
     }>,
-  ): Canvas.PointArray;
+  ): Canvas.PointTuple;
 
   /* -------------------------------------------- */
 
@@ -364,9 +364,16 @@ declare abstract class BaseGrid {
    * @param options  - Additional options which modify the measurement
    *                   (default: `{}`)
    * @returns An Array of distance measurements for each segment
-   * @deprecated Since v12 until v14. Use {@link BaseGrid#measurePath} instead.
+   * @deprecated Since v12 until v14. Use {@link BaseGrid.measurePath | `BaseGrid#measurePath`} instead.
    */
-  measureDistances(segments: GridLayer.Segment[], options?: GridLayer.MeasureDistancesOptions): number[];
+  measureDistances(
+    // eslint-disable-next-line @typescript-eslint/no-deprecated
+    segments: BaseGrid.Segment[],
+    /**
+     * @defaultValue `{}`
+     * @remarks Unused */
+    options?: EmptyObject,
+  ): number[];
 
   /* -------------------------------------------- */
 
@@ -383,17 +390,18 @@ declare abstract class BaseGrid {
    *                   (default: `null`)
    * @param options  - Additional options to configure snapping behavior.
    * @returns An object containing the coordinates of the snapped location
-   * @deprecated Since v12 until v14. Use {@link BaseGrid#getSnappedPoint} instead.
+   * @deprecated Since v12 until v14. Use {@link BaseGrid.getSnappedPoint | `BaseGrid#getSnappedPoint`} instead.
    */
   getSnappedPosition(
     x: number,
     y: number,
     interval?: number | null,
-    options?: InexactPartial<{
-      /** The token that is being moved. */
-      token: Token;
-    }>,
-  ): { x: number; y: number };
+    /**
+     * @defaultValue `{}`
+     * @remarks Unused
+     */
+    options?: EmptyObject,
+  ): PIXI.IPointData;
 
   /* -------------------------------------------- */
 
@@ -401,35 +409,35 @@ declare abstract class BaseGrid {
    * Highlight a grid position for a certain coordinates
    * @param layer   - The highlight layer to use
    * @param options - Additional options to configure behavior.
-   * @deprecated Since v12 until v14. Use {@link GridLayer#highlightPosition} instead.
+   * @deprecated Since v12 until v14. Use {@link GridLayer.highlightPosition | `GridLayer#highlightPosition`} instead.
    */
   highlightGridPosition(layer: GridHighlight, options?: AnyObject): void;
 
   /* -------------------------------------------- */
 
   /**
-   * @deprecated Since v12 until v14. Use {@link Canvas#grid} instead.
+   * @deprecated Since v12 until v14. Use {@link Canvas.grid | `Canvas#grid`} instead.
    */
   get grid(): BaseGrid;
 
   /* -------------------------------------------- */
 
   /**
-   * @deprecated Since v12 until v14. Use {@link BaseGrid#testAdjacency} instead.
+   * @deprecated Since v12 until v14. Use {@link BaseGrid.testAdjacency | `BaseGrid#testAdjacency`} instead.
    */
   isNeighbor(r0: number, c0: number, r1: number, c1: number): boolean;
 
   /* -------------------------------------------- */
 
   /**
-   * @deprecated Since v12 until v14. Use {@link BaseGrid#isHexagonal} instead.
+   * @deprecated Since v12 until v14. Use {@link BaseGrid.isHexagonal | `BaseGrid#isHexagonal`} instead.
    */
   get isHex(): boolean;
 
   /* -------------------------------------------- */
 
   /**
-   * @deprecated Since v12 until v14. Use {@link BaseGrid#measurePath} instead.
+   * @deprecated Since v12 until v14. Use {@link BaseGrid.measurePath | `BaseGrid#measurePath`} instead.
    */
   measureDistance(origin: Canvas.Point, target: Canvas.Point, options: AnyObject): number[];
 
@@ -484,6 +492,9 @@ declare abstract class BaseGrid {
 }
 
 declare namespace BaseGrid {
+  interface Any extends AnyBaseGrid {}
+  interface AnyConstructor extends Identity<typeof AnyBaseGrid> {}
+
   interface Configuration {
     /** The size of a grid space in pixels (a positive number) */
     size: number;
@@ -533,17 +544,12 @@ declare namespace BaseGrid {
     j: number;
   }
 
-  interface OffsetRange {
-    i0: number;
-    j0: number;
-    i1: number;
-    j1: number;
-  }
+  type OffsetRange = [i0: number, j0: number, i1: number, j1: number];
 
   type Coordinates = Offset | Canvas.Point;
 
   interface SnappingBehavior {
-    /** The snapping mode (a union of {@link CONST.GRID_SNAPPING_MODES}) */
+    /** The snapping mode (a union of {@link CONST.GRID_SNAPPING_MODES | `CONST.GRID_SNAPPING_MODES`}) */
     mode: number;
 
     /**
@@ -569,7 +575,7 @@ declare namespace BaseGrid {
     /** The total number of spaces moved along a direct path up to this waypoint. */
     spaces: number;
 
-    /** The total cost of the direct path ({@link BaseGrid#getDirectPath}) up to this waypoint. */
+    /** The total cost of the direct path ({@link BaseGrid.getDirectPath | `BaseGrid#getDirectPath`}) up to this waypoint. */
     cost: number;
   }
 
@@ -590,11 +596,11 @@ declare namespace BaseGrid {
     /** The number of spaces moved along this segment. */
     spaces: number;
 
-    /** The cost of the direct path ({@link BaseGrid#getDirectPath}) between the two waypoints. */
+    /** The cost of the direct path ({@link BaseGrid.getDirectPath | `BaseGrid#getDirectPath`}) between the two waypoints. */
     cost: number;
   }
 
-  /** The measurements result of {@link BaseGrid#measurePath}. */
+  /** The measurements result of {@link BaseGrid.measurePath | `BaseGrid#measurePath`}. */
   interface MeasurePathResult {
     /** The measurements at each waypoint. */
     waypoints: MeasurePathResultWaypoint[];
@@ -612,7 +618,7 @@ declare namespace BaseGrid {
      */
     spaces: number;
 
-    /** The total cost of the direct path ({@link BaseGrid#getDirectPath}) through all waypoints. */
+    /** The total cost of the direct path ({@link BaseGrid.getDirectPath | `BaseGrid#getDirectPath`}) through all waypoints. */
     cost: number;
   }
 
@@ -635,6 +641,17 @@ declare namespace BaseGrid {
     rows: number;
     columns: number;
   }
+
+  /**
+   * @deprecated since v12, will be removed in v14
+   */
+  interface Segment {
+    ray: Ray;
+  }
+}
+
+declare abstract class AnyBaseGrid extends BaseGrid {
+  constructor(...args: never);
 }
 
 export default BaseGrid;

package/src/foundry/common/grid/gridless.d.mts

@@ -1,9 +1,9 @@
 import type BaseGrid from "./base.d.mts";
 
-import type { InexactPartial } from "../../../types/utils.d.mts";
+import type { InexactPartial } from "#utils";
 
 declare class Gridless extends BaseGrid {
-  override type: number;
+  override type: typeof CONST.GRID_TYPES.GRIDLESS;
 
   calculateDimensions(sceneWidth: number, sceneHeight: number, padding: number): Gridless.Dimensions;
 

package/src/foundry/common/grid/hexagonal.d.mts

@@ -1,6 +1,6 @@
 import type BaseGrid from "./base.d.mts";
 
-import type { InexactPartial } from "../../../types/utils.d.mts";
+import type { InexactPartial } from "#utils";
 
 declare class HexagonalGrid extends BaseGrid {
   /**
@@ -8,6 +8,13 @@ declare class HexagonalGrid extends BaseGrid {
    */
   constructor(config: HexagonalGrid.Configuration);
 
+  // declared here for type-checking, but values are limited to these in constructor
+  override type:
+    | typeof CONST.GRID_TYPES.HEXEVENQ
+    | typeof CONST.GRID_TYPES.HEXODDQ
+    | typeof CONST.GRID_TYPES.HEXEVENR
+    | typeof CONST.GRID_TYPES.HEXODDR;
+
   /** Is this grid column-based (flat-topped) or row-based (pointy-topped)yy? */
   columns: boolean;
 
@@ -31,7 +38,7 @@ declare class HexagonalGrid extends BaseGrid {
    * @param coords - The coordinates
    * @returns The cube coordinates
    */
-  getCube(coords: HexagonalGrid.Configuration): HexagonalGrid.Cube;
+  getCube(coords: HexagonalGrid.Coordinates): HexagonalGrid.Cube;
 
   /**
    * Returns the cube coordinates of grid spaces adjacent to the one corresponding to the given coordinates.
@@ -44,7 +51,7 @@ declare class HexagonalGrid extends BaseGrid {
    * Returns the cube coordinates of the grid space corresponding to the given coordinates
    * shifted by one grid space in the given direction.
    * @param coords    - The coordinates
-   * @param direction - The direction (see {@link CONST.MOVEMENT_DIRECTIONS})
+   * @param direction - The direction (see {@link CONST.MOVEMENT_DIRECTIONS | `CONST.MOVEMENT_DIRECTIONS`})
    * @returns The cube coordinates
    */
   getShiftedCube(coords: HexagonalGrid.Coordinates, direction: number): HexagonalGrid.Cube;
@@ -103,7 +110,7 @@ declare class HexagonalGrid extends BaseGrid {
 
   /**
    * Convert point coordinates (x, y) into cube coordinates (q, r, s).
-   * Inverse of {@link HexagonalGrid#cubeToPoint}.
+   * Inverse of {@link HexagonalGrid.cubeToPoint | `HexagonalGrid#cubeToPoint`}.
    * @see {@link https://www.redblobgames.com/grids/hexagons/}
    * @param point - The point
    * @returns The (fractional) cube coordinates
@@ -112,7 +119,7 @@ declare class HexagonalGrid extends BaseGrid {
 
   /**
    * Convert cube coordinates (q, r, s) into point coordinates (x, y).
-   * Inverse of {@link HexagonalGrid#pointToCube}.
+   * Inverse of {@link HexagonalGrid.pointToCube | `HexagonalGrid#pointToCube`}.
    * @see {@link https://www.redblobgames.com/grids/hexagons/}
    * @param cube - The cube coordinates
    * @returns The point coordinates
@@ -121,7 +128,7 @@ declare class HexagonalGrid extends BaseGrid {
 
   /**
    * Convert offset coordinates (i, j) into integer cube coordinates (q, r, s).
-   * Inverse of {@link HexagonalGrid#cubeToOffset}.
+   * Inverse of {@link HexagonalGrid.cubeToOffset | `HexagonalGrid#cubeToOffset`}.
    * @see {@link https://www.redblobgames.com/grids/hexagons/}
    * @param offset - The offset coordinates
    * @returns The integer cube coordinates
@@ -130,7 +137,7 @@ declare class HexagonalGrid extends BaseGrid {
 
   /**
    * Convert integer cube coordinates (q, r, s) into offset coordinates (i, j).
-   * Inverse of {@link HexagonalGrid#offsetToCube}.
+   * Inverse of {@link HexagonalGrid.offsetToCube | `HexagonalGrid#offsetToCube`}.
    * @see {@link https://www.redblobgames.com/grids/hexagons/}
    * @param cube - The cube coordinates
    * @returns The offset coordinates
@@ -146,11 +153,11 @@ declare class HexagonalGrid extends BaseGrid {
    */
   static cubeDistance(a: HexagonalGrid.Cube, b: HexagonalGrid.Cube): number;
 
-  /** Used by {@link HexagonalGrid#snapToCenter}. */
+  /** Used by {@link HexagonalGrid.snapToCenter | `HexagonalGrid#snapToCenter`}. */
   static #TEMP_POINT: Canvas.Point;
 
   /**
-   * Used by {@link HexagonalGrid#snapToCenter}.
+   * Used by {@link HexagonalGrid.snapToCenter | `HexagonalGrid#snapToCenter`}.
    * Always an odd grid!
    */
   static #TEMP_GRID: HexagonalGrid;
@@ -163,7 +170,7 @@ declare class HexagonalGrid extends BaseGrid {
    * Special border polygons for different token sizes.
    * @deprecated Since v12 until v14. No Replacement
    */
-  static get POINTY_HEX_BORDERS(): Record<number, Canvas.PointArray[]>;
+  static get POINTY_HEX_BORDERS(): Record<number, Canvas.PointTuple[]>;
 
   /**
    * @deprecated Since v12 until v14. No Replacement
@@ -174,25 +181,25 @@ declare class HexagonalGrid extends BaseGrid {
    * Special border polygons for different token sizes.
    * @deprecated Since v12 until v14. No Replacement
    */
-  static get FLAT_HEX_BORDERS(): Record<number, Canvas.PointArray[]>;
+  static get FLAT_HEX_BORDERS(): Record<number, Canvas.PointTuple[]>;
 
   /**
    * A matrix of x and y offsets which is multiplied by the width/height vector to get pointy-top polygon coordinates
    * @deprecated Since v12 until v14. No Replacement
    */
-  static get pointyHexPoints(): Canvas.PointArray[];
+  static get pointyHexPoints(): Canvas.PointTuple[];
 
   /**
    * A matrix of x and y offsets which is multiplied by the width/height vector to get flat-top polygon coordinates
    * @deprecated Since v12 until v14. No Replacement
    */
-  static get flatHexPoints(): Canvas.PointArray[];
+  static get flatHexPoints(): Canvas.PointTuple[];
 
   /**
    * An array of the points which define a hexagon for this grid shape
    * @deprecated Since v12 until v14. No Replacement
    */
-  get hexPoints(): Canvas.PointArray[];
+  get hexPoints(): Canvas.PointTuple[];
 
   /**
    * A convenience method for getting all the polygon points relative to a top-left [x,y] coordinate pair
@@ -201,18 +208,18 @@ declare class HexagonalGrid extends BaseGrid {
    * @param w      - An optional polygon width
    * @param h      - An optional polygon height
    * @param points - An optional list of polygon points.
-   * @deprecated Since v12 until v14. You can get the shape of the hex with {@link HexagonalGrid#getShape}
-   *             and the polygon with {@link HexagonalGrid#getVertices}.
+   * @deprecated Since v12 until v14. You can get the shape of the hex with {@link HexagonalGrid.getShape | `HexagonalGrid#getShape`}
+   *             and the polygon with {@link HexagonalGrid.getVertices | `HexagonalGrid#getVertices`}.
    */
-  getPolygon(x: number, y: number, w?: number, h?: number, points?: Canvas.PointArray[]): Canvas.PointArray[];
+  getPolygon(x: number, y: number, w?: number, h?: number, points?: Canvas.PointTuple[]): Canvas.PointTuple[];
 
   /**
-   * @deprecated Since v12 until v14. If you need the shape of a Token, use {@link Token#getShape} instead.
+   * @deprecated Since v12 until v14. If you need the shape of a Token, use {@link Token.getShape | `Token#getShape`} instead.
    */
-  getBorderPolygon(w: number, h: number, p: number): Canvas.PointArray[];
+  getBorderPolygon(w: number, h: number, p: number): Canvas.PointTuple[];
 
   /**
-   * @deprecated Since v12 until v14. If you need the size of a Token, use {@link Token#getSize} instead.
+   * @deprecated Since v12 until v14. If you need the size of a Token, use {@link Token.getSize | `Token#getSize`} instead.
    */
   getRect(w: number, h: number): PIXI.Rectangle;
 
@@ -223,7 +230,7 @@ declare class HexagonalGrid extends BaseGrid {
    * @param token - The token.
    * @deprecated Since v12 until v14. No Replacement
    */
-  protected _adjustSnapForTokenSize(x: number, y: number, token: Token): [x: number, y: number];
+  protected _adjustSnapForTokenSize(x: number, y: number, token: Token.Object): [x: number, y: number];
 
   /**
    * We set the 'size' of a hexagon (the distance from a hexagon's centre to a vertex) to be equal to the grid size
@@ -237,13 +244,13 @@ declare class HexagonalGrid extends BaseGrid {
 
   /**
    * Is this hex grid column-based (flat-topped), or row-based (pointy-topped)?
-   * @deprecated Since v12 until v14. Use {@link HexagonalGrid#columns} instead.
+   * @deprecated Since v12 until v14. Use {@link HexagonalGrid.columns | `HexagonalGrid#columns`} instead.
    */
   get columnar(): boolean;
 
   /**
    * Is this hex grid column-based (flat-topped), or row-based (pointy-topped)?
-   * @deprecated Since v12 until v14. Use {@link HexagonalGrid#columns} instead.
+   * @deprecated Since v12 until v14. Use {@link HexagonalGrid.columns | `HexagonalGrid#columns`} instead.
    */
   set columnar(value: boolean);
 
@@ -255,7 +262,7 @@ declare class HexagonalGrid extends BaseGrid {
    * @returns The adjusted row and column number.
    * @deprecated Since v12 until v14. No Replacement
    */
-  protected _adjustPositionForTokenSize(row: number, col: number, token: Token): [x: number, y: number];
+  protected _adjustPositionForTokenSize(row: number, col: number, token: Token.Object): [x: number, y: number];
 
   /**
    * Compute the grid configuration from a provided type
@@ -271,7 +278,7 @@ declare class HexagonalGrid extends BaseGrid {
    * Source code available https://www.redblobgames.com/grids/hexagons/codegen/output/lib-functions.js
    * @param offset - The offset coordinate
    * @param config - The hex grid configuration
-   * @deprecated Since v12 until v14. Use {@link HexagonalGrid#offsetToCube} instead.
+   * @deprecated Since v12 until v14. Use {@link HexagonalGrid.offsetToCube | `HexagonalGrid#offsetToCube`} instead.
    */
   static offsetToCube(
     offset: unknown,
@@ -288,7 +295,7 @@ declare class HexagonalGrid extends BaseGrid {
    * @param cube   - The cube coordinate
    * @param config - The hex grid configuration
    * @returns The offset coordinate
-   * @deprecated Since v12 until v14. Use {@link HexagonalGrid#cubeToOffset} instead.
+   * @deprecated Since v12 until v14. Use {@link HexagonalGrid.cubeToOffset | `HexagonalGrid#cubeToOffset`} instead.
    */
   static cubeToOffset(cube: unknown, config: HexagonalGrid.Configuration): HexagonalGrid.Offset;
 
@@ -298,7 +305,7 @@ declare class HexagonalGrid extends BaseGrid {
    * @param point  - The pixel point
    * @param config - The hex grid configuration
    * @returns The cube coordinate
-   * @deprecated Since v12 until v14. Use {@link HexagonalGrid#pointToCube} instead.
+   * @deprecated Since v12 until v14. Use {@link HexagonalGrid.pointToCube | `HexagonalGrid#pointToCube`} instead.
    */
   static pixelToCube(point: Canvas.Point, config: HexagonalGrid.Configuration): HexagonalGrid.Coordinates;
 
@@ -307,7 +314,7 @@ declare class HexagonalGrid extends BaseGrid {
    * @param offset - The offset coordinate
    * @param config - The hex grid configuration
    * @returns The coordinate in pixels
-   * @deprecated Since v12 until v14. Use {@link HexagonalGrid#getTopLeftPoint} instead.
+   * @deprecated Since v12 until v14. Use {@link HexagonalGrid.getTopLeftPoint | `HexagonalGrid#getTopLeftPoint`} instead.
    */
   static offsetToPixels(offset: unknown, config: HexagonalGrid.Configuration): Canvas.Point;
 

package/src/foundry/common/grid/square.d.mts

@@ -1,6 +1,6 @@
 import type BaseGrid from "./base.d.mts";
 
-import type { InexactPartial } from "../../../types/utils.d.mts";
+import type { InexactPartial } from "#utils";
 
 declare class SquareGrid extends BaseGrid {
   /**
@@ -8,7 +8,7 @@ declare class SquareGrid extends BaseGrid {
    */
   constructor(config: SquareGrid.Configuration);
 
-  override type: number;
+  override type: typeof CONST.GRID_TYPES.SQUARE;
 
   diagonals: number;
 
@@ -61,7 +61,7 @@ declare class SquareGrid extends BaseGrid {
 declare namespace SquareGrid {
   interface Configuration extends BaseGrid.Configuration {
     /**
-     * The rule for diagonal measurement (see {@link CONST.GRID_DIAGONALS})
+     * The rule for diagonal measurement (see {@link CONST.GRID_DIAGONALS | `CONST.GRID_DIAGONALS`})
      * Default: `CONST.GRID_DIAGONALS.EQUIDISTANT`,
      */
     diagonals: number;

package/src/foundry/common/packages/base-module.d.mts

@@ -1,30 +1,12 @@
 import type BasePackage from "./base-package.d.mts";
-import type * as fields from "../data/fields.d.mts";
-import type AdditionalTypesField from "./sub-types.d.mts";
 
 declare namespace BaseModule {
-  interface Schema extends ReturnType<typeof BasePackage.defineSchema> {
-    /**
-     * The current package version
-     * @remarks Actually defined in BasePackage but defined here to avoid conflict with BaseWorld
-     */
-    version: fields.StringField<{ required: true; blank: false; initial: "0" }>;
-
-    /**
-     * Does this module provide a translation for the core software?
-     */
-    coreTranslation: fields.BooleanField;
-
-    /**
-     * A library module provides no user-facing functionality and is solely for use by other modules. Loaded before any system or module scripts.
-     */
-    library: fields.BooleanField;
-
-    /**
-     * Additional document sub-types provided by this module.
-     */
-    documentTypes: AdditionalTypesField;
-  }
+  export import Source = Module.Source;
+  export import PersistedData = Module.Source;
+  export import CreateData = Module.CreateData;
+  export import InitializedData = Module.InitializedData;
+  export import UpdateData = Module.UpdateData;
+  export import Schema = Module.Schema;
 }
 
 /**