Still-failing CreateOptions

League-of-Foundry-Developers · Dec 14, 2023 · b434b7f · b434b7f
1 parent b7ac207
commit b434b7f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/foundry/client/pixi/webgl/shaders/filters/filters.d.ts b/src/foundry/client/pixi/webgl/shaders/filters/filters.d.ts
@@ -78,10 +78,20 @@ declare global {
 
     type FilterMode = ValueOf<(typeof VisualEffectsMaskingFilter)["FILTER_MODES"]>;
 
-    type CreateOptions = {
+    /**
+     * @privateRemarks Attempting to implement https://stackoverflow.com/a/61434547
+     */
+    type CreateOptionsIntersection = {
       filterMode?: FilterMode;
       postProcessModes?: PostProcessModes;
     } & AbstractBaseShader.Uniforms;
+
+    type CreateOptions<T> = {
+      filterMode?: FilterMode;
+      postProcessModes?: PostProcessModes;
+    } & {
+      [K in keyof T]: K extends "filterMode" | "postProcessModes" ? unknown : AbstractBaseShader.UniformValue;
+    };
   }
 
   /**
@@ -95,9 +105,13 @@ declare global {
       filterMode: VisualEffectsMaskingFilter.FilterMode,
     );
 
+    static create<T1 extends VisualEffectsMaskingFilter, T2 extends VisualEffectsMaskingFilter.CreateOptions<T2>>(
+      this: ConstructorOf<T1>,
+      { filterMode, postProcessModes, ...uniforms }?: T2,
+    ): T1;
     static create<T extends VisualEffectsMaskingFilter>(
       this: ConstructorOf<T>,
-      { filterMode, postProcessModes, ...uniforms }?: VisualEffectsMaskingFilter.CreateOptions,
+      { filterMode, postProcessModes, ...uniforms }?: VisualEffectsMaskingFilter.CreateOptionsIntersection,
     ): T;
 
     /**

diff --git a/tests/foundry/client/pixi/webgl/filters.test-d.ts b/tests/foundry/client/pixi/webgl/filters.test-d.ts
@@ -6,7 +6,7 @@ expectTypeOf(CustomMaskFilter.create()).toEqualTypeOf<CustomMaskFilter>();
 
 expectTypeOf(InverseOcclusionMaskFilter.create()).toEqualTypeOf<InverseOcclusionMaskFilter>();
 
-const x: VisualEffectsMaskingFilter.CreateOptions = {
+const x = {
   filterMode: "background",
   postProcessModes: ["CONTRAST"],
   foobar: 3,