refactor: upgrade to deno_ast 0.33 (#374)

Author: dsherret

Cargo.lock

@@ -27,7 +27,7 @@ symbols = ["deno_ast/transforms", "deno_ast/visit", "deno_ast/utils"]
 anyhow = "1.0.43"
 async-trait = "0.1.68"
 data-url = "0.3.0"
-deno_ast = { version = "0.32.0", features = ["dep_analysis", "module_specifier"] }
+deno_ast = { version = "0.33.1", features = ["dep_analysis"] }
 deno_semver = "0.5.4"
 encoding_rs = "0.8.33"
 futures = "0.3.26"

Cargo.toml

@@ -17,12 +17,13 @@ crate-type = ["cdylib"]
 anyhow = "1.0.43"
 console_error_panic_hook = "0.1.7"
 deno_graph = { path = "../" }
+getrandom = { version = "*", features = ["js"] }
 futures = "0.3.17"
 js-sys = "0.3.63"
 serde = { version = "1.0.130", features = ["derive", "rc"] }
 serde_json = { version = "1.0.67", features = ["preserve_order"] }
 serde-wasm-bindgen = "0.5.0"
-wasm-bindgen = { version = "=0.2.87", features = ["serde-serialize"] }
+wasm-bindgen = { version = "=0.2.87" }
 wasm-bindgen-futures = { version = "=0.4.37" }
 
 [dev-dependencies]

lib/Cargo.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.73.0"
+channel = "1.75.0"
 components = [ "clippy", "rustfmt" ]

rust-toolchain.toml

@@ -4,9 +4,9 @@ use std::sync::Arc;
 
 use deno_ast::dep::DependencyKind;
 use deno_ast::dep::ImportAttributes;
-use deno_ast::Diagnostic;
 use deno_ast::MediaType;
 use deno_ast::ModuleSpecifier;
+use deno_ast::ParseDiagnostic;
 use deno_ast::SourceRange;
 use deno_ast::SourceTextInfo;
 use once_cell::sync::Lazy;
@@ -322,7 +322,7 @@ pub trait ModuleAnalyzer {
     specifier: &ModuleSpecifier,
     source: Arc<str>,
     media_type: MediaType,
-  ) -> Result<ModuleInfo, Diagnostic>;
+  ) -> Result<ModuleInfo, ParseDiagnostic>;
 }
 
 #[cfg(test)]

src/analyzer.rs

@@ -19,8 +19,8 @@ use deno_ast::SourcePos;
 use deno_ast::SourceRangedForSpanned;
 
 use deno_ast::swc::common::comments::CommentKind;
-use deno_ast::Diagnostic;
 use deno_ast::MediaType;
+use deno_ast::ParseDiagnostic;
 use deno_ast::ParsedSource;
 use deno_ast::SourceTextInfo;
 use once_cell::sync::Lazy;
@@ -50,6 +50,7 @@ static TYPES_REFERENCE_RE: Lazy<Regex> =
   Lazy::new(|| Regex::new(r#"(?i)\stypes\s*=\s*["']([^"']*)["']"#).unwrap());
 
 pub struct ParseOptions<'a> {
+  // this is not cloned in lazy parsing scenarios (thus the reference)
   pub specifier: &'a ModuleSpecifier,
   pub source: Arc<str>,
   pub media_type: MediaType,
@@ -61,7 +62,7 @@ pub trait ModuleParser {
   fn parse_module(
     &self,
     options: ParseOptions,
-  ) -> Result<ParsedSource, Diagnostic>;
+  ) -> Result<ParsedSource, ParseDiagnostic>;
 }
 
 #[derive(Default, Clone)]
@@ -71,9 +72,9 @@ impl ModuleParser for DefaultModuleParser {
   fn parse_module(
     &self,
     options: ParseOptions,
-  ) -> Result<ParsedSource, Diagnostic> {
+  ) -> Result<ParsedSource, ParseDiagnostic> {
     deno_ast::parse_module(deno_ast::ParseParams {
-      specifier: options.specifier.to_string(),
+      specifier: options.specifier.clone(),
       text_info: SourceTextInfo::new(options.source),
       media_type: options.media_type,
       capture_tokens: options.scope_analysis,
@@ -192,7 +193,7 @@ impl<'a> ModuleParser for CapturingModuleParser<'a> {
   fn parse_module(
     &self,
     options: ParseOptions,
-  ) -> Result<ParsedSource, Diagnostic> {
+  ) -> Result<ParsedSource, ParseDiagnostic> {
     if let Some(parsed_source) = self.get_from_store_if_matches(&options) {
       Ok(parsed_source)
     } else {
@@ -260,7 +261,7 @@ impl<'a> ModuleAnalyzer for DefaultModuleAnalyzer<'a> {
     specifier: &deno_ast::ModuleSpecifier,
     source: Arc<str>,
     media_type: MediaType,
-  ) -> Result<ModuleInfo, Diagnostic> {
+  ) -> Result<ModuleInfo, ParseDiagnostic> {
     let default_parser = DefaultModuleParser;
     let parser = self.parser.unwrap_or(&default_parser);
     let parsed_source = parser.parse_module(ParseOptions {
@@ -312,7 +313,7 @@ impl ModuleAnalyzer for CapturingModuleAnalyzer {
     specifier: &deno_ast::ModuleSpecifier,
     source: Arc<str>,
     media_type: MediaType,
-  ) -> Result<ModuleInfo, Diagnostic> {
+  ) -> Result<ModuleInfo, ParseDiagnostic> {
     let capturing_parser = self.as_capturing_parser();
     let module_analyzer = DefaultModuleAnalyzer::new(&capturing_parser);
     module_analyzer.analyze(specifier, source, media_type)
@@ -323,7 +324,7 @@ impl ModuleParser for CapturingModuleAnalyzer {
   fn parse_module(
     &self,
     options: ParseOptions,
-  ) -> Result<ParsedSource, Diagnostic> {
+  ) -> Result<ParsedSource, ParseDiagnostic> {
     let capturing_parser = self.as_capturing_parser();
     capturing_parser.parse_module(options)
   }