refactor: handle using program instead of module (#649)

Author: dsherret

Cargo.lock

@@ -11,8 +11,8 @@ repository = "https://github.com/denoland/deno_doc"
 members = ["lib"]
 
 [workspace.dependencies]
-deno_graph = { version = "0.83.0", default-features = false, features = ["symbols"] }
-deno_ast = { version = "0.42.0" }
+deno_graph = { version = "0.84.0", default-features = false, features = ["symbols"] }
+deno_ast = { version = "0.43.0" }
 import_map = "0.20.0"
 serde = { version = "1.0.204", features = ["derive"] }
 

Cargo.toml

@@ -1,31 +1,12 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-use crate::diagnostics::DiagnosticsCollector;
-use crate::diagnostics::DocDiagnostic;
-use crate::js_doc::JsDoc;
-use crate::node;
-use crate::node::DeclarationKind;
-use crate::node::DocNode;
-use crate::node::ModuleDoc;
-use crate::node::NamespaceDef;
-use crate::ts_type::infer_simple_ts_type_from_init;
-use crate::ts_type::PropertyDef;
-use crate::ts_type::TsTypeDef;
-use crate::ts_type::TsTypeDefKind;
-use crate::ts_type::TsTypeLiteralDef;
-use crate::util::graph::resolve_deno_graph_module;
-use crate::util::swc::get_location;
-use crate::util::swc::get_text_info_location;
-use crate::util::swc::js_doc_for_range;
-use crate::util::swc::module_export_name_value;
-use crate::util::swc::module_js_doc_for_source;
-use crate::util::symbol::get_module_info;
-use crate::variable::VariableDef;
-use crate::visibility::SymbolVisibility;
-use crate::DocNodeKind;
-use crate::ImportDef;
-use crate::Location;
-use crate::ReexportKind;
+use std::borrow::Cow;
+use std::cell::RefCell;
+use std::collections::HashMap;
+use std::collections::HashSet;
+use std::error::Error;
+use std::fmt;
+use std::rc::Rc;
 
 use deno_ast::swc::ast::ClassDecl;
 use deno_ast::swc::ast::Decl;
@@ -38,7 +19,6 @@ use deno_ast::swc::ast::FnDecl;
 use deno_ast::swc::ast::Ident;
 use deno_ast::swc::ast::ImportSpecifier;
 use deno_ast::swc::ast::ModuleDecl;
-use deno_ast::swc::ast::ModuleItem;
 use deno_ast::swc::ast::TsEnumDecl;
 use deno_ast::swc::ast::TsInterfaceDecl;
 use deno_ast::swc::ast::TsModuleDecl;
@@ -47,6 +27,7 @@ use deno_ast::swc::ast::TsTypeAliasDecl;
 use deno_ast::swc::ast::VarDecl;
 use deno_ast::swc::ast::VarDeclKind;
 use deno_ast::swc::ast::VarDeclarator;
+use deno_ast::ModuleItemRef;
 use deno_ast::ParsedSource;
 use deno_ast::SourceRange;
 use deno_ast::SourceRanged;
@@ -58,18 +39,37 @@ use deno_graph::symbols::ModuleInfoRef;
 use deno_graph::symbols::Symbol;
 use deno_graph::symbols::SymbolNodeRef;
 use deno_graph::symbols::UniqueSymbolId;
+use deno_graph::EsParser;
 use deno_graph::Module;
 use deno_graph::ModuleGraph;
-use deno_graph::ModuleParser;
 use deno_graph::ModuleSpecifier;
 
-use std::borrow::Cow;
-use std::cell::RefCell;
-use std::collections::HashMap;
-use std::collections::HashSet;
-use std::error::Error;
-use std::fmt;
-use std::rc::Rc;
+use crate::diagnostics::DiagnosticsCollector;
+use crate::diagnostics::DocDiagnostic;
+use crate::js_doc::JsDoc;
+use crate::node;
+use crate::node::DeclarationKind;
+use crate::node::DocNode;
+use crate::node::ModuleDoc;
+use crate::node::NamespaceDef;
+use crate::ts_type::infer_simple_ts_type_from_init;
+use crate::ts_type::PropertyDef;
+use crate::ts_type::TsTypeDef;
+use crate::ts_type::TsTypeDefKind;
+use crate::ts_type::TsTypeLiteralDef;
+use crate::util::graph::resolve_deno_graph_module;
+use crate::util::swc::get_location;
+use crate::util::swc::get_text_info_location;
+use crate::util::swc::js_doc_for_range;
+use crate::util::swc::module_export_name_value;
+use crate::util::swc::module_js_doc_for_source;
+use crate::util::symbol::get_module_info;
+use crate::variable::VariableDef;
+use crate::visibility::SymbolVisibility;
+use crate::DocNodeKind;
+use crate::ImportDef;
+use crate::Location;
+use crate::ReexportKind;
 
 #[derive(Debug)]
 pub enum DocError {
@@ -132,7 +132,7 @@ pub struct DocParser<'a> {
 impl<'a> DocParser<'a> {
   pub fn new(
     graph: &'a ModuleGraph,
-    parser: &'a dyn ModuleParser,
+    parser: &'a dyn EsParser,
     options: DocParserOptions,
   ) -> Result<Self, anyhow::Error> {
     let root_symbol =
@@ -317,11 +317,8 @@ impl<'a> DocParser<'a> {
     let referrer = module_info.specifier();
     let mut imports = vec![];
 
-    for node in &parsed_source.module().body {
-      if let deno_ast::swc::ast::ModuleItem::ModuleDecl(ModuleDecl::Import(
-        import_decl,
-      )) = node
-      {
+    for node in parsed_source.program_ref().body() {
+      if let ModuleItemRef::ModuleDecl(ModuleDecl::Import(import_decl)) = node {
         if let Some(js_doc) =
           js_doc_for_range(parsed_source, &import_decl.range())
         {
@@ -781,14 +778,14 @@ impl<'a> DocParser<'a> {
     }
   }
 
-  fn get_imports_for_module_body(
+  fn get_imports_for_module_body<'item>(
     &self,
-    module_body: &[ModuleItem],
+    module_body: impl Iterator<Item = ModuleItemRef<'item>>,
   ) -> HashMap<String, Import> {
     let mut imports = HashMap::new();
 
-    for node in module_body.iter() {
-      if let ModuleItem::ModuleDecl(ModuleDecl::Import(import_decl)) = node {
+    for node in module_body {
+      if let ModuleItemRef::ModuleDecl(ModuleDecl::Import(import_decl)) = node {
         for specifier in &import_decl.specifiers {
           let import = match specifier {
             ImportSpecifier::Named(named_specifier) => Import {
@@ -835,9 +832,9 @@ impl<'a> DocParser<'a> {
     let Some(module_info) = module_info.esm() else {
       return Vec::new();
     };
-    let module_body = &module_info.source().module().body;
+    let program = module_info.source().program_ref();
 
-    let imports = self.get_imports_for_module_body(module_body);
+    let imports = self.get_imports_for_module_body(program.body());
 
     let mut reexports: Vec<node::Reexport> = vec![];
 
@@ -853,8 +850,8 @@ impl<'a> DocParser<'a> {
       }))
     }
 
-    for node in module_body.iter() {
-      if let deno_ast::swc::ast::ModuleItem::ModuleDecl(module_decl) = node {
+    for node in program.body() {
+      if let ModuleItemRef::ModuleDecl(module_decl) = node {
         let r = match module_decl {
           ModuleDecl::ExportNamed(named_export) => {
             if let Some(src) = &named_export.src {
@@ -1425,10 +1422,10 @@ fn parse_json_module_type(value: &serde_json::Value) -> TsTypeDef {
 }
 
 fn module_has_import(module_info: &EsModuleInfo) -> bool {
-  module_info.source().module().body.iter().any(|m| {
+  module_info.source().program_ref().body().any(|m| {
     matches!(
       m,
-      ModuleItem::ModuleDecl(
+      ModuleItemRef::ModuleDecl(
         ModuleDecl::Import(_) | ModuleDecl::TsImportEquals(_)
       )
     )

src/parser.rs

@@ -71,9 +71,8 @@ pub(crate) fn module_js_doc_for_source(
   parsed_source: &ParsedSource,
 ) -> Option<Option<(JsDoc, SourceRange)>> {
   let shebang_length = parsed_source
-    .module()
-    .shebang
-    .as_ref()
+    .program_ref()
+    .shebang()
     .map_or(0, |shebang| shebang.len());
   let pos_leading_comment =
     parsed_source.comments().leading_map().keys().min()?;