fix: update from upstream

Author: Princesseuh

crates/oxc_linter/src/service/runtime.rs

@@ -1120,7 +1120,11 @@ impl Runtime {
         if !ret.errors.is_empty() {
             let section_source = JavaScriptSource::new(source_text, source_type);
             if let Some(sections) = &mut out_sections {
-                sections.push(SectionContent { source: section_source, semantic: None });
+                sections.push(SectionContent {
+                    source: section_source,
+                    semantic: None,
+                    parser_tokens: None,
+                });
             }
             return smallvec::smallvec![Err(ret.errors)];
         }
@@ -1146,7 +1150,11 @@ impl Runtime {
         if !semantic_ret.errors.is_empty() {
             let section_source = JavaScriptSource::new(source_text, source_type);
             if let Some(sections) = &mut out_sections {
-                sections.push(SectionContent { source: section_source, semantic: None });
+                sections.push(SectionContent {
+                    source: section_source,
+                    semantic: None,
+                    parser_tokens: None,
+                });
             }
             return smallvec::smallvec![Err(semantic_ret.errors)];
         }
@@ -1178,7 +1186,11 @@ impl Runtime {
 
         let section_source = JavaScriptSource::new(source_text, source_type);
         if let Some(sections) = &mut out_sections {
-            sections.push(SectionContent { source: section_source, semantic: Some(semantic) });
+            sections.push(SectionContent {
+                source: section_source,
+                semantic: Some(semantic),
+                parser_tokens: None,
+            });
         }
 
         smallvec::smallvec![Ok(ResolvedModuleRecord { module_record, resolved_module_requests })]

crates/oxc_parser/src/astro/jsx.rs

@@ -12,7 +12,7 @@ use oxc_allocator::{Allocator, Box, Dummy, Vec};
 use oxc_ast::ast::*;
 use oxc_span::{Atom, GetSpan, Span};
 
-use crate::{ParserImpl, diagnostics, lexer::Kind};
+use crate::{ParserImpl, config::ParserConfig, diagnostics, lexer::Kind};
 
 /// Represents either a closing JSX element or fragment (Astro copy).
 enum JSXClosing<'a> {
@@ -28,7 +28,7 @@ impl<'a> Dummy<'a> for JSXClosing<'a> {
     }
 }
 
-impl<'a> ParserImpl<'a> {
+impl<'a, C: ParserConfig> ParserImpl<'a, C> {
     // ==================== Astro-specific JSX entry points ====================
     //
     // These are Astro-specific versions of the core JSX parsing functions.

crates/oxc_parser/src/astro/mod.rs

@@ -27,12 +27,12 @@ pub use scripts::parse_astro_scripts;
 use oxc_allocator::{Box, Vec};
 use oxc_ast::ast::*;
 
-use crate::{ParserImpl, lexer::Kind};
+use crate::{ParserImpl, config::ParserConfig, lexer::Kind};
 
 type NoTypeArgs<'a> = Option<Box<'a, TSTypeParameterInstantiation<'a>>>;
 type NoClosingElement<'a> = Option<Box<'a, JSXClosingElement<'a>>>;
 
-impl<'a> ParserImpl<'a> {
+impl<'a, C: ParserConfig> ParserImpl<'a, C> {
     /// Parse the HTML body of an Astro file.
     ///
     /// The body is essentially JSX children in an implicit fragment.
@@ -74,7 +74,7 @@ impl<'a> ParserImpl<'a> {
                         let after_script =
                             self.source_text.get((self.cur_token().span().start as usize) + 6..);
                         if let Some(rest) = after_script {
-                            let next_char = rest.chars().next();
+                            let next_char: Option<char> = rest.chars().next();
                             if matches!(
                                 next_char,
                                 Some(' ' | '>' | '/' | '\n' | '\r' | '\t') | None

crates/oxc_parser/src/astro/parse.rs

@@ -5,7 +5,7 @@ use oxc_ast::AstBuilder;
 use oxc_diagnostics::OxcDiagnostic;
 use oxc_span::{SourceType, Span};
 
-use crate::{ParseOptions, ParserImpl, parser_parse::UniquePromise};
+use crate::{ParseOptions, ParserImpl, config::NoTokensParserConfig, parser_parse::UniquePromise};
 
 use super::parse_astro_scripts;
 
@@ -285,7 +285,8 @@ pub fn parse_astro<'a>(
 
     // Parse the body JSX
     let unique = UniquePromise::new_for_astro();
-    let parser = ParserImpl::new(allocator, source_text, source_type, options, unique);
+    let parser =
+        ParserImpl::new(allocator, source_text, source_type, options, NoTokensParserConfig, unique);
     let (mut body, body_errors, body_panicked) =
         parser.parse_astro_body_only(frontmatter_info.as_ref().map(|f| f.body_start));
 
@@ -305,8 +306,14 @@ pub fn parse_astro<'a>(
         // Enable allow_return_outside_function for Astro frontmatter per spec §2.1
         let frontmatter_options = ParseOptions { allow_return_outside_function: true, ..options };
         let unique = UniquePromise::new_for_astro();
-        let parser =
-            ParserImpl::new(allocator, padded_source, ts_source_type, frontmatter_options, unique);
+        let parser = ParserImpl::new(
+            allocator,
+            padded_source,
+            ts_source_type,
+            frontmatter_options,
+            NoTokensParserConfig,
+            unique,
+        );
         let result = parser.parse();
 
         let ast = AstBuilder::new(allocator);

crates/oxc_parser/src/astro/scripts.rs

@@ -8,7 +8,7 @@ use oxc_ast::ast::{Argument, Expression, JSXChild, JSXExpression, Statement};
 use oxc_diagnostics::OxcDiagnostic;
 use oxc_span::SourceType;
 
-use crate::{ParseOptions, ParserImpl, parser_parse::UniquePromise};
+use crate::{ParseOptions, ParserImpl, config::NoTokensParserConfig, parser_parse::UniquePromise};
 
 /// Parse script content in AstroScript nodes.
 /// This traverses the body and replaces placeholder programs with parsed TypeScript.
@@ -51,8 +51,14 @@ fn parse_scripts_in_child<'a>(
 
                 // Create a new parser for the script content
                 let unique = UniquePromise::new_for_astro();
-                let parser =
-                    ParserImpl::new(allocator, padded_source, ts_source_type, options, unique);
+                let parser = ParserImpl::new(
+                    allocator,
+                    padded_source,
+                    ts_source_type,
+                    options,
+                    NoTokensParserConfig,
+                    unique,
+                );
                 let result = parser.parse();
 
                 // Replace the placeholder program with the parsed one

crates/oxc_parser/src/lexer/astro.rs

@@ -9,7 +9,7 @@
 use super::Lexer;
 
 #[cfg(feature = "astro")]
-impl Lexer<'_> {
+impl<C: crate::config::LexerConfig> Lexer<'_, C> {
     /// Set the lexer position for Astro parsing.
     /// This is used to skip to a specific offset in the source.
     pub(crate) fn set_position_for_astro(&mut self, offset: u32) {
@@ -58,7 +58,7 @@ mod astro_jsx {
     /// Only `<` stops text scanning (for child tags like `<mi>`, `<mo>`, etc.).
     static ASTRO_FOREIGN_TEXT_END_TABLE: SafeByteMatchTable = safe_byte_match_table!(|b| b == b'<');
 
-    impl Lexer<'_> {
+    impl<C: crate::config::LexerConfig> Lexer<'_, C> {
         /// Read a JSX child token in Astro mode.
         ///
         /// This is the Astro-specific version of `read_jsx_child` that handles:

crates/oxc_semantic/src/astro/builder.rs

@@ -11,9 +11,9 @@ use oxc_cfg::{ControlFlowGraphBuilder, ErrorEdgeKind};
 use oxc_span::{Ident, SourceType};
 use oxc_syntax::{reference::ReferenceFlags, scope::ScopeFlags};
 
-#[cfg(feature = "linter")]
-use crate::jsdoc::JSDocBuilder;
 use crate::{Semantic, SemanticBuilder, SemanticBuilderReturn, stats::Stats};
+#[cfg(feature = "jsdoc")]
+use oxc_jsdoc::JSDocBuilder;
 
 #[cfg(feature = "cfg")]
 macro_rules! control_flow {
@@ -80,7 +80,7 @@ impl<'a> SemanticBuilderAstroExt<'a> for SemanticBuilder<'a> {
         // Astro files are TypeScript + JSX
         self.source_type = SourceType::ts().with_jsx(true);
 
-        #[cfg(feature = "linter")]
+        #[cfg(feature = "jsdoc")]
         {
             self.jsdoc = JSDocBuilder::new(self.source_text, comments);
         }
@@ -108,8 +108,11 @@ impl<'a> SemanticBuilderAstroExt<'a> for SemanticBuilder<'a> {
         self.scoping
             .set_root_unresolved_references(self.unresolved_references.into_root().into_iter());
 
-        #[cfg(feature = "linter")]
-        let jsdoc = self.jsdoc.build();
+        #[cfg(feature = "jsdoc")]
+        let jsdoc = {
+            let result = self.jsdoc.build();
+            crate::jsdoc::JSDocFinder::new(result.attached, result.not_attached)
+        };
 
         #[cfg(debug_assertions)]
         self.unused_labels.assert_empty();
@@ -122,7 +125,7 @@ impl<'a> SemanticBuilderAstroExt<'a> for SemanticBuilder<'a> {
             nodes: self.nodes,
             scoping: self.scoping,
             classes: self.class_table_builder.build(),
-            #[cfg(feature = "linter")]
+            #[cfg(feature = "jsdoc")]
             jsdoc,
             unused_labels: self.unused_labels.labels,
             #[cfg(feature = "cfg")]

napi/parser/src-js/generated/lazy/constructors.js

@@ -14055,18 +14055,18 @@ function constructOptionBoxAstroFrontmatter(pos, ast) {
   return constructBoxAstroFrontmatter(pos, ast);
 }
 
-function constructU64(pos, ast) {
-  const { uint32 } = ast.buffer,
-    pos32 = pos >> 2;
-  return uint32[pos32] + uint32[pos32 + 1] * /* 2^32 */ 4294967296;
-}
-
 function constructOptionNameSpan(pos, ast) {
   if (ast.buffer.uint32[(pos + 8) >> 2] === 0 && ast.buffer.uint32[(pos + 12) >> 2] === 0)
     return null;
   return new NameSpan(pos, ast);
 }
 
+function constructU64(pos, ast) {
+  const { uint32 } = ast.buffer,
+    pos32 = pos >> 2;
+  return uint32[pos32] + uint32[pos32 + 1] * /* 2^32 */ 4294967296;
+}
+
 function constructOptionU64(pos, ast) {
   if (ast.buffer[pos] === 0) return null;
   return constructU64(pos + 8, ast);