0.25.0 (#228)

Author: dsherret

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "deno_doc"
-version = "0.24.0"
+version = "0.25.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.7.0"
-deno_graph = "0.16.0"
+deno_ast = "0.8.0"
+deno_graph = "0.17.0"
 futures = "0.3.17"
 js-sys = { version = "0.3.55", optional = true }
 lazy_static = "1.4.0"

Cargo.toml

@@ -1,4 +1,4 @@
-// Copyright 2020-2021 the Deno authors. All rights reserved. MIT license.
+// Copyright 2020-2022 the Deno authors. All rights reserved. MIT license.
 // @generated file from build script, do not edit
 // deno-lint-ignore-file
 
@@ -206,7 +206,7 @@ function makeMutClosure(arg0, arg1, dtor, f) {
 }
 function __wbg_adapter_20(arg0, arg1, arg2) {
   wasm
-    ._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hda9c9576d99a9cb9(
+    ._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__haac610891b5b0a41(
       arg0,
       arg1,
       addHeapObject(arg2),
@@ -248,7 +248,7 @@ function handleError(f, args) {
   }
 }
 function __wbg_adapter_36(arg0, arg1, arg2, arg3) {
-  wasm.wasm_bindgen__convert__closures__invoke2_mut__hc6e807ee3b243fa0(
+  wasm.wasm_bindgen__convert__closures__invoke2_mut__h5878b1a6fd198edd(
     arg0,
     arg1,
     addHeapObject(arg2),

lib/deno_doc.generated.js

@@ -9,7 +9,6 @@ use crate::decorators::decorators_to_defs;
 use crate::decorators::DecoratorDef;
 use crate::function::function_to_function_def;
 use crate::function::FunctionDef;
-use crate::interface::expr_to_name;
 use crate::js_doc::JsDoc;
 use crate::node::DeclarationKind;
 use crate::params::assign_pat_to_param_def;
@@ -307,7 +306,8 @@ pub fn class_to_class_def(
 
         let ts_type = class_prop.type_ann.as_ref().map(ts_type_ann_to_def);
 
-        let prop_name = expr_to_name(&*class_prop.key);
+        let prop_name =
+          prop_name_to_string(Some(parsed_source), &class_prop.key);
 
         let decorators =
           decorators_to_defs(parsed_source, &class_prop.decorators);

lib/deno_doc_bg.wasm

@@ -8,6 +8,7 @@ use crate::node::DocNode;
 use crate::node::ModuleDoc;
 use crate::swc_util::get_location;
 use crate::swc_util::js_doc_for_span;
+use crate::swc_util::module_export_name_value;
 use crate::swc_util::module_js_doc_for_source;
 use crate::ImportDef;
 use crate::Location;
@@ -324,7 +325,7 @@ impl<'a> DocParser<'a> {
               named_specifier
                 .imported
                 .as_ref()
-                .map(|ident| ident.sym.to_string())
+                .map(module_export_name_value)
                 .or_else(|| Some(named_specifier.local.sym.to_string())),
               import_decl.src.value.to_string(),
             ),
@@ -558,7 +559,7 @@ impl<'a> DocParser<'a> {
                 named_specifier
                   .imported
                   .as_ref()
-                  .map(|ident| ident.sym.to_string()),
+                  .map(module_export_name_value),
               ),
               src: import_decl.src.value.to_string(),
             },
@@ -633,10 +634,14 @@ impl<'a> DocParser<'a> {
                     src: src_str.to_string(),
                   },
                   ExportSpecifier::Named(named_export) => {
-                    let ident = named_export.orig.sym.to_string();
-                    let maybe_alias =
-                      named_export.exported.as_ref().map(|e| e.sym.to_string());
-                    let kind = node::ReexportKind::Named(ident, maybe_alias);
+                    let export_name =
+                      module_export_name_value(&named_export.orig);
+                    let maybe_alias = named_export
+                      .exported
+                      .as_ref()
+                      .map(module_export_name_value);
+                    let kind =
+                      node::ReexportKind::Named(export_name, maybe_alias);
                     node::Reexport {
                       kind,
                       src: src_str.to_string(),
@@ -651,20 +656,17 @@ impl<'a> DocParser<'a> {
                 .filter_map(|specifier| {
                   if let ExportSpecifier::Named(specifier) = specifier {
                     if let Some(import) =
-                      imports.get(&specifier.orig.sym.to_string())
+                      imports.get(&module_export_name_value(&specifier.orig))
                     {
                       // If it has the same name as the original import and private values are exported,
                       // don't export this again and document the same value twice.
                       if self.private && specifier.exported.is_none() {
                         return None;
                       }
 
-                      let name = specifier
-                        .exported
-                        .as_ref()
-                        .unwrap_or(&specifier.orig)
-                        .sym
-                        .to_string();
+                      let name = module_export_name_value(
+                        specifier.exported.as_ref().unwrap_or(&specifier.orig),
+                      );
                       Some(node::Reexport {
                         src: import.src.clone(),
                         kind: match &import.kind {
@@ -788,11 +790,12 @@ impl<'a> DocParser<'a> {
               for specifier in &export_named.specifiers {
                 match specifier {
                   ExportSpecifier::Named(named_specifier) => {
-                    let symbol = named_specifier.orig.sym.to_string();
+                    let symbol =
+                      module_export_name_value(&named_specifier.orig);
                     if let Some(doc_node) = symbols.get(&symbol) {
                       let mut doc_node = doc_node.clone();
                       if let Some(exported) = &named_specifier.exported {
-                        doc_node.name = exported.sym.to_string()
+                        doc_node.name = module_export_name_value(exported)
                       }
                       doc_node.declaration_kind = DeclarationKind::Export;
                       doc_entries.push(doc_node)

src/class.rs

@@ -1,5 +1,6 @@
 // Copyright 2020-2021 the Deno authors. All rights reserved. MIT license.
 
+use deno_ast::swc::ast::ModuleExportName;
 use deno_ast::swc::common::comments::Comment;
 use deno_ast::swc::common::comments::CommentKind;
 use deno_ast::swc::common::comments::Comments;
@@ -83,3 +84,12 @@ pub fn get_location(parsed_source: &ParsedSource, pos: BytePos) -> Location {
     col: line_and_column_index.column_number - 1,
   }
 }
+
+pub fn module_export_name_value(
+  module_export_name: &ModuleExportName,
+) -> String {
+  match module_export_name {
+    ModuleExportName::Ident(ident) => ident.sym.to_string(),
+    ModuleExportName::Str(str) => str.value.to_string(),
+  }
+}