fix tests

Author: nathanwhit

src/html/types.rs

@@ -166,13 +166,7 @@ pub(crate) fn render_type_def(
                 )
               })
             } else {
-              Some(format!(
-                "#{}",
-                IdBuilder::new(ctx)
-                  .kind(IdKind::TypeParam)
-                  .name(&type_ref.type_name)
-                  .build_unregistered()
-              ))
+              None
             }
           }
           crate::ts_type::TypeRefResolution::Import { specifier, name } => {

src/js_doc.rs

@@ -74,7 +74,9 @@ pub fn parse_jsdoc_type(
     type_alias,
   ) = type_alias
   {
-    Some(TsTypeDef::new(module_info, &type_alias.type_annotation))
+    let mut ts_type = TsTypeDef::new(module_info, &type_alias.type_annotation);
+    ts_type.clear_resolutions();
+    Some(ts_type)
   } else {
     None
   }
@@ -615,7 +617,6 @@ mod tests {
   ) -> serde_json::Value {
     let mut value = serde_json::json!({
       "typeName": name,
-      "resolution": { "kind": "typeParam" },
     });
     if let Some(tp) = type_params {
       value["typeParams"] = serde_json::json!(tp);

src/lib.rs

@@ -207,16 +207,16 @@ pub fn docnodes_v1_to_v2(value: serde_json::Value) -> Document {
     let mut declaration = serde_json::Value::Object(obj);
     migrate_declaration(&mut declaration);
 
-    let symbol = symbols.entry(name.clone()).or_insert_with(|| Symbol {
-      name,
-      is_default,
-      declarations: vec![],
-    });
-    // If any entry is marked default, the symbol is default
-    if is_default {
-      symbol.is_default = true;
-    }
     if let Ok(decl) = serde_json::from_value::<Declaration>(declaration) {
+      let symbol = symbols.entry(name.clone()).or_insert_with(|| Symbol {
+        name,
+        is_default,
+        declarations: vec![],
+      });
+      // If any entry is marked default, the symbol is default
+      if is_default {
+        symbol.is_default = true;
+      }
       symbol.declarations.push(decl);
     }
   }
@@ -313,18 +313,21 @@ fn v1_nodes_to_symbols(nodes: Vec<serde_json::Value>) -> serde_json::Value {
     let mut decl = serde_json::Value::Object(obj);
     migrate_declaration(&mut decl);
 
-    let symbol = symbols.entry(name.clone()).or_insert_with(|| {
-      serde_json::json!({
-        "name": name,
-        "declarations": []
-      })
-    });
+    let declaration = serde_json::from_value::<Declaration>(decl.clone());
+    if declaration.is_ok() {
+      let symbol = symbols.entry(name.clone()).or_insert_with(|| {
+        serde_json::json!({
+          "name": name,
+          "declarations": []
+        })
+      });
+
+      if is_default {
+        symbol["isDefault"] = serde_json::Value::Bool(true);
+      }
 
-    if is_default {
-      symbol["isDefault"] = serde_json::Value::Bool(true);
+      symbol["declarations"].as_array_mut().unwrap().push(decl);
     }
-
-    symbol["declarations"].as_array_mut().unwrap().push(decl);
   }
 
   serde_json::Value::Array(symbols.into_values().collect())

src/parser.rs

@@ -1413,8 +1413,14 @@ impl<'a> DocParser<'a> {
         self.get_doc_for_export_default_decl(module_info, n)
       }
       SymbolNodeRef::ExportDefaultExpr(n) => {
-        let js_doc = js_doc_for_range(module_info, n.span())?;
-        let location = get_location(module_info, n.span().start);
+        let (js_doc, location) = self
+          .export_default_expr_context(module_info, n)
+          .unwrap_or_else(|| {
+            (
+              js_doc_for_range(module_info, n.span()).unwrap_or_default(),
+              get_location(module_info, n.span().start),
+            )
+          });
         self.get_decl_for_export_default_expr(module_info, n, js_doc, location)
       }
       SymbolNodeRef::FnDecl(n) => {
@@ -1530,6 +1536,26 @@ impl<'a> DocParser<'a> {
     }
   }
 
+  fn export_default_expr_context(
+    &self,
+    module_info: &EsModuleInfo,
+    export_expr: &ExportDefaultDeclarationKind,
+  ) -> Option<(JsDoc, Location)> {
+    let expr_span = export_expr.span();
+    for stmt in module_info.statements() {
+      let Statement::ExportDefaultDeclaration(export_default) = stmt else {
+        continue;
+      };
+      if export_default.declaration.span() == expr_span {
+        return Some((
+          js_doc_for_range(module_info, export_default.span)?,
+          get_location(module_info, export_default.span.start),
+        ));
+      }
+    }
+    None
+  }
+
   fn get_declare_for_export_decl_declaration(
     &self,
     export_decl: &ExportNamedDeclaration,

src/tests.rs

@@ -519,8 +519,8 @@ export * as b from "./mod_doc.ts";
         "location": {
           "filename": "file:///ns.ts",
           "line": 1,
-          "col": 7,
-          "byteIndex": 8
+          "col": 0,
+          "byteIndex": 1
         },
         "declarationKind": "export",
         "jsDoc": {