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

Jump to bottom

feat(parser/ts): support optional variance annotations #4008

Merged
merged 12 commits into from
Mar 23, 2022
Merged

feat(parser/ts): support optional variance annotations #4008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1b48a05
feat(parser/ts): support optional variance annotations
magic-akari Mar 14, 2022
fbd85fd
chore: 🍻
magic-akari Mar 14, 2022
8958d3c
chore: update test cases
magic-akari Mar 14, 2022
b0c21f5
chore: update test cases
magic-akari Mar 14, 2022
8b34eac
chore: use parse_ts_modifier
magic-akari Mar 15, 2022
59c0282
fix: estree
magic-akari Mar 15, 2022
e93ffca
fix: Babelify
magic-akari Mar 15, 2022
ad7c1eb
chore: update TS Error Code
magic-akari Mar 19, 2022
42ce7a0
Merge branch 'main' into feat/ts-varianceAnnotations
magic-akari Mar 23, 2022
3731e96
chore: update test case
magic-akari Mar 23, 2022
8a39512
chore: add jsx test case
magic-akari Mar 23, 2022
e61683a
Merge branch 'main' into feat/ts-varianceAnnotations
kdy1 Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions crates/swc_atoms/words.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,7 @@ object
of
only
or
out
override
package
private
Expand Down
6 changes: 6 additions & 0 deletions crates/swc_ecma_ast/src/typescript.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ pub struct TsTypeParam {
pub span: Span,
pub name: Ident,

#[serde(default, rename = "in")]
pub is_in: bool,

#[serde(default, rename = "out")]
pub is_out: bool,

#[serde(default)]
pub constraint: Option<Box<TsType>>,

Expand Down
10 changes: 10 additions & 0 deletions crates/swc_ecma_codegen/src/typescript.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,6 +953,16 @@ where
fn emit_ts_type_param(&mut self, n: &TsTypeParam) -> Result {
self.emit_leading_comments_of_span(n.span(), false)?;

if n.is_in {
keyword!("in");
space!();
}

if n.is_out {
keyword!("out");
space!();
}

emit!(n.name);

if let Some(constraints) = &n.constraint {
Expand Down
6 changes: 3 additions & 3 deletions ..._ecma_minifier/tests/compress/fixture/issues/firebase-core/1/analysis-snapshot.rust-debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58662,7 +58662,7 @@ TestSnapshot {
),
(
(
Atom('out' type=inline),
Atom('out' type=static),
#5,
),
VarUsageInfo {
Expand Down Expand Up @@ -58702,7 +58702,7 @@ TestSnapshot {
),
(
(
Atom('out' type=inline),
Atom('out' type=static),
#8,
),
VarUsageInfo {
Expand Down Expand Up @@ -58742,7 +58742,7 @@ TestSnapshot {
),
(
(
Atom('out' type=inline),
Atom('out' type=static),
#116,
),
VarUsageInfo {
Expand Down
4 changes: 2 additions & 2 deletions crates/swc_ecma_minifier/tests/compress/fixture/issues/moment/1/analysis-snapshot.rust-debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37494,7 +37494,7 @@ TestSnapshot {
),
(
(
Atom('out' type=inline),
Atom('out' type=static),
#275,
),
VarUsageInfo {
Expand Down Expand Up @@ -37534,7 +37534,7 @@ TestSnapshot {
),
(
(
Atom('out' type=inline),
Atom('out' type=static),
#276,
),
VarUsageInfo {
Expand Down
Loading