Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion crates/oxc_linter/src/generated/rule_runner_impls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2416,7 +2416,17 @@ impl RuleRunner
}

impl RuleRunner for crate::rules::typescript::array_type::ArrayType {
const NODE_TYPES: Option<&AstTypesBitset> = None;
const NODE_TYPES: Option<&AstTypesBitset> = Some(&AstTypesBitset::from_types(&[
AstType::TSArrayType,
AstType::TSAsExpression,
AstType::TSConditionalType,
AstType::TSIndexedAccessType,
AstType::TSMappedType,
AstType::TSTypeAliasDeclaration,
AstType::TSTypeAnnotation,
AstType::TSTypeParameterInstantiation,
AstType::TSTypeReference,
]));
const RUN_FUNCTIONS: RuleRunFunctionsImplemented = RuleRunFunctionsImplemented::Run;
}

Expand Down
54 changes: 42 additions & 12 deletions crates/oxc_linter/src/rules/typescript/array_type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,24 +177,40 @@ impl Rule for ArrayType {
}

fn run<'a>(&self, node: &AstNode<'a>, ctx: &LintContext<'a>) {
let default_config = &self.default;
let readonly_config: &ArrayOption =
&self.readonly.clone().unwrap_or_else(|| default_config.clone());

match node.kind() {
AstKind::TSArrayType(ts_array_type) => {
check(&ts_array_type.element_type, default_config, readonly_config, ctx);
check(
&ts_array_type.element_type,
self.default_config(),
self.readonly_config(),
ctx,
);
}
AstKind::TSTypeAnnotation(ts_type_annotation) => {
check(&ts_type_annotation.type_annotation, default_config, readonly_config, ctx);
check(
&ts_type_annotation.type_annotation,
self.default_config(),
self.readonly_config(),
ctx,
);
}
// for example: type barUnion = (string | number | boolean)[];
AstKind::TSTypeAliasDeclaration(ts_alias_annotation) => {
check(&ts_alias_annotation.type_annotation, default_config, readonly_config, ctx);
check(
&ts_alias_annotation.type_annotation,
self.default_config(),
self.readonly_config(),
ctx,
);
}
// for example: let ya = [[1, '2']] as [number, string][];
AstKind::TSAsExpression(ts_as_expression) => {
check(&ts_as_expression.type_annotation, default_config, readonly_config, ctx);
check(
&ts_as_expression.type_annotation,
self.default_config(),
self.readonly_config(),
ctx,
);
}
AstKind::TSTypeReference(ts_type_reference)
if outermost_paren_parent(node, ctx).is_some_and(|x| match x.kind() {
Expand All @@ -209,30 +225,34 @@ impl Rule for ArrayType {
}) =>
{
check_and_report_error_reference(
default_config,
readonly_config,
self.default_config(),
self.readonly_config(),
ts_type_reference,
ctx,
);
}
AstKind::TSTypeParameterInstantiation(ts_type_param_instantiation) => {
for param in &ts_type_param_instantiation.params {
check(param, default_config, readonly_config, ctx);
check(param, self.default_config(), self.readonly_config(), ctx);
}
}
AstKind::TSConditionalType(ts_conditional_type) => {
let default_config = self.default_config();
let readonly_config = self.readonly_config();
check(&ts_conditional_type.check_type, default_config, readonly_config, ctx);
check(&ts_conditional_type.extends_type, default_config, readonly_config, ctx);
check(&ts_conditional_type.true_type, default_config, readonly_config, ctx);
check(&ts_conditional_type.false_type, default_config, readonly_config, ctx);
}
AstKind::TSIndexedAccessType(ts_indexed_access_type) => {
let default_config = self.default_config();
let readonly_config = self.readonly_config();
check(&ts_indexed_access_type.object_type, default_config, readonly_config, ctx);
check(&ts_indexed_access_type.index_type, default_config, readonly_config, ctx);
}
AstKind::TSMappedType(ts_mapped_type) => {
if let Some(type_annotation) = &ts_mapped_type.type_annotation {
check(type_annotation, default_config, readonly_config, ctx);
check(type_annotation, self.default_config(), self.readonly_config(), ctx);
}
}
_ => {}
Expand All @@ -244,6 +264,16 @@ impl Rule for ArrayType {
}
}

impl ArrayType {
fn default_config(&self) -> &ArrayOption {
&self.default
}

fn readonly_config(&self) -> &ArrayOption {
if let Some(readonly) = &self.readonly { readonly } else { &self.default }
}
}

fn check(
type_annotation: &TSType,
default_config: &ArrayOption,
Expand Down
Loading