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

refactor: Create Type::get_any_key_type #1066

Merged
merged 3 commits into from
Aug 14, 2023
Merged

refactor: Create Type::get_any_key_type #1066

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
813d328
Update: extract get key type function
sunrabbit123 Aug 13, 2023
4ad1a66
remove unused import
sunrabbit123 Aug 13, 2023
5ad52f1
Merge branch 'main' into fix/1
sunrabbit123 Aug 13, 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
27 changes: 1 addition & 26 deletions crates/stc_ts_file_analyzer/src/analyzer/expr/bin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2091,32 +2091,7 @@ impl Analyzer<'_, '_> {
ty => {
if let Err(err) = self.assign_with_opts(
&mut Default::default(),
&Type::Union(Union {
span,
types: vec![
Type::Keyword(KeywordType {
span,
kind: TsKeywordTypeKind::TsStringKeyword,
metadata: Default::default(),
tracker: Default::default(),
}),
Type::Keyword(KeywordType {
span,
kind: TsKeywordTypeKind::TsNumberKeyword,
metadata: Default::default(),
tracker: Default::default(),
}),
Type::Keyword(KeywordType {
span,
kind: TsKeywordTypeKind::TsSymbolKeyword,
metadata: Default::default(),
tracker: Default::default(),
}),
],
metadata: Default::default(),
tracker: Default::default(),
})
.freezed(),
&Type::get_any_key_type(span),
ty,
AssignOpts {
span: ls,
Expand Down
56 changes: 2 additions & 54 deletions crates/stc_ts_file_analyzer/src/analyzer/types/keyof.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use stc_ts_errors::{debug::force_dump_type_as_string, DebugExt, ErrorKind};
use stc_ts_type_ops::{is_str_lit_or_union, Fix};
use stc_ts_types::{
Class, ClassMember, ClassProperty, Index, KeywordType, KeywordTypeMetadata, LitType, Method, MethodSignature, PropertySignature, Ref,
Type, TypeElement, Union,
Type, TypeElement,
};
use stc_utils::{cache::Freeze, ext::TypeVecExt, stack, try_cache};
use swc_atoms::js_word;
Expand Down Expand Up @@ -89,32 +89,7 @@ impl Analyzer<'_, '_> {
.context("tried applying `keyof` to a literal by delegating to keyword type handler")
}
Type::Keyword(KeywordType { kind, .. }) => match kind {
TsKeywordTypeKind::TsAnyKeyword => {
let string = Type::Keyword(KeywordType {
span,
kind: TsKeywordTypeKind::TsStringKeyword,
metadata: Default::default(),
tracker: Default::default(),
});
let number = Type::Keyword(KeywordType {
span,
kind: TsKeywordTypeKind::TsNumberKeyword,
metadata: Default::default(),
tracker: Default::default(),
});
let symbol = Type::Keyword(KeywordType {
span,
kind: TsKeywordTypeKind::TsSymbolKeyword,
metadata: Default::default(),
tracker: Default::default(),
});
return Ok(Type::Union(Union {
span,
types: vec![string, number, symbol],
metadata: Default::default(),
tracker: Default::default(),
}));
}
TsKeywordTypeKind::TsAnyKeyword | TsKeywordTypeKind::TsNeverKeyword => return Ok(Type::get_any_key_type(span)),
TsKeywordTypeKind::TsVoidKeyword
| TsKeywordTypeKind::TsUndefinedKeyword
| TsKeywordTypeKind::TsNullKeyword
Expand Down Expand Up @@ -156,33 +131,6 @@ impl Analyzer<'_, '_> {

TsKeywordTypeKind::TsBigIntKeyword => {}
TsKeywordTypeKind::TsSymbolKeyword => {}
TsKeywordTypeKind::TsNeverKeyword => {
return Ok(Type::Union(Union {
span,
types: vec![
Type::Keyword(KeywordType {
span,
kind: TsKeywordTypeKind::TsStringKeyword,
metadata: Default::default(),
tracker: Default::default(),
}),
Type::Keyword(KeywordType {
span,
kind: TsKeywordTypeKind::TsNumberKeyword,
metadata: Default::default(),
tracker: Default::default(),
}),
Type::Keyword(KeywordType {
span,
kind: TsKeywordTypeKind::TsSymbolKeyword,
metadata: Default::default(),
tracker: Default::default(),
}),
],
metadata: Default::default(),
tracker: Default::default(),
}))
}
TsKeywordTypeKind::TsIntrinsicKeyword => {}
},

Expand Down
29 changes: 29 additions & 0 deletions crates/stc_ts_types/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1900,6 +1900,35 @@ impl Type {
_ => None,
}
}

pub fn get_any_key_type(span: Span) -> Type {
let string = Type::Keyword(KeywordType {
span,
kind: TsKeywordTypeKind::TsStringKeyword,
metadata: Default::default(),
tracker: Default::default(),
});
let number = Type::Keyword(KeywordType {
span,
kind: TsKeywordTypeKind::TsNumberKeyword,
metadata: Default::default(),
tracker: Default::default(),
});
let symbol = Type::Keyword(KeywordType {
span,
kind: TsKeywordTypeKind::TsSymbolKeyword,
metadata: Default::default(),
tracker: Default::default(),
});

Type::Union(Union {
span,
types: vec![string, number, symbol],
metadata: Default::default(),
tracker: Default::default(),
})
.freezed()
}
}

impl Type {
Expand Down
Loading