typedoc 0.25.5 → 0.25.7

package/dist/lib/converter/symbols.js

@@ -276,8 +276,7 @@ function convertFunctionOrMethod(context, symbol, exportSymbol) {
     for (const sig of signatures) {
         (0, signature_1.createSignature)(scope, models_1.ReflectionKind.CallSignature, sig, symbol);
     }
-    convertFunctionProperties(scope, symbol, type);
-    return typescript_1.default.SymbolFlags.NamespaceModule;
+    return convertFunctionProperties(scope, symbol, type);
 }
 // getDeclaredTypeOfSymbol gets the INSTANCE type
 // getTypeOfSymbolAtLocation gets the STATIC type
@@ -573,6 +572,7 @@ function convertFunctionProperties(context, symbol, type) {
         ((0, enum_1.hasAllFlags)(symbol.flags, nsFlags) ||
             !(0, enum_1.hasAnyFlag)(symbol.flags, nsFlags))) {
         convertSymbols(context, type.getProperties());
+        return typescript_1.default.SymbolFlags.NamespaceModule;
     }
 }
 function convertAccessor(context, symbol, exportSymbol) {

package/dist/lib/converter/types.js

@@ -64,7 +64,7 @@ function loadConverters() {
 exports.loadConverters = loadConverters;
 // This ought not be necessary, but we need some way to discover recursively
 // typed symbols which do not have type nodes. See the `recursive` symbol in the variables test.
-const seenTypeSymbols = new Set();
+const seenTypes = new Set();
 function maybeConvertType(context, typeOrNode) {
     if (!typeOrNode) {
         return;
@@ -86,24 +86,17 @@ function convertType(context, typeOrNode) {
     // TS 4.2 added this to enable better tracking of type aliases.
     // We need to check it here, not just in the union checker, because typeToTypeNode
     // will use the origin when serializing
-    if (typeOrNode.isUnion() &&
-        typeOrNode.origin &&
-        !typeOrNode.origin.isUnion()) {
+    // aliasSymbol check is important - #2468
+    if (typeOrNode.isUnion() && typeOrNode.origin && !typeOrNode.aliasSymbol) {
         return convertType(context, typeOrNode.origin);
     }
     // IgnoreErrors is important, without it, we can't assert that we will get a node.
     const node = context.checker.typeToTypeNode(typeOrNode, void 0, typescript_1.default.NodeBuilderFlags.IgnoreErrors);
     (0, assert_1.default)(node); // According to the TS source of typeToString, this is a bug if it does not hold.
-    const symbol = typeOrNode.getSymbol();
-    if (symbol) {
-        if (node.kind !== typescript_1.default.SyntaxKind.TypeReference &&
-            node.kind !== typescript_1.default.SyntaxKind.ArrayType &&
-            seenTypeSymbols.has(symbol)) {
-            const typeString = context.checker.typeToString(typeOrNode);
-            context.logger.verbose(`Refusing to recurse when converting type: ${typeString}`);
-            return new models_1.UnknownType(typeString);
-        }
-        seenTypeSymbols.add(symbol);
+    if (seenTypes.has(typeOrNode.id)) {
+        const typeString = context.checker.typeToString(typeOrNode);
+        context.logger.verbose(`Refusing to recurse when converting type: ${typeString}`);
+        return new models_1.UnknownType(typeString);
     }
     let converter = converters.get(node.kind);
     if (converter) {
@@ -112,9 +105,9 @@ function convertType(context, typeOrNode) {
             !typeOrNode.isIntersection()) {
             converter = typeLiteralConverter;
         }
+        seenTypes.add(typeOrNode.id);
         const result = converter.convertType(context, typeOrNode, node);
-        if (symbol)
-            seenTypeSymbols.delete(symbol);
+        seenTypes.delete(typeOrNode.id);
         return result;
     }
     return requestBugReport(context, typeOrNode);

package/dist/lib/models/reflections/abstract.d.ts

@@ -151,8 +151,6 @@ export declare abstract class Reflection {
     hasOwnDocument?: boolean;
     /**
      * Url safe alias for this reflection.
-     *
-     * @see {@link BaseReflection.getAlias}
      */
     private _alias?;
     private _aliases?;

package/dist/lib/utils/options/readers/typedoc.d.ts

@@ -30,7 +30,6 @@ export declare class TypeDocReader implements OptionsReader {
      *
      * @param  path Path to the typedoc.(js|json) file. If path is a directory
      *   typedoc file will be attempted to be found at the root of this path
-     * @param logger
      * @return the typedoc.(js|json) file path or undefined
      */
     private findTypedocFile;

package/dist/lib/utils/options/readers/typedoc.js

@@ -149,7 +149,6 @@ class TypeDocReader {
      *
      * @param  path Path to the typedoc.(js|json) file. If path is a directory
      *   typedoc file will be attempted to be found at the root of this path
-     * @param logger
      * @return the typedoc.(js|json) file path or undefined
      */
     findTypedocFile(path) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "typedoc",
   "description": "Create api documentation for TypeScript projects.",
-  "version": "0.25.5",
+  "version": "0.25.7",
   "homepage": "https://typedoc.org",
   "exports": {
     ".": "./dist/index.js",