0.26.0 (#234)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deno_doc"
-version = "0.25.0"
+version = "0.26.0"
 edition = "2021"
 description = "doc generation for deno"
 authors = ["the Deno authors"]
@@ -16,8 +16,8 @@ name = "ddoc"
 [dependencies]
 anyhow = { version = "1.0.43", optional = true }
 cfg-if = "1.0.0"
-deno_ast = "0.8.0"
-deno_graph = "0.17.0"
+deno_ast = "0.9.0"
+deno_graph = "0.18.0"
 futures = "0.3.17"
 js-sys = { version = "0.3.55", optional = true }
 lazy_static = "1.4.0"

benches/doc_parser.rs

@@ -27,6 +27,7 @@ async fn parse_with_reexports() -> Vec<DocNode> {
     None,
     None,
     None,
+    None,
   )
   .await;
   let source_parser = deno_graph::DefaultSourceParser::new();

examples/ddoc/main.rs

@@ -40,7 +40,7 @@ impl Loader for SourceFileLoader {
     } else {
       Ok(None)
     };
-    Box::pin(future::ready((specifier.clone(), result)))
+    Box::pin(future::ready(result))
   }
 }
 
@@ -69,6 +69,7 @@ fn main() {
       None,
       None,
       Some(&source_parser),
+      None,
     )
     .await;
     let parser = DocParser::new(graph, false, &source_parser);

src/interface.rs

@@ -181,17 +181,19 @@ pub struct InterfaceDef {
 
 pub fn expr_to_name(expr: &deno_ast::swc::ast::Expr) -> String {
   use deno_ast::swc::ast::Expr::*;
-  use deno_ast::swc::ast::ExprOrSuper::*;
+  use deno_ast::swc::ast::MemberProp;
 
   match expr {
     Ident(ident) => ident.sym.to_string(),
     Member(member_expr) => {
-      let left = match &member_expr.obj {
-        Super(_) => "super".to_string(),
-        Expr(boxed_expr) => expr_to_name(&*boxed_expr),
+      let left = expr_to_name(&*member_expr.obj);
+      let right = match &member_expr.prop {
+        MemberProp::Ident(ident) => format!(".{}", ident.sym.to_string()),
+        MemberProp::Computed(_) | MemberProp::PrivateName(_) => {
+          "[UNSUPPORTED]".to_string()
+        }
       };
-      let right = expr_to_name(&*member_expr.prop);
-      format!("[{}.{}]", left, right)
+      format!("[{}{}]", left, right)
     }
     Lit(lit) => {
       use deno_ast::swc::ast::BigInt;

src/js.rs

@@ -28,7 +28,6 @@ impl Loader for JsLoader {
     specifier: &ModuleSpecifier,
     is_dynamic: bool,
   ) -> LoadFuture {
-    let specifier = specifier.clone();
     let this = JsValue::null();
     let arg0 = JsValue::from(specifier.to_string());
     let arg1 = JsValue::from(is_dynamic);
@@ -38,12 +37,9 @@ impl Loader for JsLoader {
         Ok(result) => JsFuture::from(js_sys::Promise::resolve(&result)).await,
         Err(err) => Err(err),
       };
-      (
-        specifier,
-        response
-          .map(|value| value.into_serde().unwrap())
-          .map_err(|_| anyhow!("load rejected or errored")),
-      )
+      response
+        .map(|value| value.into_serde().unwrap())
+        .map_err(|_| anyhow!("load rejected or errored"))
     };
     Box::pin(f)
   }
@@ -98,6 +94,7 @@ pub async fn doc(
     maybe_resolver.as_ref().map(|r| r as &dyn Resolver),
     None,
     None,
+    None,
   )
   .await;
   let source_parser = deno_graph::DefaultSourceParser::new();

src/parser.rs

@@ -622,7 +622,7 @@ impl<'a> DocParser<'a> {
                 .map(|export_specifier| match export_specifier {
                   ExportSpecifier::Namespace(ns_export) => node::Reexport {
                     kind: node::ReexportKind::Namespace(
-                      ns_export.name.sym.to_string(),
+                      module_export_name_value(&ns_export.name),
                     ),
                     src: src_str.to_string(),
                   },

src/tests.rs

@@ -29,6 +29,7 @@ pub(crate) async fn setup<S: AsRef<str> + Copy>(
     None,
     None,
     None,
+    None,
   )
   .await;
   (graph, root)
@@ -137,6 +138,7 @@ async fn content_type_handling() {
     None,
     None,
     None,
+    None,
   )
   .await;
   let source_parser = deno_graph::DefaultSourceParser::new();
@@ -182,6 +184,7 @@ async fn types_header_handling() {
     None,
     None,
     None,
+    None,
   )
   .await;
   let source_parser = deno_graph::DefaultSourceParser::new();
@@ -893,7 +896,7 @@ export class A {
 
   /**
    * Some leading documentation here.
-   * 
+   *
    * @param {string} name some comment
    * @param {string} a    some other comment that
    *                      spans two lines

src/ts_type.rs

@@ -1481,7 +1481,7 @@ fn infer_ts_type_from_new_expr(new_expr: &NewExpr) -> Option<TsTypeDef> {
 
 fn infer_ts_type_from_call_expr(call_expr: &CallExpr) -> Option<TsTypeDef> {
   match &call_expr.callee {
-    ExprOrSuper::Expr(expr) => {
+    Callee::Expr(expr) => {
       if let Expr::Ident(ident) = expr.as_ref() {
         let sym = ident.sym.to_string();
         match sym.as_str() {