Fix

Author: hoodmane

README.rst

@@ -647,12 +647,14 @@ Version History
 
 5.0.0: (Unreleased)
   * Droped support for Python 3.9 (pyodide/sphinx-js-fork#7)
-  * Dropped support for typedoc 0.15, added support for typedoc 0.25, 0.26, and
-    0.27 (pyodide/sphinx-js-fork#11, pyodide/sphinx-js-fork#22,
+  * Dropped support for typedoc 0.15, added support for typedoc 0.25--0.28
+   (pyodide/sphinx-js-fork#11, pyodide/sphinx-js-fork#22,
     pyodide/sphinx-js-fork#31, pyodide/sphinx-js-fork#39,
     pyodide/sphinx-js-fork#41, pyodide/sphinx-js-fork#43
     pyodide/sphinx-js-fork#52, pyodide/sphinx-js-fork#53,
-    pyodide/sphinx-js-fork#54, pyodide/sphinx-js-fork#174)
+    pyodide/sphinx-js-fork#54, pyodide/sphinx-js-fork#174,
+    #266
+    )
   * Added handling for Typescript type parameters and type bounds.
     (pyodide/sphinx-js-fork#25)
   * Only monkeypatch Sphinx classes when sphinx_js extension is used

sphinx_js/js/convertTopLevel.ts

@@ -12,7 +12,11 @@ import {
   TypeContext,
   TypeParameterReflection,
 } from "typedoc";
-import { referenceToXRef, convertType } from "./convertType.ts";
+import {
+  referenceToXRef,
+  convertType,
+  convertTypeLiteral,
+} from "./convertType.ts";
 import {
   NO_DEFAULT,
   Attribute,
@@ -878,10 +882,23 @@ export class Converter {
   }
 
   convertTypeAlias(ty: DeclarationReflection): ConvertResult {
+    let type;
+    if (ty.type) {
+      type = this.convertType(ty.type);
+    } else {
+      // Handle this change:
+      // https://github.com/TypeStrong/typedoc/commit/ca94f7eaecf90c25d6377e20c405626817de1e26#diff-14759d25b74ca53aee4558d0e26c85eee3c13484ea3ccdf28872b906829ef6f8R380-R390
+      type = convertTypeLiteral(
+        this.basePath,
+        this.pathMap,
+        this.symbolToType,
+        ty,
+      );
+    }
     const ir: TopLevelIR = {
       ...this.topLevelProperties(ty),
       kind: "typeAlias",
-      type: this.convertType(ty.type!),
+      type,
       type_params: this.typeParamsToIR(ty.typeParameters),
     };
     return [ir, ty.children];

sphinx_js/js/convertType.ts

@@ -215,7 +215,7 @@ class TypeConverter implements TypeVisitor<Type> {
       // up so in this case we index on file name and reference name.
 
       // Another place where we incorrectly handle merged declarations
-      const src = type.reflection?.sources?.[0];
+      const src = refl?.sources?.[0];
       if (!src) {
         return undefined;
       }
@@ -281,7 +281,7 @@ class TypeConverter implements TypeVisitor<Type> {
       throw new Error("This shouldn't happen");
     }
 
-    const path = parseFilePath(type.symbolId.fileName, this.basePath);
+    const path = parseFilePath(type.symbolId?.fileName ?? "", this.basePath);
     if (path.includes("node_modules/")) {
       // External reference
       const xref: TypeXRefExternal = {
@@ -420,6 +420,7 @@ class TypeConverter implements TypeVisitor<Type> {
     }
     const result: Type = ["{ "];
     // lit.indexSignature for 0.25.x, lit.indexSignatures for 0.26.0 and later.
+    // @ts-ignore
     const index_sig = lit.indexSignature ?? lit.indexSignatures?.[0];
     if (index_sig) {
       if (index_sig.parameters?.length !== 1) {
@@ -472,6 +473,19 @@ export function convertType(
   return typeConverter.convert(type, context);
 }
 
+export function convertTypeLiteral(
+  basePath: string,
+  reflToPath: ReadonlyMap<
+    DeclarationReflection | SignatureReflection,
+    string[]
+  >,
+  symbolToType: ReadonlySymbolToType,
+  type: DeclarationReflection,
+): Type {
+  const typeConverter = new TypeConverter(basePath, reflToPath, symbolToType);
+  return typeConverter.convertTypeLiteral(type);
+}
+
 export function referenceToXRef(
   basePath: string,
   reflToPath: ReadonlyMap<