File tree Expand file tree Collapse file tree 5 files changed +13
-1529
lines changed
Expand file tree Collapse file tree 5 files changed +13
-1529
lines changed Original file line number Diff line number Diff line change @@ -1401,6 +1401,7 @@ pub struct CatchClause<'a> {
14011401pub struct CatchParameter < ' a > {
14021402 pub span : Span ,
14031403 /// The bound error
1404+ #[ estree( flatten) ]
14041405 pub pattern : BindingPattern < ' a > ,
14051406}
14061407
Original file line number Diff line number Diff line change @@ -1222,7 +1222,9 @@ impl Serialize for CatchParameter<'_> {
12221222 map. serialize_entry ( "type" , "CatchParameter" ) ?;
12231223 map. serialize_entry ( "start" , & self . span . start ) ?;
12241224 map. serialize_entry ( "end" , & self . span . end ) ?;
1225- map. serialize_entry ( "pattern" , & self . pattern ) ?;
1225+ self . pattern . kind . serialize ( FlatMapSerializer ( & mut map) ) ?;
1226+ map. serialize_entry ( "typeAnnotation" , & self . pattern . type_annotation ) ?;
1227+ map. serialize_entry ( "optional" , & self . pattern . optional ) ?;
12261228 map. end ( )
12271229 }
12281230}
Original file line number Diff line number Diff line change @@ -483,10 +483,12 @@ export interface CatchClause extends Span {
483483 body : BlockStatement ;
484484}
485485
486- export interface CatchParameter extends Span {
487- type : 'CatchParameter' ;
488- pattern : BindingPattern ;
489- }
486+ export type CatchParameter =
487+ & ( {
488+ type : 'CatchParameter' ;
489+ } )
490+ & Span
491+ & BindingPattern ;
490492
491493export interface DebuggerStatement extends Span {
492494 type : 'DebuggerStatement' ;
Original file line number Diff line number Diff line change @@ -220,7 +220,8 @@ fn generate_ts_type_def_for_struct_field<'s>(
220220 }
221221 }
222222
223- if field_type_name. contains ( '|' ) {
223+ // need `type` instead of `interface` when flattening BindingPattern
224+ if field_type_name. contains ( '|' ) || field_type_name == "BindingPattern" {
224225 * output_as_type = true ;
225226 }
226227 extends. push ( field_type_name) ;
You can’t perform that action at this time.
0 commit comments