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

package/src/foundry/client/pixi/webgl/shaders/samplers/color-adjustment.d.mts

@@ -1,22 +1,6 @@
 export {};
 
-declare abstract class AnyColorAdjustmentsSamplerShader extends ColorAdjustmentsSamplerShader {
-  constructor(arg0: never, ...args: never[]);
-}
-
-declare abstract class AnyAmplificationSamplerShader extends AmplificationSamplerShader {
-  constructor(arg0: never, ...args: never[]);
-}
-
 declare global {
-  namespace ColorAdjustmentsSamplerShader {
-    type AnyConstructor = typeof AnyColorAdjustmentsSamplerShader;
-  }
-
-  namespace AmplificationSamplerShader {
-    type AnyConstructor = typeof AnyAmplificationSamplerShader;
-  }
-
   /**
    * A color adjustment shader.
    */
@@ -26,6 +10,8 @@ declare global {
      */
     static override classPluginName: string | null;
 
+    static override vertexShader: string;
+
     static override fragmentShader: string;
 
     /**
@@ -33,7 +19,8 @@ declare global {
      * ```js
      * {
      *   tintAlpha: [1, 1, 1, 1],
-     *   tint: [1, 1, 1],  contrast: 0,
+     *   tint: [1, 1, 1],
+     *   contrast: 0,
      *   saturation: 0,
      *   exposure: 0,
      *   sampler: null,
@@ -45,21 +32,30 @@ declare global {
      */
     static override defaultUniforms: AbstractBaseShader.Uniforms;
 
-    get linkedToDarknessLevel(): AbstractBaseShader.UniformValue;
+    /** @privateRemarks Inferred from defaultUniforms */
+    get linkedToDarknessLevel(): boolean;
+
+    set linkedToDarknessLevel(link);
 
-    set linkedToDarknessLevel(link: AbstractBaseShader.UniformValue);
+    /** @privateRemarks Inferred from defaultUniforms */
+    get contrast(): number;
 
-    get contrast(): AbstractBaseShader.UniformValue;
+    set contrast(contrast);
 
-    set contrast(contrast: AbstractBaseShader.UniformValue);
+    /** @privateRemarks Inferred from defaultUniforms */
+    get exposure(): number;
 
-    get exposure(): AbstractBaseShader.UniformValue;
+    set exposure(exposure);
 
-    set exposure(exposure: AbstractBaseShader.UniformValue);
+    /** @privateRemarks Inferred from defaultUniforms */
+    get saturation(): number;
 
-    get saturation(): AbstractBaseShader.UniformValue;
+    set saturation(saturation);
+  }
 
-    set saturation(saturation: AbstractBaseShader.UniformValue);
+  namespace ColorAdjustmentsSamplerShader {
+    interface Any extends AnyColorAdjustmentsSamplerShader {}
+    type AnyConstructor = typeof AnyColorAdjustmentsSamplerShader;
   }
 
   /**
@@ -95,15 +91,28 @@ declare global {
      */
     get brightness(): number;
 
-    set brightness(brightness: AbstractBaseShader.UniformValue);
+    set brightness(brightness);
 
     /**
      * Tint color applied to Light Amplification.
      * Light Amplification tint
      * @defaultValue `[0.48, 1.0, 0.48]`
      */
-    get colorTint(): number[];
+    get colorTint(): Color.RGBColorVector;
 
-    set colorTint(color: AbstractBaseShader.UniformValue);
+    set colorTint(color);
+  }
+
+  namespace AmplificationSamplerShader {
+    interface Any extends AnyAmplificationSamplerShader {}
+    type AnyConstructor = typeof AnyAmplificationSamplerShader;
   }
 }
+
+declare abstract class AnyColorAdjustmentsSamplerShader extends ColorAdjustmentsSamplerShader {
+  constructor(arg0: never, ...args: never[]);
+}
+
+declare abstract class AnyAmplificationSamplerShader extends AmplificationSamplerShader {
+  constructor(arg0: never, ...args: never[]);
+}

package/src/foundry/client/pixi/webgl/shaders/samplers/depth.d.mts

@@ -1,22 +1,6 @@
 export {};
 
-declare abstract class AnyDepthSamplerShader extends DepthSamplerShader {
-  constructor(arg0: never, ...args: never[]);
-}
-
 declare global {
-  namespace DepthSamplerShader {
-    type AnyConstructor = typeof AnyDepthSamplerShader;
-
-    interface DepthBatchData extends PIXI.IBatchableElement {
-      elevation: number;
-      textureAlphaThreshold: number;
-      fadeOcclusion: number;
-      radialOcclusion: number;
-      visionOcclusion: number;
-    }
-  }
-
   /**
    * The depth sampler shader.
    */
@@ -100,4 +84,24 @@ declare global {
 
     protected override _preRender: AbstractBaseShader.PreRenderFunction;
   }
+
+  namespace DepthSamplerShader {
+    interface Any extends AnyDepthSamplerShader {}
+    type AnyConstructor = typeof AnyDepthSamplerShader;
+
+    /** @internal */
+    type PartialPIXIBatchable = Pick<PIXI.IBatchableElement, "_texture" | "vertexData" | "indices" | "uvs">;
+
+    interface DepthBatchData extends PartialPIXIBatchable {
+      elevation: number;
+      textureAlphaThreshold: number;
+      fadeOcclusion: number;
+      radialOcclusion: number;
+      visionOcclusion: number;
+    }
+  }
+}
+
+declare abstract class AnyDepthSamplerShader extends DepthSamplerShader {
+  constructor(arg0: never, ...args: never[]);
 }

package/src/foundry/client/pixi/webgl/shaders/samplers/fog-of-war.d.mts

@@ -1,14 +1,6 @@
 export {};
 
-declare abstract class AnyFogSamplerShader extends FogSamplerShader {
-  constructor(arg0: never, ...args: never[]);
-}
-
 declare global {
-  namespace FogSamplerShader {
-    type AnyConstructor = typeof AnyFogSamplerShader;
-  }
-
   /**
    * A simple shader which purpose is to make the original texture red channel the alpha channel,
    * and still keeping channel informations. Used in cunjunction with the AlphaBlurFilterPass and Fog of War.
@@ -21,4 +13,13 @@ declare global {
 
     static override fragmentShader: string;
   }
+
+  namespace FogSamplerShader {
+    interface Any extends AnyFogSamplerShader {}
+    type AnyConstructor = typeof AnyFogSamplerShader;
+  }
+}
+
+declare abstract class AnyFogSamplerShader extends FogSamplerShader {
+  constructor(arg0: never, ...args: never[]);
 }

package/src/foundry/client/pixi/webgl/shaders/samplers/occlusion.d.mts

@@ -1,23 +1,6 @@
 export {};
 
-declare abstract class AnyOccludableSamplerShader extends OccludableSamplerShader {
-  constructor(arg0: never, ...args: never[]);
-}
-
 declare global {
-  namespace OccludableSamplerShader {
-    type AnyConstructor = typeof AnyOccludableSamplerShader;
-
-    interface OccludableBatchData extends PIXI.IBatchableElement {
-      elevation: number;
-      unoccludedAlpha: number;
-      occludedAlpha: number;
-      fadeOcclusion: number;
-      radialOcclusion: number;
-      visionOcclusion: number;
-    }
-  }
-
   /**
    * An occlusion shader to reveal certain area with elevation comparisons.
    * This shader is also working as a batched plugin.
@@ -101,4 +84,23 @@ declare global {
 
     protected override _preRender: AbstractBaseShader.PreRenderFunction;
   }
+
+  namespace OccludableSamplerShader {
+    interface Any extends AnyOccludableSamplerShader {}
+    type AnyConstructor = typeof AnyOccludableSamplerShader;
+
+    /** @privateRemarks Unlike `DepthSamplerShader`, this class uses every `IBatchableElement` key */
+    interface OccludableBatchData extends PIXI.IBatchableElement {
+      elevation: number;
+      unoccludedAlpha: number;
+      occludedAlpha: number;
+      fadeOcclusion: number;
+      radialOcclusion: number;
+      visionOcclusion: number;
+    }
+  }
+}
+
+declare abstract class AnyOccludableSamplerShader extends OccludableSamplerShader {
+  constructor(arg0: never, ...args: never[]);
 }

package/src/foundry/client/pixi/webgl/shaders/samplers/primary.d.mts

@@ -23,4 +23,13 @@ declare global {
      */
     protected _configureDepthShader(depthShader: DepthSamplerShader): void;
   }
+
+  namespace PrimaryBaseSamplerShader {
+    interface Any extends AnyPrimaryBaseSamplerShader {}
+    type AnyConstructor = typeof AnyPrimaryBaseSamplerShader;
+  }
+}
+
+declare abstract class AnyPrimaryBaseSamplerShader extends PrimaryBaseSamplerShader {
+  constructor(arg0: never, ...args: never[]);
 }

package/src/foundry/client/pixi/webgl/shaders/samplers/token-ring.d.mts

@@ -1,3 +1,6 @@
+import type { NullishProps } from "../../../../../../utils/index.d.mts";
+import type TokenRing from "../../../../../client-esm/canvas/tokens/ring.d.mts";
+
 export {};
 
 declare global {
@@ -33,7 +36,8 @@ declare global {
     protected static override _preRenderBatch: BatchRenderer.PreRenderBatchFunction;
 
     protected static override _packInterleavedGeometry(
-      element: PIXI.IBatchableElement,
+      /** @privateRemarks Calls super, which is the grandparent class in this case, with no new keys */
+      element: TokenRingSamplerShader.BatchData,
       attributeBuffer: PIXI.ViewableBuffer,
       indexBuffer: Uint16Array,
       aIndex: number,
@@ -44,4 +48,28 @@ declare global {
 
     protected static override _batchFragmentShader: string;
   }
+
+  namespace TokenRingSamplerShader {
+    interface Any extends AnyTokenRingSamplerShader {}
+    type AnyConstructor = typeof AnyTokenRingSamplerShader;
+
+    /** @internal */
+    type RingContainerObject = NullishProps<{
+      object: NullishProps<{
+        ring: TokenRing;
+      }>;
+    }>;
+
+    interface BatchData extends OccludableSamplerShader.OccludableBatchData {
+      /**
+       * @remarks This key is required to be an object as `TokenRingSamplerShader._packInterleavedGeometry` does `element.object.object || {}`.
+       * All `TokenRing` keys are then accessed via optional chaining with `??` defaults.
+       */
+      object: RingContainerObject;
+    }
+  }
+}
+
+declare abstract class AnyTokenRingSamplerShader extends TokenRingSamplerShader {
+  constructor(arg0: never, ...args: never[]);
 }

package/src/foundry/client/pixi/webgl/shaders/vision/background-vision.d.mts

@@ -1,14 +1,6 @@
 export {};
 
-declare abstract class AnyBackgroundVisionShader extends BackgroundVisionShader {
-  constructor(arg0: never, ...args: never[]);
-}
-
 declare global {
-  namespace BackgroundVisionShader {
-    type AnyConstructor = typeof AnyBackgroundVisionShader;
-  }
-
   /**
    * The default background shader used for vision sources
    */
@@ -39,4 +31,13 @@ declare global {
      */
     get isRequired(): boolean;
   }
+
+  namespace BackgroundVisionShader {
+    interface Any extends AnyBackgroundVisionShader {}
+    type AnyConstructor = typeof AnyBackgroundVisionShader;
+  }
+}
+
+declare abstract class AnyBackgroundVisionShader extends BackgroundVisionShader {
+  constructor(arg0: never, ...args: never[]);
 }

package/src/foundry/client/pixi/webgl/shaders/vision/base-vision.d.mts

@@ -1,14 +1,6 @@
 export {};
 
-declare abstract class AnyAdaptiveVisionShader extends AdaptiveVisionShader {
-  constructor(arg0: never, ...args: never[]);
-}
-
 declare global {
-  namespace AdaptiveVisionShader {
-    type AnyConstructor = typeof AnyAdaptiveVisionShader;
-  }
-
   /**
    * This class defines an interface which all adaptive vision shaders extend.
    */
@@ -25,7 +17,17 @@ declare global {
 
     /**
      * A mapping of available shader techniques
+     * @remarks Removes all parent techniques other than `LEGACY`
      */
     static override SHADER_TECHNIQUES: Record<string, AdaptiveLightingShader.ShaderTechnique>;
   }
+
+  namespace AdaptiveVisionShader {
+    interface Any extends AnyAdaptiveVisionShader {}
+    type AnyConstructor = typeof AnyAdaptiveVisionShader;
+  }
+}
+
+declare abstract class AnyAdaptiveVisionShader extends AdaptiveVisionShader {
+  constructor(arg0: never, ...args: never[]);
 }

package/src/foundry/client/pixi/webgl/shaders/vision/coloration-vision.d.mts

@@ -1,14 +1,6 @@
 export {};
 
-declare abstract class AnyColorationVisionShader extends ColorationVisionShader {
-  constructor(arg0: never, ...args: never[]);
-}
-
 declare global {
-  namespace ColorationVisionShader {
-    type AnyConstructor = typeof AnyColorationVisionShader;
-  }
-
   /**
    * The default coloration shader used for vision sources.
    */
@@ -38,4 +30,13 @@ declare global {
      */
     get isRequired(): boolean;
   }
+
+  namespace ColorationVisionShader {
+    interface Any extends AnyColorationVisionShader {}
+    type AnyConstructor = typeof AnyColorationVisionShader;
+  }
+}
+
+declare abstract class AnyColorationVisionShader extends ColorationVisionShader {
+  constructor(arg0: never, ...args: never[]);
 }

package/src/foundry/client/pixi/webgl/shaders/vision/effects/amplification.d.mts

@@ -1,14 +1,6 @@
 export {};
 
-declare abstract class AnyAmplificationBackgroundVisionShader extends AmplificationBackgroundVisionShader {
-  constructor(arg0: never, ...args: never[]);
-}
-
 declare global {
-  namespace AmplificationBackgroundVisionShader {
-    type AnyConstructor = typeof AnyAmplificationBackgroundVisionShader;
-  }
-
   /**
    * Shader specialized in light amplification
    */
@@ -29,4 +21,13 @@ declare global {
 
     override get isRequired(): boolean;
   }
+
+  namespace AmplificationBackgroundVisionShader {
+    interface Any extends AnyAmplificationBackgroundVisionShader {}
+    type AnyConstructor = typeof AnyAmplificationBackgroundVisionShader;
+  }
+}
+
+declare abstract class AnyAmplificationBackgroundVisionShader extends AmplificationBackgroundVisionShader {
+  constructor(arg0: never, ...args: never[]);
 }

package/src/foundry/client/pixi/webgl/shaders/vision/effects/wave.d.mts

@@ -1,22 +1,6 @@
 export {};
 
-declare abstract class AnyWaveBackgroundVisionShader extends WaveBackgroundVisionShader {
-  constructor(arg0: never, ...args: never[]);
-}
-
-declare abstract class AnyWaveColorationVisionShader extends WaveColorationVisionShader {
-  constructor(arg0: never, ...args: never[]);
-}
-
 declare global {
-  namespace WaveBackgroundVisionShader {
-    type AnyConstructor = typeof AnyWaveBackgroundVisionShader;
-  }
-
-  namespace WaveColorationVisionShader {
-    type AnyConstructor = typeof AnyWaveColorationVisionShader;
-  }
-
   /**
    * Shader specialized in wave like senses (tremorsenses)
    */
@@ -37,6 +21,11 @@ declare global {
     override get isRequired(): boolean;
   }
 
+  namespace WaveBackgroundVisionShader {
+    interface Any extends AnyWaveBackgroundVisionShader {}
+    type AnyConstructor = typeof AnyWaveBackgroundVisionShader;
+  }
+
   /**
    * The wave vision shader, used to create waves emanations (ex: tremorsense)
    */
@@ -56,4 +45,17 @@ declare global {
 
     override get isRequired(): boolean;
   }
+
+  namespace WaveColorationVisionShader {
+    interface Any extends AnyWaveColorationVisionShader {}
+    type AnyConstructor = typeof AnyWaveColorationVisionShader;
+  }
+}
+
+declare abstract class AnyWaveBackgroundVisionShader extends WaveBackgroundVisionShader {
+  constructor(arg0: never, ...args: never[]);
+}
+
+declare abstract class AnyWaveColorationVisionShader extends WaveColorationVisionShader {
+  constructor(arg0: never, ...args: never[]);
 }

package/src/foundry/client/pixi/webgl/shaders/vision/illumination-vision.d.mts

@@ -1,14 +1,6 @@
 export {};
 
-declare abstract class AnyIlluminationVisionShader extends IlluminationVisionShader {
-  constructor(arg0: never, ...args: never[]);
-}
-
 declare global {
-  namespace IlluminationVisionShader {
-    type AnyConstructor = typeof AnyIlluminationVisionShader;
-  }
-
   /**
    * The default illumination shader used for vision sources
    */
@@ -33,4 +25,13 @@ declare global {
 
     static override defaultUniforms: AbstractBaseShader.Uniforms;
   }
+
+  namespace IlluminationVisionShader {
+    interface Any extends AnyIlluminationVisionShader {}
+    type AnyConstructor = typeof AnyIlluminationVisionShader;
+  }
+}
+
+declare abstract class AnyIlluminationVisionShader extends IlluminationVisionShader {
+  constructor(arg0: never, ...args: never[]);
 }

package/src/foundry/client/pixi/webgl/shaders/weather/base-weather.d.mts

@@ -1,9 +1,9 @@
-import type { InterfaceToObject } from "../../../../../../types/helperTypes.d.mts";
-import type { AnyObject, RemoveIndexSignatures } from "../../../../../../types/utils.d.mts";
-
-declare abstract class AnyAbstractWeatherShader extends AbstractWeatherShader {
-  constructor(arg0: never, ...args: never[]);
-}
+import type {
+  InterfaceToObject,
+  AnyObject,
+  RemoveIndexSignatures,
+  FixedInstanceType,
+} from "../../../../../../utils/index.d.mts";
 
 type AbstractBaseShaderClass = typeof AbstractBaseShader;
 
@@ -22,31 +22,6 @@ class InternalAbstractWeatherShader<
 > extends InternalAbstractWeatherShader_Const<_ComputedUniforms> {}
 
 declare global {
-  namespace AbstractWeatherShader {
-    type AnyConstructor = typeof AnyAbstractWeatherShader;
-
-    interface CommonUniforms {
-      terrainUvMatrix: PIXI.Matrix;
-      useOcclusion: boolean;
-      occlusionTexture: PIXI.Matrix | null;
-      reverseOcclusion: boolean;
-      occlusionWeights: number[];
-      useTerrain: boolean;
-      terrainTexture: PIXI.Texture | null;
-      reverseTerrain: boolean;
-      terrainWeights: number[];
-      alpha: number;
-      tint: number[];
-      screenDimensions: [number, number];
-      effectDimensions: [number, number];
-      depthElevation: number;
-      time: number;
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-empty-object-type
-    interface DefaultUniforms {}
-  }
-
   /**
    * The base shader class for weather shaders.
    */
@@ -75,7 +50,7 @@ declare global {
     static override create<ThisType extends AbstractBaseShader.AnyConstructor>(
       this: ThisType,
       initialUniforms?: AbstractBaseShader.Uniforms,
-    ): InstanceType<ThisType>;
+    ): FixedInstanceType<ThisType>;
 
     /**
      * Create the shader program.
@@ -103,4 +78,34 @@ declare global {
 
     protected override _preRender: AbstractBaseShader.PreRenderFunction;
   }
+
+  namespace AbstractWeatherShader {
+    interface Any extends AnyAbstractWeatherShader {}
+    type AnyConstructor = typeof AnyAbstractWeatherShader;
+
+    interface CommonUniforms extends AbstractBaseShader.Uniforms {
+      terrainUvMatrix: PIXI.Matrix;
+      useOcclusion: boolean;
+      occlusionTexture: PIXI.Matrix | null;
+      reverseOcclusion: boolean;
+      occlusionWeights: number[];
+      useTerrain: boolean;
+      terrainTexture: PIXI.Texture | null;
+      reverseTerrain: boolean;
+      terrainWeights: number[];
+      alpha: number;
+      tint: Color.RGBColorVector;
+      screenDimensions: [number, number];
+      effectDimensions: [number, number];
+      depthElevation: number;
+      time: number;
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-empty-object-type
+    interface DefaultUniforms {}
+  }
+}
+
+declare abstract class AnyAbstractWeatherShader extends AbstractWeatherShader {
+  constructor(arg0: never, ...args: never[]);
 }

package/src/foundry/client/pixi/webgl/shaders/weather/effect.d.mts

@@ -1,8 +1,4 @@
-import type { InexactPartial } from "../../../../../../types/utils.d.mts";
-
-declare abstract class AnyWeatherShaderEffect extends WeatherShaderEffect<any> {
-  constructor(arg0: never, ...args: never[]);
-}
+import type { InexactPartial, FixedInstanceType } from "fvtt-types/utils";
 
 type QuadMeshClass = typeof QuadMesh;
 
@@ -16,17 +12,11 @@ declare const InternalWeatherShaderEffect_Const: InternalWeatherShaderEffect_Int
 
 // @ts-expect-error - This pattern inherently requires a ts-expect-error as the base class is dynamic.
 class InternalWeatherShaderEffect<
-  ShaderClass extends AbstractBaseShader.AnyConstructor,
-  _ShaderClassInstance extends object = InstanceType<ShaderClass>,
+  ShaderClass extends AbstractWeatherShader.AnyConstructor,
+  _ShaderClassInstance extends object = FixedInstanceType<ShaderClass>,
 > extends InternalWeatherShaderEffect_Const<_ShaderClassInstance> {}
 
 declare global {
-  namespace WeatherShaderEffect {
-    type AnyConstructor = typeof AnyWeatherShaderEffect;
-
-    type WeatherShaderEffectConfig = InexactPartial<AbstractBaseShader.Uniforms & WeatherShaderEffect["shader"]>;
-  }
-
   /**
    * An interface for defining shader-based weather effects
    */
@@ -36,7 +26,7 @@ declare global {
     /**
      * @param config - The config object to create the shader effect
      */
-    constructor(config: WeatherShaderEffect.WeatherShaderEffectConfig, shaderClass: ShaderClass);
+    constructor(config: WeatherShaderEffect.WeatherShaderEffectConfig | undefined, shaderClass: ShaderClass);
 
     /**
      * Set shader parameters.
@@ -59,4 +49,15 @@ declare global {
      */
     protected _initialize(config: WeatherShaderEffect.WeatherShaderEffectConfig): void;
   }
+
+  namespace WeatherShaderEffect {
+    interface Any extends AnyWeatherShaderEffect {}
+    type AnyConstructor = typeof AnyWeatherShaderEffect;
+
+    type WeatherShaderEffectConfig = InexactPartial<AbstractBaseShader.Uniforms & WeatherShaderEffect["shader"]>;
+  }
+}
+
+declare abstract class AnyWeatherShaderEffect extends WeatherShaderEffect<AbstractWeatherShader.AnyConstructor> {
+  constructor(arg0: never, ...args: never[]);
 }

package/src/foundry/client/pixi/webgl/shaders/weather/fog.d.mts

@@ -1,20 +1,6 @@
-import type { InterfaceToObject } from "../../../../../../types/helperTypes.d.mts";
-
-declare abstract class AnyFogShader extends FogShader {
-  constructor(arg0: never, ...args: never[]);
-}
+import type { InterfaceToObject } from "fvtt-types/utils";
 
 declare global {
-  namespace FogShader {
-    type AnyConstructor = typeof AnyFogShader;
-
-    interface DefaultUniforms extends AbstractBaseShader.Uniforms {
-      intensity: number;
-      rotation: number;
-      slope: number;
-    }
-  }
-
   /**
    * Fog shader effect.
    */
@@ -47,4 +33,19 @@ declare global {
 
     static override fragmentShader(mode: number): string;
   }
+
+  namespace FogShader {
+    interface Any extends AnyFogShader {}
+    type AnyConstructor = typeof AnyFogShader;
+
+    interface DefaultUniforms extends AbstractBaseShader.Uniforms, AbstractWeatherShader.DefaultUniforms {
+      intensity: number;
+      rotation: number;
+      slope: number;
+    }
+  }
+}
+
+declare abstract class AnyFogShader extends FogShader {
+  constructor(arg0: never, ...args: never[]);
 }