refactor(parser/js): rename import assertions to import attributes

biomejs · Oct 24, 2024 · 93ab39d · 93ab39d
1 parent 270cf3c
commit 93ab39d
Show file tree

Hide file tree

Showing 41 changed files with 496 additions and 510 deletions.
diff --git a/crates/biome_js_analyze/src/lint/correctness/no_unused_imports.rs b/crates/biome_js_analyze/src/lint/correctness/no_unused_imports.rs
@@ -178,14 +178,14 @@ fn remove_import_specifier(
             let default_specifier = default_extra_clause.default_specifier().ok()?;
             let from_token = default_extra_clause.from_token().ok()?;
             let source = default_extra_clause.source().ok()?;
-            let assertion = default_extra_clause.assertion();
+            let assertion = default_extra_clause.attribute();
             if default_specifier.syntax() == specifier {
                 let new_clause = match default_extra_clause.specifier().ok()? {
                     AnyJsCombinedSpecifier::JsNamedImportSpecifiers(named_specifier) => {
                         let named_clause =
                             make::js_import_named_clause(named_specifier, from_token, source);
                         let named_clause = if let Some(assertion) = assertion {
-                            named_clause.with_assertion(assertion)
+                            named_clause.with_attribute(assertion)
                         } else {
                             named_clause
                         };
@@ -198,7 +198,7 @@ fn remove_import_specifier(
                             source,
                         );
                         let namespace_clause = if let Some(assertion) = assertion {
-                            namespace_clause.with_assertion(assertion)
+                            namespace_clause.with_attribute(assertion)
                         } else {
                             namespace_clause
                         };
@@ -212,7 +212,7 @@ fn remove_import_specifier(
                 let default_clause =
                     make::js_import_default_clause(default_specifier, from_token, source);
                 let default_clause = if let Some(assertion) = assertion {
-                    default_clause.with_assertion(assertion)
+                    default_clause.with_attribute(assertion)
                 } else {
                     default_clause
                 };

diff --git a/crates/biome_js_analyze/src/lint/nursery/use_explicit_type.rs b/crates/biome_js_analyze/src/lint/nursery/use_explicit_type.rs
@@ -533,7 +533,7 @@ fn is_property_of_object_with_type(syntax: &SyntaxNode<JsLanguage>) -> bool {
 /// const castTyped = <() => string>(() => '');
 /// ```
 fn is_type_assertion(syntax: &SyntaxNode<JsLanguage>) -> bool {
-    fn is_assertion_kind(kind: JsSyntaxKind) -> bool {
+    fn is_attribute_kind(kind: JsSyntaxKind) -> bool {
         matches!(
             kind,
             JsSyntaxKind::TS_AS_EXPRESSION | JsSyntaxKind::TS_TYPE_ASSERTION_EXPRESSION
@@ -544,9 +544,9 @@ fn is_type_assertion(syntax: &SyntaxNode<JsLanguage>) -> bool {
         if parent.kind() == JsSyntaxKind::JS_PARENTHESIZED_EXPRESSION {
             parent
                 .parent()
-                .is_some_and(|grandparent| is_assertion_kind(grandparent.kind()))
+                .is_some_and(|grandparent| is_attribute_kind(grandparent.kind()))
         } else {
-            is_assertion_kind(parent.kind())
+            is_attribute_kind(parent.kind())
         }
     })
 }
diff --git a/crates/biome_js_analyze/src/lint/style/use_import_type.rs b/crates/biome_js_analyze/src/lint/style/use_import_type.rs
@@ -133,11 +133,11 @@ impl Rule for UseImportType {
         }
         let import = ctx.query();
         let import_clause = import.import_clause().ok()?;
-        if import_clause.assertion().is_some() {
+        if import_clause.attribute().is_some() {
             return None;
         }
         // Import attributes and type-only imports are not compatible.
-        if import_clause.assertion().is_some() {
+        if import_clause.attribute().is_some() {
             return None;
         }
         let model = ctx.model();

diff --git a/crates/biome_js_analyze/src/syntax/correctness/no_type_only_import_attributes.rs b/crates/biome_js_analyze/src/syntax/correctness/no_type_only_import_attributes.rs
@@ -56,11 +56,11 @@ impl Rule for NoTypeOnlyImportAttributes {
                 | AnyJsExportClause::TsExportAssignmentClause(_)
                 | AnyJsExportClause::TsExportDeclareClause(_) => None,
                 AnyJsExportClause::JsExportFromClause(clause) => Some(RuleState {
-                    assertion_range: clause.assertion()?.range(),
+                    assertion_range: clause.attribute()?.range(),
                     type_token_range: clause.type_token()?.text_trimmed_range(),
                 }),
                 AnyJsExportClause::JsExportNamedFromClause(clause) => {
-                    let assertion_range = clause.assertion()?.range();
+                    let assertion_range = clause.attribute()?.range();
                     let type_token = clause.type_token().or_else(|| {
                         clause
                             .specifiers()
@@ -77,7 +77,7 @@ impl Rule for NoTypeOnlyImportAttributes {
             AnyJsModuleItem::JsImport(import) => match import.import_clause().ok()? {
                 AnyJsImportClause::JsImportBareClause(_) => None,
                 AnyJsImportClause::JsImportCombinedClause(clause) => {
-                    let assertion_range = clause.assertion()?.range();
+                    let assertion_range = clause.attribute()?.range();
                     let type_token = find_first_type_token(
                         clause.specifier().ok()?.as_js_named_import_specifiers()?,
                     )?;
@@ -87,11 +87,11 @@ impl Rule for NoTypeOnlyImportAttributes {
                     })
                 }
                 AnyJsImportClause::JsImportDefaultClause(clause) => Some(RuleState {
-                    assertion_range: clause.assertion()?.range(),
+                    assertion_range: clause.attribute()?.range(),
                     type_token_range: clause.type_token()?.text_trimmed_range(),
                 }),
                 AnyJsImportClause::JsImportNamedClause(clause) => {
-                    let assertion_range = clause.assertion()?.range();
+                    let assertion_range = clause.attribute()?.range();
                     let type_token = clause
                         .type_token()
                         .or_else(|| find_first_type_token(&clause.named_specifiers().ok()?))?;
@@ -101,7 +101,7 @@ impl Rule for NoTypeOnlyImportAttributes {
                     })
                 }
                 AnyJsImportClause::JsImportNamespaceClause(clause) => Some(RuleState {
-                    assertion_range: clause.assertion()?.range(),
+                    assertion_range: clause.attribute()?.range(),
                     type_token_range: clause.type_token()?.text_trimmed_range(),
                 }),
             },