Fix expando functions merged with a namespace

Resolves #2876

Author: Gerrit0

CHANGELOG.md

@@ -44,6 +44,7 @@ title: Changelog
 - TypeDoc will now only create references for symbols re-exported from modules.
 - Variable-functions will now prefer placing the comment on the signature if there is only one signature present, #2824.
 - User filter settings will no longer sometimes cause the search to have fewer visible results than expected.
+- Fixed handling of expando functions which were also merged with a namespace, #2876.
 
 ### Thanks!
 

src/lib/converter/symbols.ts

@@ -274,6 +274,10 @@ function convertNamespace(
         }
     }
 
+    if (symbol.declarations?.some(ts.isFunctionDeclaration)) {
+        exportFlags |= ts.SymbolFlags.PropertyOrAccessor;
+    }
+
     // #2364, @namespace on a variable might be merged with a namespace containing types.
     const existingReflection = context.getReflectionFromSymbol(
         exportSymbol || symbol,
@@ -1179,7 +1183,8 @@ function convertFunctionProperties(
     if (
         type.getProperties().length &&
         (hasAllFlags(symbol.flags, nsFlags) ||
-            !hasAnyFlag(symbol.flags, nsFlags))
+            !hasAnyFlag(symbol.flags, nsFlags)) &&
+        !symbol.declarations?.some(ts.isModuleDeclaration)
     ) {
         convertSymbols(context, type.getProperties());
 

src/test/converter2/issues/gh2876.ts

@@ -0,0 +1,13 @@
+export function MyComponent(props: MyComponent.Props) {
+    return;
+}
+
+export namespace MyComponent {
+    export interface Props {
+        children?: {};
+    }
+}
+
+MyComponent.propTypes = {
+    children: {},
+};

src/test/issues.c2.test.ts

@@ -17,7 +17,7 @@ import {
 import type { InlineTagDisplayPart } from "../lib/models/Comment.js";
 import { getConverter2App, getConverter2Project } from "./programs.js";
 import { TestLogger } from "./TestLogger.js";
-import { equalKind, getComment, getLinks, getSigComment, query, querySig } from "./utils.js";
+import { equalKind, getComment, getLinks, getSigComment, query, querySig, reflToTree } from "./utils.js";
 import { DefaultTheme, KindRouter, PageEvent } from "../index.js";
 
 const app = getConverter2App();
@@ -1988,4 +1988,18 @@ describe("Issue Tests", () => {
         ok(query(project, "B.definedInA").isReference());
         ok(!query(project, "B.definedInB").isReference());
     });
+
+    it("#2876 converts both expando and namespace properties", () => {
+        const project = convert();
+
+        equal(reflToTree(project), {
+            "MyComponent": {
+                "Props": {
+                    "children": {},
+                },
+                "propTypes": {},
+            },
+            "Function:MyComponent": {},
+        });
+    });
 });

src/test/utils.ts

@@ -6,6 +6,7 @@ import {
     Reflection,
     ReflectionKind,
     type SignatureReflection,
+    TraverseProperty,
 } from "../index.js";
 import { filterMap } from "#utils";
 import { equal } from "assert/strict";
@@ -110,3 +111,24 @@ export function equalKind(refl: Reflection, kind: ReflectionKind) {
         `Expected ${ReflectionKind[kind]} but got ${ReflectionKind[refl.kind]}`,
     );
 }
+
+interface ReflectionTree {
+    [name: string]: ReflectionTree;
+}
+
+export function reflToTree(refl: Reflection) {
+    const result: ReflectionTree = {};
+
+    refl.traverse((refl, prop) => {
+        if (prop == TraverseProperty.Children) {
+            if (refl.name in result) {
+                result[`${ReflectionKind[refl.kind]}:${refl.name}`] = reflToTree(refl);
+            } else {
+                result[refl.name] = reflToTree(refl);
+            }
+        }
+        return true;
+    });
+
+    return result;
+}