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: Relate rest parameters correctly #1042

Draft
wants to merge 38 commits into
base: main
Choose a base branch
from
Draft

feat: Relate rest parameters correctly #1042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
41e7e70
Add tests
kdy1 Jun 2, 2023
52f8665
Cache
kdy1 Jun 2, 2023
69dc1ff
No iter
kdy1 Jun 3, 2023
70d31c2
counts
kdy1 Jun 3, 2023
42b777d
Fix panic
kdy1 Jun 3, 2023
516c4aa
Remove dbg
kdy1 Jun 3, 2023
10b1bd0
context
kdy1 Jun 3, 2023
779bf2d
Rest - Rest
kdy1 Jun 3, 2023
0a71f43
Recover from prop access
kdy1 Jun 3, 2023
b99de5a
context
kdy1 Jun 3, 2023
5518c2d
context
kdy1 Jun 3, 2023
2cb1d83
context
kdy1 Jun 3, 2023
2736620
Remove useless code
kdy1 Jun 3, 2023
b6d951e
cspell
kdy1 Jun 3, 2023
accc2ea
`relate_spread_likes`
kdy1 Jun 3, 2023
b8236e5
Bump
kdy1 Jun 3, 2023
61e9139
generic
kdy1 Jun 3, 2023
21dea66
relate
kdy1 Jun 3, 2023
738efc0
Use it
kdy1 Jun 3, 2023
69f2c30
fixup
kdy1 Jun 3, 2023
9f73435
SpreadLike trait
kdy1 Jun 3, 2023
19c8eb0
Use generic
kdy1 Jun 3, 2023
144c95c
WIP
kdy1 Jun 3, 2023
8764386
fixup
kdy1 Jun 3, 2023
c1c3bfa
context
kdy1 Jun 3, 2023
184857e
More work
kdy1 Jun 3, 2023
f3041b4
context
kdy1 Jun 3, 2023
ade7b7e
context
kdy1 Jun 3, 2023
851c0f0
bump
kdy1 Jun 3, 2023
e2516e6
context
kdy1 Jun 3, 2023
8412eff
context
kdy1 Jun 3, 2023
e2d12bb
Rename
kdy1 Jun 3, 2023
eb764e6
Fix bump
kdy1 Jun 3, 2023
38751cc
Fix for rebase
kdy1 Jun 3, 2023
adc838d
SpreadLike
kdy1 Jun 3, 2023
1475e96
access_property: empty tuple
kdy1 Jun 3, 2023
4a48d97
Adjust
kdy1 Jun 3, 2023
285181c
`disallow_creating_indexed_type_for_type_params`
kdy1 Jun 3, 2023
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
301 changes: 162 additions & 139 deletions crates/stc_ts_file_analyzer/src/analyzer/assign/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::{borrow::Cow, cmp::max};
use std::{borrow::Cow, cmp::max, iter::Peekable};

use fxhash::FxHashMap;
use itertools::Itertools;
Expand All @@ -7,10 +7,10 @@ use stc_ts_errors::{
debug::{dump_type_map, force_dump_type_as_string},
DebugExt, ErrorKind,
};
use stc_ts_types::{Constructor, FnParam, Function, IdCtx, Key, KeywordType, LitType, Type, TypeElement, TypeParamDecl};
use stc_ts_types::{Constructor, FnParam, Function, IdCtx, Key, KeywordType, LitType, SpreadLike, Type, TypeElement, TypeParamDecl};
use stc_utils::{cache::Freeze, dev_span, stack};
use swc_atoms::js_word;
use swc_common::{Spanned, SyntaxContext, TypeEq};
use swc_common::{Span, Spanned, SyntaxContext, TypeEq};
use swc_ecma_ast::TsKeywordTypeKind;
use tracing::debug;

Expand Down Expand Up @@ -816,6 +816,125 @@ impl Analyzer<'_, '_> {
Ok(())
}

fn relate_spread_likes<'a, 'l, 'r, T, LI, RI>(
&'a mut self,
span: Span,
li: &mut Peekable<LI>,
ri: &mut Peekable<RI>,
relate: &mut impl FnMut(&mut Self, &Type, &Type) -> VResult<()>,
) -> VResult<()>
where
T: SpreadLike,
LI: Iterator<Item = &'l T> + Clone,
RI: Iterator<Item = &'r T> + Clone,
{
let _tracing = dev_span!("relate_spread_likes");
let li_count = li.clone().count();
let ri_count = ri.clone().count();

while let (Some(..), Some(..)) = (li.peek(), ri.peek()) {
let l = li.peek().copied().cloned().unwrap();
let r = ri.peek().copied().cloned().unwrap();

match (l.is_spread(), r.is_spread()) {
(true, true) => {
li.next();
ri.next();

relate(self, &l.ty(), &r.ty()).context("failed to relate a spread item to another one")?;
}
(true, false) => {
li.next();

for (idx, r) in ri.into_iter().enumerate() {
let le = self
.access_property(
span,
&l.ty(),
&Key::Num(RNumber {
span: l.span(),
value: idx as f64,
raw: None,
}),
TypeOfMode::RValue,
IdCtx::Var,
AccessPropertyOpts {
disallow_indexing_array_with_string: true,
disallow_creating_indexed_type_from_ty_els: true,
disallow_indexing_class_with_computed: true,
disallow_inexact: true,
use_last_element_for_tuple_on_out_of_bound: true,
disallow_creating_indexed_type_for_type_params: true,
..Default::default()
},
)
.unwrap_or_else(|_| l.ty().clone());

relate(self, &le, r.ty()).with_context(|| {
format!(
"l: spread + {} (from {}); r: non-spread + {}; idx = {}",
force_dump_type_as_string(&le),
force_dump_type_as_string(&l.ty()),
force_dump_type_as_string(r.ty()),
idx
)
})?;
}

return Ok(());
}
(false, true) => {
ri.next();

for (idx, l) in li.into_iter().enumerate() {
let re = self
.access_property(
span,
&r.ty(),
&Key::Num(RNumber {
span: r.span(),
value: idx as f64,
raw: None,
}),
TypeOfMode::RValue,
IdCtx::Var,
AccessPropertyOpts {
disallow_indexing_array_with_string: true,
disallow_creating_indexed_type_from_ty_els: true,
disallow_indexing_class_with_computed: true,
disallow_inexact: true,
use_last_element_for_tuple_on_out_of_bound: true,
disallow_creating_indexed_type_for_type_params: true,
..Default::default()
},
)
.unwrap_or_else(|_| r.ty().clone());

relate(self, l.ty(), &re).with_context(|| {
format!(
"l: non-spread + {}; r: spread + {} (from {}); idx = {}",
force_dump_type_as_string(&l.ty()),
force_dump_type_as_string(&re),
force_dump_type_as_string(&r.ty()),
idx
)
})?;
}

return Ok(());
}
(false, false) => {
li.next();
ri.next();

relate(self, &l.ty(), &r.ty()).context("failed to relate a non-spread item")?;
}
}
}

Ok(())
}

/// # Validation of parameter count
///
/// A parameter named `this` is excluded.
Expand All @@ -837,24 +956,33 @@ impl Analyzer<'_, '_> {

let span = opts.span;

let mut li = l.iter().filter(|p| {
!matches!(
p.pat,
RPat::Ident(RBindingIdent {
id: RIdent { sym: js_word!("this"), .. },
..
})
)
});
let mut ri = r.iter().filter(|p| {
!matches!(
p.pat,
RPat::Ident(RBindingIdent {
id: RIdent { sym: js_word!("this"), .. },
..
})
)
});
let mut li = l
.iter()
.filter(|p| {
!matches!(
p.pat,
RPat::Ident(RBindingIdent {
id: RIdent { sym: js_word!("this"), .. },
..
})
)
})
.peekable();
let mut ri = r
.iter()
.filter(|p| {
!matches!(
p.pat,
RPat::Ident(RBindingIdent {
id: RIdent { sym: js_word!("this"), .. },
..
})
)
})
.peekable();

let li_count = li.clone().count();
let ri_count = ri.clone().count();

let l_has_rest = l.iter().any(|p| matches!(p.pat, RPat::Rest(..)));

Expand Down Expand Up @@ -899,124 +1027,19 @@ impl Analyzer<'_, '_> {
}
}

loop {
let l = li.next();
let r = ri.next();

let (Some(l), Some(r)) = (l, r) else {
break
};

// TODO(kdy1): What should we do?
if opts.allow_assignment_to_param {
if let Ok(()) = self.assign_param(
data,
r,
l,
AssignOpts {
allow_unknown_type: true,
allow_assignment_to_param: false,
..opts
},
) {
continue;
}
}

// A rest pattern is always the last
match (&l.pat, &r.pat) {
(RPat::Rest(..), RPat::Rest(..)) => {
self.assign_param(data, l, r, opts)
.with_context(|| "tried to assign a rest parameter to another rest parameter".to_string())?;
break;
}

(RPat::Rest(..), _) => {
// TODO(kdy1): Implement correct logic

return Ok(());
}

(_, RPat::Rest(..)) => {
// If r is an iterator, we should assign each element to l.
if let Ok(r_iter) = self.get_iterator(span, Cow::Borrowed(&r.ty), Default::default()) {
if let Ok(l_iter) = self.get_iterator(span, Cow::Borrowed(&l.ty), Default::default()) {
for idx in 0..max(li.clone().count(), ri.clone().count()) {
let le = self.access_property(
span,
&l_iter,
&Key::Num(RNumber {
span: l.span,
value: idx as f64,
raw: None,
}),
TypeOfMode::RValue,
IdCtx::Var,
AccessPropertyOpts {
disallow_indexing_array_with_string: true,
disallow_creating_indexed_type_from_ty_els: true,
disallow_indexing_class_with_computed: true,
disallow_inexact: true,
..Default::default()
},
)?;

let re = self.access_property(
span,
&r_iter,
&Key::Num(RNumber {
span: r.span,
value: idx as f64,
raw: None,
}),
TypeOfMode::RValue,
IdCtx::Var,
AccessPropertyOpts {
disallow_indexing_array_with_string: true,
disallow_creating_indexed_type_from_ty_els: true,
disallow_indexing_class_with_computed: true,
disallow_inexact: true,
use_last_element_for_tuple_on_out_of_bound: true,
..Default::default()
},
)?;

self.assign_param_type(data, &le, &re, opts).with_context(|| {
format!(
"tried to assign a rest parameter to parameters; r_ty = {}",
force_dump_type_as_string(&r.ty)
)
})?;
}
}

return Ok(());
}

self.assign_param(data, l, r, opts)
.context("tried to assign a rest parameter to parameters where r-ty is not a tuple")?;

for l in li {
self.assign_param(data, l, r, opts)
.context("tried to assign a rest parameter to parameters where r-ty is not a tuple (iter)")?;
}

return Ok(());
}

_ => {
self.assign_param(
data,
l,
r,
AssignOpts {
allow_unknown_type: true,
..opts
},
)?;
}
}
}
self.relate_spread_likes(span, &mut li, &mut ri, &mut |this, l, r| {
//
this.assign_param_type(
data,
l,
r,
AssignOpts {
allow_assignment_to_void: true,
..opts
},
)
})
.context("failed to relate parameters")?;

Ok(())
}
Expand Down
7 changes: 6 additions & 1 deletion crates/stc_ts_file_analyzer/src/analyzer/assign/type_el.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,12 @@ impl Analyzer<'_, '_> {
..opts
},
)
.context("tried to assign to type elements by converting rhs to a type literal");
.with_context(|| {
format!(
"tried to assign to type elements by converting rhs to a type literal: {}",
force_dump_type_as_string(&rty)
)
});
}

return Err(ErrorKind::SimpleAssignFailed { span, cause: None }.into());
Expand Down
15 changes: 14 additions & 1 deletion crates/stc_ts_file_analyzer/src/analyzer/expr/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,7 @@ pub(crate) struct AccessPropertyOpts {
/// obj11.foo; // Error TS2339
/// ```
pub disallow_creating_indexed_type_from_ty_els: bool,
pub disallow_creating_indexed_type_for_type_params: bool,

pub disallow_indexing_class_with_computed: bool,

Expand Down Expand Up @@ -2187,6 +2188,15 @@ impl Analyzer<'_, '_> {
}
}

if opts.disallow_creating_indexed_type_for_type_params {
return Err(ErrorKind::NoSuchProperty {
span,
obj: Some(Box::new(obj.clone())),
prop: Some(Box::new(prop.clone())),
}
.context("disallow_creating_indexed_type_for_type_params = true"));
}

let mut prop_ty = match prop {
Key::Computed(key) => key.ty.clone(),
Key::Normal { span, sym } => Box::new(Type::Lit(LitType {
Expand Down Expand Up @@ -2756,6 +2766,9 @@ impl Analyzer<'_, '_> {
}));
}
if opts.use_last_element_for_tuple_on_out_of_bound {
if elems.is_empty() {
return Ok(Type::any(span, Default::default()));
}
return Ok(*elems.last().unwrap().ty.clone());
}

Expand All @@ -2777,7 +2790,7 @@ impl Analyzer<'_, '_> {
}

return Err(ErrorKind::TupleIndexError {
span: n.span(),
span,
index: v,
len: elems.len() as u64,
}
Expand Down
Loading