Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ast): improve TS type definitions for appended fields #8882

Merged
merged 1 commit into from
Feb 4, 2025
Merged

feat(ast): improve TS type definitions for appended fields #8882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions npm/oxc-types/types.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,12 +341,12 @@ export type AssignmentTargetPattern = ArrayAssignmentTarget | ObjectAssignmentTa

export interface ArrayAssignmentTarget extends Span {
type: 'ArrayAssignmentTarget';
elements: Array<AssignmentTargetRest | AssignmentTargetMaybeDefault | null>;
elements: Array<AssignmentTargetMaybeDefault | AssignmentTargetRest | null>;
}

export interface ObjectAssignmentTarget extends Span {
type: 'ObjectAssignmentTarget';
properties: Array<AssignmentTargetRest | AssignmentTargetProperty>;
properties: Array<AssignmentTargetProperty | AssignmentTargetRest>;
}

export interface AssignmentTargetRest extends Span {
Expand Down Expand Up @@ -689,7 +689,7 @@ export interface AssignmentPattern extends Span {

export interface ObjectPattern extends Span {
type: 'ObjectPattern';
properties: Array<BindingRestElement | BindingProperty>;
properties: Array<BindingProperty | BindingRestElement>;
}

export interface BindingProperty extends Span {
Expand All @@ -702,7 +702,7 @@ export interface BindingProperty extends Span {

export interface ArrayPattern extends Span {
type: 'ArrayPattern';
elements: Array<BindingRestElement | BindingPattern | null>;
elements: Array<BindingPattern | BindingRestElement | null>;
}

export interface BindingRestElement extends Span {
Expand Down
16 changes: 13 additions & 3 deletions tasks/ast_tools/src/generators/typescript.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,23 @@ fn generate_ts_type_def_for_struct(struct_def: &StructDef, schema: &Schema) -> S
field.name()
),
};
let inner_type_name = ts_type_name(vec_def.inner_type(schema), schema);

// TODO: Reverse these two
let mut field_type_name = format!("Array<{appended_type_name} | {inner_type_name}>");
let mut inner_type = vec_def.inner_type(schema);
let mut inner_is_option = false;
if let TypeDef::Option(option_def) = inner_type {
inner_is_option = true;
inner_type = option_def.inner_type(schema);
}
let inner_type_name = ts_type_name(inner_type, schema);
let mut field_type_name = format!("Array<{inner_type_name} | {appended_type_name}");
if inner_is_option {
field_type_name.push_str(" | null");
}
field_type_name.push('>');
if is_option {
field_type_name.push_str(" | null");
}

Cow::Owned(field_type_name)
} else {
get_field_type_name(field, schema)
Expand Down
Loading