Use override type

Bashamega · Bashamega · commit d7a25a61522d · 2025-11-03T10:14:59.000+02:00
diff --git a/inputfiles/patches/webgl.kdl b/inputfiles/patches/webgl.kdl
@@ -2,172 +2,172 @@ interface-mixin WebGLRenderingContextBase {
   property canvas exposed=Window
 
   method getExtension {
-    param extensionName type="\"ANGLE_instanced_arrays\""
+    param extensionName overrideType="\"ANGLE_instanced_arrays\""
     type ANGLE_instanced_arrays nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"EXT_blend_minmax\""
+    param extensionName overrideType="\"EXT_blend_minmax\""
     type EXT_blend_minmax nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"EXT_color_buffer_float\""
+    param extensionName overrideType="\"EXT_color_buffer_float\""
     type EXT_color_buffer_float nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"EXT_color_buffer_half_float\""
+    param extensionName overrideType="\"EXT_color_buffer_half_float\""
     type EXT_color_buffer_half_float nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"EXT_float_blend\""
+    param extensionName overrideType="\"EXT_float_blend\""
     type EXT_float_blend nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"EXT_frag_depth\""
+    param extensionName overrideType="\"EXT_frag_depth\""
     type EXT_frag_depth nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"EXT_sRGB\""
+    param extensionName overrideType="\"EXT_sRGB\""
     type EXT_sRGB nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"EXT_shader_texture_lod\""
+    param extensionName overrideType="\"EXT_shader_texture_lod\""
     type EXT_shader_texture_lod nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"EXT_texture_compression_bptc\""
+    param extensionName overrideType="\"EXT_texture_compression_bptc\""
     type EXT_texture_compression_bptc nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"EXT_texture_compression_rgtc\""
+    param extensionName overrideType="\"EXT_texture_compression_rgtc\""
     type EXT_texture_compression_rgtc nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"EXT_texture_filter_anisotropic\""
+    param extensionName overrideType="\"EXT_texture_filter_anisotropic\""
     type EXT_texture_filter_anisotropic nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"KHR_parallel_shader_compile\""
+    param extensionName overrideType="\"KHR_parallel_shader_compile\""
     type KHR_parallel_shader_compile nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"OES_element_index_uint\""
+    param extensionName overrideType="\"OES_element_index_uint\""
     type OES_element_index_uint nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"OES_fbo_render_mipmap\""
+    param extensionName overrideType="\"OES_fbo_render_mipmap\""
     type OES_fbo_render_mipmap nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"OES_standard_derivatives\""
+    param extensionName overrideType="\"OES_standard_derivatives\""
     type OES_standard_derivatives nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"OES_texture_float\""
+    param extensionName overrideType="\"OES_texture_float\""
     type OES_texture_float nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"OES_texture_float_linear\""
+    param extensionName overrideType="\"OES_texture_float_linear\""
     type OES_texture_float_linear nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"OES_texture_half_float\""
+    param extensionName overrideType="\"OES_texture_half_float\""
     type OES_texture_half_float nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"OES_texture_half_float_linear\""
+    param extensionName overrideType="\"OES_texture_half_float_linear\""
     type OES_texture_half_float_linear nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"OES_vertex_array_object\""
+    param extensionName overrideType="\"OES_vertex_array_object\""
     type OES_vertex_array_object nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"OVR_multiview2\""
+    param extensionName overrideType="\"OVR_multiview2\""
     type OVR_multiview2 nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"WEBGL_color_buffer_float\""
+    param extensionName overrideType="\"WEBGL_color_buffer_float\""
     type WEBGL_color_buffer_float nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"WEBGL_compressed_texture_astc\""
+    param extensionName overrideType="\"WEBGL_compressed_texture_astc\""
     type WEBGL_compressed_texture_astc nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"WEBGL_compressed_texture_etc\""
+    param extensionName overrideType="\"WEBGL_compressed_texture_etc\""
     type WEBGL_compressed_texture_etc nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"WEBGL_compressed_texture_etc1\""
+    param extensionName overrideType="\"WEBGL_compressed_texture_etc1\""
     type WEBGL_compressed_texture_etc1 nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"WEBGL_compressed_texture_pvrtc\""
+    param extensionName overrideType="\"WEBGL_compressed_texture_pvrtc\""
     type WEBGL_compressed_texture_pvrtc nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"WEBGL_compressed_texture_s3tc\""
+    param extensionName overrideType="\"WEBGL_compressed_texture_s3tc\""
     type WEBGL_compressed_texture_s3tc nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"WEBGL_compressed_texture_s3tc_srgb\""
+    param extensionName overrideType="\"WEBGL_compressed_texture_s3tc_srgb\""
     type WEBGL_compressed_texture_s3tc_srgb nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"WEBGL_debug_renderer_info\""
+    param extensionName overrideType="\"WEBGL_debug_renderer_info\""
     type WEBGL_debug_renderer_info nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"WEBGL_debug_shaders\""
+    param extensionName overrideType="\"WEBGL_debug_shaders\""
     type WEBGL_debug_shaders nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"WEBGL_depth_texture\""
+    param extensionName overrideType="\"WEBGL_depth_texture\""
     type WEBGL_depth_texture nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"WEBGL_draw_buffers\""
+    param extensionName overrideType="\"WEBGL_draw_buffers\""
     type WEBGL_draw_buffers nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"WEBGL_lose_context\""
+    param extensionName overrideType="\"WEBGL_lose_context\""
     type WEBGL_lose_context nullable=#true
   }
 
   method getExtension {
-    param extensionName type="\"WEBGL_multi_draw\""
+    param extensionName overrideType="\"WEBGL_multi_draw\""
     type WEBGL_multi_draw nullable=#true
   }
 }
diff --git a/src/build/emitter.ts b/src/build/emitter.ts
@@ -509,11 +509,6 @@ export function emitWebIdl(
       return objDomType;
     }
 
-    // If it's a quoted string literal (has " " inside), just return it
-    if (typeof objDomType === "string" && objDomType.includes('"')) {
-      return objDomType;
-    }
-
     throw new Error("Unknown DOM type: " + objDomType);
   }
 
diff --git a/src/build/patches.ts b/src/build/patches.ts
@@ -239,7 +239,7 @@ function handleMethod(child: Node): Partial<Method> {
   const name = string(child.values[0]);
 
   let typeNode: Node | undefined;
-  const params: { name: string; type: string }[] = [];
+  const params: { name: string; type?: string, overrideType?:string }[] = [];
 
   for (const c of child.children) {
     switch (c.name) {
@@ -253,7 +253,8 @@ function handleMethod(child: Node): Partial<Method> {
       case "param":
         params.push({
           name: string(c.values[0]),
-          type: string(c.properties.type),
+          ...optionalMember("type", "string", c.properties?.type),
+          ...optionalMember("overrideType", "string", c.properties?.overrideType),
         });
         break;
 
@@ -269,7 +270,7 @@ function handleMethod(child: Node): Partial<Method> {
         ? handleTyped(typeNode)
         : { type: string(child.properties?.returns) }),
     },
-  ];
+  ] as Method["signature"];
   return { name, signature };
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2,172 +2,172 @@ interface-mixin WebGLRenderingContextBase {`
`2`	`2`	`property canvas exposed=Window`
`3`	`3`
`4`	`4`	`method getExtension {`
`5`		`- param extensionName type="\"ANGLE_instanced_arrays\""`
	`5`	`+ param extensionName overrideType="\"ANGLE_instanced_arrays\""`
`6`	`6`	`type ANGLE_instanced_arrays nullable=#true`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`method getExtension {`
`10`		`- param extensionName type="\"EXT_blend_minmax\""`
	`10`	`+ param extensionName overrideType="\"EXT_blend_minmax\""`
`11`	`11`	`type EXT_blend_minmax nullable=#true`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`method getExtension {`
`15`		`- param extensionName type="\"EXT_color_buffer_float\""`
	`15`	`+ param extensionName overrideType="\"EXT_color_buffer_float\""`
`16`	`16`	`type EXT_color_buffer_float nullable=#true`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`method getExtension {`
`20`		`- param extensionName type="\"EXT_color_buffer_half_float\""`
	`20`	`+ param extensionName overrideType="\"EXT_color_buffer_half_float\""`
`21`	`21`	`type EXT_color_buffer_half_float nullable=#true`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`method getExtension {`
`25`		`- param extensionName type="\"EXT_float_blend\""`
	`25`	`+ param extensionName overrideType="\"EXT_float_blend\""`
`26`	`26`	`type EXT_float_blend nullable=#true`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`method getExtension {`
`30`		`- param extensionName type="\"EXT_frag_depth\""`
	`30`	`+ param extensionName overrideType="\"EXT_frag_depth\""`
`31`	`31`	`type EXT_frag_depth nullable=#true`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`method getExtension {`
`35`		`- param extensionName type="\"EXT_sRGB\""`
	`35`	`+ param extensionName overrideType="\"EXT_sRGB\""`
`36`	`36`	`type EXT_sRGB nullable=#true`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`method getExtension {`
`40`		`- param extensionName type="\"EXT_shader_texture_lod\""`
	`40`	`+ param extensionName overrideType="\"EXT_shader_texture_lod\""`
`41`	`41`	`type EXT_shader_texture_lod nullable=#true`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`method getExtension {`
`45`		`- param extensionName type="\"EXT_texture_compression_bptc\""`
	`45`	`+ param extensionName overrideType="\"EXT_texture_compression_bptc\""`
`46`	`46`	`type EXT_texture_compression_bptc nullable=#true`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`method getExtension {`
`50`		`- param extensionName type="\"EXT_texture_compression_rgtc\""`
	`50`	`+ param extensionName overrideType="\"EXT_texture_compression_rgtc\""`
`51`	`51`	`type EXT_texture_compression_rgtc nullable=#true`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`method getExtension {`
`55`		`- param extensionName type="\"EXT_texture_filter_anisotropic\""`
	`55`	`+ param extensionName overrideType="\"EXT_texture_filter_anisotropic\""`
`56`	`56`	`type EXT_texture_filter_anisotropic nullable=#true`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`method getExtension {`
`60`		`- param extensionName type="\"KHR_parallel_shader_compile\""`
	`60`	`+ param extensionName overrideType="\"KHR_parallel_shader_compile\""`
`61`	`61`	`type KHR_parallel_shader_compile nullable=#true`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`method getExtension {`
`65`		`- param extensionName type="\"OES_element_index_uint\""`
	`65`	`+ param extensionName overrideType="\"OES_element_index_uint\""`
`66`	`66`	`type OES_element_index_uint nullable=#true`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`method getExtension {`
`70`		`- param extensionName type="\"OES_fbo_render_mipmap\""`
	`70`	`+ param extensionName overrideType="\"OES_fbo_render_mipmap\""`
`71`	`71`	`type OES_fbo_render_mipmap nullable=#true`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`method getExtension {`
`75`		`- param extensionName type="\"OES_standard_derivatives\""`
	`75`	`+ param extensionName overrideType="\"OES_standard_derivatives\""`
`76`	`76`	`type OES_standard_derivatives nullable=#true`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`method getExtension {`
`80`		`- param extensionName type="\"OES_texture_float\""`
	`80`	`+ param extensionName overrideType="\"OES_texture_float\""`
`81`	`81`	`type OES_texture_float nullable=#true`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`method getExtension {`
`85`		`- param extensionName type="\"OES_texture_float_linear\""`
	`85`	`+ param extensionName overrideType="\"OES_texture_float_linear\""`
`86`	`86`	`type OES_texture_float_linear nullable=#true`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`method getExtension {`
`90`		`- param extensionName type="\"OES_texture_half_float\""`
	`90`	`+ param extensionName overrideType="\"OES_texture_half_float\""`
`91`	`91`	`type OES_texture_half_float nullable=#true`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`method getExtension {`
`95`		`- param extensionName type="\"OES_texture_half_float_linear\""`
	`95`	`+ param extensionName overrideType="\"OES_texture_half_float_linear\""`
`96`	`96`	`type OES_texture_half_float_linear nullable=#true`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`method getExtension {`
`100`		`- param extensionName type="\"OES_vertex_array_object\""`
	`100`	`+ param extensionName overrideType="\"OES_vertex_array_object\""`
`101`	`101`	`type OES_vertex_array_object nullable=#true`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`method getExtension {`
`105`		`- param extensionName type="\"OVR_multiview2\""`
	`105`	`+ param extensionName overrideType="\"OVR_multiview2\""`
`106`	`106`	`type OVR_multiview2 nullable=#true`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`method getExtension {`
`110`		`- param extensionName type="\"WEBGL_color_buffer_float\""`
	`110`	`+ param extensionName overrideType="\"WEBGL_color_buffer_float\""`
`111`	`111`	`type WEBGL_color_buffer_float nullable=#true`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`method getExtension {`
`115`		`- param extensionName type="\"WEBGL_compressed_texture_astc\""`
	`115`	`+ param extensionName overrideType="\"WEBGL_compressed_texture_astc\""`
`116`	`116`	`type WEBGL_compressed_texture_astc nullable=#true`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`method getExtension {`
`120`		`- param extensionName type="\"WEBGL_compressed_texture_etc\""`
	`120`	`+ param extensionName overrideType="\"WEBGL_compressed_texture_etc\""`
`121`	`121`	`type WEBGL_compressed_texture_etc nullable=#true`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`method getExtension {`
`125`		`- param extensionName type="\"WEBGL_compressed_texture_etc1\""`
	`125`	`+ param extensionName overrideType="\"WEBGL_compressed_texture_etc1\""`
`126`	`126`	`type WEBGL_compressed_texture_etc1 nullable=#true`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`method getExtension {`
`130`		`- param extensionName type="\"WEBGL_compressed_texture_pvrtc\""`
	`130`	`+ param extensionName overrideType="\"WEBGL_compressed_texture_pvrtc\""`
`131`	`131`	`type WEBGL_compressed_texture_pvrtc nullable=#true`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`method getExtension {`
`135`		`- param extensionName type="\"WEBGL_compressed_texture_s3tc\""`
	`135`	`+ param extensionName overrideType="\"WEBGL_compressed_texture_s3tc\""`
`136`	`136`	`type WEBGL_compressed_texture_s3tc nullable=#true`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`method getExtension {`
`140`		`- param extensionName type="\"WEBGL_compressed_texture_s3tc_srgb\""`
	`140`	`+ param extensionName overrideType="\"WEBGL_compressed_texture_s3tc_srgb\""`
`141`	`141`	`type WEBGL_compressed_texture_s3tc_srgb nullable=#true`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`method getExtension {`
`145`		`- param extensionName type="\"WEBGL_debug_renderer_info\""`
	`145`	`+ param extensionName overrideType="\"WEBGL_debug_renderer_info\""`
`146`	`146`	`type WEBGL_debug_renderer_info nullable=#true`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`method getExtension {`
`150`		`- param extensionName type="\"WEBGL_debug_shaders\""`
	`150`	`+ param extensionName overrideType="\"WEBGL_debug_shaders\""`
`151`	`151`	`type WEBGL_debug_shaders nullable=#true`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`method getExtension {`
`155`		`- param extensionName type="\"WEBGL_depth_texture\""`
	`155`	`+ param extensionName overrideType="\"WEBGL_depth_texture\""`
`156`	`156`	`type WEBGL_depth_texture nullable=#true`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`method getExtension {`
`160`		`- param extensionName type="\"WEBGL_draw_buffers\""`
	`160`	`+ param extensionName overrideType="\"WEBGL_draw_buffers\""`
`161`	`161`	`type WEBGL_draw_buffers nullable=#true`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`method getExtension {`
`165`		`- param extensionName type="\"WEBGL_lose_context\""`
	`165`	`+ param extensionName overrideType="\"WEBGL_lose_context\""`
`166`	`166`	`type WEBGL_lose_context nullable=#true`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`method getExtension {`
`170`		`- param extensionName type="\"WEBGL_multi_draw\""`
	`170`	`+ param extensionName overrideType="\"WEBGL_multi_draw\""`
`171`	`171`	`type WEBGL_multi_draw nullable=#true`
`172`	`172`	`}`
`173`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -509,11 +509,6 @@ export function emitWebIdl(`
`509`	`509`	`return objDomType;`
`510`	`510`	`}`
`511`	`511`
`512`		`- // If it's a quoted string literal (has " " inside), just return it`
`513`		`- if (typeof objDomType === "string" && objDomType.includes('"')) {`
`514`		`- return objDomType;`
`515`		`- }`
`516`		`-`
`517`	`512`	`throw new Error("Unknown DOM type: " + objDomType);`
`518`	`513`	`}`
`519`	`514`